Merge pull request #190 from Kelebek1/fragment57
Some checks are pending
C/C++ CI / build (push) Waiting to run

fragment57
This commit is contained in:
Maide 2025-04-18 02:11:20 +01:00 committed by GitHub
commit baec9e1e30
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 2995 additions and 58 deletions

View File

@ -55,6 +55,7 @@ extern u64 _binary_assets_us_F3DEX2_bin_start[];
extern f32 gSineTable[];
extern f32 gCosineTable[0x1000];
extern s16 gArctanTable[0x401];
extern s32 D_B0000504;
extern u8 D_1000000[];
extern u8 D_8000000[];
@ -510,6 +511,50 @@ extern u8 D_3008200[];
extern u8 D_4000C40[];
extern u8 D_4000DD0[];
extern u8 D_300F780[];
extern u8 D_3024480[];
extern u8 D_30256A0[];
extern u8 D_3026AE0[];
extern u8 D_2016010[];
extern u8 D_300F380[];
extern u8 D_300F400[];
extern u8 D_300F480[];
extern u8 D_300F500[];
extern u8 D_30229A0[];
extern u8 D_30229E0[];
extern u8 D_3022A20[];
extern u8 D_3022A60[];
extern u8 D_30111A0[];
extern u8 D_3017DA0[];
extern u8 D_301E9A0[];
extern u8 D_301F9A0[];
extern u8 D_30209A0[];
extern u8 D_30219A0[];
extern u8 D_30230C0[];
extern u8 D_30239C0[];
extern u8 D_3004E20[];
extern u8 D_3006020[];
extern u8 D_3007220[];
extern u8 D_3008420[];
extern u8 D_3009620[];
extern u8 D_3000FA0[];
extern u8 D_3001F40[];
extern u8 D_3002EE0[];
extern u8 D_3003E80[];
extern u8 D_300A820[];
extern u8 D_300B820[];
extern u8 D_300C820[];
extern u8 D_300D820[];
extern u8 D_300F240[];
extern u8 D_300F280[];
extern u8 D_300F2C0[];
extern u8 D_300F300[];
extern u8 D_300F340[];
extern u8 D_2000040[];
extern u8 D_2000240[];
extern u8 D_300E820[];
extern u8 D_300ED30[];
extern u8 D_300F580[];
extern u8 D_3022AA0[];
extern LEODiskID D_800818E0;

View File

@ -760,4 +760,50 @@ D_3008200 = 0x3008200;
D_8267E4F8 = 0x8267E4F8; // size:0x258
D_4000C40 = 0x4000C40;
D_4000DD0 = 0x4000DD0;
D_300F780 = 0x300F780;
D_300F780 = 0x300F780;
D_82D0AB38 = 0x82D0AB38; // size:0x54
D_82D09FF8 = 0x82D09FF8; // size:0xB40
D_3024480 = 0x3024480;
D_30256A0 = 0x30256A0;
D_3026AE0 = 0x3026AE0;
D_2016010 = 0x2016010;
D_300F380 = 0x300F380;
D_300F400 = 0x300F400;
D_300F480 = 0x300F480;
D_300F500 = 0x300F500;
D_30229A0 = 0x30229A0;
D_30229E0 = 0x30229E0;
D_3022A20 = 0x3022A20;
D_3022A60 = 0x3022A60;
D_30111A0 = 0x30111A0;
D_3017DA0 = 0x3017DA0;
D_301E9A0 = 0x301E9A0;
D_301F9A0 = 0x301F9A0;
D_30209A0 = 0x30209A0;
D_30219A0 = 0x30219A0;
D_30230C0 = 0x30230C0;
D_30239C0 = 0x30239C0;
D_3004E20 = 0x3004E20;
D_3006020 = 0x3006020;
D_3007220 = 0x3007220;
D_3008420 = 0x3008420;
D_3009620 = 0x3009620;
D_3000FA0 = 0x3000FA0;
D_3001F40 = 0x3001F40;
D_3002EE0 = 0x3002EE0;
D_3003E80 = 0x3003E80;
D_300A820 = 0x300A820;
D_300B820 = 0x300B820;
D_300C820 = 0x300C820;
D_300D820 = 0x300D820;
D_300F240 = 0x300F240;
D_300F280 = 0x300F280;
D_300F2C0 = 0x300F2C0;
D_300F300 = 0x300F300;
D_300F340 = 0x300F340;
D_2000040 = 0x2000040;
D_2000240 = 0x2000240;
D_300E820 = 0x300E820;
D_300ED30 = 0x300ED30;
D_300F580 = 0x300F580;
D_3022AA0 = 0x3022AA0;

View File

