Game-Decompilation/dk64
1
0
Fork 0
mirror of https://gitlab.com/dk64_decomp/dk64.git synced 2025-02-28 03:35:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Donkey Kong 2024-03-04 20:34:22 +10:30
parent d6e980170a
commit e2dc29a9f7
15 changed files with 17 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/functions.h
View File

@ -1081,7 +1081,7 @@ void func_global_asm_806E7568(void);
void func_global_asm_806E9804(s16 arg0);
void func_global_asm_806E7658(void);
void func_global_asm_806E7780(void);
void func_global_asm_806E78B8();
void func_global_asm_806E78B8(void);
void func_global_asm_806E78E0(void);
void func_global_asm_806E78F8(void);
void func_global_asm_806E7900(void);
@ -1092,13 +1092,13 @@ void func_global_asm_806E84C0(void);
void func_global_asm_806E84F8(void);
void func_global_asm_806E8724(Actor *arg0, RaceAdditionalActorData *arg1);
void func_global_asm_806E884C(void);
void func_global_asm_806E8880();
void func_global_asm_806E88AC();
void func_global_asm_806E8880(void);
void func_global_asm_806E88AC(void);
void func_global_asm_806E8A8C(void);
void func_global_asm_806E8AF0(void);
void func_global_asm_806E8B28(void);
void func_global_asm_806E8BA4(void);
void func_global_asm_806E8BFC();
void func_global_asm_806E8BFC(void);
void func_global_asm_806E8D54(void);
void func_global_asm_806E8DB4(void);
void func_global_asm_806E8E00(void);
@ -1134,8 +1134,8 @@ void func_global_asm_806EA958(void);
void func_global_asm_806EA9B4(void);
void func_global_asm_806EAA44(void);
void func_global_asm_806EAAA0(void);
void func_global_asm_806EAC8C();
void func_global_asm_806EACBC();
void func_global_asm_806EAC8C(void);
void func_global_asm_806EACBC(void);
void func_global_asm_806EACEC(void);
void func_global_asm_806EAE04(void);
void func_global_asm_806EAE60(void);
@ -1229,7 +1229,7 @@ void func_global_asm_8066B8C8(u32 arg0, s32 arg1, s32 arg2);
void func_global_asm_8066BDE0(void);
void func_global_asm_806FB480(void);
void func_global_asm_806FB488(void);
void func_global_asm_806FBB58();
void func_global_asm_806FBB58(void);
s32 func_global_asm_806FBB9C(s16 textureIndex);
void func_global_asm_80663C60(f32 *arg0, s16 arg1);
void func_global_asm_8072ED90(void);
@ -1240,7 +1240,7 @@ void func_global_asm_80678F64(Actor*);
s16 func_global_asm_8067AF74(Actor*);
s32 func_global_asm_806782E8(Actor *arg0);
void func_global_asm_806785D4(Actor*);
void func_global_asm_806783BC();
void func_global_asm_806783BC(void);
void func_global_asm_8067AEFC(Actor*);
void func_global_asm_80677EC8(s32 arg0);
void func_global_asm_8067AE90(Actor *arg0);
@ -2360,14 +2360,12 @@ void func_global_asm_806C8984(void);
void func_global_asm_806C850C(s32 arg0, u8 arg1);
void func_global_asm_806AFA60(u8 arg0);
s32 func_global_asm_806B0770(void);
void func_global_asm_8068A7B0(void);
void func_global_asm_8068D8C8(Gfx *dl, s32 arg1);
void func_global_asm_80611594(HeapHeader *arg0);
void func_global_asm_8061159C(HeapHeader *arg0);
s32 func_global_asm_80611688(HeapHeader *arg0);
void func_global_asm_806116E0(HeapHeader *arg0, s32 arg1);
void func_global_asm_806F833C(s32 arg0);
u16 func_global_asm_806F8EDC(s32 HUDItemIndex, s32 playerIndex);
u8 func_global_asm_806FB3D0(u8 HUDItemIndex, u8 playerIndex);
void func_global_asm_806CC970(void);
void func_global_asm_806CEED8(void);

2
src/global_asm/code_100180.c
View File

