8000 fragment61 by Kelebek1 · Pull Request #194 · pret/pokestadium · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fragment61 #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 26, 2025
Merged

fragment61 #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions include/variables.h
View file
Open in desktop
10000
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ extern f32 gSineTable[];
extern f32 gCosineTable[0x1000];
extern s16 gArctanTable[0x401];
extern s32 D_B0000504;
extern s32 D_B0000800;

extern u8 D_1000000[];
extern u8 D_8000000[];
Expand Down Expand Up @@ -574,6 +575,47 @@ extern u8 D_3024000[];
extern u8 D_3009000[];
extern u8 D_3012000[];
extern u8 D_301B000[];
extern u8 D_2028AE0[];
extern u8 D_20293E0[];
extern u8 D_200DFA0[];
extern u8 D_200F3E0[];
extern u8 D_2010820[];
extern u8 D_2011C60[];
extern u8 D_20130A0[];
extern u8 D_2029CE0[];
extern u8 D_20068E0[];
extern u8 D_200AC00[];
extern u8 D_202C080[];
extern u8 D_202C500[];
extern u8 D_202C980[];
extern u8 D_202CE00[];
extern u8 D_202D280[];
extern u8 D_202D700[];
extern u8 D_202DB80[];
extern u8 D_202E000[];
extern u8 D_202A8C0[];
extern u8 D_202B4A0[];
extern u8 D_2014F00[];
extern u8 D_20154B0[];
extern u8 D_2015A60[];
extern u8 D_2016D40[];
extern u8 D_2017740[];
extern u8 D_2019040[];
extern u8 D_2019680[];
extern u8 D_2018D20[];
extern u8 D_2018A00[];
extern u8 D_20199A0[];
extern u8 D_2019360[];
extern u8 D_2019FE0[];
extern u8 D_2017A60[];
extern u8 D_2017D80[];
extern u8 D_20183C0[];
extern u8 D_20186E0[];
extern u8 D_2019CC0[];
extern u8 D_20180A0[];
extern u8 D_201A300[];
extern u8 D_20165C0[];
extern u8 D_2016980[];

extern LEODiskID D_800818E0;

