Skip to content

Commit 3015ed2

Browse files
RevoSucksRevoSucks
authored
Merge pull request #161 from Kelebek1/fragment21
fragment21
2 parents 5c689ff + 9541ed7 commit 3015ed2

File tree

12 files changed

+2674
-114
lines changed

12 files changed

+2674
-114
lines changed

‎include/global.h

+9-6
Original file line numberDiff line numberDiff line change
@@ -418,14 +418,17 @@ typedef struct unk_D_86002F34_alt24 {
418418

419419
typedef void* (*func_unk_D_800ABE10)(s32, s32);
420420

421+
#define unk_D_86002F34_018_GFX_TYPE_1 1 // 8-bit per texel
422+
#define unk_D_86002F34_018_GFX_TYPE_2 2 // 16-bit per texel
423+
#define unk_D_86002F34_018_GFX_TYPE_3 3 // 32-bit per texel
424+
421425
typedef struct unk_D_86002F34_018 {
422426
/* 0x00 */ u8 unk_00;
423-
/* 0x01 */ u8 unk_01;
424-
/* 0x02 */ u8 unk_02;
425-
/* 0x03 */ u8 unk_03;
426-
/* 0x04 */ s16 unk_04;
427-
/* 0x06 */ s16 unk_06;
428-
/* 0x08 */ u8* unk_08;
427+
/* 0x01 */ u8 type;
428+
/* 0x02 */ s16 width;
429+
/* 0x04 */ s16 height;
430+
/* 0x06 */ s16 num_texels;
431+
/* 0x08 */ u8* texture;
429432
} unk_D_86002F34_018; // size = 0xC
430433

431434
typedef struct unk_D_86002F34_01C {

‎linker_scripts/us/undefined_syms.ld

+6
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,9 @@ D_03042E00 = 0x03042E00;
2424
D_0303ED80 = 0x0303ED80;
2525
D_0303F580 = 0x0303F580;
2626
D_0303F180 = 0x0303F180;
27+
D_030451A0 = 0x030451A0;
28+
D_03046AA0 = 0x03046AA0;
29+
D_03045E20 = 0x03045E20;
30+
D_03049020 = 0x03049020;
31+
D_030483A0 = 0x030483A0;
32+
D_03047720 = 0x03047720;

‎src/19840.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,18 @@ void func_80018C40(unk_D_86002F34* arg0, arg1_func_80010CA8 arg1) {
3131

3232
for (i = 0; i < arg0->unk_24; i++, var_s2++) {
3333
if (var_s2->unk_00 == 0) {
34-
if (var_s2->unk_01 == 2) {
35-
u16* var_s1 = var_s2->unk_08;
34+
if (var_s2->type == unk_D_86002F34_018_GFX_TYPE_2) {
35+
u16* var_s1 = var_s2->texture;
3636

37-
for (j = 0; j < var_s2->unk_06; j++) {
37+
for (j = 0; j < var_s2->num_texels; j++) {
3838
var_s1[j] = func_80010CA8(var_s1[j], arg1);
3939
}
4040
}
4141

42-
if (var_s2->unk_01 == 3) {
43-
u32* var_s1 = var_s2->unk_08;
42+
if (var_s2->type == unk_D_86002F34_018_GFX_TYPE_3) {
43+
u32* var_s1 = var_s2->texture;
4444

45-
for (j = 0; j < var_s2->unk_06; j++) {
45+
for (j = 0; j < var_s2->num_texels; j++) {
4646
var_s1[j] = func_80010E20(var_s1[j], arg1);
4747
}
4848
}

‎src/fragments/17/fragment17_161E60.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ static u32 D_86B0C4E0[] = {
385385
};
386386

387387
static unk_D_86002F34_018 D_86B0CCE0 = {
388-
0x03, 0x02, 0x00, 0x20, 0x0020, 0x0400, D_86B0C4E0,
388+
0x03, unk_D_86002F34_018_GFX_TYPE_2, 32, 32, 0x0400, D_86B0C4E0,
389389
};
390390

391391
static Gfx D_86B0CCF0[] = {
@@ -534,7 +534,7 @@ static u32 D_86B0CFE0[] = {
534534
0x29EB3A71, 0x4B357439, 0x6BF7532F, 0x532B4AA9, 0x3A273229, 0x326F3AB3, 0x2A2B195D, 0x1919299D,
535535
};
536536
static unk_D_86002F34_018 D_86B0D7E0 = {
537-
0x00, 0x02, 0x00, 0x20, 0x0020, 0x0400, D_86B0CFE0,
537+
0x00, unk_D_86002F34_018_GFX_TYPE_2, 32, 32, 0x0400, D_86B0CFE0,
538538
};
539539
static Gfx D_86B0D7F0[] = {
540540
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_MIRROR | G_TX_WRAP, 5, G_TX_NOLOD,

‎src/fragments/18/fragment18.c

+20-30
Original file line numberDiff line numberDiff line change
@@ -915,90 +915,80 @@ static u32 D_86C0B1F8[] = {
915915
static unk_D_86002F34_018 D_86C0B9F8[] = {
916916
{
917917
0x00,
918-
0x02,
919-
0x00,
920-
0x20,
918+
unk_D_86002F34_018_GFX_TYPE_2,
919+
32,
921920
64,
922921
2048,
923922
D_86C049F8,
924923
},
925924
{
926925
0x00,
927-
0x02,
928-
0x00,
929-
0x20,
926+
unk_D_86002F34_018_GFX_TYPE_2,
927+
32,
930928
64,
931929
2048,
932930
D_86C059F8,
933931
},
934932
{
935933
0x00,
936-
0x02,
937-
0x00,
938-
0x20,
934+
unk_D_86002F34_018_GFX_TYPE_2,
935+
32,
939936
64,
940937
2048,
941938
D_86C069F8,
942939
},
943940
{
944941
0x00,
945-
0x02,
946-
0x00,
947-
0x20,
942+
unk_D_86002F34_018_GFX_TYPE_2,
943+
32,
948944
32,
949945
1024,
950946
D_86C079F8,
951947
},
952948
{
953949
0x00,
954-
0x03,
955-
0x00,
956-
0x20,
950+
unk_D_86002F34_018_GFX_TYPE_3,
951+
32,
957952
32,
958953
1024,
959954
D_86C081F8,
960955
},
961956
{
962957
0x00,
963-
0x02,
964-
0x00,
965-
0x20,
958+
unk_D_86002F34_018_GFX_TYPE_2,
959+
32,
966960
32,
967961
1024,
968962
D_86C091F8,
969963
},
970964
{
971965
0x00,
972-
0x02,
973-
0x00,
974-
0x20,
966+
unk_D_86002F34_018_GFX_TYPE_2,
967+
32,
975968
32,
976969
1024,
977970
D_86C099F8,
978971
},
979972
{
980973
0x00,
981-
0x02,
982-
0x00,
983-
0x20,
974+
unk_D_86002F34_018_GFX_TYPE_2,
975+
32,
984976
32,
985977
1024,
986978
D_86C0A1F8,
987979
},
988980
{
989981
0x00,
990-
0x02,
991-
0x00,
992-
0x20,
982+
unk_D_86002F34_018_GFX_TYPE_2,
983+
32,
993984
32,
994985
1024,
995986
D_86C0A9F8,
996987
},
997988
{
998989
0x00,
999-
0x02,
1000-
0x00,
1001-
0x20,
990+
unk_D_86002F34_018_GFX_TYPE_2,
991+
32,
1002992
32,
1003993
1024,
1004994
D_86C0B1F8,

‎src/fragments/20/fragment20.c

+6-9
Original file line numberDiff line numberDiff line change
@@ -155,27 +155,24 @@ static u32 D_86E035B0[] = {
155155
static unk_D_86002F34_018 D_86E03DB0[3] = {
156156
{
157157
0x04,
158-
0x01,
159-
0x00,
160-
0x20,
158+
unk_D_86002F34_018_GFX_TYPE_1,
159+
32,
161160
32,
162161
1024,
163162
D_86E02FB0,
164163
},
165164
{
166165
0x00,
167-
0x02,
168-
0x00,
169-
0x04,
166+
unk_D_86002F34_018_GFX_TYPE_2,
167+
4,
170168
64,
171169
256,
172170
D_86E033B0,
173171
},
174172
{
175173
0x00,
176-
0x02,
177-
0x00,
178-
0x20,
174+
unk_D_86002F34_018_GFX_TYPE_2,
175+
32,
179176
32,
180177
1024,
181178
D_86E035B0,

0 commit comments

Comments
 (0)