diff --git a/config/GMPE01_00/symbols.txt b/config/GMPE01_00/symbols.txt index 2fc1ed93..a502889b 100644 --- a/config/GMPE01_00/symbols.txt +++ b/config/GMPE01_00/symbols.txt @@ -130,29 +130,29 @@ fn_8000AFF4 = .text:0x8000AFF4; // type:function size:0x15C DrawBox = .text:0x8000B150; // type:function size:0xAC fn_8000B1FC = .text:0x8000B1FC; // type:function size:0xEE8 fn_8000C0E4 = .text:0x8000C0E4; // type:function size:0x3C0 -fn_8000C4A4 = .text:0x8000C4A4; // type:function size:0x14 +HuPrcInit = .text:0x8000C4A4; // type:function size:0x14 HuPrcCreate = .text:0x8000C4B8; // type:function size:0x1E8 -fn_8000C6A0 = .text:0x8000C6A0; // type:function size:0x68 -fn_8000C708 = .text:0x8000C708; // type:function size:0x58 -fn_8000C760 = .text:0x8000C760; // type:function size:0x27C -fn_8000C9DC = .text:0x8000C9DC; // type:function size:0x60 -fn_8000CA3C = .text:0x8000CA3C; // type:function size:0x8 -fn_8000CA44 = .text:0x8000CA44; // type:function size:0x50 -fn_8000CA94 = .text:0x8000CA94; // type:function size:0xD4 -fn_8000CB68 = .text:0x8000CB68; // type:function size:0x2A4 -fn_8000CE0C = .text:0x8000CE0C; // type:function size:0x100 -fn_8000CF0C = .text:0x8000CF0C; // type:function size:0x80 -fn_8000CF8C = .text:0x8000CF8C; // type:function size:0x54 -fn_8000CFE0 = .text:0x8000CFE0; // type:function size:0xC -fn_8000CFEC = .text:0x8000CFEC; // type:function size:0x8 -fn_8000CFF4 = .text:0x8000CFF4; // type:function size:0x28 -fn_8000D01C = .text:0x8000D01C; // type:function size:0x184 -fn_8000D1A0 = .text:0x8000D1A0; // type:function size:0x4C -fn_8000D1EC = .text:0x8000D1EC; // type:function size:0x30 -fn_8000D21C = .text:0x8000D21C; // type:function size:0x10 -fn_8000D22C = .text:0x8000D22C; // type:function size:0x14 -fn_8000D240 = .text:0x8000D240; // type:function size:0x84 -fn_8000D2C4 = .text:0x8000D2C4; // type:function size:0x84 +HuPrcChildLink = .text:0x8000C6A0; // type:function size:0x68 +HuPrcChildUnlink = .text:0x8000C708; // type:function size:0x58 +HuPrcChildCreate = .text:0x8000C760; // type:function size:0x27C +HuPrcChildWatch = .text:0x8000C9DC; // type:function size:0x60 +HuPrcCurrentGet = .text:0x8000CA3C; // type:function size:0x8 +SetKillStatusProcess = .text:0x8000CA44; // type:function size:0x50 scope:local +HuPrcKill = .text:0x8000CA94; // type:function size:0xD4 +HuPrcChildKill = .text:0x8000CB68; // type:function size:0x2A4 +HuPrcEnd = .text:0x8000CE0C; // type:function size:0x100 +HuPrcSleep = .text:0x8000CF0C; // type:function size:0x80 +HuPrcVSleep = .text:0x8000CF8C; // type:function size:0x54 +HuPrcWakeup = .text:0x8000CFE0; // type:function size:0xC +HuPrcDestructorSet2 = .text:0x8000CFEC; // type:function size:0x8 +HuPrcDestructorSet = .text:0x8000CFF4; // type:function size:0x28 +HuPrcCall = .text:0x8000D01C; // type:function size:0x184 +HuPrcMemAlloc = .text:0x8000D1A0; // type:function size:0x4C +HuPrcMemFree = .text:0x8000D1EC; // type:function size:0x30 +HuPrcSetStat = .text:0x8000D21C; // type:function size:0x10 +HuPrcResetStat = .text:0x8000D22C; // type:function size:0x14 +HuPrcAllPause = .text:0x8000D240; // type:function size:0x84 +HuPrcAllUPause = .text:0x8000D2C4; // type:function size:0x84 HuSprInit = .text:0x8000D348; // type:function size:0xA0 HuSprClose = .text:0x8000D3E8; // type:function size:0xB0 HuSprExec = .text:0x8000D498; // type:function size:0x64 @@ -4831,7 +4831,7 @@ lbl_8011F77C = .data:0x8011F77C; // type:object size:0x13 data:string lbl_8011F78F = .data:0x8011F78F; // type:object size:0x13 data:string lbl_8011F7A2 = .data:0x8011F7A2; // type:object size:0x12 data:string lbl_8011F7B4 = .data:0x8011F7B4; // type:object size:0x10 -DataDirStat = .data:0x8011F7C4; // type:object size:0x468 data:4byte scope:local +DataDirStat = .data:0x8011F7C4; // type:object size:0x468 scope:local data:4byte lbl_8011FC2C = .data:0x8011FC2C; // type:object size:0x1D data:string lbl_8011FC49 = .data:0x8011FC49; // type:object size:0x1F data:string lbl_8011FC68 = .data:0x8011FC68; // type:object size:0x3C diff --git a/include/common_structs.h b/include/common_structs.h index 29d3ada6..dbfef15a 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -15,4 +15,10 @@ typedef struct Vec3f { f32 z; } Vec3f; -#endif \ No newline at end of file +typedef struct unkStruct_1D3B44 { + struct unkStruct_1D3B44 *prev; + char unk_04[0x1A]; + u16 unk_1E; +} unkStruct_1D3B44; + +#endif diff --git a/include/functions.h b/include/functions.h index 29afc607..cf5eaa2d 100644 --- a/include/functions.h +++ b/include/functions.h @@ -9,6 +9,8 @@ void* OSAllocFromHeap(int heap, u32 size); s32 OSCheckHeap(int heap); void DCFlushRangeNoSync(void *addr, u32 size); void* HuPrcCreate(void (*), s32, s32, s32); +void HuPrcSleep(s32, f32); +void HuPrcVSleep(void); void Hu3DBGColorSet(u8, u8, u8); void Hu3DCameraCreate(s16); void Hu3DCameraPerspectiveSet(s16, f32, f32, f32, f32); @@ -21,7 +23,6 @@ void fn_80045F74(s16, s32); s32 fn_800578E4(void); void fn_1_26C(void); - void HuMemInitAll(void); void *HuMemInit(void *ptr, s32 size); void HuMemDCFlushAll(); @@ -47,4 +48,4 @@ void HuMemHeapDump(void *heap_ptr, s16 status); -#endif \ No newline at end of file +#endif diff --git a/src/REL/subchrselDll/subchrselDll.c b/src/REL/subchrselDll/subchrselDll.c index 9f9678e9..3c5a4c59 100644 --- a/src/REL/subchrselDll/subchrselDll.c +++ b/src/REL/subchrselDll/subchrselDll.c @@ -16,3 +16,5 @@ u16 fn_1_10C(void) { } return var_r31; } + +// void fn_1_164(void) diff --git a/src/REL/subchrselDll/subchrselDll.h b/src/REL/subchrselDll/subchrselDll.h index b996b549..9c0762c0 100644 --- a/src/REL/subchrselDll/subchrselDll.h +++ b/src/REL/subchrselDll/subchrselDll.h @@ -4,8 +4,35 @@ void fn_8000C760(void*, s32, s32, s32, s32); s32 fn_8000CA3C(); void fn_800414AC(s16, s16, s16); -extern void fn_1_164(void); extern u8 lbl_1_bss_0; extern u8 lbl_801D3AAC; extern u16 lbl_801D3AD0; + +typedef struct unkStruct192360 { + char unk_00[0x34]; + f32 unk_34; +} unkStruct192360; + +s16 fn_8000AFF4(s16, s16, f32, char*, ...); /* extern */ +void fn_8000CF0C(s32, f32); /* extern */ +void fn_8000CF8C(); /* extern */ +void fn_8002EEC0(s32, s16, s32, s32); /* extern */ +void fn_8002EF20(s16, s16); /* extern */ +void fn_80032A58(s32); /* extern */ +void fn_80035A0C(void); /* extern */ +void fn_800414AC(s16, s16, s16); /* extern */ +extern s32 debugFontColor; +extern u8 lbl_1_bss_0; +extern char *lbl_1_data_20[4]; +extern char *lbl_1_data_64[8]; +extern char *lbl_1_data_B0[7]; +extern char lbl_1_data_CC[20]; +extern s16 lbl_8018FC10[]; +extern unkStruct192360 lbl_80192360; +extern u8 lbl_801D3AAC; +extern u16 lbl_801D3AD0; + +void fn_1_A0(void); +u16 fn_1_10C(void); +void fn_1_164(void);