@ -46,7 +46,7 @@ void func_global_asm_806FB8B0(s32 arg0) {
// Jumptable
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_100180/func_global_asm_806FB914.s")
void func_global_asm_806FBB58() {
void func_global_asm_806FBB58(void) {
D_global_asm_807FD7F0 = malloc(sizeof(s32) * 43);
func_global_asm_80611690(D_global_asm_807FD7F4 = malloc(sizeof(u8) * 43));
}

1
src/global_asm/code_10D2D0.c
View File

@ -1,7 +1,6 @@
#include <ultra64.h>
#include "functions.h"
void func_global_asm_80708C24(s32 arg0, CharacterChange *arg1, PlayerProgress *arg2, s32 arg3);
void func_multiplayer_80026B0C(s32);
s32 func_global_asm_806C8DE0(s16);
s32 func_global_asm_807085D0(s32, PlayerProgress *, CharacterProgress *, void *);

5
src/global_asm/code_114270.c
View File

@ -628,9 +628,8 @@ void func_global_asm_80713270(void) {
}
}
Gfx *func_global_asm_807132DC(Gfx *arg0) {
Gfx *dl;
dl = func_global_asm_805FD030(arg0);
Gfx *func_global_asm_807132DC(Gfx *dl) {
dl = func_global_asm_805FD030(dl);
gSPDisplayList(dl++, &D_1000118);
gSPMatrix(dl++, &D_20000C0, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
gSPMatrix(dl++, &D_2000180, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);

1
src/global_asm/code_12E800.c
View File

@ -208,7 +208,6 @@ extern f64 D_global_asm_8075FD40;
void func_global_asm_80729EB0(s32, f32, f32, u16);
void func_global_asm_806653C0(Actor*, f32, f32);
s32 func_global_asm_80725BA4(s16, s16, Struct807FDCA0*);
void func_global_asm_8072B438(u16 arg0);
s32 func_global_asm_807264B0(Actor *arg0, f32 arg1, f32 arg2, void *arg3);

2
src/global_asm/code_2F550.c
View File

@ -1314,8 +1314,6 @@ void func_global_asm_8062F318(void);
void func_global_asm_80659110(u8);
void func_global_asm_8065CDA0(u8);
void func_global_asm_8065996C(s16);
/*
void func_global_asm_8062F050(MapGeometryHeader *arg0) {
s32 *temp_a0;

1
src/global_asm/code_55B20.c
View File

@ -741,7 +741,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_80654418(f32, f32, f32);
void func_global_asm_80654A2C(f32, f32, f32);
void func_global_asm_80655258(f32, f32, f32, s32);
extern s32 D_global_asm_807F70AC;

3
src/global_asm/code_699B0.c
View File

@ -382,7 +382,6 @@ s16 func_global_asm_80665C18(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) {
//forward decl necessary
//looks like its taking the linear distance between 2 points (2D)
s16 func_global_asm_80665C18(f32,f32,f32,f32,f32);
s16 func_global_asm_80665DE0(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
f32 temp_f0;
f32 temp_f2;
@ -1164,8 +1163,6 @@ u8 func_global_asm_80668C30(Struct8066893C *arg0, f32 arg1, f32 arg2) {
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_699B0/func_global_asm_80668E9C.s")
s32 func_global_asm_80669930(f32[4][4]);
typedef struct {
f32 unk0;
f32 unk4;

1
src/global_asm/code_80150.c
View File

@ -752,7 +752,6 @@ typedef struct {
extern GlobalASMStruct45 D_global_asm_8074E814[];
void func_global_asm_80682AB4(void *);
void func_global_asm_806F09F0(Actor *, u16);
typedef struct {
s32 unk0;

1
src/global_asm/code_C2A90.c
View File

@ -29,7 +29,6 @@ extern u16 D_global_asm_807FC930[];
void func_global_asm_8061C518(Actor*, Actor*, s32, s32, s32, s32, s32, s32, s32, s32, f32);
void func_global_asm_8061C600(Actor*, Actor*, s32, s32, s32, s32, s32, s32, s32, s32, f32);
void func_global_asm_806BF920(void);
void func_global_asm_806F09F0(Actor*, u16);
void func_global_asm_806F91B4(s32, u8, s32);
int func_global_asm_807035C4(); // TODO: Signature
void func_global_asm_80718BF4(void);

3
src/global_asm/code_CC800.c
View File

@ -170,9 +170,6 @@ extern s16 D_global_asm_807FD584;
extern f32 D_global_asm_80753578[];
extern f32 D_global_asm_807535E8[];
void func_global_asm_806F09F0(Actor*, u16);
void func_global_asm_806C8984(void);
void func_global_asm_806C850C(s32 arg0, u8 arg1) {
Struct8075C410 *sp2C;
s32 i;

7
src/global_asm/code_CEAE0.c
View File

@ -143,11 +143,9 @@ int func_global_asm_806FF358(); // TODO: Signature
int func_global_asm_806FF75C(); // TODO: Signature
void func_global_asm_80665160(Actor *, s16, s16);
void func_global_asm_806653C0(Actor *, f32, f32);
void func_global_asm_806CC970(void);
void func_global_asm_806CCB0C(void);
f32 func_global_asm_806CD898(f32 currentSpeed, f32 desiredSpeed, f32 boostAmount); // boostSpeed
void func_global_asm_806CEE64(f32);
void func_global_asm_806CEED8(void);
void func_global_asm_806CFD68(void);
f32 func_global_asm_806DFFA0(f32, s16, s16);
@ -158,8 +156,6 @@ void func_global_asm_806CFECC(void);
void func_global_asm_806D2378();
void func_global_asm_806CC948();
u8 func_global_asm_806CDD24(Actor *arg0, f32 arg1, f32 arg2, s32 arg3);
s16 func_global_asm_806CE4E4(Actor*, f32, f32, s32);
void func_global_asm_806DF494(s16*, s16, s16);
void func_global_asm_806D0468(Actor *arg0, u8 arg1);
void func_global_asm_806CD8EC(void);
void func_global_asm_806CD424(s16, f32, f32); // TODO: Is this signature correct?
@ -175,7 +171,6 @@ void func_global_asm_806CF138(Struct806CF138 *arg0);
void func_global_asm_80613AF8(Actor*, s32, f32, f32);
s32 func_global_asm_806CD9A0(Actor*, f32, f32, s16, s16);
void func_global_asm_80613A50(Actor*, s32);
s32 func_global_asm_806CE7A0(Actor*, f32, f32, s16, s16);
void func_global_asm_806C9DE0(void) {
func_global_asm_806CA5F8(0);
@ -1312,8 +1307,6 @@ void func_global_asm_806CEE64(f32 arg0) {
}
}
void func_global_asm_806CF2EC(s32*, s32*);
void func_global_asm_806CEED8(void) {
f32 sp44; // 44
f32 sp40; // 40

4
src/global_asm/code_D78D0.c
View File

@ -176,18 +176,14 @@ extern s16 D_global_asm_807FD584; // index into a ton of arrays
void func_global_asm_806F91B4(s32, s32, s16);
void func_global_asm_80665160(Actor *, s16, s16);
void func_global_asm_806CC970(void);
f32 func_global_asm_806CD898(f32 currentSpeed, f32 desiredSpeed, f32 boostAmount); // boostSpeed
void func_global_asm_806CEE64(f32);
void func_global_asm_806CEED8(void);
void func_global_asm_806CFD68(void);
void func_global_asm_806EAB44(Actor *arg0, u8 arg1);
s32 func_global_asm_806DF6D4(s32 arg0);
void func_global_asm_806CC948();
void func_global_asm_806CFECC(void);
u8 func_global_asm_806CDD24(Actor *arg0, f32 arg1, f32 arg2, s32 arg3);
s16 func_global_asm_806CE4E4(Actor*, f32, f32, s32);
void func_global_asm_806DF494(s16*, s16, s16);
void func_global_asm_806CD8EC(void);
void func_global_asm_806CD424(s16, f32, f32); // TODO: Is this signature correct?
void func_global_asm_806CC638(f32 arg0);

2
src/global_asm/code_E4090.c
View File

@ -179,7 +179,6 @@ s32 func_global_asm_806DF6D4(s32 arg0);
f32 func_global_asm_806E0454(f32, f32);
void func_global_asm_8072FE60(f32);
void func_global_asm_806E1630(void);
void func_global_asm_806DF494(s16*, s16, s16);
void func_global_asm_806DF390(Actor*, PlayerAdditionalActorData*, u8);
void func_global_asm_806DF3D0(Actor*, PlayerAdditionalActorData*, u8);
void func_global_asm_806CD8EC(void);
@ -1814,7 +1813,6 @@ s32 func_global_asm_806E527C(void) {
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/code_E4090/func_global_asm_806E52D0.s")
s32 func_global_asm_806E5488(Actor *arg0);
u8 func_global_asm_806E560C(Actor *arg0);
/*
void func_global_asm_806E52D0(void) {

12
src/global_asm/code_EBBE0.c
View File

@ -223,7 +223,7 @@ void func_global_asm_806E7780(void) {
}
}
void func_global_asm_806E78B8() {
void func_global_asm_806E78B8(void) {
extra_player_info_pointer->unk30 = D_global_asm_80753B18[D_global_asm_807FD584];
}
@ -448,7 +448,7 @@ void func_global_asm_806E884C(void) {
}
}
void func_global_asm_806E8880() {
void func_global_asm_806E8880(void) {
Actor *vehicle = extra_player_info_pointer->vehicle_actor_pointer;
if (vehicle) {
PaaD0 *paad = vehicle->PaaD0;
@ -456,7 +456,7 @@ void func_global_asm_806E8880() {
}
}
void func_global_asm_806E88AC() {
void func_global_asm_806E88AC(void) {
Actor *vehicle = extra_player_info_pointer->vehicle_actor_pointer;
if (vehicle) {
PaaD0 *paad = vehicle->PaaD0;
@ -528,7 +528,7 @@ void func_global_asm_806E8BA4(void) {
}
}
void func_global_asm_806E8BFC() {
void func_global_asm_806E8BFC(void) {
Actor *vehicle = extra_player_info_pointer->vehicle_actor_pointer;
if (vehicle) {
RaceAdditionalActorData* RaaD = vehicle->RaaD;
@ -1116,14 +1116,14 @@ void func_global_asm_806EAB44(Actor *arg0, u8 arg1) {
arg0->y_rotation = func_global_asm_8062773C(PaaD->unk104);
}
void func_global_asm_806EAC8C() {
void func_global_asm_806EAC8C(void) {
Actor178 *temp_v0 = extra_player_info_pointer->vehicle_actor_pointer->unk178;
if (temp_v0->unkE == 5) {
temp_v0->unkE = 0xA;
}
}
void func_global_asm_806EACBC() {
void func_global_asm_806EACBC(void) {
Actor178 *temp_v0 = extra_player_info_pointer->vehicle_actor_pointer->unk178;
if (temp_v0->unkE == 5) {
temp_v0->unkE = 0xF;