Skip to content

Commit

Permalink
Merge pull request #160 from Kelebek1/fragment20
Browse files Browse the repository at this point in the history 
fragment20
  • Loading branch information
@RevoSucks
RevoSucks authored Oct 17, 2024
2 parents 8fee860 + 48f4988 commit 5c689ff
Show file tree
Hide file tree
Showing 26 changed files with 2,232 additions and 296 deletions.
2 changes: 1 addition & 1 deletion include/global.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ typedef struct unk_D_86002F34_018 {
/* 0x03 */ u8 unk_03;
/* 0x04 */ s16 unk_04;
/* 0x06 */ s16 unk_06;
/* 0x08 */ s32* unk_08;
/* 0x08 */ u8* unk_08;
} unk_D_86002F34_018; // size = 0xC

typedef struct unk_D_86002F34_01C {
Expand Down
2 changes: 2 additions & 0 deletions linker_scripts/us/symbol_addrs.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -357,3 +357,5 @@ D_86C0E480 = 0x86C0E480; // size:0x1854
D_86C0FCD8 = 0x86C0FCD8; // size:0x1854
D_86C11530 = 0x86C11530; // size:0xAD0
D_879060BC = 0x879060BC; // size:0x2
D_86E04D60 = 0x86E04D60; // size:0xAD0
D_86E05830 = 0x86E05830; // size:0x3610
3 changes: 3 additions & 0 deletions linker_scripts/us/undefined_syms.ld
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,6 @@ D_03043520 = 0x03043520;
D_03043C40 = 0x03043C40;
D_030426E0 = 0x030426E0;
D_03042E00 = 0x03042E00;
D_0303ED80 = 0x0303ED80;
D_0303F580 = 0x0303F580;
D_0303F180 = 0x0303F180;
14 changes: 7 additions & 7 deletions src/11BA0.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "F420.h"
#include "util.h"

void func_80010FA0(struct GraphNode* arg0, u8 arg1) {
void func_80010FA0(GraphNode* arg0, u8 arg1) {
if (arg0 != NULL) {
arg0->unk_00 = arg1;
arg0->unk_01 = 0x11;
Expand All @@ -17,7 +17,7 @@ void func_80010FA0(struct GraphNode* arg0, u8 arg1) {
}
}

void func_80010FDC(struct GraphNode* arg0, func_D_86002F34_000_010 arg1, unk_D_86002F34_000_014* arg2) {
void func_80010FDC(GraphNode* arg0, func_D_86002F34_000_010 arg1, unk_D_86002F34_000_014* arg2) {
if (arg1 != NULL) {
arg1 = Util_ConvertAddrToVirtAddr(arg1);
}
Expand All @@ -31,7 +31,7 @@ void func_80010FDC(struct GraphNode* arg0, func_D_86002F34_000_010 arg1, unk_D_8
}
}

struct GraphNode* func_8001103C(MainPoolState* arg0, struct GraphNode* arg1) {
GraphNode* func_8001103C(MainPoolState* arg0, GraphNode* arg1) {
if (arg0 != NULL) {
arg1 = func_80002DCC(arg0, sizeof(struct GraphNode), 4);
}
Expand All @@ -43,7 +43,7 @@ struct GraphNode* func_8001103C(MainPoolState* arg0, struct GraphNode* arg1) {
return arg1;
}

unk_D_86002F34_alt2* func_80011088(MainPoolState* arg0, unk_D_86002F34_alt2* arg1, struct GraphNode* arg2) {
unk_D_86002F34_alt2* func_80011088(MainPoolState* arg0, unk_D_86002F34_alt2* arg1, GraphNode* arg2) {
if (arg0 != NULL) {
arg1 = func_80002DCC(arg0, sizeof(unk_D_86002F34_alt2), 4);
}
Expand Down Expand Up @@ -529,9 +529,9 @@ void func_80011FC8(unk_D_86002F34_00C* arg0, s16 arg1, s16 arg2, u8 arg3, u8 arg

#pragma GLOBAL_ASM("asm/us/nonmatchings/11BA0/func_80012044.s")

void func_80012094(struct GraphNode* arg0, struct GraphNode* arg1) {
struct GraphNode* temp_v0;
struct GraphNode* temp_v1;
void func_80012094(GraphNode* arg0, GraphNode* arg1) {
GraphNode* temp_v0;
GraphNode* temp_v1;

if ((arg0 != NULL) && (arg1 != NULL)) {
temp_v0 = arg0->unk_0C;
Expand Down
10 changes: 5 additions & 5 deletions src/11BA0.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ typedef struct unk_D_8690A610 {
/* 0x18 */ unk_D_8690A610_018 unk_18;
} unk_D_8690A610; // size = 0x20

void func_80010FA0(struct GraphNode* arg0, u8 arg1);
void func_80010FDC(struct GraphNode* arg0, func_D_86002F34_000_010 arg1, unk_D_86002F34_000_014* arg2);
struct GraphNode* func_8001103C(MainPoolState* arg0, struct GraphNode* arg1);
unk_D_86002F34_alt2* func_80011088(MainPoolState* arg0, unk_D_86002F34_alt2* arg1, struct GraphNode* arg2);
void func_80010FA0(GraphNode* arg0, u8 arg1);
void func_80010FDC(GraphNode* arg0, func_D_86002F34_000_010 arg1, unk_D_86002F34_000_014* arg2);
GraphNode* func_8001103C(MainPoolState* arg0, GraphNode* arg1);
unk_D_86002F34_alt2* func_80011088(MainPoolState* arg0, unk_D_86002F34_alt2* arg1, GraphNode* arg2);
unk_D_86002F34_00C* func_800110E0(MemoryBlock* arg0, unk_D_86002F34_00C* arg1, s16 arg2, s16 arg3, s16 arg4, s16 arg5);
unk_D_86002F34_alt13* func_800111A4(MemoryBlock* arg0, unk_D_86002F34_alt13* arg1, s16 arg2);
unk_D_86002F34_alt1* func_800111FC(MemoryBlock* arg0, unk_D_86002F34_alt1* arg1, s16 arg2);
Expand Down Expand Up @@ -58,5 +58,5 @@ void func_80011DAC(unk_D_86002F34_00C* arg0, s16 arg1, s16 arg2, s16 arg3, s16 a
void func_80011E68(unk_D_86002F34_00C* arg0, f32 arg1, f32 arg2, f32 arg3);
void func_80011EB4(unk_D_86002F34_00C* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, s32 arg7);
void func_80011FC8(unk_D_86002F34_00C* arg0, s16 arg1, s16 arg2, u8 arg3, u8 arg4, u8 arg5);
void func_80012094(struct GraphNode* arg0, struct GraphNode* arg1);
void func_80012094(GraphNode* arg0, GraphNode* arg1);
#endif // _11BA0_H_
78 changes: 39 additions & 39 deletions src/12D80.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "src/memmap.h"
#include "src/util.h"

typedef void (*func_D_8006F0A4)(struct GraphNode* arg0);
typedef void (*func_D_8006F0A4)(GraphNode* arg0);

typedef struct unk_D_800AA8C8 {
/* 0x0000 */ MtxF unk_0000[64];
Expand Down Expand Up @@ -380,9 +380,9 @@ void func_800131B4(unk_D_86002F34_00C_0CC* arg0, unk_D_86002F34_00C_040* arg1) {
}
}

void func_80013330(struct GraphNode* arg0) {
struct GraphNode* temp_s2 = arg0->unk_0C;
struct GraphNode* var_s0 = temp_s2;
void func_80013330(GraphNode* arg0) {
GraphNode* temp_s2 = arg0->unk_0C;
GraphNode* var_s0 = temp_s2;

if (temp_s2 != NULL) {
do {
Expand All @@ -398,9 +398,9 @@ void func_80013330(struct GraphNode* arg0) {
}
}

void func_800133D8(struct GraphNode* arg0) {
void func_800133D8(GraphNode* arg0) {
UNUSED s32 pad;
struct GraphNode* temp_a1 = ((unk_D_86002F34*)arg0)->unk_18;
GraphNode* temp_a1 = ((unk_D_86002F34*)arg0)->unk_18;

if ((temp_a1 != NULL) && (temp_a1->unk_01 & 1)) {
D_800AA6C0 = 0;
Expand All @@ -413,7 +413,7 @@ void func_800133D8(struct GraphNode* arg0) {
func_80013330(arg0);
}

void func_80013464(struct GraphNode* arg0) {
void func_80013464(GraphNode* arg0) {
UNUSED MtxF pad_mtx;
unk_D_86002F34_00C* arg = (unk_D_86002F34_00C*)arg0;
unk_D_86002F34_00C_040* temp_s2 = &arg->unk_40;
Expand Down Expand Up @@ -454,13 +454,13 @@ void func_80013464(struct GraphNode* arg0) {
D_8006F088 = NULL;
}

void func_80013764(struct GraphNode* arg0) {
void func_80013764(GraphNode* arg0) {
D_8006F08C = arg0;
func_80013330(arg0);
D_8006F08C = NULL;
}

void func_8001378C(struct GraphNode* arg0) {
void func_8001378C(GraphNode* arg0) {
unk_D_86002F34_alt1* arg = (unk_D_86002F34_alt1*)arg0;

if (arg->unk_00.unk_0C != NULL) {
Expand Down Expand Up @@ -494,7 +494,7 @@ void func_8001378C(struct GraphNode* arg0) {
arg->unk_1A = D_8006F084;
}

void func_800138F0(struct GraphNode* arg0) {
void func_800138F0(GraphNode* arg0) {
unk_D_86002F34_00C* arg = (unk_D_86002F34_00C*)arg0;

if ((D_8006F094 == NULL) && (arg->unk_00.unk_0C != NULL)) {
Expand All @@ -506,7 +506,7 @@ void func_800138F0(struct GraphNode* arg0) {
}
}

void func_8001395C(struct GraphNode* arg0) {
void func_8001395C(GraphNode* arg0) {
if ((D_8006F094 == NULL) && (arg0->unk_0C != NULL)) {
gSPPerspNormalize(gDisplayListHead++, 0xFFFF);
gSPMatrix(gDisplayListHead++, (u32)D_8006F088->unk_40.mtx & 0x1FFFFFFF,
Expand All @@ -516,7 +516,7 @@ void func_8001395C(struct GraphNode* arg0) {
}
}

void func_800139E8(struct GraphNode* arg0) {
void func_800139E8(GraphNode* arg0) {
if ((D_8006F094 == NULL) && (arg0->unk_0C != NULL)) {
gSPLookAt(gDisplayListHead++, (u32)&D_8006F088->unk_60.lookat->l & 0x1FFFFFFF);

Expand All @@ -531,7 +531,7 @@ void func_800139E8(struct GraphNode* arg0) {
}
}

void func_80013AF8(struct GraphNode* arg0) {
void func_80013AF8(GraphNode* arg0) {
unk_D_86002F34_alt2* arg = (unk_D_86002F34_alt2*)arg0;
unk_D_86002F34_00C_018* ptr = &D_8006F088->unk_18;

Expand All @@ -541,7 +541,7 @@ void func_80013AF8(struct GraphNode* arg0) {
gDPSetCycleType(gDisplayListHead++, G_CYC_2CYCLE);
}

void func_80013B8C(UNUSED struct GraphNode* arg0) {
void func_80013B8C(UNUSED GraphNode* arg0) {
unk_D_86002F34_00C_018* ptr = &D_8006F088->unk_18;

func_800067E4(&gDisplayListHead, ptr->x, ptr->y, ptr->width, ptr->height);
Expand All @@ -550,10 +550,10 @@ void func_80013B8C(UNUSED struct GraphNode* arg0) {
gDPSetCycleType(gDisplayListHead++, G_CYC_2CYCLE);
}

void func_80013C14(UNUSED struct GraphNode* arg0) {
void func_80013C14(UNUSED GraphNode* arg0) {
}

void func_80013C1C(struct GraphNode* arg0) {
void func_80013C1C(GraphNode* arg0) {
unk_D_86002F34_alt3* arg = (unk_D_86002F34_alt3*)arg0;

D_8006F090->unk_1D = 1;
Expand All @@ -565,7 +565,7 @@ void func_80013C1C(struct GraphNode* arg0) {
}

#ifdef NON_MATCHING
void func_80013D34(struct GraphNode* arg0) {
void func_80013D34(GraphNode* arg0) {
unk_D_86002F34_alt4* arg = (unk_D_86002F34_alt4*)arg0;
Lights7* lights;
unk_D_86002F34_alt1* new_var;
Expand Down Expand Up @@ -611,10 +611,10 @@ void func_80013D34(struct GraphNode* arg0) {
#pragma GLOBAL_ASM("asm/us/nonmatchings/12D80/func_80013D34.s")
#endif

void func_80013F7C(UNUSED struct GraphNode* arg0) {
void func_80013F7C(UNUSED GraphNode* arg0) {
}

void func_80013F84(struct GraphNode* arg0) {
void func_80013F84(GraphNode* arg0) {
unk_D_86002F34_alt4* arg = (unk_D_86002F34_alt4*)arg0;
s32 i;
Lights7* lights;
Expand All @@ -640,7 +640,7 @@ void func_80013F84(struct GraphNode* arg0) {
gSPLight(gDisplayListHead++, D_8006F090->lights, i + 1);
}

void func_80014124(struct GraphNode* arg0) {
void func_80014124(GraphNode* arg0) {
unk_D_86002F34_alt11* arg = (unk_D_86002F34_alt11*)arg0;
MtxF* temp_v0 = &D_800AA8C8.unk_0000[D_800AA8C8.unk_10A0];
Vec3f sp2C;
Expand All @@ -665,7 +665,7 @@ void func_80014124(struct GraphNode* arg0) {
D_8006F0A0 = NULL;
}

void func_80014214(struct GraphNode* arg0) {
void func_80014214(GraphNode* arg0) {
unk_D_86002F34_alt3* arg = (unk_D_86002F34_alt3*)arg0;
MtxF* mtx2 = &D_8006F088->unk_60.mtxf;
f32 a = D_800AA8C8.unk_0000[D_800AA8C8.unk_10A0].mf[3][0];
Expand All @@ -678,10 +678,10 @@ void func_80014214(struct GraphNode* arg0) {
}
}

void func_800142BC(struct GraphNode* arg0) {
void func_800142BC(GraphNode* arg0) {
unk_D_86002F34_alt3* arg = (unk_D_86002F34_alt3*)arg0;
s32 i;
struct GraphNode* var_a1 = arg->unk_00.unk_0C;
GraphNode* var_a1 = arg->unk_00.unk_0C;

if (var_a1 != NULL) {
for (i = 0; i < arg->unk_1A; i++) {
Expand All @@ -694,7 +694,7 @@ void func_800142BC(struct GraphNode* arg0) {
}
}

void func_80014334(struct GraphNode* arg0) {
void func_80014334(GraphNode* arg0) {
MtxF sp20;
unk_D_86002F34_alt5* arg = (unk_D_86002F34_alt5*)arg0;

Expand All @@ -705,7 +705,7 @@ void func_80014334(struct GraphNode* arg0) {
D_800AA8C8.unk_10A0--;
}

void func_80014384(struct GraphNode* arg0) {
void func_80014384(GraphNode* arg0) {
unk_D_86002F34_alt5* arg = (unk_D_86002F34_alt5*)arg0;

func_80012344(&arg->unk_18);
Expand All @@ -714,7 +714,7 @@ void func_80014384(struct GraphNode* arg0) {
D_800AA8C8.unk_10A0--;
}

void func_800143C0(struct GraphNode* arg0) {
void func_800143C0(GraphNode* arg0) {
Vec3s sp90;
Vec3f sp84;
Vec3f sp78;
Expand Down Expand Up @@ -766,7 +766,7 @@ void func_800143C0(struct GraphNode* arg0) {
}
}

void func_80014624(struct GraphNode* arg0) {
void func_80014624(GraphNode* arg0) {
unk_D_86002F34_alt7* arg = (unk_D_86002F34_alt7*)arg0;

if (arg->unk_18 != NULL) {
Expand All @@ -777,7 +777,7 @@ void func_80014624(struct GraphNode* arg0) {
func_80013330(arg0);
}

void func_80014690(struct GraphNode* arg0) {
void func_80014690(GraphNode* arg0) {
MtxF sp38;
Color_RGBA8_u32 sp34;
unk_D_86002F58_004_000* arg = (unk_D_86002F58_004_000*)arg0;
Expand Down Expand Up @@ -829,7 +829,7 @@ void func_80014690(struct GraphNode* arg0) {
}
}

void func_800148D8(struct GraphNode* arg0) {
void func_800148D8(GraphNode* arg0) {
unk_D_86002F34_alt8* arg = (unk_D_86002F34_alt8*)arg0;

func_800122B4(&arg->unk_1C);
Expand All @@ -845,7 +845,7 @@ void func_800148D8(struct GraphNode* arg0) {
D_800AA8C8.unk_10A0--;
}

void func_80014980(struct GraphNode* arg0) {
void func_80014980(GraphNode* arg0) {
MtxF sp30;
unk_D_86002F34_alt9* arg = (unk_D_86002F34_alt9*)arg0;

Expand All @@ -866,7 +866,7 @@ void func_80014980(struct GraphNode* arg0) {
D_800AA8C8.unk_10A0--;
}

void func_80014A60(struct GraphNode* arg0) {
void func_80014A60(GraphNode* arg0) {
unk_D_86002F34_alt9* arg = (unk_D_86002F34_alt9*)arg0;

if ((arg->unk_18 != NULL) || (arg->unk_00.unk_10 != NULL)) {
Expand All @@ -879,7 +879,7 @@ void func_80014A60(struct GraphNode* arg0) {
func_80013330(arg0);
}

void func_80014AEC(struct GraphNode* arg0) {
void func_80014AEC(GraphNode* arg0) {
Color_RGBA8_u32 sp44;
unk_D_86002F34_alt10* arg = (unk_D_86002F34_alt10*)arg0;
unk_D_86002F34_alt11_018* sp3C;
Expand Down Expand Up @@ -932,18 +932,18 @@ void func_80014CB8(s32 arg0) {
}
}

void func_80014D24(struct GraphNode* arg0) {
void func_80014D24(GraphNode* arg0) {
unk_D_86002F34_alt3* arg = (unk_D_86002F34_alt3*)arg0;

func_80014CB8(arg->unk_18);
func_80013330(arg0);
}

void func_80014D50(struct GraphNode* arg0) {
void func_80014D50(GraphNode* arg0) {
func_80013330(arg0);
}

void func_80014D70(struct GraphNode* arg0) {
void func_80014D70(GraphNode* arg0) {
Vec3f sp9C;
Vec3f sp90;
Vec3f sp84;
Expand Down Expand Up @@ -1007,7 +1007,7 @@ void func_80014D70(struct GraphNode* arg0) {
}
}

void func_80015094(struct GraphNode* arg0) {
void func_80015094(GraphNode* arg0) {
unk_D_86002F34_alt1* arg = (unk_D_86002F34_alt1*)arg0;

if (arg0->unk_01 & 1) {
Expand All @@ -1032,9 +1032,9 @@ void func_80015094(struct GraphNode* arg0) {
D_8006F080 = 0;
}

void func_80015220(struct GraphNode* arg0, s32 arg1) {
struct GraphNode* var_s1 = arg0;
struct GraphNode** var_s0;
void func_80015220(GraphNode* arg0, s32 arg1) {
GraphNode* var_s1 = arg0;
GraphNode** var_s0;

do {
if (var_s1->unk_10 != NULL) {
Expand Down
Loading

0 comments on commit 5c689ff

Please sign in to comment.