mirror of
https://gitlab.com/dk64_decomp/dk64.git
synced 2024-11-23 07:01:58 +00:00
More sigs :)
This commit is contained in:
Donkey Kong
parent
695fb5319e
commit
2874c7adea
@ -28,10 +28,11 @@ void func_global_asm_80614A64(Actor *arg0);
|
||||
void func_global_asm_80614D00(Actor *arg0, f32 arg1, f32 arg2);
|
||||
void func_global_asm_80614D48(Actor *arg0, f32 arg1, f32 arg2);
|
||||
void func_global_asm_80614D90(Actor *arg0);
|
||||
void func_global_asm_8061C464(Actor *arg0, Actor *arg1, s32, s32, s32, s32, s32, s32, s32, s32, f32);
|
||||
void func_global_asm_8061C6A8(Actor *arg0, Actor *arg1, s32, s32, s32, s32, s32, s32, s32, s32, f32);
|
||||
void func_global_asm_8061C464(Actor *arg0, Actor *arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, f32 arg10);
|
||||
void func_global_asm_8061C6A8(Actor *arg0, Actor *arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, f32 arg10);
|
||||
void func_global_asm_8061CB08(void);
|
||||
s32 func_global_asm_8061CB50(void);
|
||||
void func_global_asm_80626F8C(f32, f32, f32, f32 *, f32 *, s32, f32, s32);
|
||||
void func_global_asm_80626F8C(f32 arg0, f32 arg1, f32 arg2, f32 *arg3, f32 *arg4, s32 arg5, f32 arg6, s32 arg7);
|
||||
void func_global_asm_806A36F4(void);
|
||||
u8 func_global_asm_806E770C(void);
|
||||
void func_global_asm_8073243C(void);
|
||||
@ -70,11 +71,11 @@ void func_global_asm_8073E8B4(void);
|
||||
// dk64_boot/inflate.c
|
||||
// TODO: func_dk64_boot_800010C0 has no documented signature
|
||||
// TODO: func_dk64_boot_80001700 has no documented signature
|
||||
// TODO: func_dk64_boot_80001AF4 has no documented signature
|
||||
// TODO: func_dk64_boot_80001C48 has no documented signature
|
||||
// TODO: func_dk64_boot_80001DB0 has no documented signature
|
||||
// TODO: func_dk64_boot_800022D4 has no documented signature
|
||||
// TODO: func_dk64_boot_800023F4 has no documented signature
|
||||
int func_dk64_boot_80001AF4(void); // inflate_stored();
|
||||
int func_dk64_boot_80001C48(void); // inflate_fixed();
|
||||
int func_dk64_boot_80001DB0(void); // inflate_dynamic();
|
||||
int func_dk64_boot_800022D4(int *e); // inflate_block();
|
||||
int func_dk64_boot_800023F4(void); //int inflate()
|
||||
|
||||
// dk64_boot/dk64_boot_30E0.c
|
||||
// TODO: func_dk64_boot_800024E0 has no documented signature
|
||||
@ -939,7 +940,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 boneIndex, f32* x, f32* y, f32* z);
|
||||
void func_global_asm_806335B0(s32 arg0, u8 arg1, 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);
|
||||
@ -956,13 +957,13 @@ void func_global_asm_8063495C(OM2_unk24 *arg0, ObjectModel2 *arg1);
|
||||
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);
|
||||
void func_global_asm_80634D64(s32 arg0, s16 arg1, s16 arg2, s16 arg3, s32 arg4, s32 arg5, u8 arg6);
|
||||
void func_global_asm_80634E10(Model2Model50_B8*, s16, s16, s16, s16*, s16*, u8);
|
||||
void func_global_asm_80634E10(Model2Model50_B8 *arg0, s16 arg1, s16 arg2, s16 arg3, s16 *arg4, s16 *arg5, u8 arg6);
|
||||
void func_global_asm_80634EA4(s32 arg0, s16 arg1, u8 arg2);
|
||||
void func_global_asm_80634EDC(s32 arg0, s16 arg1, u8 *arg2);
|
||||
void func_global_asm_80634F14(s32, s16, u8, u8*, u8);
|
||||
void func_global_asm_80634FA0(Model2Model50_B8*, s16, u8, u8*, u8);
|
||||
void func_global_asm_80634F14(s32 arg0, s16 arg1, u8 arg2, u8 *arg3, u8 arg4);
|
||||
void func_global_asm_80634FA0(Model2Model50_B8 *arg0, s16 arg1, u8 arg2, u8 *arg3, u8 arg4);
|
||||
void func_global_asm_80635018(s32 arg0, s16 arg1, s32 arg2, s32 arg3);
|
||||
void func_global_asm_80635098(Model2Model50_B8*, s16, s32, s32);
|
||||
void func_global_asm_80635098(Model2Model50_B8 *arg0, s16 arg1, s32 arg2, s32 arg3);
|
||||
// TODO: func_global_asm_80635114 has no documented signature
|
||||
s32 func_global_asm_80635214(Gfx *arg0);
|
||||
// TODO: func_global_asm_8063524C has no documented signature
|
||||
@ -999,9 +1000,9 @@ 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
|
||||
s32 func_global_asm_80639F1C(Model2Model50_B8 *, s32 *, s32 *);
|
||||
s32 func_global_asm_80639F1C(Model2Model50_B8 *arg0, s32 *arg1, s32 *arg2);
|
||||
// TODO: func_global_asm_80639FC0 has no documented signature
|
||||
s32 func_global_asm_8063A38C(Chunk14*, Chunk14*, f32, f32, f32);
|
||||
s32 func_global_asm_8063A38C(Chunk14 *arg0, Chunk14 *arg1, f32 arg2, f32 arg3, f32 arg4);
|
||||
// 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
|
||||
@ -1105,7 +1106,7 @@ void func_global_asm_80643F38(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
|
||||
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);
|
||||
void func_global_asm_80644A18(s32, s32, s32, f32);
|
||||
void func_global_asm_80644A18(s32 arg0, s32 arg1, s32 arg2, f32 arg3);
|
||||
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);
|
||||
@ -1208,7 +1209,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
|
||||
s32 func_global_asm_8064E174(s32, s16, s16, s32 *, s32, s32, s32);
|
||||
s32 func_global_asm_8064E174(s32 arg0, s16 arg1, s16 arg2, s32 *arg3, s32 arg4, s32 arg5, s32 arg6);
|
||||
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);
|
||||
@ -1239,7 +1240,7 @@ 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
|
||||
void func_global_asm_8064FA7C(void*, void*);
|
||||
void func_global_asm_8064FA7C(void *arg0, void *arg1);
|
||||
// TODO: func_global_asm_8064FB64 has no documented signature
|
||||
// TODO: func_global_asm_806500E0 has no documented signature
|
||||
void func_global_asm_8065051C(void);
|
||||
@ -1288,12 +1289,12 @@ 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);
|
||||
void func_global_asm_80652FDC(f32, f32, f32, s16, s16, s16*);
|
||||
s16 func_global_asm_806531B8(f32, f32, f32, s16);
|
||||
void func_global_asm_80652FDC(f32 arg0, f32 arg1, f32 arg2, s16 arg3, s16 arg4, s16 *arg5);
|
||||
s16 func_global_asm_806531B8(f32 arg0, f32 arg1, f32 arg2, s16 arg3);
|
||||
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);
|
||||
s32 func_global_asm_80653804(Chunk78_7C*, f32, f32);
|
||||
s32 func_global_asm_80653684(Chunk78_7C *arg0, f32 arg1, f32 arg2);
|
||||
s32 func_global_asm_80653804(Chunk78_7C *arg0, f32 arg1, f32 arg2);
|
||||
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);
|
||||
@ -1301,17 +1302,17 @@ void func_global_asm_80653B80(f32 arg0, f32 arg1, f32 arg2);
|
||||
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);
|
||||
void func_global_asm_80654380(f32 arg0, f32 arg1, f32 arg2);
|
||||
void func_global_asm_80654418(f32 arg0, f32 arg1, f32 arg2);
|
||||
// TODO: func_global_asm_806545D4 has no documented signature
|
||||
void func_global_asm_806547A8(f32, f32, f32);
|
||||
void func_global_asm_80654A2C(f32, f32, f32);
|
||||
void func_global_asm_806547A8(f32 arg0, f32 arg1, f32 arg2);
|
||||
void func_global_asm_80654A2C(f32 arg0, f32 arg1, f32 arg2);
|
||||
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
|
||||
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_80655410(f32 arg0, f32 arg1, f32 arg2);
|
||||
void func_global_asm_80655AD0(void);
|
||||
void func_global_asm_80655BF0(void);
|
||||
s32 func_global_asm_80655CF8(s16 arg0, s32 arg1);
|
||||
@ -1335,7 +1336,7 @@ void func_global_asm_8065850C(f32 arg0[4][4], f32 arg1[4][4], s32 arg2, f32 arg3
|
||||
// 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
|
||||
s16 func_global_asm_80658B08(s8, u8*, s16);
|
||||
s16 func_global_asm_80658B08(s8 arg0, u8 *arg1, s16 arg2);
|
||||
void func_global_asm_80658BD0(void);
|
||||
void func_global_asm_80658C10(s32 arg0, s16 arg1, s16 arg2, s16 arg3);
|
||||
void func_global_asm_80658CCC(void);
|
||||
@ -1419,7 +1420,7 @@ 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);
|
||||
void func_global_asm_8065F678(f32, f32, f32, u8);
|
||||
void func_global_asm_8065F678(f32 arg0, f32 arg1, f32 arg2, u8 arg3);
|
||||
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
|
||||
@ -1525,7 +1526,7 @@ void func_global_asm_80666290(Actor *arg0, void *arg1, void *arg2, void *arg3, v
|
||||
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);
|
||||
void func_global_asm_80666428(Actor *arg0, f32 x, f32 y, f32 z, void*, void*, void*, void*, u8);
|
||||
void func_global_asm_80666428(Actor *arg0, f32 x, f32 y, f32 z, void *arg4, void *arg5, void *arg6, void *arg7, u8 arg8);
|
||||
u8 func_global_asm_80666A88(void);
|
||||
u8 func_global_asm_80666A94(void);
|
||||
u8 func_global_asm_80666AA0(void);
|
||||
@ -1542,9 +1543,9 @@ s32 func_global_asm_80667110(f32 arg0, f32 arg1, f32 *arg2);
|
||||
u8 func_global_asm_8066715C(f32 *arg0);
|
||||
u8 func_global_asm_80667174(void);
|
||||
u8 func_global_asm_80667180(f32 arg0, f32 arg1, f32 *arg2, s32 arg3);
|
||||
s32 func_global_asm_806672B8(f32, f32, f32 *, s32);
|
||||
s32 func_global_asm_806672B8(f32 arg0, f32 arg1, f32 *arg2, s32 arg3);
|
||||
f32 func_global_asm_8066785C(void *arg0, f32 arg1, f32 arg2);
|
||||
u8 func_global_asm_806679BC(f32, f32, f32 *);
|
||||
u8 func_global_asm_806679BC(f32 arg0, f32 arg1, f32 *arg2);
|
||||
s32 func_global_asm_80668520(f32 *arg0, f32 arg1, f32 arg2, f32 *arg3);
|
||||
// TODO: func_global_asm_806685E0 has no documented signature
|
||||
void func_global_asm_806686F4(s32 arg0);
|
||||
@ -1583,7 +1584,7 @@ void func_global_asm_8066B0DC(void);
|
||||
void func_global_asm_8066B0EC(s32 arg0);
|
||||
void *getPointerTableFile(s32 pointerTableIndex, s32 fileIndex, u8 arg2, u8 arg3);
|
||||
void func_global_asm_8066B424(void);
|
||||
void func_global_asm_8066B434(void*, s32, s32);
|
||||
void func_global_asm_8066B434(void *arg0, s32 arg1, s32 arg2);
|
||||
void func_global_asm_8066B4AC(s32 arg0, s32 arg1, s32 arg2);
|
||||
s32 func_global_asm_8066B4D4(s32 arg0, s32 arg1, s32 *arg2, s32 *arg3);
|
||||
s32 func_global_asm_8066B5C8(s32 pointerTableIndex, s32 fileIndex);
|
||||
@ -1734,7 +1735,7 @@ void func_global_asm_806755A8(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4,
|
||||
// global_asm/done/code_7A510.c
|
||||
// TODO: func_global_asm_80675810 has no documented signature
|
||||
void func_global_asm_80675AFC(Actor *arg0, Actor *arg1);
|
||||
s32 func_global_asm_80675C70(s16, s16, s16);
|
||||
s32 func_global_asm_80675C70(s16 arg0, s16 arg1, s16 arg2);
|
||||
void func_global_asm_80675D70(Actor *arg0);
|
||||
void func_global_asm_80675DD0(Actor *arg0, Actor *arg1);
|
||||
// TODO: func_global_asm_80675E3C has no documented signature
|
||||
@ -1778,7 +1779,7 @@ u8 func_global_asm_80676CB0(Struct80676CB0 *arg0, u8 arg1);
|
||||
void func_global_asm_80676D00(Actor *arg0, Actor *arg1, s32 arg2, s32 arg3);
|
||||
|
||||
// global_asm/code_7BBD0.c
|
||||
// TODO: func_global_asm_80676ED0 has no documented signature
|
||||
u8 func_global_asm_80676ED0(Actor *arg0, s16 *arg1, s16 *arg2);
|
||||
// TODO: func_global_asm_80677148 has no documented signature
|
||||
// TODO: func_global_asm_8067760C has no documented signature
|
||||
// TODO: func_global_asm_806776A0 has no documented signature
|
||||
@ -1786,12 +1787,12 @@ s32 func_global_asm_80677CAC(s16 arg0, s16 arg1);
|
||||
s32 func_global_asm_80677D58(Actor *arg0);
|
||||
|
||||
// global_asm/code_7CA80.c
|
||||
// TODO: func_global_asm_80677D80 has no documented signature
|
||||
void func_global_asm_80677D80(void);
|
||||
void func_global_asm_80677EC8(s32 arg0);
|
||||
// TODO: func_global_asm_80677ED0 has no documented signature
|
||||
s32 spawnActor(Actors actorIndex, s32 modelIndex);
|
||||
s32 func_global_asm_80678014(s32 arg0);
|
||||
// TODO: func_global_asm_80678050 has no documented signature
|
||||
s32 func_global_asm_80678050(u16);
|
||||
void deleteActor(Actor *arg0);
|
||||
s32 func_global_asm_806782E8(Actor *arg0);
|
||||
void func_global_asm_806783BC(void);
|
||||
@ -1827,12 +1828,12 @@ void func_global_asm_806791EC(Actor *arg0, s32 arg1);
|
||||
void func_global_asm_80679200(Actor *arg0, Actor *arg1, s32 arg2, u8 arg3, s32 arg4, void *arg5);
|
||||
void func_global_asm_80679290(Actor *arg0, s32 arg1, s32 arg2, u8 arg3, s32 arg4, s32 arg5, s32 arg6);
|
||||
// TODO: func_global_asm_80679334 has no documented signature
|
||||
ActorCollision *func_global_asm_80679490(Actor *, s32, u8, s32, void*);
|
||||
ActorCollision *func_global_asm_80679490(Actor *arg0, s32 arg1, u8 arg2, s32 arg3, void *arg4);
|
||||
// TODO: func_global_asm_806794EC has no documented signature
|
||||
void func_global_asm_80679DC4(Actor *arg0, Actor *arg1, u8 arg2);
|
||||
// TODO: func_global_asm_8067A09C has no documented signature
|
||||
void func_global_asm_8067A170(Actor* arg0, u8 arg1);
|
||||
// TODO: func_global_asm_8067A1DC has no documented signature
|
||||
void func_global_asm_8067A1DC(Actor *arg0);
|
||||
void func_global_asm_8067A69C(Actor *arg0, Actor *arg1, f32 arg2, f32 arg3, u8 arg4, u8 arg5);
|
||||
void func_global_asm_8067A70C(Actor *arg0, Actor *arg1, f32 arg2, f32 arg3, f32 arg4, u8 arg5, u8 arg6);
|
||||
void func_global_asm_8067A784(Actor *arg0, Actor *arg1, s16 arg2, f32 arg3, s16 arg4);
|
||||
@ -1856,7 +1857,7 @@ void func_global_asm_8067AE90(Actor *arg0);
|
||||
void func_global_asm_8067AEFC(Actor *arg0);
|
||||
s32 func_global_asm_8067AF44(Actor *arg0);
|
||||
s16 func_global_asm_8067AF74(Actor *arg0);
|
||||
// TODO: func_global_asm_8067B01C has no documented signature
|
||||
void func_global_asm_8067B01C(void);
|
||||
void func_global_asm_8067B100(Actor *player);
|
||||
u8 func_global_asm_8067B1E0(Actor *arg0);
|
||||
void moveAndScaleActorToAnother(Actor *destination, Actor *source, f32 scale);
|
||||
@ -1955,8 +1956,8 @@ void func_global_asm_806852C4(f32 arg0, f32 arg1, f32 arg2, f32 arg3);
|
||||
// TODO: func_global_asm_80685390 has no documented signature
|
||||
void func_global_asm_80685520(f32 arg0, u8 arg1, f32 arg2, f32 arg3, f32 arg4);
|
||||
void func_global_asm_80685708(Actor *arg0, u8 arg1);
|
||||
void func_global_asm_8068581C(Actor *, s16, f32, f32, f32, f32, s32);
|
||||
void func_global_asm_8068588C(Actor *actor, s16 arg1, f32 scale, f32 x, f32 y, f32 z, s32 arg6);
|
||||
void func_global_asm_8068581C(Actor *actor, s16 boneIndex, f32 scale, f32 x, f32 y, f32 z, s32 arg6);
|
||||
void func_global_asm_8068588C(Actor *actor, s16 boneIndex, f32 scale, f32 x, f32 y, f32 z, s32 arg6);
|
||||
void func_global_asm_806858E8(Actor *actor, s16 boneIndex, f32 scale, f32 x, f32 y, f32 z, s32 arg6);
|
||||
void func_global_asm_80685984(f32 arg0, f32 arg1, f32 arg2, f32 arg3);
|
||||
void func_global_asm_80685B44(void *arg0, u8 arg1, f32 arg2, u8 arg3, u8 arg4, s16 arg5, s16 arg6, s16 arg7, s16 arg8);
|
||||
@ -1968,7 +1969,7 @@ void func_global_asm_80686340(void);
|
||||
// TODO: func_global_asm_80686390 has no documented signature
|
||||
void func_global_asm_8068696C(Actor *arg0);
|
||||
void func_global_asm_80686A5C(Actor *arg0, f32 arg1, f32 arg2, s32 arg3);
|
||||
// TODO: func_global_asm_80686CF8 has no documented signature
|
||||
void func_global_asm_80686CF8(Actor *actor);
|
||||
void func_global_asm_80686E40(f32 x, f32 y, f32 z, s32 arg3);
|
||||
void func_global_asm_80686F90(u8 arg0, s16 arg1, s16 arg2);
|
||||
void func_global_asm_80687080(void);
|
||||
@ -2112,7 +2113,7 @@ void func_global_asm_80690470(Actor *arg0);
|
||||
void func_global_asm_80690500(void);
|
||||
void func_global_asm_806907B8(void);
|
||||
void func_global_asm_806907E0(void);
|
||||
void func_global_asm_806907F0(f32, f32, f32);
|
||||
void func_global_asm_806907F0(f32 x, f32 y, f32 z);
|
||||
void func_global_asm_80690814(Actor *arg0, s32 arg1);
|
||||
void func_global_asm_8069084C(s16 arg0, s16 arg1, f32 arg2, s16 arg3, f32 arg4, f32 arg5, Actor *arg6);
|
||||
void func_global_asm_80690930(s16 arg0, s16 arg1, s16 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, Actor *arg8);
|
||||
@ -2143,7 +2144,7 @@ void func_global_asm_8069329C(void);
|
||||
// TODO: func_global_asm_80694D20 has no documented signature
|
||||
s32 func_global_asm_806951B0(Actor *arg0);
|
||||
// TODO: func_global_asm_806951E8 has no documented signature
|
||||
// TODO: func_global_asm_80695724 has no documented signature
|
||||
void func_global_asm_80695724(f32 arg0, u8 arg1);
|
||||
void func_global_asm_80695B50(void);
|
||||
// TODO: func_global_asm_80695BAC has no documented signature
|
||||
// TODO: func_global_asm_806960A4 has no documented signature
|
||||
@ -2166,7 +2167,7 @@ void func_global_asm_8069902C(void);
|
||||
void func_global_asm_8069904C(void);
|
||||
|
||||
// global_asm/code_9DD70.c
|
||||
void func_global_asm_80699070(s16 *, s16 *, f32, f32, f32, f32, f32, f32);
|
||||
void func_global_asm_80699070(s16 *arg0, s16 *arg1, f32 x1, f32 y1, f32 z1, f32 x2, f32 y2, f32 z2);
|
||||
// TODO: func_global_asm_80699128 has no documented signature
|
||||
// TODO: func_global_asm_80699284 has no documented signature
|
||||
void func_global_asm_806998C8(void);
|
||||
@ -2264,13 +2265,13 @@ void func_global_asm_806A3B78(s32 *arg0, AAD_global_asm_806A4DDC *arg1, Struct80
|
||||
// TODO: func_global_asm_806A495C has no documented signature
|
||||
// TODO: func_global_asm_806A4B84 has no documented signature
|
||||
// TODO: func_global_asm_806A4DDC has no documented signature
|
||||
// TODO: func_global_asm_806A5174 has no documented signature
|
||||
void func_global_asm_806A5174(Actor *arg0, void *arg1, f32 arg2);
|
||||
void func_global_asm_806A57C0(AAD_global_asm_806A4DDC *arg0);
|
||||
// TODO: func_global_asm_806A5868 has no documented signature
|
||||
// TODO: func_global_asm_806A5C60 has no documented signature
|
||||
void func_global_asm_806A5868(void);
|
||||
void func_global_asm_806A5C60(Actor *arg0);
|
||||
|
||||
// global_asm/done/code_AAAF0.c
|
||||
void func_global_asm_806A5DF0(s16 arg0, f32 arg1, f32 arg2, f32 arg3, s16 arg4, u8 arg5, s16 arg6, s32 arg7);
|
||||
void func_global_asm_806A5DF0(s16 arg0, f32 x, f32 y, f32 z, s16 arg4, u8 arg5, s16 arg6, s32 arg7);
|
||||
// TODO: func_global_asm_806A5EAC has no documented signature
|
||||
void func_global_asm_806A5F44(void);
|
||||
void func_global_asm_806A5FA4(void);
|
||||
@ -2290,7 +2291,7 @@ void func_global_asm_806A63A8(void);
|
||||
void func_global_asm_806A6408(void);
|
||||
// TODO: func_global_asm_806A6468 has no documented signature
|
||||
// TODO: func_global_asm_806A6574 has no documented signature
|
||||
// TODO: func_global_asm_806A664C has no documented signature
|
||||
void func_global_asm_806A664C(f32 arg0);
|
||||
void func_global_asm_806A6DB4(u8 arg0);
|
||||
void func_global_asm_806A734C(void);
|
||||
void func_global_asm_806A736C(void);
|
||||
@ -2564,7 +2565,7 @@ void func_global_asm_806C850C(s32 arg0, u8 arg1);
|
||||
void func_global_asm_806C8984(void);
|
||||
void func_global_asm_806C8D20(Actor *arg0);
|
||||
u8 func_global_asm_806C8D2C(s16 arg0);
|
||||
// TODO: func_global_asm_806C8DE0 has no documented signature
|
||||
s32 func_global_asm_806C8DE0(s32 playerIndex);
|
||||
// TODO: func_global_asm_806C8E58 has no documented signature
|
||||
void func_global_asm_806C8EE8(void);
|
||||
// TODO: func_global_asm_806C8F8C has no documented signature
|
||||
@ -3226,15 +3227,15 @@ f32 func_global_asm_806F7378(s32 arg0);
|
||||
// global_asm/hud.c
|
||||
// TODO: func_global_asm_806F7FD0 has no documented signature
|
||||
void func_global_asm_806F8004(f32 arg0, f32 arg1, f32 *arg2, f32 *arg3, f32 *arg4);
|
||||
void func_global_asm_806F8170(s32 arg0, f32 *arg1, f32 *arg2, f32 *arg3);
|
||||
void func_global_asm_806F8170(s32 HUDItemIndex, f32 *arg1, f32 *arg2, f32 *arg3);
|
||||
// TODO: func_global_asm_806F8278 has no documented signature
|
||||
void func_global_asm_806F833C(s32 arg0);
|
||||
void func_global_asm_806F8A8C(u8 arg0, u8 playerIndex, s32 arg2);
|
||||
u16 func_global_asm_806F8AD4(u8 arg0, u8 playerIndex);
|
||||
void func_global_asm_806F8BC4(s32 HUDItemIndex, u8 arg1, s32 arg2);
|
||||
void func_global_asm_806F8CB0(s32 arg0);
|
||||
void func_global_asm_806F8CFC(s32 arg0, s32 arg1);
|
||||
void func_global_asm_806F8D58(s32 arg0, s32 arg1);
|
||||
void func_global_asm_806F8CB0(s32 HUDItemIndex);
|
||||
void func_global_asm_806F8CFC(s32 HUDItemIndex, s32 arg1);
|
||||
void func_global_asm_806F8D58(s32 HUDItemIndex, s32 arg1);
|
||||
void func_global_asm_806F8DC4(u8 *arg0, s32 arg1, s32 arg2);
|
||||
s32 func_global_asm_806F8EB4(void);
|
||||
u16 func_global_asm_806F8EDC(s32 HUDItemIndex, s32 playerIndex); // getMaxItemCapacity(HUDItemIndex, playerIndex)
|
||||
@ -3262,7 +3263,7 @@ s32 func_global_asm_806FA7A4(s32 arg0);
|
||||
// TODO: func_global_asm_806FA9C0 has no documented signature
|
||||
// TODO: func_global_asm_806FAB20 has no documented signature
|
||||
void func_global_asm_806FAC64(u8 arg0);
|
||||
// TODO: func_global_asm_806FACE8 has no documented signature
|
||||
void *func_global_asm_806FACE8(u32 arg0);
|
||||
// TODO: func_global_asm_806FAFE4 has no documented signature
|
||||
void func_global_asm_806FB218(void);
|
||||
void func_global_asm_806FB290(void);
|
||||
@ -3303,10 +3304,10 @@ void func_global_asm_806FDAEC(s16 arg0);
|
||||
// TODO: func_global_asm_806FDB8C has no documented signature
|
||||
void func_global_asm_806FDF1C(s16 arg0, char *arg1);
|
||||
// TODO: func_global_asm_806FDF54 has no documented signature
|
||||
Gfx *func_global_asm_806FE078(Gfx *, u8, s32, f32, f32, f32, f32);
|
||||
Gfx *func_global_asm_806FE078(Gfx *dl, u8 arg1, s32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6);
|
||||
|
||||
// global_asm/code_103AB0.c
|
||||
Gfx *func_global_asm_806FEDB0(Gfx*, u8);
|
||||
Gfx *func_global_asm_806FEDB0(Gfx *dl, u8 arg1);
|
||||
// TODO: func_global_asm_806FEF7C has no documented signature
|
||||
Gfx *func_global_asm_806FF01C(Gfx *dl, Actor *arg1);
|
||||
void func_global_asm_806FF144(Gfx *dl);
|
||||
@ -3322,7 +3323,7 @@ void func_global_asm_806FFF5C(void);
|
||||
// TODO: func_global_asm_80700088 has no documented signature
|
||||
void func_global_asm_807002AC(u16 *arg0, s16 **arg1, f32 arg2);
|
||||
// TODO: func_global_asm_8070033C has no documented signature
|
||||
Gfx *func_global_asm_8070068C(Gfx *);
|
||||
Gfx *func_global_asm_8070068C(Gfx *dl);
|
||||
// TODO: func_global_asm_807007B8 has no documented signature
|
||||
// TODO: func_global_asm_807009F4 has no documented signature
|
||||
// TODO: func_global_asm_80700AE4 has no documented signature
|
||||
@ -3394,25 +3395,25 @@ void func_global_asm_8070C27C(Mtx *arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4,
|
||||
// TODO: func_global_asm_8070C2D8 has no documented signature
|
||||
void func_global_asm_8070C590(f32 (*arg0)[4], f32 (*arg1)[4], f32 (*arg2)[4]);
|
||||
// TODO: func_global_asm_8070C808 has no documented signature
|
||||
void func_global_asm_8070C89C(float (*mf)[4], f32, f32, f32);
|
||||
void func_global_asm_8070C8F4(float (*mf)[4], f32, f32, f32);
|
||||
void func_global_asm_8070C990(float (*mf)[4], f32, f32, f32);
|
||||
void func_global_asm_8070C89C(float (*mf)[4], f32 arg1, f32 arg2, f32 arg3);
|
||||
void func_global_asm_8070C8F4(float (*mf)[4], f32 arg1, f32 arg2, f32 arg3);
|
||||
void func_global_asm_8070C990(float (*mf)[4], f32 arg1, f32 arg2, f32 arg3);
|
||||
void func_global_asm_8070C9E8(Mtx *arg0, f32 arg1, f32 arg2, f32 arg3);
|
||||
void func_global_asm_8070CA2C(Mtx *arg0, f32 arg1, f32 arg2, f32 arg3);
|
||||
void func_global_asm_8070CA70(Mtx *arg0, f32 arg1, f32 arg2, f32 arg3);
|
||||
void func_global_asm_8070CAB4(float (*mf)[4], f32);
|
||||
void func_global_asm_8070CB2C(float (*mf)[4], f32);
|
||||
void func_global_asm_8070CBA4(float (*mf)[4], f32);
|
||||
void func_global_asm_8070CAB4(float (*mf)[4], f32 arg1);
|
||||
void func_global_asm_8070CB2C(float (*mf)[4], f32 arg1);
|
||||
void func_global_asm_8070CBA4(float (*mf)[4], f32 arg1);
|
||||
void func_global_asm_8070CC1C(Mtx *arg0, f32 arg1);
|
||||
void func_global_asm_8070CC54(Mtx *arg0, f32 arg1);
|
||||
void func_global_asm_8070CC8C(Mtx *arg0, f32 arg1);
|
||||
void func_global_asm_8070CCC4(float (*mf)[4]);
|
||||
void func_global_asm_8070CD14(Mtx *arg0);
|
||||
void func_global_asm_8070CD44(float (*mf)[4], f32, f32, f32);
|
||||
void func_global_asm_8070CD44(float (*mf)[4], f32 arg1, f32 arg2, f32 arg3);
|
||||
void func_global_asm_8070CD8C(Mtx *arg0, f32 arg1, f32 arg2, f32 arg3);
|
||||
// TODO: func_global_asm_8070CDD0 has no documented signature
|
||||
void func_global_asm_8070CDD0(f32 (*arg0)[4], f32 (*arg1)[4], f32 arg2, f32 arg3, f32 arg4);
|
||||
void func_global_asm_8070D020(Mtx *arg0, Mtx *arg1, f32 arg2, f32 arg3, f32 arg4);
|
||||
// TODO: func_global_asm_8070D07C has no documented signature
|
||||
void func_global_asm_8070D07C(f32 (*mf)[4], f32 (*mf2)[4], f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7);
|
||||
void func_global_asm_8070D300(Mtx *arg0, Mtx *arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7);
|
||||
|
||||
// global_asm/code_112080.c
|
||||
@ -3429,7 +3430,7 @@ void loadText(Actor *arg0, u16 fileIndex, u8 textIndex);
|
||||
void func_global_asm_8070D970(u16 arg0);
|
||||
void func_global_asm_8070D9AC(Struct806A57C0_2 *arg0);
|
||||
void func_global_asm_8070DA28(AAD_global_asm_806A4DDC *arg0);
|
||||
// TODO: func_global_asm_8070DA74 has no documented signature
|
||||
void func_global_asm_8070DA74(Actor*);
|
||||
// TODO: func_global_asm_8070DB7C has no documented signature
|
||||
// TODO: func_global_asm_8070DB9C has no documented signature
|
||||
// TODO: func_global_asm_8070DC40 has no documented signature
|
||||
@ -3439,8 +3440,8 @@ void func_global_asm_8070DA28(AAD_global_asm_806A4DDC *arg0);
|
||||
s32 func_global_asm_8070DDDC(u16 arg0, s32 arg1);
|
||||
// TODO: func_global_asm_8070DED4 has no documented signature
|
||||
// TODO: func_global_asm_8070E2AC has no documented signature
|
||||
// TODO: func_global_asm_8070E34C has no documented signature
|
||||
// TODO: func_global_asm_8070E548 has no documented signature
|
||||
void func_global_asm_8070E34C(void *arg0, void *arg1, s32 arg2);
|
||||
void func_global_asm_8070E548(Actor *arg0, u16 arg1, u8 arg2);
|
||||
char *getTextString(u8 fileIndex, s32 stringIndex, s32 arg2);
|
||||
void func_global_asm_8070E808(Actor *arg0, Actor *arg1);
|
||||
void func_global_asm_8070E8C8(void);
|
||||
@ -3453,7 +3454,7 @@ void func_global_asm_8070F2C8(s16 arg0, s16 arg1, u8 arg2, u8 arg3);
|
||||
|
||||
// global_asm/code_114270.c
|
||||
void func_global_asm_8070F570(void);
|
||||
// TODO: func_global_asm_8070F5CC has no documented signature
|
||||
void func_global_asm_8070F5CC(s32 arg0, s16 arg1, f32 arg2, s16 arg3, s16 arg4, u8 arg5);
|
||||
// TODO: func_global_asm_8070FA58 has no documented signature
|
||||
// TODO: func_global_asm_8070FC40 has no documented signature
|
||||
// TODO: func_global_asm_8070FCCC has no documented signature
|
||||
@ -3463,10 +3464,10 @@ void func_global_asm_8070F570(void);
|
||||
// TODO: func_global_asm_807103E0 has no documented signature
|
||||
// TODO: func_global_asm_807105D4 has no documented signature
|
||||
// TODO: func_global_asm_80710CA0 has no documented signature
|
||||
// TODO: func_global_asm_80711410 has no documented signature
|
||||
void func_global_asm_80711410(f32 arg0, s16 arg1, f32 arg2, s16 arg3, f32 arg4);
|
||||
// TODO: func_global_asm_80711950 has no documented signature
|
||||
// TODO: func_global_asm_80711BD0 has no documented signature
|
||||
// TODO: func_global_asm_80711F90 has no documented signature
|
||||
void func_global_asm_80711F90(f32 arg0, s16 arg1, s32 arg2, s16 arg3, f32 arg4);
|
||||
s32 func_global_asm_807122B4(void);
|
||||
void func_global_asm_80712490(Maps newMap, s32 newExit, u8 newGameMode);
|
||||
void func_global_asm_807124B8(Maps newMap, s32 cutsceneIndex, u8 newGameMode);
|
||||
@ -3655,7 +3656,7 @@ void func_global_asm_8071F8E4(Struct80717D84 *arg0, u8 *arg1);
|
||||
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
|
||||
s32 func_global_asm_80723020(Actor *arg0, s32 arg1, s32 arg2, f32 arg3, f32 arg4, f32 arg5, u8 arg6);
|
||||
void func_global_asm_80723284(s32 arg0, u8 arg1);
|
||||
void func_global_asm_807232B8(s32 arg0, u8 arg1);
|
||||
void func_global_asm_807232EC(s32 arg0, u8 arg1);
|
||||
@ -3664,7 +3665,7 @@ void func_global_asm_8072334C(s32 arg0, u8 arg1);
|
||||
void func_global_asm_80723380(s32 arg0, u8 arg1);
|
||||
void func_global_asm_807233B4(Actor *arg0);
|
||||
void func_global_asm_80723428(s32 arg0);
|
||||
// TODO: func_global_asm_80723484 has no documented signature
|
||||
void func_global_asm_80723484(s32 arg0, Actor *arg1);
|
||||
// TODO: func_global_asm_807238D4 has no documented signature
|
||||
u8 func_global_asm_80723C98(s32 arg0);
|
||||
// TODO: func_global_asm_80723CCC has no documented signature
|
||||
@ -3700,7 +3701,7 @@ s32 func_global_asm_80726164(Actor *actor, s16 x, s16 y, s16 z, void *arg4);
|
||||
// TODO: func_global_asm_80726744 has no documented signature
|
||||
u8 func_global_asm_80726D7C(u8 arg0);
|
||||
u8 func_global_asm_80726DC0(u8 arg0);
|
||||
u8 func_global_asm_80726DEC(u8, u8);
|
||||
u8 func_global_asm_80726DEC(u8 arg0, u8 arg1);
|
||||
void func_global_asm_80726E60(u16 arg0, u8 arg1);
|
||||
void func_global_asm_80726EE0(u8 arg0);
|
||||
void func_global_asm_8072707C(s16 arg0, u8 arg1, u16 arg2);
|
||||
@ -3747,7 +3748,7 @@ void func_global_asm_8072C870(u8 arg0, u8 arg1, s32 arg2);
|
||||
// TODO: func_global_asm_8072C918 has no documented signature
|
||||
void func_global_asm_8072CFE8(s16 *arg0, s16 *arg1, s16 *arg2);
|
||||
void func_global_asm_8072D08C(void);
|
||||
// TODO: func_global_asm_8072D13C has no documented signature
|
||||
u8 func_global_asm_8072D13C(u8 arg0, s32 arg1);
|
||||
void func_global_asm_8072D714(Actor *arg0, s32 arg1);
|
||||
void func_global_asm_8072D99C(void);
|
||||
void func_global_asm_8072D9D4(void);
|
||||
@ -3917,7 +3918,7 @@ void func_global_asm_807381D8(ALSeqPlayer *seqp, f32 arg1, f32 arg2);
|
||||
void func_global_asm_80738230(ALSeqPlayer *seqp, u8 arg1, u8 arg2);
|
||||
|
||||
// global_asm/audio/code_13CFA0.c
|
||||
void func_global_asm_807382A0(ALSeqPlayer*, s32, u8, u8, u8);
|
||||
void func_global_asm_807382A0(ALSeqPlayer *seqp, s32 arg1, u8 arg2, u8 arg3, u8 arg4);
|
||||
|
||||
// global_asm/audio/code_13D020.c
|
||||
// TODO: func_global_asm_80738320 has no documented signature
|
||||
|
||||
@ -307,7 +307,7 @@ block_71:
|
||||
break;
|
||||
case 1: // switch 6
|
||||
if (!(current_actor_pointer->object_properties_bitfield & 0x02000000)) {
|
||||
func_global_asm_8061CB08(current_actor_pointer);
|
||||
func_global_asm_8061CB08();
|
||||
func_global_asm_806A2B08(current_actor_pointer->unk11C);
|
||||
switch (current_map) { // switch 7; irregular
|
||||
case MAP_KROOL_BARREL_TINY_MUSHROOM_GAME:
|
||||
|
||||
@ -43,7 +43,6 @@ extern s8 D_bonus_8002DEF0[];
|
||||
extern s16 D_80744518;
|
||||
extern u16 D_807ECD60;
|
||||
|
||||
void func_global_asm_8061CB08(void);
|
||||
Gfx *func_global_asm_8068DC54(Gfx*, s32, s32, void*, s16, void*);
|
||||
s32 func_global_asm_806A2A10(s32, s32, u8);
|
||||
s8 func_global_asm_806FDB8C(s32, void*, s32, f32, f32, f32);
|
||||
|
||||
@ -375,16 +375,16 @@ void func_boss_800253AC(void) {
|
||||
#pragma GLOBAL_ASM("asm/nonmatchings/boss/code_0/func_boss_800254D0.s")
|
||||
|
||||
void func_boss_80027770(void) {
|
||||
u8 var_v1;
|
||||
u8 boneIndex;
|
||||
|
||||
if (!(object_timer & 3)) {
|
||||
if (!(object_timer & 0xF)) {
|
||||
var_v1 = 0xC;
|
||||
boneIndex = 0xC;
|
||||
} else {
|
||||
var_v1 = ((((rand() >> 0xF) % 32767) % 7) + 0x1D);
|
||||
boneIndex = ((((rand() >> 0xF) % 32767) % 7) + 0x1D);
|
||||
}
|
||||
func_global_asm_80714998(3);
|
||||
changeActorColor(0x50, 0x50, 0x50, 0xC8);
|
||||
func_global_asm_8068588C(current_actor_pointer, var_v1, 2.0f, 0.0f, 0.0f, 0.0f, -0x78);
|
||||
func_global_asm_8068588C(current_actor_pointer, boneIndex, 2.0f, 0.0f, 0.0f, 0.0f, -0x78);
|
||||
}
|
||||
}
|
||||
|
||||
@ -21,7 +21,6 @@ extern s8 D_critter_80029FA8;
|
||||
extern u16 D_global_asm_807FCC44;
|
||||
|
||||
Gfx *func_critter_800296DC(Gfx *dl, Actor *arg1);
|
||||
s32 func_global_asm_8061CB08();
|
||||
s32 func_global_asm_8061CB38();
|
||||
s32 func_global_asm_806A2A10(s32, s32, u8);
|
||||
u8 func_global_asm_806FDB8C(s16, s32, s32, f32, f32, f32);
|
||||
|
||||
@ -6,7 +6,7 @@ void __osResetGlobalIntMask(OSHWIntr interrupt)
|
||||
register u32 saveMask = __osDisableInt();
|
||||
|
||||
//not sure about these constants, SR_IBIT3 is external level 3 INT0, which I think corresponds to the rcp
|
||||
//os.h has several masks defined that end in 401 but non that are just 401
|
||||
//os.h has several masks defined that end in 401 but none that are just 401
|
||||
__OSGlobalIntMask &= ~(interrupt & ~(SR_IBIT3 | SR_IE));
|
||||
|
||||
__osRestoreInt(saveMask);
|
||||
|
||||
@ -79,7 +79,6 @@ void func_global_asm_807215EC();
|
||||
void func_global_asm_80650E20(s32* arg0);
|
||||
|
||||
void func_global_asm_806886E0(s32* arg0, s32 arg1, s32 arg2);
|
||||
void func_global_asm_80677D80(void);
|
||||
|
||||
void func_global_asm_80626264(void*);
|
||||
void func_global_asm_806C7D40(s32 arg0);
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
#include "functions.h"
|
||||
|
||||
void func_multiplayer_80026B0C(s32);
|
||||
s32 func_global_asm_806C8DE0(s16);
|
||||
s32 func_global_asm_807085D0(s32, PlayerProgress *, CharacterProgress *, void *);
|
||||
|
||||
extern s8 D_global_asm_80744504;
|
||||
|
||||
@ -1,17 +1,6 @@
|
||||
#include <ultra64.h>
|
||||
#include "functions.h"
|
||||
|
||||
void func_global_asm_8070C89C(f32 (*mf)[4], f32, f32, f32);
|
||||
void func_global_asm_8070C8F4(f32 (*mf)[4], f32, f32, f32);
|
||||
void func_global_asm_8070C990(f32 (*mf)[4], f32, f32, f32);
|
||||
void func_global_asm_8070CAB4(f32 (*mf)[4], f32);
|
||||
void func_global_asm_8070CB2C(f32 (*mf)[4], f32);
|
||||
void func_global_asm_8070CBA4(f32 (*mf)[4], f32);
|
||||
void func_global_asm_8070CCC4(f32 (*mf)[4]);
|
||||
void func_global_asm_8070CD44(f32 (*mf)[4], f32, f32, f32);
|
||||
void func_global_asm_8070CDD0(f32 (*arg0)[4], f32 (*arg1)[4], f32 arg2, f32 arg3, f32 arg4);
|
||||
void func_global_asm_8070D07C(f32 (*mf)[4], f32 (*mf2)[4], f32, f32, f32, f32, f32, f32);
|
||||
|
||||
// tiny, round float, can't auto decompile
|
||||
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_110F00/func_global_asm_8070C200.s")
|
||||
|
||||
|
||||
@ -581,8 +581,6 @@ void func_global_asm_8070E2AC(s32 arg0, Struct8070E2AC_arg1 *arg1, Struct8070E2A
|
||||
// https://decomp.me/scratch/b7jCl
|
||||
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_112080/func_global_asm_8070E548.s")
|
||||
|
||||
void func_global_asm_8070E34C(void *arg0, void *arg1, s32 arg2);
|
||||
|
||||
/*
|
||||
void func_global_asm_8070E548(Actor *arg0, u16 arg1, u8 arg2) {
|
||||
Struct8070DDDC *temp_s2;
|
||||
|
||||
@ -310,8 +310,6 @@ u8 func_global_asm_807103E0(Struct807103E0 *arg0) {
|
||||
// rodata, close
|
||||
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_114270/func_global_asm_80711410.s")
|
||||
|
||||
void func_global_asm_8070F5CC(s32 arg0, s16 arg1, f32 arg2, s16 arg3, s16 arg4, u8 arg5);
|
||||
|
||||
extern f64 D_global_asm_8075E550;
|
||||
extern f64 D_global_asm_8075E558;
|
||||
extern f64 D_global_asm_8075E560;
|
||||
|
||||
@ -521,7 +521,6 @@ typedef struct {
|
||||
Actor *unk94;
|
||||
} GlobalASMStruct44;
|
||||
|
||||
s32 func_global_asm_80678014(s32);
|
||||
extern s16 D_global_asm_807F693C;
|
||||
extern u8 D_global_asm_807F693F;
|
||||
|
||||
|
||||
@ -16,7 +16,6 @@ void func_global_asm_80672E90(s32, s32, s32);
|
||||
s32 func_global_asm_806730A4(s32, s32, s32, s32);
|
||||
s32 func_global_asm_806734E4(s32, s32, s32, s32, s16 *, s16 *);
|
||||
void func_global_asm_80674E14(Actor *);
|
||||
s8 func_global_asm_80676ED0(Actor *, s16 *, s16 *);
|
||||
void func_global_asm_80679290(Actor *arg0, s32 arg1, s32 arg2, u8 arg3, s32 arg4, s32 arg5, s32 arg6);
|
||||
|
||||
s32 func_global_asm_80672328(Actor*, f32, f32);
|
||||
|
||||
@ -22,22 +22,7 @@ extern u16 D_global_asm_8074D624[];
|
||||
Actor *actor_list[256];
|
||||
s16 actor_count;
|
||||
|
||||
s32 func_global_asm_8067B2C0(s32);
|
||||
void func_global_asm_80678F64(Actor*);
|
||||
void func_global_asm_8067B01C(void);
|
||||
s16 func_global_asm_8067AF74(Actor*);
|
||||
s32 func_global_asm_806782E8(Actor *arg0);
|
||||
s32 func_global_asm_8067B3F4(s32 arg0);
|
||||
void func_global_asm_80679178(Actor *arg0);
|
||||
void func_global_asm_80678E6C(Actor *arg0);
|
||||
void func_global_asm_80678E14(Actor *arg0);
|
||||
void func_global_asm_806790F4(u8);
|
||||
void func_global_asm_8067A1DC(Actor *arg0);
|
||||
|
||||
void func_global_asm_806783BC();
|
||||
void func_global_asm_806136B4();
|
||||
// Note: The pointer can be to any one of the above 10 structs, maybe more
|
||||
void func_global_asm_8070DA74(Actor*);
|
||||
|
||||
// regalloc, close
|
||||
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_7CA80/func_global_asm_80677D80.s")
|
||||
@ -133,8 +118,6 @@ typedef struct {
|
||||
Actor124 *unk1C;
|
||||
} Struct80677ED0;
|
||||
|
||||
extern s32 func_global_asm_80678050(u16);
|
||||
|
||||
s32 func_global_asm_80677ED0(Struct80677ED0 *arg0) {
|
||||
s32 master_type;
|
||||
|
||||
@ -183,7 +166,6 @@ extern u16 *D_global_asm_8074E218[];
|
||||
extern u16 D_global_asm_8074DA58[];
|
||||
|
||||
void func_global_asm_8067AE90(Actor *arg0);
|
||||
void func_global_asm_806761D0(Actor *arg0);
|
||||
|
||||
/*
|
||||
// Doable, initializeActor(behaviour)
|
||||
@ -849,8 +831,6 @@ ActorCollision *func_global_asm_80679490(Actor * arg0, s32 arg1, u8 arg2, s32 ar
|
||||
extern u8 D_global_asm_807FBB85;
|
||||
extern s32 D_global_asm_80720E2C; // TODO: Datatype
|
||||
|
||||
void func_global_asm_80686CF8(Actor *actor);
|
||||
|
||||
void func_global_asm_80679DC4(Actor *arg0, Actor *arg1, u8 arg2) {
|
||||
s32 sp3C;
|
||||
s32 var_a2;
|
||||
|
||||
@ -54,14 +54,14 @@ void func_global_asm_80684550(Actor *actor, u8 boneIndex, f32 scale) {
|
||||
|
||||
void func_global_asm_806845B8(u8 arg0, u8 arg1) {
|
||||
f32 scale;
|
||||
u8 sp2B;
|
||||
u8 boneIndex;
|
||||
|
||||
if ((object_timer & 3) == 0) {
|
||||
scale = current_actor_pointer->animation_state->scale_y / 0.15;
|
||||
sp2B = (((rand() >> 0xF) % 0x7FFF) % ((arg1 - arg0) + 1)) + arg0;
|
||||
boneIndex = (((rand() >> 0xF) % 0x7FFF) % ((arg1 - arg0) + 1)) + arg0;
|
||||
func_global_asm_80714998(3);
|
||||
changeActorColor(0xE6, 0xE6, 0xE6, 0xE6);
|
||||
func_global_asm_8068588C(current_actor_pointer, sp2B, scale, 0.0f, 0.0f, 0.0f, -0x78);
|
||||
func_global_asm_8068588C(current_actor_pointer, boneIndex, scale, 0.0f, 0.0f, 0.0f, -0x78);
|
||||
}
|
||||
}
|
||||
|
||||
@ -689,30 +689,30 @@ void func_global_asm_80687080(void) {
|
||||
|
||||
void func_global_asm_806871DC(u8 arg0) {
|
||||
s16 var_s4;
|
||||
u8 var_v0;
|
||||
u8 boneIndex;
|
||||
u8 var_s2;
|
||||
|
||||
var_s2 = ((object_timer & 3) * 4) + 3;
|
||||
for (var_s4 = 0; var_s4 < 4; var_s4++) {
|
||||
if (var_s2 == 0x10) {
|
||||
var_v0 = 0x14;
|
||||
boneIndex = 0x14;
|
||||
} else if (var_s2 == 0x11) {
|
||||
var_v0 = 0x15;
|
||||
boneIndex = 0x15;
|
||||
} else {
|
||||
var_v0 = var_s2;
|
||||
boneIndex = var_s2;
|
||||
}
|
||||
switch (arg0) {
|
||||
case 3:
|
||||
if (var_v0 < 0xA) {
|
||||
if (boneIndex < 0xA) {
|
||||
break;
|
||||
}
|
||||
case 1:
|
||||
func_global_asm_80714998(1);
|
||||
changeActorColor(0xB4, 0xB4, 0xB4, 0xC8);
|
||||
func_global_asm_8068588C(current_actor_pointer, var_v0, 2.0f, 0.0f, 0.0f, 0.0f, -0x78);
|
||||
func_global_asm_8068588C(current_actor_pointer, boneIndex, 2.0f, 0.0f, 0.0f, 0.0f, -0x78);
|
||||
break;
|
||||
case 2:
|
||||
if (var_v0 < 0xA) {
|
||||
if (boneIndex < 0xA) {
|
||||
break;
|
||||
}
|
||||
case 0:
|
||||
@ -720,7 +720,7 @@ void func_global_asm_806871DC(u8 arg0) {
|
||||
func_global_asm_8071498C(func_global_asm_80717D4C);
|
||||
func_global_asm_80714950(-1000);
|
||||
changeActorColor(0xFF, 0xD7, 0x58, 0xFF);
|
||||
func_global_asm_80714C08(&D_global_asm_80720120, (((rand() >> 0xF) % 100) / 30.0) + 1.0, current_actor_pointer, var_v0, 0);
|
||||
func_global_asm_80714C08(&D_global_asm_80720120, (((rand() >> 0xF) % 100) / 30.0) + 1.0, current_actor_pointer, boneIndex, 0);
|
||||
break;
|
||||
}
|
||||
var_s2++;
|
||||
|
||||
@ -344,10 +344,10 @@ void func_global_asm_806907E0(void) {
|
||||
D_global_asm_80750270 = 1;
|
||||
}
|
||||
|
||||
void func_global_asm_806907F0(f32 arg0, f32 arg1, f32 arg2) {
|
||||
D_global_asm_807FC7B0 = arg0;
|
||||
D_global_asm_807FC7B4 = arg1;
|
||||
D_global_asm_807FC7B8 = arg2;
|
||||
void func_global_asm_806907F0(f32 x, f32 y, f32 z) {
|
||||
D_global_asm_807FC7B0 = x;
|
||||
D_global_asm_807FC7B4 = y;
|
||||
D_global_asm_807FC7B8 = z;
|
||||
}
|
||||
|
||||
void func_global_asm_80690814(Actor *arg0, s32 arg1) {
|
||||
@ -418,9 +418,7 @@ void func_global_asm_80690BE8(s16 arg0, s16 arg1, f32 arg2, Actor *arg3, s32 bon
|
||||
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_936B0/func_global_asm_80690F30.s")
|
||||
|
||||
void func_global_asm_806915B0(void) {
|
||||
f32 randomZ;
|
||||
f32 randomY;
|
||||
f32 randomX;
|
||||
f32 randomZ, randomY, randomX;
|
||||
s32 i;
|
||||
s32 max;
|
||||
|
||||
@ -1120,8 +1118,6 @@ s32 func_global_asm_806951B0(Actor *arg0) {
|
||||
// doable, matrix
|
||||
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_936B0/func_global_asm_806951E8.s")
|
||||
|
||||
void func_global_asm_80695724(f32, u8);
|
||||
|
||||
extern s32 D_global_asm_8072006C; // Sprite
|
||||
extern s16 D_global_asm_80750344;
|
||||
extern u32 D_global_asm_8076A068;
|
||||
|
||||
@ -4,14 +4,13 @@
|
||||
extern s8 D_global_asm_807F6951;
|
||||
extern s8 D_global_asm_807F6950;
|
||||
|
||||
void func_global_asm_80699070(s16 *arg0, s16 *arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7) {
|
||||
f32 temp_f0;
|
||||
f32 temp_f2;
|
||||
void func_global_asm_80699070(s16 *arg0, s16 *arg1, f32 x1, f32 y1, f32 z1, f32 x2, f32 y2, f32 z2) {
|
||||
f32 dx, dz;
|
||||
|
||||
*arg1 = func_global_asm_80665DE0(arg2, arg4, arg5, arg7);
|
||||
temp_f0 = arg5 - arg2;
|
||||
temp_f2 = arg7 - arg4;
|
||||
*arg0 = (func_global_asm_80611BB4(arg6 - arg3, sqrtf((temp_f0 * temp_f0) + (temp_f2 * temp_f2))) * 2048.0) / 3.14159274101257324;
|
||||
*arg1 = func_global_asm_80665DE0(x1, z1, x2, z2);
|
||||
dx = x2 - x1;
|
||||
dz = z2 - z1;
|
||||
*arg0 = (func_global_asm_80611BB4(y2 - y1, sqrtf((dx * dx) + (dz * dz))) * 2048.0) / 3.14159274101257324;
|
||||
}
|
||||
|
||||
typedef struct {
|
||||
|
||||
@ -18,10 +18,6 @@ extern Struct80750400 D_global_asm_80750400[];
|
||||
|
||||
int func_global_asm_806A4284();
|
||||
void func_global_asm_806A4DDC(Actor *arg0);
|
||||
void func_global_asm_806A5174(Actor*, void*, f32);
|
||||
|
||||
void func_global_asm_8070DA74(Actor*);
|
||||
void func_global_asm_8070E808(Actor *arg0, Actor *arg1);
|
||||
|
||||
void func_global_asm_806A3700(s32 arg0, s32 arg1) {
|
||||
|
||||
@ -395,7 +391,6 @@ void func_global_asm_806A5868(void) {
|
||||
aaD->unk55 &= 0xFFFB;
|
||||
}
|
||||
if (aaD->unk55 & 1) {
|
||||
// func_global_asm_8061CB08(0x280, current_actor_pointer, var_a3);
|
||||
func_global_asm_8061CB08();
|
||||
current_actor_pointer->control_state = 5;
|
||||
}
|
||||
|
||||
@ -138,7 +138,6 @@ Gfx *func_global_asm_806AA09C(s16 x, s16 y, s16 arg2, s16 arg3, Gfx *dl, s8 arg5
|
||||
f32 func_global_asm_80612E40(f32);
|
||||
? func_global_asm_806AB4EC(void *, ? *, s32, s32, f32, s32, s32);
|
||||
? func_global_asm_806AB808(void *, ?, ?, ?, s32, s32, s32, s32);
|
||||
s32 func_global_asm_806C8DE0(?);
|
||||
extern ? D_global_asm_80720C34;
|
||||
extern ? D_global_asm_80720D38;
|
||||
extern ? D_global_asm_80720D5C;
|
||||
|
||||
@ -2,11 +2,9 @@
|
||||
#include "functions.h"
|
||||
|
||||
s32 func_global_asm_8072881C(s32, s32);
|
||||
void func_global_asm_806A5C60(Actor *arg0);
|
||||
|
||||
// Not 100% on these signatures
|
||||
void func_global_asm_8072C918(s16, s16, s16);
|
||||
u8 func_global_asm_8072D13C(u8 arg0, s32 arg1);
|
||||
|
||||
void func_global_asm_806AD260(s16 arg0, u8 arg1, s32 arg2) {
|
||||
if (arg0 != 0) {
|
||||
|
||||
@ -98,9 +98,6 @@ void func_global_asm_806AE394(f32 arg0, f32 arg1) {
|
||||
void func_global_asm_8072C918(s16, s16, s16);
|
||||
|
||||
void func_global_asm_8072A450(void);
|
||||
u8 func_global_asm_8072D13C(u8, s32);
|
||||
|
||||
void func_global_asm_806A5C60(Actor *);
|
||||
|
||||
/*
|
||||
void func_global_asm_806AE588(void) {
|
||||
|
||||
@ -40,7 +40,6 @@ void func_global_asm_806B1348(void) {
|
||||
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_B5EC0/func_global_asm_806B13B4.s")
|
||||
|
||||
void func_global_asm_8072C918(s16, s16, s16);
|
||||
u8 func_global_asm_8072D13C(u8, s32);
|
||||
|
||||
/*
|
||||
void func_global_asm_806B13B4(u8 arg0) {
|
||||
|
||||
@ -6,7 +6,6 @@ extern s16 D_global_asm_80750340;
|
||||
extern u8 D_global_asm_807FBD70;
|
||||
|
||||
void func_global_asm_8072A86C(s16 arg0, f32 arg1, f32 arg2, f32 arg3, u16 arg4);
|
||||
u8 func_global_asm_8072D13C(u8 arg0, s32 arg1);
|
||||
|
||||
void func_global_asm_806B2790(void) {
|
||||
u8 var_a2;
|
||||
|
||||
@ -27,12 +27,10 @@ extern s32 D_global_asm_807FBDC8[];
|
||||
extern u16 D_global_asm_807FC930[];
|
||||
|
||||
void func_global_asm_8061CAD8(void);
|
||||
void func_global_asm_8061CB08(void);
|
||||
void func_global_asm_8061F510(s32, s32);
|
||||
void func_global_asm_8062217C(Actor *, s32);
|
||||
u8 func_global_asm_8072881C(u8 arg0, u32 *arg1);
|
||||
void func_global_asm_8072A450(void);
|
||||
u8 func_global_asm_8072D13C(u8 arg0, s32 arg1);
|
||||
extern int func_global_asm_8068E474(); // TODO: Signature
|
||||
Gfx *func_global_asm_806BE6F0(Gfx *dl, Actor *arg1);
|
||||
|
||||
|
||||
@ -229,7 +229,6 @@ void func_global_asm_806C55D8(void) {
|
||||
|
||||
}
|
||||
|
||||
void func_global_asm_8061CB08(void);
|
||||
typedef struct {
|
||||
s16 unk0;
|
||||
} A180_806C55E0;
|
||||
|
||||
@ -117,7 +117,6 @@ s32 func_global_asm_806CD9A0(Actor*, f32, f32, s16, s16);
|
||||
void func_global_asm_80614FD8(void*);
|
||||
void func_global_asm_80614F28(void*);
|
||||
s32 func_global_asm_80613448();
|
||||
s32 func_global_asm_806C8DE0(u8);
|
||||
|
||||
void func_global_asm_806F09F0(Actor *arg0, u16 arg1) {
|
||||
switch (arg1) {
|
||||
|
||||
@ -70,13 +70,6 @@ typedef struct {
|
||||
s16 unk6;
|
||||
} AAD_global_asm_806A7600;
|
||||
|
||||
void func_global_asm_80686CF8(Actor *actor);
|
||||
|
||||
void func_global_asm_806A664C(f32 arg0);
|
||||
|
||||
s32 func_global_asm_80723020(Actor *arg0, s32 arg1, s32 arg2, f32 arg3, f32 arg4, f32 arg5, u8 arg6);
|
||||
void func_global_asm_80723484(s32, Actor*);
|
||||
|
||||
void func_global_asm_806A5DF0(s16 arg0, f32 x, f32 y, f32 z, s16 arg4, u8 arg5, s16 arg6, s32 arg7) {
|
||||
f32 var_f0;
|
||||
f32 sp2C[8];
|
||||
|
||||
@ -192,8 +192,6 @@ s32 func_global_asm_806F9518(s32);
|
||||
Gfx *func_global_asm_806FA5A4(s32, Gfx *);
|
||||
Gfx *func_global_asm_806FA7BC(s32, Gfx *);
|
||||
Gfx *func_global_asm_806FA9C0(s32, Gfx *);
|
||||
s32 func_global_asm_806C8DE0(s32);
|
||||
void *func_global_asm_806FACE8(u32 arg0);
|
||||
|
||||
PlayerHUD* func_global_asm_806F7FD0(u8 playerIndex) {
|
||||
return &D_global_asm_80754280[playerIndex];
|
||||
@ -222,20 +220,20 @@ void func_global_asm_806F8004(f32 arg0, f32 arg1, f32 *arg2, f32 *arg3, f32 *arg
|
||||
*arg4 = *arg4 * 10.5;
|
||||
}
|
||||
|
||||
void func_global_asm_806F8170(s32 arg0, f32 *arg1, f32 *arg2, f32 *arg3) {
|
||||
void func_global_asm_806F8170(s32 HUDItemIndex, f32 *arg1, f32 *arg2, f32 *arg3) {
|
||||
s32 temp_v0;
|
||||
|
||||
if (arg0 < 0) {
|
||||
if (HUDItemIndex < 0) {
|
||||
func_global_asm_806F8004(16.5f, 0.0f, arg1, arg2, arg3);
|
||||
return;
|
||||
}
|
||||
if (arg0 == 8) {
|
||||
func_global_asm_806F8004(1.5 - (D_global_asm_80754280->hud_item[arg0].hud_count * 7), 26.0f, arg1, arg2, arg3);
|
||||
if (HUDItemIndex == 8) {
|
||||
func_global_asm_806F8004(1.5 - (D_global_asm_80754280->hud_item[HUDItemIndex].hud_count * 7), 26.0f, arg1, arg2, arg3);
|
||||
return;
|
||||
}
|
||||
*arg1 = D_global_asm_80754280->hud_item[arg0].unk_10;
|
||||
*arg2 = D_global_asm_80754280->hud_item[arg0].unk_14;
|
||||
*arg3 = D_global_asm_80754280->hud_item[arg0].unk_18;
|
||||
*arg1 = D_global_asm_80754280->hud_item[HUDItemIndex].unk_10;
|
||||
*arg2 = D_global_asm_80754280->hud_item[HUDItemIndex].unk_14;
|
||||
*arg3 = D_global_asm_80754280->hud_item[HUDItemIndex].unk_18;
|
||||
}
|
||||
|
||||
// Close
|
||||
@ -419,7 +417,7 @@ void func_global_asm_806F8A8C(u8 arg0, u8 playerIndex, s32 arg2) {
|
||||
u16 func_global_asm_806F8AD4(u8 arg0, u8 playerIndex) {
|
||||
u16 phi_a2;
|
||||
u16 *temp;
|
||||
s32 sp1C;
|
||||
s32 kong;
|
||||
HUDDisplay *HUDItem;
|
||||
s32 levelIndex;
|
||||
|
||||
@ -432,15 +430,15 @@ u16 func_global_asm_806F8AD4(u8 arg0, u8 playerIndex) {
|
||||
if (temp) {
|
||||
phi_a2 = *((u16*)HUDItem->actual_count_pointer);
|
||||
} else {
|
||||
sp1C = func_global_asm_806C8DE0(playerIndex);
|
||||
kong = func_global_asm_806C8DE0(playerIndex);
|
||||
levelIndex = getLevelIndex(D_global_asm_8076A0AB, TRUE);
|
||||
phi_a2 = 0;
|
||||
switch (arg0) {
|
||||
case 0xC:
|
||||
phi_a2 = func_global_asm_80731A04(0x1D5, levelIndex, levelIndex, sp1C);
|
||||
phi_a2 = func_global_asm_80731A04(0x1D5, levelIndex, levelIndex, kong);
|
||||
break;
|
||||
case 0xA:
|
||||
phi_a2 = func_global_asm_80731A04(0x225, levelIndex, levelIndex, sp1C);
|
||||
phi_a2 = func_global_asm_80731A04(0x225, levelIndex, levelIndex, kong);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -472,13 +470,13 @@ void func_global_asm_806F8BC4(s32 HUDItemIndex, u8 arg1, s32 arg2) {
|
||||
}
|
||||
}
|
||||
|
||||
void func_global_asm_806F8CB0(s32 arg0) {
|
||||
void func_global_asm_806F8CB0(s32 HUDItemIndex) {
|
||||
s32 phi_v1;
|
||||
GlobalASMStruct71 *phi_v0;
|
||||
|
||||
// GB Count (Character)?
|
||||
if (arg0 == 8) {
|
||||
phi_v0 = D_global_asm_80754280->hud_item[arg0].counter_pointer;
|
||||
if (HUDItemIndex == 8) {
|
||||
phi_v0 = D_global_asm_80754280->hud_item[HUDItemIndex].counter_pointer;
|
||||
phi_v1 = 0;
|
||||
while (phi_v0) {
|
||||
phi_v0->unkC = phi_v1;
|
||||
@ -488,23 +486,23 @@ void func_global_asm_806F8CB0(s32 arg0) {
|
||||
}
|
||||
}
|
||||
|
||||
void func_global_asm_806F8CFC(s32 arg0, s32 arg1) {
|
||||
D_global_asm_80754280->hud_item[arg0].counter_timer = 0;
|
||||
D_global_asm_80754280->hud_item[arg0].freeze_timer = 0;
|
||||
if (arg0 == 8) {
|
||||
void func_global_asm_806F8CFC(s32 HUDItemIndex, s32 arg1) {
|
||||
D_global_asm_80754280->hud_item[HUDItemIndex].counter_timer = 0;
|
||||
D_global_asm_80754280->hud_item[HUDItemIndex].freeze_timer = 0;
|
||||
if (HUDItemIndex == 8) {
|
||||
func_global_asm_806F8D58(9, 0);
|
||||
}
|
||||
}
|
||||
|
||||
void func_global_asm_806F8D58(s32 arg0, s32 arg1) {
|
||||
void func_global_asm_806F8D58(s32 HUDItemIndex, s32 arg1) {
|
||||
GlobalASMStruct71 *phi_v0 = D_global_asm_80754284;
|
||||
|
||||
D_global_asm_80754280->hud_item[arg0].unk_1c = 0;
|
||||
D_global_asm_80754280->hud_item[HUDItemIndex].unk_1c = 0;
|
||||
while (phi_v0) {
|
||||
phi_v0->unk0 &= ~(1 << arg0);
|
||||
phi_v0->unk0 &= ~(1 << HUDItemIndex);
|
||||
phi_v0 = phi_v0->unk4;
|
||||
}
|
||||
func_global_asm_806F8CFC(arg0, arg1);
|
||||
func_global_asm_806F8CFC(HUDItemIndex, arg1);
|
||||
}
|
||||
|
||||
void func_global_asm_806F8DC4(u8 *arg0, s32 arg1, s32 arg2) {
|
||||
@ -974,10 +972,10 @@ void func_global_asm_806FAC64(u8 arg0) {
|
||||
}
|
||||
|
||||
void *func_global_asm_806FACE8(u32 arg0) {
|
||||
void *var_v1;
|
||||
void *sprite;
|
||||
u32 kong;
|
||||
|
||||
var_v1 = NULL;
|
||||
sprite = NULL;
|
||||
kong = func_global_asm_806C8DE0(0);
|
||||
if (arg0 == 0xD) {
|
||||
kong = D_global_asm_80754288;
|
||||
@ -987,49 +985,49 @@ void *func_global_asm_806FACE8(u32 arg0) {
|
||||
case 13:
|
||||
switch (kong) {
|
||||
case 1:
|
||||
var_v1 = &D_global_asm_8072057C;
|
||||
sprite = &D_global_asm_8072057C;
|
||||
break;
|
||||
case 0:
|
||||
var_v1 = &D_global_asm_807205E8;
|
||||
sprite = &D_global_asm_807205E8;
|
||||
break;
|
||||
case 3:
|
||||
var_v1 = &D_global_asm_8072060C;
|
||||
sprite = &D_global_asm_8072060C;
|
||||
break;
|
||||
case 2:
|
||||
var_v1 = &D_global_asm_807205C4;
|
||||
sprite = &D_global_asm_807205C4;
|
||||
break;
|
||||
case 4:
|
||||
case 5:
|
||||
var_v1 = &D_global_asm_807205A0;
|
||||
sprite = &D_global_asm_807205A0;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case 6:
|
||||
var_v1 = &D_global_asm_80720488;
|
||||
sprite = &D_global_asm_80720488;
|
||||
break;
|
||||
case 4:
|
||||
var_v1 = &D_global_asm_807204BC;
|
||||
sprite = &D_global_asm_807204BC;
|
||||
break;
|
||||
case 2:
|
||||
case 3:
|
||||
switch (kong) {
|
||||
case 1:
|
||||
var_v1 = &D_global_asm_807200A0;
|
||||
sprite = &D_global_asm_807200A0;
|
||||
break;
|
||||
case 0:
|
||||
var_v1 = &D_global_asm_807206A8;
|
||||
sprite = &D_global_asm_807206A8;
|
||||
break;
|
||||
case 3:
|
||||
var_v1 = &D_global_asm_80720854;
|
||||
sprite = &D_global_asm_80720854;
|
||||
break;
|
||||
case 2:
|
||||
var_v1 = &D_global_asm_8072029C;
|
||||
sprite = &D_global_asm_8072029C;
|
||||
break;
|
||||
case 4:
|
||||
var_v1 = &D_global_asm_807201A0;
|
||||
sprite = &D_global_asm_807201A0;
|
||||
break;
|
||||
case 5:
|
||||
var_v1 = &D_global_asm_80720268;
|
||||
sprite = &D_global_asm_80720268;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
@ -1037,107 +1035,107 @@ void *func_global_asm_806FACE8(u32 arg0) {
|
||||
case 14:
|
||||
switch (kong) {
|
||||
case 1:
|
||||
var_v1 = &D_global_asm_807203B0;
|
||||
sprite = &D_global_asm_807203B0;
|
||||
break;
|
||||
case 0:
|
||||
var_v1 = &D_global_asm_8072041C;
|
||||
sprite = &D_global_asm_8072041C;
|
||||
break;
|
||||
case 3:
|
||||
var_v1 = &D_global_asm_80720440;
|
||||
sprite = &D_global_asm_80720440;
|
||||
break;
|
||||
case 2:
|
||||
var_v1 = &D_global_asm_807203F8;
|
||||
sprite = &D_global_asm_807203F8;
|
||||
break;
|
||||
case 4:
|
||||
case 5:
|
||||
var_v1 = &D_global_asm_807203D4;
|
||||
sprite = &D_global_asm_807203D4;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case 11:
|
||||
var_v1 = &D_global_asm_807207BC;
|
||||
sprite = &D_global_asm_807207BC;
|
||||
break;
|
||||
case 7:
|
||||
switch (kong) {
|
||||
case 1:
|
||||
var_v1 = &D_global_asm_80720878;
|
||||
sprite = &D_global_asm_80720878;
|
||||
break;
|
||||
case 0:
|
||||
var_v1 = &D_global_asm_80720890;
|
||||
sprite = &D_global_asm_80720890;
|
||||
break;
|
||||
case 3:
|
||||
var_v1 = &D_global_asm_807208A8;
|
||||
sprite = &D_global_asm_807208A8;
|
||||
break;
|
||||
case 2:
|
||||
var_v1 = &D_global_asm_807208D8;
|
||||
sprite = &D_global_asm_807208D8;
|
||||
break;
|
||||
case 4:
|
||||
case 5:
|
||||
var_v1 = &D_global_asm_807208C0;
|
||||
sprite = &D_global_asm_807208C0;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case 5:
|
||||
var_v1 = &D_global_asm_80720508;
|
||||
sprite = &D_global_asm_80720508;
|
||||
break;
|
||||
case 8:
|
||||
var_v1 = &D_global_asm_8072052C;
|
||||
sprite = &D_global_asm_8072052C;
|
||||
break;
|
||||
case 9:
|
||||
var_v1 = &D_global_asm_8072052C;
|
||||
sprite = &D_global_asm_8072052C;
|
||||
break;
|
||||
case 10:
|
||||
var_v1 = &D_global_asm_80720558;
|
||||
sprite = &D_global_asm_80720558;
|
||||
break;
|
||||
case 12:
|
||||
switch (kong) {
|
||||
case 1:
|
||||
var_v1 = &D_global_asm_807209EC;
|
||||
sprite = &D_global_asm_807209EC;
|
||||
break;
|
||||
case 0:
|
||||
var_v1 = &D_global_asm_80720A34;
|
||||
sprite = &D_global_asm_80720A34;
|
||||
break;
|
||||
case 3:
|
||||
var_v1 = &D_global_asm_80720A58;
|
||||
sprite = &D_global_asm_80720A58;
|
||||
break;
|
||||
case 2:
|
||||
var_v1 = &D_global_asm_807207E0;
|
||||
sprite = &D_global_asm_807207E0;
|
||||
break;
|
||||
case 4:
|
||||
case 5:
|
||||
var_v1 = &D_global_asm_80720A10;
|
||||
sprite = &D_global_asm_80720A10;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case 16:
|
||||
var_v1 = &D_global_asm_8072145C;
|
||||
sprite = &D_global_asm_8072145C;
|
||||
break;
|
||||
case 17:
|
||||
var_v1 = &D_global_asm_80721250;
|
||||
sprite = &D_global_asm_80721250;
|
||||
break;
|
||||
case 18:
|
||||
var_v1 = &D_global_asm_80721200;
|
||||
sprite = &D_global_asm_80721200;
|
||||
break;
|
||||
case 19:
|
||||
var_v1 = &D_global_asm_8072121C;
|
||||
sprite = &D_global_asm_8072121C;
|
||||
break;
|
||||
case 20:
|
||||
var_v1 = &D_global_asm_807214A0;
|
||||
sprite = &D_global_asm_807214A0;
|
||||
break;
|
||||
case 21:
|
||||
var_v1 = &D_global_asm_807214B8;
|
||||
sprite = &D_global_asm_807214B8;
|
||||
break;
|
||||
case 22:
|
||||
var_v1 = &D_global_asm_807214D0;
|
||||
sprite = &D_global_asm_807214D0;
|
||||
break;
|
||||
case 23:
|
||||
var_v1 = &D_global_asm_807214E8;
|
||||
sprite = &D_global_asm_807214E8;
|
||||
break;
|
||||
case 24:
|
||||
var_v1 = &D_global_asm_80721500;
|
||||
sprite = &D_global_asm_80721500;
|
||||
break;
|
||||
}
|
||||
return var_v1;
|
||||
return sprite;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/hud/func_global_asm_806FAFE4.s")
|
||||
|
||||
@ -1,49 +1,50 @@
|
||||
#!/usr/bin/env python3
|
||||
orphanFunctionsWithSignatures = [
|
||||
"rand",
|
||||
"func_global_asm_80614D48",
|
||||
"func_global_asm_80613AF8",
|
||||
"func_global_asm_806119A0",
|
||||
"func_global_asm_80611BB4",
|
||||
"playCutscene",
|
||||
"func_global_asm_80613C48",
|
||||
"func_global_asm_80614A64",
|
||||
"func_global_asm_80612794",
|
||||
"playAnimation",
|
||||
"playActorAnimation",
|
||||
"func_global_asm_806119FC",
|
||||
"func_global_asm_80614D90",
|
||||
"func_global_asm_80612790",
|
||||
"func_global_asm_806E770C",
|
||||
"addActorRecolor",
|
||||
"func_global_asm_80614D00",
|
||||
"func_global_asm_806119A0",
|
||||
"func_global_asm_806119FC",
|
||||
"func_global_asm_80611BB4",
|
||||
"func_global_asm_80612790",
|
||||
"func_global_asm_80612794",
|
||||
"func_global_asm_80612D10",
|
||||
"func_global_asm_80612D1C",
|
||||
"func_global_asm_80613794",
|
||||
"func_global_asm_80613AF8",
|
||||
"func_global_asm_80613C48",
|
||||
"func_global_asm_80614A64",
|
||||
"func_global_asm_80614D00",
|
||||
"func_global_asm_80614D48",
|
||||
"func_global_asm_80614D90",
|
||||
"func_global_asm_8061C464",
|
||||
"func_global_asm_8061C6A8",
|
||||
"func_global_asm_8061CB08",
|
||||
"func_global_asm_8061CB50",
|
||||
"func_global_asm_80626F8C",
|
||||
"func_global_asm_806A36F4",
|
||||
"func_global_asm_806E770C",
|
||||
"func_global_asm_8073243C",
|
||||
"func_global_asm_8073E8B4",
|
||||
"func_global_asm_807383EC",
|
||||
"func_global_asm_807383F4",
|
||||
"func_global_asm_80738BA8",
|
||||
"func_global_asm_80738BB0",
|
||||
"func_global_asm_80732924",
|
||||
"func_global_asm_80735A44",
|
||||
"func_global_asm_80737600",
|
||||
"func_global_asm_80737630",
|
||||
"func_global_asm_80737B48",
|
||||
"func_global_asm_80737B50",
|
||||
"func_global_asm_806A36F4",
|
||||
"func_global_asm_8073AD48",
|
||||
"func_global_asm_80735A44",
|
||||
"func_global_asm_80737E9C",
|
||||
"func_global_asm_80737F38",
|
||||
"func_global_asm_80732924",
|
||||
"func_global_asm_80613794",
|
||||
"func_global_asm_8061C464",
|
||||
"func_global_asm_80626F8C",
|
||||
"func_global_asm_8061C6A8",
|
||||
"func_global_asm_807383EC",
|
||||
"func_global_asm_807383F4",
|
||||
"func_global_asm_80738BA8",
|
||||
"func_global_asm_80738BB0",
|
||||
"func_global_asm_8073AD48",
|
||||
"func_global_asm_8073E8B4",
|
||||
]
|
||||
|
||||
functionsHLines = []
|
||||
cFiles = {}
|
||||
osHLines = []
|
||||
|
||||
def getSignature(functionName):
|
||||
for i, line in enumerate(functionsHLines):
|
||||
@ -53,11 +54,21 @@ def getSignature(functionName):
|
||||
return lc
|
||||
return f'// TODO: {functionName.replace("(", "")} has no documented signature'
|
||||
|
||||
def isLibultra(functionName):
|
||||
for line in osHLines:
|
||||
if functionName in line:
|
||||
return True
|
||||
return False
|
||||
|
||||
if __name__ == "__main__":
|
||||
with open("./include/functions.h", 'r') as f:
|
||||
for line in f:
|
||||
functionsHLines.append(line.strip())
|
||||
|
||||
with open("./include/2.0L/PR/os.h", 'r') as f:
|
||||
for line in f:
|
||||
osHLines.append(line.strip())
|
||||
|
||||
# header header
|
||||
print("#ifndef __FUNCTIONS_H__")
|
||||
print("#define __FUNCTIONS_H__")
|
||||
@ -76,24 +87,34 @@ if __name__ == "__main__":
|
||||
with open("./build/us/donkeykong64.us.map", 'r') as f:
|
||||
grabbingFunctions = False
|
||||
filename = ''
|
||||
sigs = []
|
||||
for line in f:
|
||||
line = line.strip()
|
||||
if line.startswith(".text") and line.endswith(".c.o"):
|
||||
if len(sigs) > 0:
|
||||
print("")
|
||||
print(f"// {filename}")
|
||||
for sig in sigs:
|
||||
print(sig)
|
||||
info = line.split()
|
||||
address = info[1].replace("0x00000000", '0x')
|
||||
filename = info[3].replace("build/us/src/", "").replace(".o", "")
|
||||
grabbingFunctions = True
|
||||
cFiles[filename] = []
|
||||
print("")
|
||||
print(f"// {filename}")
|
||||
sigs = []
|
||||
elif line.startswith(".data") or line.startswith(".rodata") or line.endswith("_TEXT_END = ."):
|
||||
if grabbingFunctions:
|
||||
grabbingFunctions = False
|
||||
if len(sigs) > 0:
|
||||
print("")
|
||||
print(f"// {filename}")
|
||||
for sig in sigs:
|
||||
print(sig)
|
||||
elif grabbingFunctions:
|
||||
splitLine = line.split()
|
||||
if len(splitLine) == 2 and not splitLine[1].startswith(".L"):
|
||||
sig = getSignature(f"{splitLine[1]}(")
|
||||
print(sig)
|
||||
if not isLibultra(f"{splitLine[1]}("):
|
||||
sig = getSignature(f"{splitLine[1]}(")
|
||||
sigs.append(sig)
|
||||
|
||||
# header footer
|
||||
print("#endif")
|
||||
|
||||
Loading…
Reference in New Issue
Block a user