Expand Down
49 changes: 48 additions & 1 deletion linker_scripts/us/symbol_addrs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,4 +829,51 @@ D_82E01F68 = 0x82E01F68; // size:0x438
D_3024000 = 0x3024000;
D_3009000 = 0x3009000;
D_3012000 = 0x3012000;
D_301B000 = 0x301B000;
D_301B000 = 0x301B000;
D_8423D3D8 = 0x8423D3D8; // size:0x20
D_8423D3A8 = 0x8423D3A8; // size:0x2C
D_2028AE0 = 0x2028AE0;
D_20293E0 = 0x20293E0;
D_200DFA0 = 0x200DFA0;
D_200F3E0 = 0x200F3E0;
D_2010820 = 0x2010820;
D_2011C60 = 0x2011C60;
D_20130A0 = 0x20130A0;
D_84211B50 = 0x84211B50; // size:0x4D10
D_B0000800 = 0xB0000800;
D_842168A0 = 0x842168A0; // size:0x13610
D_2029CE0 = 0x2029CE0;
D_84210DA0 = 0x84210DA0; // size:0x38
D_20068E0 = 0x20068E0;
D_200AC00 = 0x200AC00;
D_202C080 = 0x202C080;
D_202C500 = 0x202C500;
D_202C980 = 0x202C980;
D_202CE00 = 0x202CE00;
D_202D280 = 0x202D280;
D_202D700 = 0x202D700;
D_202DB80 = 0x202DB80;
D_202E000 = 0x202E000;
D_202A8C0 = 0x202A8C0;
D_202B4A0 = 0x202B4A0;
D_2014F00 = 0x2014F00;
D_20154B0 = 0x20154B0;
D_2015A60 = 0x2015A60;
D_2016D40 = 0x2016D40;
D_2017740 = 0x2017740;
D_2019040 = 0x2019040;
D_2019680 = 0x2019680;
D_2018D20 = 0x2018D20;
D_2018A00 = 0x2018A00;
D_20199A0 = 0x20199A0;
D_2019360 = 0x2019360;
D_2019FE0 = 0x2019FE0;
D_2017A60 = 0x2017A60;
D_2017D80 = 0x2017D80;
D_20183C0 = 0x20183C0;
D_20186E0 = 0x20186E0;
D_2019CC0 = 0x2019CC0;
D_20180A0 = 0x20180A0;
D_201A300 = 0x201A300;
D_20165C0 = 0x20165C0;
D_2016980 = 0x2016980;
42 changes: 41 additions & 1 deletion linker_scripts/us/undefined_syms.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,4 +344,44 @@ D_0302A9C0 = 0x0302A9C0;
D_0302B740 = 0x0302B740;
D_0302C4C0 = 0x0302C4C0;
D_0302D480 = 0x0302D480;
D_301B000 = 0x301B000;
D_301B000 = 0x301B000;
D_B0000800 = 0xB0000800;
D_200F3E0 = 0x200F3E0;
D_2010820 = 0x2010820;
D_2011C60 = 0x2011C60;
D_20130A0 = 0x20130A0;
D_2029CE0 = 0x2029CE0;
D_20068E0 = 0x20068E0;
D_200AC00 = 0x200AC00;
D_202C080 = 0x202C080;
D_202C500 = 0x202C500;
D_202C980 = 0x202C980;
D_202CE00 = 0x202CE00;
D_202D280 = 0x202D280;
D_202D700 = 0x202D700;
D_202DB80 = 0x202DB80;
D_202E000 = 0x202E000;
D_202A8C0 = 0x202A8C0;
D_202B4A0 = 0x202B4A0;
D_2014F00 = 0x2014F00;
D_20154B0 = 0x20154B0;
D_2015A60 = 0x2015A60;
D_2016D40 = 0x2016D40;
D_2017740 = 0x2017740;
D_2019040 = 0x2019040;
D_2019680 = 0x2019680;
D_2018D20 = 0x2018D20;
D_2018A00 = 0x2018A00;
D_20199A0 = 0x20199A0;
D_2019360 = 0x2019360;
D_2019FE0 = 0x2019FE0;
D_2017A60 = 0x2017A60;
D_2017D80 = 0x2017D80;
D_20183C0 = 0x20183C0;
D_20186E0 = 0x20186E0;
D_2019CC0 = 0x2019CC0;
D_20180A0 = 0x20180A0;
D_201A300 = 0x201A300;
D_20165C0 = 0x20165C0;
D_2016980 = 0x2016980;
D_200DFA0 = 0x200DFA0;
2 changes: 1 addition & 1 deletion src/22630.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ void func_80021F04(unk_func_80026268_arg0* arg0, unk_D_800AE4E8_004_1_000_010_00
arg1->unk_00 = arg0->unk_00.unk_01;
}

func_80021A68(arg1->unk_01, arg0->unk_02);
func_80021A68(arg1->unk_01, (u16)arg0->unk_02);

