Skip to content

Commit ff538c9

Browse files
RevoSucksRevoSucks
authored
Merge pull request #149 from pret/revert-147-fragment15
Revert "fragment15"
2 parents f83ef11 + 67de4f7 commit ff538c9

31 files changed

+227
-3937
lines changed

‎include/global.h

+14-97
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,6 @@ typedef union unk_D_86002F58_004_000_010_02C {
4141
u32 raw;
4242
} unk_D_86002F58_004_000_010_02C; // size = 0x4
4343

44-
typedef struct unk_D_86002F58_004_000_010_024 {
45-
/* 0x00 */ u16 unk_00;
46-
/* 0x02 */ char unk02[0x6];
47-
/* 0x08 */ struct unk_D_86002F58_004_000_004* unk_08;
48-
} unk_D_86002F58_004_000_010_024; // size >= 0xC
49-
5044
typedef struct unk_D_86002F58_004_000_010 {
5145
/* 0x00 */ u8 unk_00;
5246
/* 0x01 */ u8 unk_01;
@@ -56,7 +50,7 @@ typedef struct unk_D_86002F58_004_000_010 {
5650
/* 0x18 */ s32 unk_18;
5751
/* 0x1C */ s32 unk_1C;
5852
/* 0x20 */ s32 unk_20;
59-
/* 0x24 */ unk_D_86002F58_004_000_010_024* unk_24;
53+
/* 0x24 */ u16* unk_24;
6054
/* 0x28 */ s32 unk_28;
6155
/* 0x2C */ unk_D_86002F58_004_000_010_02C unk_2C;
6256
/* 0x30 */ OSMesgQueue unk_30;
@@ -123,7 +117,6 @@ typedef struct unk_D_86002F58_004_000_054 {
123117

124118
typedef struct unk_D_86002F58_004_000_0A8 {
125119
/* 0x00 */ u16 unk_00;
126-
/* 0x02 */ u8 unk_02;
127120
/* 0x04 */ Vec3f unk_04;
128121
} unk_D_86002F58_004_000_0A8; // size = 0x10
129122

@@ -167,17 +160,16 @@ typedef struct unk_D_86002F34_000_014 {
167160
/* 0x04 */ u8* unk_04;
168161
} unk_D_86002F34_000_014; // size >= 0x8
169162

170-
typedef s32 (*func_D_86002F34_000_010)(s32, struct unk_D_86002F34_000*);
171-
172163
typedef struct unk_D_86002F34_000 {
173164
/* 0x00 */ u8 unk_00;
174165
/* 0x01 */ u8 unk_01;
175166
/* 0x02 */ u8 unk_02;
176167
/* 0x03 */ u8 unk_03;
177-
/* 0x04 */ struct unk_D_86002F34_000* unk_04;
168+
/* 0x04 */ char pad04[0x2];
169+
/* 0x06 */ s16 unk_06;
178170
/* 0x08 */ struct unk_D_86002F34_000* unk_08;
179171
/* 0x0C */ struct unk_D_86002F34_00C* unk_0C;
180-
/* 0x10 */ func_D_86002F34_000_010 unk_10;
172+
/* 0x10 */ s32 (*unk_10)(s32, struct unk_D_86002F34_000*);
181173
/* 0x14 */ unk_D_86002F34_000_014* unk_14;
182174
} unk_D_86002F34_000; // size = 0x18
183175

@@ -243,8 +235,7 @@ typedef struct unk_D_86002F34_00C {
243235
/* 0x40 */ unk_D_86002F34_00C_040 unk_40;
244236
/* 0x60 */ unk_D_86002F34_00C_060 unk_60;
245237
/* 0xCC */ unk_D_86002F34_00C_0CC unk_CC;
246-
/* 0xEC */ char unkEC[0x4];
247-
} unk_D_86002F34_00C; // size = 0xF0
238+
} unk_D_86002F34_00C; // size >= 0xEC
248239

249240
typedef struct unk_D_86002F34_alt1 {
250241
/* 0x00 */ unk_D_86002F34_000 unk_00;
@@ -258,7 +249,7 @@ typedef struct unk_D_86002F34_alt1 {
258249

259250
typedef struct unk_D_86002F34_alt2 {
260251
/* 0x00 */ unk_D_86002F34_000 unk_00;
261-
/* 0x18 */ unk_D_86002F34_000* unk_18;
252+
/* 0x18 */ u32 unk_18;
262253
} unk_D_86002F34_alt2; // size >= 0x1C
263254

264255
typedef struct unk_D_86002F34_alt3 {
@@ -279,7 +270,7 @@ typedef struct unk_D_86002F34_alt5 {
279270
/* 0x00 */ unk_D_86002F34_000 unk_00;
280271
/* 0x18 */ Vec3f unk_18;
281272
/* 0x24 */ Vec3s unk_24;
282-
} unk_D_86002F34_alt5; // size = 0x2C
273+
} unk_D_86002F34_alt5; // size >= 0x2C
283274

284275
typedef struct unk_D_86002F34_alt6 {
285276
/* 0x00 */ unk_D_86002F34_000 unk_00;
@@ -289,26 +280,26 @@ typedef struct unk_D_86002F34_alt6 {
289280
/* 0x30 */ u8 unk_30;
290281
/* 0x31 */ u8 unk_31;
291282
/* 0x32 */ s16 unk_32;
292-
} unk_D_86002F34_alt6; // size = 0x34
283+
} unk_D_86002F34_alt6; // size >= 0x58
293284

294285
typedef struct unk_D_86002F34_alt7 {
295286
/* 0x00 */ unk_D_86002F34_000 unk_00;
296287
/* 0x18 */ Gfx* unk_18;
297288
/* 0x1C */ s16 unk_1C;
298-
} unk_D_86002F34_alt7; // size = 0x20
289+
} unk_D_86002F34_alt7; // size >= 0x20
299290

300291
typedef struct unk_D_86002F34_alt8 {
301292
/* 0x00 */ unk_D_86002F34_000 unk_00;
302293
/* 0x18 */ Gfx* unk_18;
303294
/* 0x1C */ MtxF unk_1C;
304-
} unk_D_86002F34_alt8; // size = 0x5C
295+
} unk_D_86002F34_alt8; // size >= 0x5C
305296

306297
typedef struct unk_D_86002F34_alt9 {
307298
/* 0x00 */ unk_D_86002F34_000 unk_00;
308299
/* 0x18 */ Gfx* unk_18;
309300
/* 0x1C */ Vec3f unk_1C;
310301
/* 0x28 */ f32 unk_28;
311-
} unk_D_86002F34_alt9; // size = 0x2C
302+
} unk_D_86002F34_alt9; // size >= 0x2C
312303

313304
typedef struct unk_D_86002F34_alt10 {
314305
/* 0x00 */ unk_D_86002F34_000 unk_00;
@@ -340,80 +331,7 @@ typedef struct unk_D_86002F34_alt12 {
340331
/* 0x1A */ s16 unk_1A;
341332
/* 0x1C */ s16 unk_1C;
342333
/* 0x1E */ s16 unk_1E;
343-
} unk_D_86002F34_alt12; // size = 0x20
344-
345-
typedef struct unk_D_86002F34_alt13 {
346-
/* 0x00 */ unk_D_86002F34_000 unk_00;
347-
/* 0x18 */ s16 unk_18;
348-
} unk_D_86002F34_alt13; // size = 0x1C
349-
350-
typedef struct unk_D_86002F34_alt14 {
351-
/* 0x00 */ unk_D_86002F34_000 unk_00;
352-
} unk_D_86002F34_alt14; // size = 0x18
353-
354-
typedef struct unk_D_86002F34_alt15 {
355-
/* 0x00 */ unk_D_86002F34_000 unk_00;
356-
} unk_D_86002F34_alt15; // size = 0x18
357-
358-
typedef struct unk_D_86002F34_alt16 {
359-
/* 0x00 */ unk_D_86002F34_000 unk_00;
360-
/* 0x18 */ u32 unk_18;
361-
} unk_D_86002F34_alt16; // size = 0x1C
362-
363-
typedef struct unk_D_86002F34_alt17 {
364-
/* 0x00 */ unk_D_86002F34_000 unk_00;
365-
} unk_D_86002F34_alt17; // size = 0x18
366-
367-
typedef struct unk_D_86002F34_alt18 {
368-
/* 0x00 */ unk_D_86002F34_000 unk_00;
369-
/* 0x18 */ u8 r;
370-
/* 0x19 */ u8 g;
371-
/* 0x1A */ u8 b;
372-
/* 0x1B */ u8 a;
373-
/* 0x1C */ s16 unk_1C;
374-
/* 0x1E */ s16 unk_1E;
375-
} unk_D_86002F34_alt18; // size = 0x20
376-
377-
typedef struct unk_D_86002F34_alt19 {
378-
/* 0x00 */ unk_D_86002F34_000 unk_00;
379-
/* 0x18 */ u8 r;
380-
/* 0x19 */ u8 g;
381-
/* 0x1A */ u8 b;
382-
} unk_D_86002F34_alt19; // size = 0x1C
383-
384-
typedef struct unk_D_86002F34_alt20 {
385-
/* 0x00 */ unk_D_86002F34_000 unk_00;
386-
/* 0x18 */ s16 unk_18;
387-
/* 0x1A */ s16 unk_1A;
388-
} unk_D_86002F34_alt20; // size = 0x1C
389-
390-
typedef struct unk_D_86002F34_alt21 {
391-
/* 0x00 */ unk_D_86002F34_000 unk_00;
392-
/* 0x18 */ s16 unk_18;
393-
/* 0x1A */ s16 unk_1A;
394-
} unk_D_86002F34_alt21; // size = 0x1C
395-
396-
typedef struct unk_D_86002F34_alt22 {
397-
/* 0x00 */ unk_D_86002F34_000 unk_00;
398-
/* 0x18 */ Vec3f unk_18;
399-
} unk_D_86002F34_alt22; // size = 0x24
400-
401-
typedef struct unk_D_86002F34_alt23 {
402-
/* 0x00 */ unk_D_86002F34_000 unk_00;
403-
/* 0x18 */ s16 unk_18;
404-
} unk_D_86002F34_alt23; // size = 0x1C
405-
406-
typedef struct unk_D_86002F34_alt24 {
407-
/* 0x00 */ unk_D_86002F34_000 unk_00;
408-
/* 0x18 */ s16 unk_18;
409-
/* 0x1A */ s16 unk_1A;
410-
/* 0x1C */ s16 unk_1C;
411-
/* 0x1E */ s16 unk_1E;
412-
/* 0x20 */ s16 unk_20;
413-
/* 0x22 */ s16 unk_22;
414-
/* 0x24 */ s32 unk_24;
415-
/* 0x28 */ Color_RGBA8_u32 unk_28;
416-
} unk_D_86002F34_alt24; // size = 0x2C
334+
} unk_D_86002F34_alt12; // size >= 0x20
417335

418336
typedef void* (*func_unk_D_800ABE10)(s32, s32);
419337

@@ -437,12 +355,11 @@ typedef struct unk_D_86002F34 {
437355
/* 0x00 */ unk_D_86002F34_000 unk_00;
438356
/* 0x18 */ unk_D_86002F34_018* unk_18;
439357
/* 0x1C */ unk_D_86002F34_01C* unk_1C;
440-
/* 0x20 */ Vtx* unk_20;
358+
/* 0x20 */ char unk20[0x4];
441359
/* 0x24 */ u8 unk_24;
442360
/* 0x25 */ u8 unk_25;
443-
/* 0x26 */ s16 unk_26;
444361
/* 0x28 */ func_unk_D_800ABE10 unk_28;
445-
} unk_D_86002F34; // size = 0x2C
362+
} unk_D_86002F34; // size >= 0x2C
446363

