Skip to content

fragment26 #166

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
Feb 28, 2025
Merged

fragment26 #166

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
41 changes: 41 additions & 0 deletions include/variables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,47 @@ extern u8 D_4001010[];
extern u8 D_4001C90[];
extern u8 D_4001FB8[];
extern u8 D_4006AB8[];
extern u8 D_4007750[];
extern u8 D_4007798[];
extern u8 D_40077E0[];
extern u8 D_4007828[];
extern u8 D_4006F40[];
extern u8 D_4006F88[];
extern u8 D_4006FD0[];
extern u8 D_4007018[];
extern u8 D_4007060[];
extern u8 D_40070A8[];
extern u8 D_40070F0[];
extern u8 D_4007138[];
extern u8 D_4007180[];
extern u8 D_40071C8[];
extern u8 D_4007BF0[];
extern u8 D_4007210[];
extern u8 D_4007318[];
extern u8 D_4007420[];
extern u8 D_4007528[];
extern u8 D_4001218[];
extern u8 D_4001320[];
extern u8 D_4001428[];
extern u8 D_4001530[];
extern u8 D_4007630[];
extern u8 D_4007678[];
extern u8 D_40076C0[];
extern u8 D_4007708[];
extern u8 D_4007948[];
extern u8 D_4007978[];
extern u8 D_04005C48[];
extern u8 D_04005F70[];
extern u8 D_04006298[];
extern u8 D_040065C0[];
extern u8 D_40068E8[];
extern u8 D_4006930[];
extern u8 D_4006978[];
extern u8 D_40069C0[];
extern u8 D_4007AD0[];
extern u8 D_4007B18[];
extern u8 D_4007B60[];
extern u8 D_4007BA8[];

extern u8 D_800818E0[0x20];

Expand Down
6 changes: 5 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 @@ -381,4 +381,8 @@ D_88217C48 = 0x88217C48; // size:0x4
D_88217C4C = 0x88217C4C; // size:0x4
D_88217C50 = 0x88217C50; // size:0x4
D_88217C54 = 0x88217C54; // size:0x4
D_88217C58 = 0x88217C58; // size:0x4
D_88217C58 = 0x88217C58; // size:0x4
D_04005C48 = 0x04005C48;
D_04005F70 = 0x04005F70;
D_04006298 = 0x04006298;
D_040065C0 = 0x040065C0;
4 changes: 4 additions & 0 deletions linker_scripts/us/undefined_syms.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,7 @@ D_03045E20 = 0x03045E20;
D_03049020 = 0x03049020;
D_030483A0 = 0x030483A0;
D_03047720 = 0x03047720;
D_04005C48 = 0x04005C48;
D_04005F70 = 0x04005F70;
D_04006298 = 0x04006298;
D_040065C0 = 0x040065C0;
16 changes: 8 additions & 8 deletions src/fragments/23/fragment23.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ typedef struct unk_func_8820B12C_000 {
/* 0x04 */ struct unk_func_8820B12C_000* unk_04;
/* 0x08 */ struct unk_func_8820B12C_000* unk_08;
/* 0x0C */ char unk0C[0x4];
/* 0x10 */ unk_func_88203ED8_064_010 unk_10;
/* 0x14 */ unk_func_88203ED8_064_014 unk_14;
/* 0x10 */ unk_func_8820B12C_02C_010 unk_10;
/* 0x14 */ unk_func_8820B12C_02C_014 unk_14;
/* 0x18 */ char unk18[0x4];
/* 0x1C */ s32 unk_1C;
/* 0x20 */ s32 unk_20;
Expand Down Expand Up @@ -316,8 +316,8 @@ typedef struct unk_func_8821421C_02C_06C_000 {
/* 0x04 */ struct unk_func_88203ED8_064* unk_04;
/* 0x08 */ struct unk_func_88203ED8_064* unk_08;
/* 0x0C */ char unk0C[0x4];
/* 0x10 */ unk_func_88203ED8_064_010 unk_10;
/* 0x14 */ unk_func_88203ED8_064_014 unk_14;
/* 0x10 */ unk_func_8820B12C_02C_010 unk_10;
/* 0x14 */ unk_func_8820B12C_02C_014 unk_14;
/* 0x18 */ char unk18[0x4];
/* 0x1C */ s32 unk_1C;
/* 0x20 */ s32 unk_20;
Expand Down Expand Up @@ -371,7 +371,7 @@ typedef struct unk_func_8821421C_038_04C_000 {
/* 0x04 */ struct unk_func_88203ED8_064* unk_04;
/* 0x08 */ struct unk_func_88203ED8_064* unk_08;
/* 0x0C */ char unk0C[0x4];
/* 0x10 */ unk_func_88203ED8_064_010 unk_10;
/* 0x10 */ unk_func_8820B12C_02C_010 unk_10;
/* 0x14 */ unk_func_8821421C_038_04C_000_014 unk_14;
/* 0x18 */ char unk18[0x4];
/* 0x1C */ s32 unk_1C;
Expand Down Expand Up @@ -461,7 +461,7 @@ extern u32* D_88223470[];
extern u32 D_88223488[];
extern u32 D_88223E48[];

s32 func_88200020(void);
unk_D_800AC870* func_88200020(void);
void func_882000E4(void);
s32 func_88200110(UNUSED s32 arg0, UNUSED s32 arg1);
s32 func_88200190(s32 arg0, s32 arg1);
Expand Down Expand Up @@ -592,7 +592,7 @@ s32 func_8820B838(unk_func_8820B12C* arg0, Controller* arg1);
void func_8820C510(unk_func_8820BE14* arg0);
void func_8820C5BC(unk_func_8820BE14* arg0);
void func_8820C63C(unk_func_8820BE14* arg0);
void func_8820C700(s32 arg0, s32 arg1);
void func_8820C700(unk_D_800AC870* arg0, s32 arg1);

void func_8820C930(s32 arg0, s32 arg1, s32 arg2, unk_func_8820BE14_06C* arg3);
void func_8820C97C(s32 arg0, s32 arg1, s32 arg2, unk_func_8820BE14_06C* arg3, s32 arg4, char* arg5, s32 arg6);
Expand Down Expand Up @@ -686,7 +686,7 @@ s32 func_88213CA0(unk_func_8821421C_02C_06C* arg0, Controller* arg1);
void func_8821421C(unk_func_8821421C* arg0, s32 arg1, s32 arg2, MemoryPool* arg3, s32 arg4, char** arg5);
void func_88214720(unk_func_8821421C* arg0);
void func_882147BC(unk_func_8821421C* arg0);
void func_8821483C(s32 arg0);
void func_8821483C(unk_D_800AC870* arg0);

void func_882149A0(unk_func_882149A0* arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, Color_RGBA8 arg7, Color_RGBA8 arg8, Color_RGBA8 arg9);
s32 func_88214A58(unk_func_882149A0* arg0, s32 arg1, s32 arg2);
Expand Down
4 changes: 2 additions & 2 deletions src/fragments/23/fragment23_1A8590.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "src/memory.h"
#include "src/stage_loader.h"

s32 func_88200020(void) {
unk_D_800AC870* func_88200020(void) {
unk_D_800AC870* sp1C;

main_pool_push_state('TERM');
Expand Down Expand Up @@ -37,7 +37,7 @@ s32 func_88200110(UNUSED s32 arg0, UNUSED s32 arg1) {
}

s32 func_88200190(s32 arg0, s32 arg1) {
s32 temp_s0;
unk_D_800AC870* temp_s0;
s32 var_s1;

if (arg0 == 5) {
Expand Down
Loading