arg1->unk_03 = arg0->unk_04;
arg1->unk_04 = arg0->unk_05;
Expand Down
4 changes: 2 additions & 2 deletions src/29BA0.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ typedef struct unk_D_800AE540_0874 {
/* 0x002 */ u8 unk_002;
/* 0x003 */ u8 unk_003;
/* 0x004 */ char unk004[0x10];
/* 0x014 */ char unk_014[0x4];
/* 0x014 */ char unk_014[4];
/* 0x018 */ char unk018[0x10];
/* 0x028 */ unk_func_80026268_arg0 unk_028[1];
/* 0x07C */ char unk07C[0x1A4];
Expand All @@ -71,7 +71,7 @@ typedef struct unk_D_800AE540_0004 {
/* 0x001 */ u8 unk_001;
/* 0x002 */ u8 unk_002;
/* 0x004 */ Controller* controller;
/* 0x008 */ char unk_008[0x4];
/* 0x008 */ char unk_008[4];
/* 0x00C */ char unk00C[0xC];
/* 0x018 */ s32 unk_018;
/* 0x01C */ unk_func_80026268_arg0 unk_01C[1];
Expand Down
28 changes: 22 additions & 6 deletions src/fragments/47/fragment47.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,17 @@ typedef struct unk_D_8380565C {
} unk_D_8380565C; // size >= 0x838

typedef struct unk_D_838067F0_0168_0000 {
/* 0x000 */ u8 unk_000;
/* 0x001 */ u8 unk_001;
/* 0x002 */ u8 unk_002;
/* 0x003 */ u8 unk_003;
/* 0x004 */ unk_func_80026268_arg0 unk_004[3];
/* 0x100 */ char unk100[0xBD8];
union {
struct {
/* 0x000 */ u8 unk_000;
/* 0x001 */ u8 unk_001;
/* 0x002 */ u8 unk_002;
/* 0x003 */ u8 unk_003;
};
s32 raw;
};
/* 0x004 */ unk_func_80026268_arg0 unk_004;
/* 0x058 */ u16 unk_058[0x640];
} unk_D_838067F0_0168_0000; // size = 0xCD8

typedef struct unk_D_838067F0_0168 {
Expand Down Expand Up @@ -60,6 +65,17 @@ typedef struct unk_D_838067F0 {
/* 0x0168 */ unk_D_838067F0_0168 unk_0168[12];
} unk_D_838067F0; // size = 0x1D088

typedef struct unk_D_8380548C {
/* 0x00 */ u8 unk_00;
/* 0x01 */ u8 unk_01;
/* 0x02 */ s16 unk_02;
/* 0x04 */ s16 unk_04;
/* 0x06 */ s16 unk_06;
/* 0x08 */ s16 unk_08;
/* 0x0A */ s16 unk_0A;
/* 0x0C */ s16 unk_0C;
} unk_D_8380548C; // size = 0xE

void func_83800020(s32 arg0);
void func_8380008C(s32 arg0);
void func_83800098(s32 arg0, s32 arg1);
Expand Down
11 changes: 0 additions & 11 deletions src/fragments/47/fragment47_2AE1F0.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,6 @@
#include "src/memmap.h"
#include "src/memory.h"

typedef struct unk_D_8380548C {
/* 0x00 */ u8 unk_00;
/* 0x01 */ u8 unk_01;
/* 0x02 */ s16 unk_02;
/* 0x04 */ s16 unk_04;
/* 0x06 */ s16 unk_06;
/* 0x08 */ s16 unk_08;
/* 0x0A */ s16 unk_0A;
/* 0x0C */ s16 unk_0C;
} unk_D_8380548C; // size = 0xE

typedef struct unk_D_83806778 {
/* 0x00 */ u8 unk_00;
/* 0x01 */ u8 unk_01;
Expand Down
34 changes: 17 additions & 17 deletions src/fragments/47/fragment47_2AFDB0.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ s32 func_83802700(unk_D_838067F0* arg0, unk_D_838067F0_0168* arg1, s32 arg2, unk
arg1->unk_2692 = arg0->unk_001C;

for (i = 0; i < 3; i++) {
arg1->unk_0000[i].unk_004[0].unk_00.unk_00 = 0;
arg1->unk_0000[i].unk_004.unk_00.unk_00 = 0;
*(s32*)&arg1->unk_0000[i].unk_000 = 0;
}

Expand All @@ -118,7 +118,7 @@ s32 func_83802700(unk_D_838067F0* arg0, unk_D_838067F0_0168* arg1, s32 arg2, unk
for (j = 0; j < 3; j++) {
if (i < temp_s3->unk_00) {
if (func_80022DF4(var_v0, temp_s3->unk_02[i++]) != 0) {
var_s4 += func_80022E18(arg1->unk_0000[j].unk_004, 1, var_v0);
var_s4 += func_80022E18(&arg1->unk_0000[j].unk_004, 1, var_v0);
}
}
}
Expand All @@ -130,24 +130,25 @@ s32 func_83802700(unk_D_838067F0* arg0, unk_D_838067F0_0168* arg1, s32 arg2, unk
s32 var_s1_3 = arg2 * 3;
for (j = 0; j < 3; j++) {
if (var_s1_3 < arg3->unk_000) {
_bcopy(&arg3->unk_004[var_s1_3++], &arg1->unk_0000[var_s4].unk_004[0], 0x54);
func_800228B0(arg1->unk_0000[var_s4++].unk_004);
_bcopy(&arg3->unk_004[var_s1_3++], &arg1->unk_0000[var_s4].unk_004,
sizeof(arg1->unk_0000[var_s4].unk_004));
func_800228B0(&arg1->unk_0000[var_s4++].unk_004);
}
}
}

for (i = 0; i < var_s4; i++) {
func_8001B0DC(&arg1->unk_0000[i].unk_004[1], 0, &arg1->unk_0000[i].unk_004[0]);
func_8001B0DC(arg1->unk_0000[i].unk_058, 0, &arg1->unk_0000[i].unk_004);

arg1->unk_0000[i].unk_000 = arg0->unk_0018;
arg1->unk_0000[i].unk_001 = arg0->unk_001C;
arg1->unk_0000[i].unk_002 = arg2 * 3 + i;
arg1->unk_0000[i].unk_003 = arg1->unk_0000[i].unk_004[0].unk_00.unk_00;
arg1->unk_0000[i].unk_003 = arg1->unk_0000[i].unk_004.unk_00.unk_00;

arg1->unk_0000[i].unk_004[0].unk_53 = arg2 * 3 + i;
arg1->unk_0000[i].unk_004[0].unk_52 = (arg0->unk_0018 * 0x10) | arg0->unk_001C;
arg1->unk_0000[i].unk_004.unk_53 = arg2 * 3 + i;
arg1->unk_0000[i].unk_004.unk_52 = (arg0->unk_0018 * 0x10) | arg0->unk_001C;

func_83802660(arg0, &arg1->unk_0000[i].unk_004[0]);
func_83802660(arg0, &arg1->unk_0000[i].unk_004);
}

return var_s4;
Expand Down Expand Up @@ -238,7 +239,7 @@ unk_D_838067F0_0168* func_83802C74(unk_D_838067F0_0168* arg0, s32 arg1) {

void func_83802C98(unk_D_838067F0* arg0) {
unk_D_838067F0_0168* ptr = func_83802C74(arg0->unk_0160, arg0->unk_0028);
unk_func_80026268_arg0* temp_a1 = &ptr->unk_0000[arg0->unk_0024].unk_004[0];
unk_func_80026268_arg0* temp_a1 = &ptr->unk_0000[arg0->unk_0024].unk_004;

if (temp_a1->unk_00.unk_00 != 0) {
arg0->unk_0000 = 7;
Expand Down Expand Up @@ -667,7 +668,7 @@ void func_8380419C(s32 arg0, s32 arg1, unk_D_838067F0_0168* arg2) {
s32 i;

for (i = 0; i < 3; i++) {
if (arg2->unk_0000[i].unk_004[0].unk_00.unk_00 != 0) {
if (arg2->unk_0000[i].unk_004.unk_00.unk_00 != 0) {
func_84200420(arg0 + i * 0x84, arg1, 0x84, 0x2C, 0x64, 0x64, 0xC8, 0xFF);
} else {
func_84200420(arg0 + i * 0x84, arg1, 0x84, 0x2C, 0x3C, 0x3C, 0xA0, 0xFF);
Expand All @@ -677,21 +678,20 @@ void func_8380419C(s32 arg0, s32 arg1, unk_D_838067F0_0168* arg2) {
gSPDisplayList(gDisplayListHead++, D_8006F518);

for (i = 0; i < 3; i++) {
if (arg2->unk_0000[i].unk_004[0].unk_00.unk_00 != 0) {
func_8001C6AC(arg0 + (i * 0x84) + 2, arg1 + 2, 0x28, 0x28, &arg2->unk_0000[i].unk_004[1].unk_00.unk_00,
0x28, 0);
if (arg2->unk_0000[i].unk_004.unk_00.unk_00 != 0) {
func_8001C6AC(arg0 + (i * 0x84) + 2, arg1 + 2, 0x28, 0x28, &arg2->unk_0000[i].unk_058, 0x28, 0);
}
}

func_8001F3F4();

for (i = 0; i < 3; i++) {
if (arg2->unk_0000[i].unk_004[0].unk_00.unk_00 != 0) {
if (arg2->unk_0000[i].unk_004.unk_00.unk_00 != 0) {
func_8001F324(0xFF, 0xFF, 0xFF, 0xFF);
func_8001EBE0(4, 0);
func_8001F1E8(arg0 + (i * 0x84) + 0x2C, arg1 + 5, arg2->unk_0000[i].unk_004[0].unk_30);
func_8001F1E8(arg0 + (i * 0x84) + 0x2C, arg1 + 5, arg2->unk_0000[i].unk_004.unk_30);
func_8001EBE0(4, 0);
func_8001F1E8(arg0 + (i * 0x84) + 0x2C, arg1 + 0x17, "L%d", arg2->unk_0000[i].unk_004[0].unk_24);
func_8001F1E8(arg0 + (i * 0x84) + 0x2C, arg1 + 0x17, "L%d", arg2->unk_0000[i].unk_004.unk_24);
}
}

Expand Down
Loading
0