Skip to content

Commit 5c689ff

Browse files
RevoSucksRevoSucks
authored
Merge pull request #160 from Kelebek1/fragment20
fragment20
2 parents 8fee860 + 48f4988 commit 5c689ff

26 files changed

+2232
-296
lines changed

‎include/global.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ typedef struct unk_D_86002F34_018 {
425425
/* 0x03 */ u8 unk_03;
426426
/* 0x04 */ s16 unk_04;
427427
/* 0x06 */ s16 unk_06;
428-
/* 0x08 */ s32* unk_08;
428+
/* 0x08 */ u8* unk_08;
429429
} unk_D_86002F34_018; // size = 0xC
430430

431431
typedef struct unk_D_86002F34_01C {

‎linker_scripts/us/symbol_addrs.txt

+2
Original file line numberDiff line numberDiff line change
@@ -357,3 +357,5 @@ D_86C0E480 = 0x86C0E480; // size:0x1854
357357
D_86C0FCD8 = 0x86C0FCD8; // size:0x1854
358358
D_86C11530 = 0x86C11530; // size:0xAD0
359359
D_879060BC = 0x879060BC; // size:0x2
360+
D_86E04D60 = 0x86E04D60; // size:0xAD0
361+
D_86E05830 = 0x86E05830; // size:0x3610

‎linker_scripts/us/undefined_syms.ld

+3
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,6 @@ D_03043520 = 0x03043520;
2121
D_03043C40 = 0x03043C40;
2222
D_030426E0 = 0x030426E0;
2323
D_03042E00 = 0x03042E00;
24+
D_0303ED80 = 0x0303ED80;
25+
D_0303F580 = 0x0303F580;
26+
D_0303F180 = 0x0303F180;

‎src/11BA0.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include "F420.h"
44
#include "util.h"
55

6-
void func_80010FA0(struct GraphNode* arg0, u8 arg1) {
6+
void func_80010FA0(GraphNode* arg0, u8 arg1) {
77
if (arg0 != NULL) {
88
arg0->unk_00 = arg1;
99
arg0->unk_01 = 0x11;
@@ -17,7 +17,7 @@ void func_80010FA0(struct GraphNode* arg0, u8 arg1) {
1717
}
1818
}
1919

20-
void func_80010FDC(struct GraphNode* arg0, func_D_86002F34_000_010 arg1, unk_D_86002F34_000_014* arg2) {
20+
void func_80010FDC(GraphNode* arg0, func_D_86002F34_000_010 arg1, unk_D_86002F34_000_014* arg2) {
2121
if (arg1 != NULL) {
2222
arg1 = Util_ConvertAddrToVirtAddr(arg1);
2323
}
@@ -31,7 +31,7 @@ void func_80010FDC(struct GraphNode* arg0, func_D_86002F34_000_010 arg1, unk_D_8
3131
}
3232
}
3333

34-
struct GraphNode* func_8001103C(MainPoolState* arg0, struct GraphNode* arg1) {
34+
GraphNode* func_8001103C(MainPoolState* arg0, GraphNode* arg1) {
3535
if (arg0 != NULL) {
3636
arg1 = func_80002DCC(arg0, sizeof(struct GraphNode), 4);
3737
}
@@ -43,7 +43,7 @@ struct GraphNode* func_8001103C(MainPoolState* arg0, struct GraphNode* arg1) {
4343
return arg1;
4444
}
4545

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

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

532-
void func_80012094(struct GraphNode* arg0, struct GraphNode* arg1) {
533-
struct GraphNode* temp_v0;
534-
struct GraphNode* temp_v1;
532+
void func_80012094(GraphNode* arg0, GraphNode* arg1) {
533+
GraphNode* temp_v0;
534+
GraphNode* temp_v1;
535535

536536
if ((arg0 != NULL) && (arg1 != NULL)) {
537537
temp_v0 = arg0->unk_0C;

‎src/11BA0.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ typedef struct unk_D_8690A610 {
2020
/* 0x18 */ unk_D_8690A610_018 unk_18;
2121
} unk_D_8690A610; // size = 0x20
2222

23-
void func_80010FA0(struct GraphNode* arg0, u8 arg1);
24-
void func_80010FDC(struct GraphNode* arg0, func_D_86002F34_000_010 arg1, unk_D_86002F34_000_014* arg2);
25-
struct GraphNode* func_8001103C(MainPoolState* arg0, struct GraphNode* arg1);
26-
unk_D_86002F34_alt2* func_80011088(MainPoolState* arg0, unk_D_86002F34_alt2* arg1, struct GraphNode* arg2);
23+
void func_80010FA0(GraphNode* arg0, u8 arg1);
24+
void func_80010FDC(GraphNode* arg0, func_D_86002F34_000_010 arg1, unk_D_86002F34_000_014* arg2);
25+
GraphNode* func_8001103C(MainPoolState* arg0, GraphNode* arg1);
26+
unk_D_86002F34_alt2* func_80011088(MainPoolState* arg0, unk_D_86002F34_alt2* arg1, GraphNode* arg2);
2727
unk_D_86002F34_00C* func_800110E0(MemoryBlock* arg0, unk_D_86002F34_00C* arg1, s16 arg2, s16 arg3, s16 arg4, s16 arg5);
2828
unk_D_86002F34_alt13* func_800111A4(MemoryBlock* arg0, unk_D_86002F34_alt13* arg1, s16 arg2);
2929
unk_D_86002F34_alt1* func_800111FC(MemoryBlock* arg0, unk_D_86002F34_alt1* arg1, s16 arg2);
@@ -58,5 +58,5 @@ void func_80011DAC(unk_D_86002F34_00C* arg0, s16 arg1, s16 arg2, s16 arg3, s16 a
5858
void func_80011E68(unk_D_86002F34_00C* arg0, f32 arg1, f32 arg2, f32 arg3);
5959
void func_80011EB4(unk_D_86002F34_00C* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, s32 arg7);
6060
void func_80011FC8(unk_D_86002F34_00C* arg0, s16 arg1, s16 arg2, u8 arg3, u8 arg4, u8 arg5);
61-
void func_80012094(struct GraphNode* arg0, struct GraphNode* arg1);
61+
void func_80012094(GraphNode* arg0, GraphNode* arg1);
6262
#endif // _11BA0_H_

‎src/12D80.c

+39-39
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "src/memmap.h"
1212
#include "src/util.h"
1313

14-
typedef void (*func_D_8006F0A4)(struct GraphNode* arg0);
14+
typedef void (*func_D_8006F0A4)(GraphNode* arg0);
1515

1616
typedef struct unk_D_800AA8C8 {
1717
/* 0x0000 */ MtxF unk_0000[64];
@@ -380,9 +380,9 @@ void func_800131B4(unk_D_86002F34_00C_0CC* arg0, unk_D_86002F34_00C_040* arg1) {
380380
}
381381
}
382382

383-
void func_80013330(struct GraphNode* arg0) {
384-
struct GraphNode* temp_s2 = arg0->unk_0C;
385-
struct GraphNode* var_s0 = temp_s2;
383+
void func_80013330(GraphNode* arg0) {
384+
GraphNode* temp_s2 = arg0->unk_0C;
385+
GraphNode* var_s0 = temp_s2;
386386

387387
if (temp_s2 != NULL) {
388388
do {
@@ -398,9 +398,9 @@ void func_80013330(struct GraphNode* arg0) {
398398
}
399399
}
400400

401-
void func_800133D8(struct GraphNode* arg0) {
401+
void func_800133D8(GraphNode* arg0) {
402402
UNUSED s32 pad;
403-
struct GraphNode* temp_a1 = ((unk_D_86002F34*)arg0)->unk_18;
403+
GraphNode* temp_a1 = ((unk_D_86002F34*)arg0)->unk_18;
404404

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

416-
void func_80013464(struct GraphNode* arg0) {
416+
void func_80013464(GraphNode* arg0) {
417417
UNUSED MtxF pad_mtx;
418418
unk_D_86002F34_00C* arg = (unk_D_86002F34_00C*)arg0;
419419
unk_D_86002F34_00C_040* temp_s2 = &arg->unk_40;
@@ -454,13 +454,13 @@ void func_80013464(struct GraphNode* arg0) {
454454
D_8006F088 = NULL;
455455
}
456456

457-
void func_80013764(struct GraphNode* arg0) {
457+
void func_80013764(GraphNode* arg0) {
458458
D_8006F08C = arg0;
459459
func_80013330(arg0);
460460
D_8006F08C = NULL;
461461
}
462462

463-
void func_8001378C(struct GraphNode* arg0) {
463+
void func_8001378C(GraphNode* arg0) {
464464
unk_D_86002F34_alt1* arg = (unk_D_86002F34_alt1*)arg0;
465465

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

497-
void func_800138F0(struct GraphNode* arg0) {
497+
void func_800138F0(GraphNode* arg0) {
498498
unk_D_86002F34_00C* arg = (unk_D_86002F34_00C*)arg0;
499499

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

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

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

@@ -531,7 +531,7 @@ void func_800139E8(struct GraphNode* arg0) {
531531
}
532532
}
533533

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

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

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

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

553-
void func_80013C14(UNUSED struct GraphNode* arg0) {
553+
void func_80013C14(UNUSED GraphNode* arg0) {
554554
}
555555

556-
void func_80013C1C(struct GraphNode* arg0) {
556+
void func_80013C1C(GraphNode* arg0) {
557557
unk_D_86002F34_alt3* arg = (unk_D_86002F34_alt3*)arg0;
558558

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

567567
#ifdef NON_MATCHING
568-
void func_80013D34(struct GraphNode* arg0) {
568+
void func_80013D34(GraphNode* arg0) {
569569
unk_D_86002F34_alt4* arg = (unk_D_86002F34_alt4*)arg0;
570570
Lights7* lights;
571571
unk_D_86002F34_alt1* new_var;
@@ -611,10 +611,10 @@ void func_80013D34(struct GraphNode* arg0) {
611611
#pragma GLOBAL_ASM("asm/us/nonmatchings/12D80/func_80013D34.s")
612612
#endif
613613

614-
void func_80013F7C(UNUSED struct GraphNode* arg0) {
614+
void func_80013F7C(UNUSED GraphNode* arg0) {
615615
}
616616

617-
void func_80013F84(struct GraphNode* arg0) {
617+
void func_80013F84(GraphNode* arg0) {
618618
unk_D_86002F34_alt4* arg = (unk_D_86002F34_alt4*)arg0;
619619
s32 i;
620620
Lights7* lights;
@@ -640,7 +640,7 @@ void func_80013F84(struct GraphNode* arg0) {
640640
gSPLight(gDisplayListHead++, D_8006F090->lights, i + 1);
641641
}
642642

643-
void func_80014124(struct GraphNode* arg0) {
643+
void func_80014124(GraphNode* arg0) {
644644
unk_D_86002F34_alt11* arg = (unk_D_86002F34_alt11*)arg0;
645645
MtxF* temp_v0 = &D_800AA8C8.unk_0000[D_800AA8C8.unk_10A0];
646646
Vec3f sp2C;
@@ -665,7 +665,7 @@ void func_80014124(struct GraphNode* arg0) {
665665
D_8006F0A0 = NULL;
666666
}
667667

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

681-
void func_800142BC(struct GraphNode* arg0) {
681+
void func_800142BC(GraphNode* arg0) {
682682
unk_D_86002F34_alt3* arg = (unk_D_86002F34_alt3*)arg0;
683683
s32 i;
684-
struct GraphNode* var_a1 = arg->unk_00.unk_0C;
684+
GraphNode* var_a1 = arg->unk_00.unk_0C;
685685

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

697-
void func_80014334(struct GraphNode* arg0) {
697+
void func_80014334(GraphNode* arg0) {
698698
MtxF sp20;
699699
unk_D_86002F34_alt5* arg = (unk_D_86002F34_alt5*)arg0;
700700

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

708-
void func_80014384(struct GraphNode* arg0) {
708+
void func_80014384(GraphNode* arg0) {
709709
unk_D_86002F34_alt5* arg = (unk_D_86002F34_alt5*)arg0;
710710

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

717-
void func_800143C0(struct GraphNode* arg0) {
717+
void func_800143C0(GraphNode* arg0) {
718718
Vec3s sp90;
719719
Vec3f sp84;
720720
Vec3f sp78;
@@ -766,7 +766,7 @@ void func_800143C0(struct GraphNode* arg0) {
766766
}
767767
}
768768

769-
void func_80014624(struct GraphNode* arg0) {
769+
void func_80014624(GraphNode* arg0) {
770770
unk_D_86002F34_alt7* arg = (unk_D_86002F34_alt7*)arg0;
771771

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

780-
void func_80014690(struct GraphNode* arg0) {
780+
void func_80014690(GraphNode* arg0) {
781781
MtxF sp38;
782782
Color_RGBA8_u32 sp34;
783783
unk_D_86002F58_004_000* arg = (unk_D_86002F58_004_000*)arg0;
@@ -829,7 +829,7 @@ void func_80014690(struct GraphNode* arg0) {
829829
}
830830
}
831831

832-
void func_800148D8(struct GraphNode* arg0) {
832+
void func_800148D8(GraphNode* arg0) {
833833
unk_D_86002F34_alt8* arg = (unk_D_86002F34_alt8*)arg0;
834834

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

848-
void func_80014980(struct GraphNode* arg0) {
848+
void func_80014980(GraphNode* arg0) {
849849
MtxF sp30;
850850
unk_D_86002F34_alt9* arg = (unk_D_86002F34_alt9*)arg0;
851851

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

869-
void func_80014A60(struct GraphNode* arg0) {
869+
void func_80014A60(GraphNode* arg0) {
870870
unk_D_86002F34_alt9* arg = (unk_D_86002F34_alt9*)arg0;
871871

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

882-
void func_80014AEC(struct GraphNode* arg0) {
882+
void func_80014AEC(GraphNode* arg0) {
883883
Color_RGBA8_u32 sp44;
884884
unk_D_86002F34_alt10* arg = (unk_D_86002F34_alt10*)arg0;
885885
unk_D_86002F34_alt11_018* sp3C;
@@ -932,18 +932,18 @@ void func_80014CB8(s32 arg0) {
932932
}
933933
}
934934

935-
void func_80014D24(struct GraphNode* arg0) {
935+
void func_80014D24(GraphNode* arg0) {
936936
unk_D_86002F34_alt3* arg = (unk_D_86002F34_alt3*)arg0;
937937

938938
func_80014CB8(arg->unk_18);
939939
func_80013330(arg0);
940940
}
941941

942-
void func_80014D50(struct GraphNode* arg0) {
942+
void func_80014D50(GraphNode* arg0) {
943943
func_80013330(arg0);
944944
}
945945

946-
void func_80014D70(struct GraphNode* arg0) {
946+
void func_80014D70(GraphNode* arg0) {
947947
Vec3f sp9C;
948948
Vec3f sp90;
949949
Vec3f sp84;
@@ -1007,7 +1007,7 @@ void func_80014D70(struct GraphNode* arg0) {
10071007
}
10081008
}
10091009

1010-
void func_80015094(struct GraphNode* arg0) {
1010+
void func_80015094(GraphNode* arg0) {
10111011
unk_D_86002F34_alt1* arg = (unk_D_86002F34_alt1*)arg0;
10121012

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

1035-
void func_80015220(struct GraphNode* arg0, s32 arg1) {
1036-
struct GraphNode* var_s1 = arg0;
1037-
struct GraphNode** var_s0;
1035+
void func_80015220(GraphNode* arg0, s32 arg1) {
1036+
GraphNode* var_s1 = arg0;
1037+
GraphNode** var_s0;
10381038

10391039
do {
10401040
if (var_s1->unk_10 != NULL) {

0 commit comments

Comments
 (0)