Skip to content

Commit 944d476

Browse files
author
Maide
committed
26E6D0
1 parent b117937 commit 944d476

10 files changed

+591
-266
lines changed

linker_scripts/us/symbol_addrs.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -307,4 +307,4 @@ pad_D_879060B4 = 0x879060B4; // size:0x8
307307
D_879060E0 = 0x879060E0; // size:0xC
308308
D_87906100 = 0x87906100; // size:0xC
309309
D_87906110 = 0x87906110; // size:0xC
310-
D_8140E628 = 0x8140E628; // size:0xC
310+
D_8140E628 = 0x8140E628; // size:0x90

src/fragments/3/fragment3_119FB0.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,9 @@ void func_87901B08(void) {
176176
}
177177

178178
void func_87901BB0(unk_D_8140E720* arg0) {
179-
D_8140E628.x = arg0->unk_28;
180-
D_8140E628.y = arg0->unk_28;
181-
D_8140E628.z = arg0->unk_28;
179+
D_8140E628.unk_00.x = arg0->unk_28;
180+
D_8140E628.unk_00.y = arg0->unk_28;
181+
D_8140E628.unk_00.z = arg0->unk_28;
182182
}
183183

184184
void func_87901BD4(unk_D_8140E720* arg0) {

src/fragments/34/fragment34.h

+42-10
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ typedef struct unk_D_8140E720 {
9999
/* 0xB8 */ s16 unk_B8;
100100
/* 0xBA */ s16 unk_BA;
101101
/* 0xBC */ s16 unk_BC;
102-
/* 0xBE */ u8 unk_BE;
103-
/* 0xBF */ u8 unk_BF;
104-
/* 0xC0 */ u8 unk_C0;
105-
/* 0xC1 */ u8 unk_C1;
106-
/* 0xC2 */ u8 unk_C2;
107-
/* 0xC3 */ u8 unk_C3;
108-
/* 0xC4 */ u8 unk_C4;
102+
/* 0xBE */ u8 prim_r;
103+
/* 0xBF */ u8 prim_g;
104+
/* 0xC0 */ u8 prim_b;
105+
/* 0xC1 */ u8 env_r;
106+
/* 0xC2 */ u8 env_g;
107+
/* 0xC3 */ u8 env_b;
108+
/* 0xC4 */ u8 prim_a;
109109
/* 0xC5 */ char unkC5[0x1];
110110
/* 0xC6 */ s8 unk_C6;
111111
/* 0xC7 */ s8 unk_C7;
@@ -217,6 +217,11 @@ typedef struct arg1_func_81407874 {
217217
/* 0x00 */ arg1_func_81407874_014* unk_14;
218218
} arg1_func_81407874; // size >= 0x18
219219

220+
typedef struct unk_D_8140E634 {
221+
/* 0x00 */ Vec3f unk_00;
222+
/* 0x0C */ char unk0C[0x84];
223+
} unk_D_8140E634; // size = 0x90
224+
220225
extern Gfx D_8140DAE0[];
221226
extern Gfx D_8140DB30[];
222227
extern Gfx D_8140DBA8[];
@@ -256,10 +261,35 @@ extern Gfx D_8140E430[];
256261
extern Gfx D_8140E448[];
257262
extern unk_D_8140E728_01C D_8140E460;
258263

264+
extern u8 D_8140E538[];
265+
259266
extern MtxF* D_8140E620;
260267
extern s32 D_8140E624;
261-
extern Vec3f D_8140E628;
262-
268+
extern s32 D_8140E624;
269+
extern unk_D_8140E634 D_8140E628;
270+
extern u32 D_8140E6B8;
271+
extern s32 D_8140E6BC;
272+
extern s32 D_8140E6C0;
273+
extern s32 D_8140E6C4;
274+
extern s32 D_8140E6C8;
275+
extern s32 D_8140E6CC;
276+
extern u32 D_8140E6D0;
277+
extern s32 D_8140E6D4;
278+
extern u32 D_8140E6D8;
279+
extern u32 D_8140E6DC;
280+
extern u32 D_8140E6E0;
281+
extern u32 D_8140E6E4;
282+
extern u32 D_8140E6E8;
283+
extern u32 D_8140E6EC;
284+
extern u32 D_8140E6F0;
285+
extern s32 D_8140E6F4;
286+
extern s32 D_8140E6F8;
287+
extern s32 D_8140E6FC;
288+
extern s32 D_8140E700;
289+
extern s32 D_8140E704;
290+
extern s32 D_8140E708;
291+
extern s32 D_8140E70C;
292+
extern s32 D_8140E710;
263293
extern unk_D_8140E720* D_8140E720;
264294
extern unk_D_8140E728* D_8140E728;
265295
extern s32 D_8140E72C;
@@ -734,6 +764,8 @@ void func_8140C5BC(UNUSED unk_D_8140E720* arg0, UNUSED unk_D_86002F34_00C* arg1)
734764

735765

736766
void func_8140C5D0(void);
737-
void func_8140D5A0(unk_D_8140E720*, s32);
767+
768+
769+
void func_8140D5A0(unk_D_8140E720*, u16);
738770

739771
#endif // _FRAGMENT34_H_

src/fragments/34/fragment34_261F90.c

+33-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,39 @@
33
#include "src/F420.h"
44
#include "src/math_util.h"
55

6-
extern MtxF* D_8140E620;
7-
extern s32 D_8140E624;
8-
extern s32 D_8140E710;
6+
MtxF* D_8140E620;
7+
s32 D_8140E624;
8+
s32 D_8140E624;
9+
unk_D_8140E634 D_8140E628;
10+
u32 D_8140E6B8;
11+
s32 D_8140E6BC;
12+
s32 D_8140E6C0;
13+
s32 D_8140E6C4;
14+
s32 D_8140E6C8;
15+
s32 D_8140E6CC;
16+
u32 D_8140E6D0;
17+
s32 D_8140E6D4;
18+
u32 D_8140E6D8;
19+
u32 D_8140E6DC;
20+
u32 D_8140E6E0;
21+
u32 D_8140E6E4;
22+
u32 D_8140E6E8;
23+
u32 D_8140E6EC;
24+
u32 D_8140E6F0;
25+
s32 D_8140E6F4;
26+
s32 D_8140E6F8;
27+
s32 D_8140E6FC;
28+
s32 D_8140E700;
29+
s32 D_8140E704;
30+
s32 D_8140E708;
31+
s32 D_8140E70C;
32+
s32 D_8140E710;
33+
s32 pad_D_8140E714[2];
34+
unk_D_8140E720* D_8140E720;
35+
s32 pad_D_8140E724;
36+
unk_D_8140E728* D_8140E728;
37+
s32 D_8140E72C;
38+
s32 D_8140E734;
939

1040
void func_81400020(s32* arg0, s32 arg1) {
1141
*arg0 |= arg1;

src/fragments/34/fragment34_264380.c

-5
Original file line numberDiff line numberDiff line change
@@ -354,11 +354,6 @@ Gfx D_8140E448[] = {
354354
gsSPEndDisplayList(),
355355
};
356356

357-
extern u32 D_8140E6B8;
358-
extern u32 D_8140E6E8;
359-
extern u32 D_8140E6EC;
360-
extern u32 D_8140E6F0;
361-
362357
void func_81402410(void) {
363358
gDPPipeSync(gDisplayListHead++);
364359
}

0 commit comments

Comments
 (0)