447364
// Are unk_D_86002F30 and unk_D_800AC840 the same?
448365
typedef struct unk_D_86002F30 {

‎include/sections.h

-6
Original file line numberDiff line numberDiff line change
@@ -464,8 +464,6 @@ extern u8 common_menu1_ui_ROM_START[];
464464
extern u8 common_menu1_ui_ROM_END[];
465465
extern u8 common_menu2_ui_ROM_START[];
466466
extern u8 common_menu2_ui_ROM_END[];
467-
extern u8 snap_mode_ui_ROM_START[];
468-
extern u8 snap_mode_ui_ROM_END[];
469467
extern u8 area_select_ui_ROM_START[]; // 4D1330
470468
extern u8 area_select_ui_ROM_END[]; // 4D1330
471469
extern u8 menu_select_ui_ROM_START[]; // 4EB0C0
@@ -520,10 +518,6 @@ extern u8 badge_ui_ROM_START[];
520518
extern u8 badge_ui_ROM_END[];
521519
extern u8 gym_leader_castle_ui_ROM_START[];
522520
extern u8 gym_leader_castle_ui_ROM_END[];
523-
extern u8 _70D3A0_ROM_START[];
524-
extern u8 _70D3A0_ROM_END[];
525-
extern u8 D_70110[];
526-
extern u8 D_70290[];
527521

528522
extern u8 D_124570[];
529523

‎include/variables.h

-5
Original file line numberDiff line numberDiff line change
@@ -199,10 +199,5 @@ extern u32 D_304F120[];
199199

200200
extern s32 D_800FC820;
201201
extern u8* D_800FF9C0;
202-
extern s32 D_80075BCC[];
203-
204-
typedef struct unk_70D3A0 {
205-
/* 0x00 */ char unk00[0x10];
206-
} unk_70D3A0; // size = 0x10
207202

208203
#endif

‎linker_scripts/us/symbol_addrs.txt

-9
Original file line numberDiff line numberDiff line change
@@ -332,12 +332,3 @@ D_04008000 = 0x04008000;
332332
D_04009000 = 0x04009000;
333333
D_0400A000 = 0x0400A000;
334334
D_0400B000 = 0x0400B000;
335-
D_8790604A = 0x8790604A; // size:0x2
336-
D_87906050 = 0x87906050;
337-
D_80075BCC = 0x80075BCC;
338-
D_80075E40 = 0x80075E40;
339-
D_80075950 = 0x80075950; // size:0x1C
340-
D_8007596C = 0x8007596C;
341-
D_8690B360 = 0x8690B360; // size:0x18
342-
D_8690B390 = 0x8690B390; // size:0x24
343-
D_8690B5D0 = 0x8690B5D0; // size:0x24

0 commit comments

Comments
 (0)