@ -28,9 +28,9 @@ void func_8002D5D4(u32 arg0, u32 arg1) {
}
}
void func_8002D600(u32 arg0, char* arg1) {
void func_8002D600(u32 arg0, u32 arg1) {
if ((arg0 != 0) && (arg0 < 0xA)) {
D_800AF744[arg0] = arg1;
D_800AF744[arg0] = (char*)arg1;
}
}

View File

@ -6,7 +6,7 @@
void func_8002D510(void);
char** func_8002D5AC(s32 file_number);
void func_8002D5D4(u32 arg0, u32 arg1);
void func_8002D600(u32 arg0, char* arg1);
void func_8002D600(u32 arg0, u32 arg1);
void func_8002D628(char* arg0, u32 arg1, s8* arg2);
char* func_8002D7C0(char* arg0, s32 arg1, char** arg2, u32 file_number);
s32 func_8002D80C(s8* arg0);

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,92 @@
#ifndef _FRAGMENT57_H_
#define _FRAGMENT57_H_
#include "global.h"
#include "src/6BC0.h"
#include "src/11BA0.h"
#include "src/26820.h"
typedef struct unk_D_82D0AB38 {
/* 0x00 */ u8 unk_00;
/* 0x01 */ u8 unk_01;
/* 0x02 */ u8 unk_02;
/* 0x03 */ u8 unk_03;
/* 0x04 */ u8 unk_04;
/* 0x06 */ s16 unk_06;
/* 0x08 */ char unk_08[1];
/* 0x09 */ char unk09[0xD];
} unk_D_82D0AB38; // size = 0x16
typedef struct unk_D_82D0ABD0 {
/* 0x00 */ u8 unk_00;
/* 0x02 */ s16 unk_02;
/* 0x04 */ s16 unk_04;
/* 0x06 */ s16 unk_06;
/* 0x08 */ s16 unk_08;
/* 0x0A */ s16 unk_0A;
/* 0x0C */ char unk0C[0x4];
} unk_D_82D0ABD0; // size = 0x10
typedef struct unk_D_82D09F1C {
/* 0x00 */ s16 unk_00;
/* 0x02 */ s16 unk_02;
/* 0x04 */ s16 unk_04;
/* 0x06 */ s16 unk_06;
/* 0x08 */ s8 unk_08;
/* 0x09 */ s8 unk_09;
/* 0x0A */ s8 unk_0A;
/* 0x0B */ s8 unk_0B;
} unk_D_82D09F1C; // size = 0xC
s32 func_82D00020(s32 arg0);
void func_82D00088(void);
void func_82D002C4(unk_D_80068BB0* arg0, s16 arg1, s16 arg2);
void func_82D0053C(s16 arg0, s16 arg1, s16 arg2, s16 arg3, u8 arg4, u8 arg5, u8 arg6, u8 arg7);
void func_82D00D3C(s16 arg0, s16 arg1, s16 arg2, s16 arg3, u8 arg4, u8 arg5, u8 arg6, u8 arg7);
void func_82D0153C(s16 arg0, s16 arg1, s16 arg2, s16 arg3, u8 arg4, u8 arg5, u8 arg6, u8 arg7);
s32 func_82D01758(s32 arg0, unk_func_80011B94* arg1);
s32 func_82D0180C(s32 arg0, unk_func_80011B94* arg1);
s32 func_82D018AC(s32 arg0, unk_func_80011B94* arg1);
void func_82D0194C(s32 arg0);
void func_82D01AB4(s16 arg0);
void func_82D021B4(s32 arg0);
void func_82D022E8(u8 arg0);
void func_82D02454(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s8* arg4);
void func_82D02870(s32 arg0);
void func_82D029E0(void);
void func_82D02D94(void);
void func_82D02ED0(s32 arg0, s16 arg1);
void func_82D02FB8(void);
void func_82D03120(void);
s32 func_82D03174(void);
void func_82D03340(s16 arg0, s16 arg1, s16 arg2, s16 arg3, u8 arg4, u8 arg5, u8 arg6, u8 arg7);
void func_82D03B40(s16 arg0, s16 arg1, s16 arg2, s16 arg3, char* arg4);
void func_82D03BCC(s16 arg0, s16 arg1);
void func_82D03DC0(s16 arg0, s16 arg1, unk_func_800281D4* arg2, s32 arg3);
void func_82D043CC(s16 arg0, s16 arg1, unk_func_800281D4* arg2, s16 arg3, s16 arg4);
s32 func_82D0442C(unk_func_800281D4* arg0);
s16 func_82D04590(unk_func_800281D4* arg0);
void func_82D04904(unk_D_82D0ABD0* arg0);
s32 func_82D04C20(unk_D_82D0ABD0* arg0);
void func_82D04CF4(unk_D_82D0ABD0* arg0, s16 arg1, s16 arg2);
void func_82D04D24(unk_D_82D0ABD0* arg0, s16 arg1, s16 arg2);
s32 func_82D04D50(s32 arg0, UNUSED unk_func_80011B94* a1);
s32 func_82D04EB8(void);
void func_82D04FA0(s32 arg0, s32 arg1);
void func_82D05258(s32 arg0, s32 arg1);
void func_82D053F4(s32 arg0, s32 arg1);
unk_D_80068BB0* func_82D0580C(s32 arg0);
unk_D_80068BB0* func_82D05A5C(void);
unk_D_80068BB0* func_82D05BE0(void);
unk_D_80068BB0* func_82D05D64(void);
unk_D_80068BB0* func_82D05EE8(s8* arg0, u8 arg1, u8 arg2, u8 arg3);
void func_82D06014(void);
void func_82D06388(void);
s32 func_82D063E4(void);
s32 func_82D0670C(void);
s16 func_82D067A0(void);
void func_82D06AB0(void);
void func_82D06B98(void);
s32 func_82D06D0C(s32 arg0, s32 arg1);
#endif // _FRAGMENT57_H_

View File

@ -2008,10 +2008,10 @@
subsegments:
- [0x2C49D0, textbin, fragments/57/fragment57_header]
- [0x2C49F0, c, fragments/57/fragment57]
- [0x2CB970, data, fragments/57/fragment57_data]
- [0x2CE950, rodata, fragments/57/fragment57_rodata]
- [0x2CB970, .data, fragments/57/fragment57]
- [0x2CE950, .rodata, fragments/57/fragment57]
- {vram: 0x82D09FF0, type: bss, name: fragments/57/fragment57_bss}
- {vram: 0x82D09FF0, type: .bss, name: fragments/57/fragment57}
- name: fragment57_relocs
type: code