Merge branch 'Rainchus:main' into main

include/functions.h

@@ -3,14 +3,14 @@
 
 #include "types.h"
 #include "common_structs.h"
+#include "common_enums.h"
+
+#include "dolphin/gx/GXStruct.h"
 
 void Hu3DBGColorSet(u8, u8, u8);
 void Hu3DCameraCreate(s16);
 void Hu3DCameraPerspectiveSet(s16, f32, f32, f32, f32);
 void Hu3DCameraViewportSet(s16, f32, f32, f32, f32, f32, f32);
-void omOvlHisChg(s32, s32, s32, s32);
-UnkOvl* omOvlHisGet(s32);
-void* omInitObjMan(s32, s32);
 void fn_80044920(s16);
 void fn_80045F74(s16, s32);
 s32 fn_800578E4(void);
@@ -18,18 +18,19 @@ void fn_80032A58(int arg0);
 void fn_80035A0C(void);
 
 void HuDecodeData(void *src, void *dst, u32 size, int decode_type);
+
 void HuMemInitAll(void);
 void *HuMemInit(void *ptr, s32 size);
 void HuMemDCFlushAll();
-void HuMemDCFlush(int heap);
-void *HuMemDirectMalloc(int heap, s32 size);
-void *HuMemDirectMallocNum(int heap, s32 size, u32 num);
+void HuMemDCFlush(HeapID heap);
+void *HuMemDirectMalloc(HeapID heap, s32 size);
+void *HuMemDirectMallocNum(HeapID heap, s32 size, u32 num);
 void HuMemDirectFree(void *ptr);
-void HuMemDirectFreeNum(int heap, u32 num);
-s32 HuMemUsedMallocSizeGet(int heap);
-s32 HuMemUsedMallocBlockGet(int heap);
-u32 HuMemHeapSizeGet(int heap);
-void *HuMemHeapPtrGet(int heap);
+void HuMemDirectFreeNum(HeapID heap, u32 num);
+s32 HuMemUsedMallocSizeGet(HeapID heap);
+s32 HuMemUsedMallocBlockGet(HeapID heap);
+u32 HuMemHeapSizeGet(HeapID heap);
+void *HuMemHeapPtrGet(HeapID heap);
 
 void *HuMemHeapInit(void *ptr, s32 size);
 void *HuMemMemoryAlloc(void *heap_ptr, s32 size, u32 retaddr);
@@ -42,6 +43,7 @@ s32 HuMemMemoryAllocSizeGet(s32 size);
 void HuMemHeapDump(void *heap_ptr, s16 status);
 
 void HuPrcInit(void);
+void HuPrcEnd(void);
 Process *HuPrcCreate(void (*func)(void), u16 prio, u32 stack_size, s32 extra_size);
 void HuPrcChildLink(Process *parent, Process *child);
 void HuPrcChildUnlink(Process *process);
@@ -63,10 +65,110 @@ void HuPrcResetStat(Process *process, u16 value);
 void HuPrcAllPause(int flag);
 void HuPrcAllUPause(int flag);
 
-void omOvlGotoEx(int id, s16 end_mode, int stat, int event);
-void omOvlReturnEx(int level, s16 end_mode);
+void omMasterInit(int prio, FileListEntry *ovl_list, int ovl_count, OverlayID start_ovl);
+void omOvlCallEx(OverlayID overlay, s16 arg2, int event, int stat);
+void omOvlGotoEx(OverlayID overlay, s16 arg2, int event, int stat);
+void omOvlReturnEx(s16 level, s16 arg2);
+void omOvlKill(s16 arg);
+void omOvlHisChg(s32 level, OverlayID overlay, int event, int stat);
+omOvlHisData *omOvlHisGet(s32 level);
+Process *omInitObjMan(s16 max_objs, int prio);
+void omDestroyObjMan(void);
+omObjData *omAddObjEx(Process *objman_process, s16 prio, u16 mdlcnt, u16 mtncnt, s16 group, void (*func)(omObjData *));
+void omAddMember(Process *objman_process, u16 group, omObjData *object);
+void omDelObjEx(Process *objman_process, omObjData *object);
+void omDelMember(Process *objman_process, omObjData *object);
+void omMakeGroupEx(Process *objman_process, u16 group, u16 max_objs);
+omObjData **omGetGroupMemberListEx(Process *objman_process, s16 group);
+void omSetStatBit(omObjData *obj, u16 stat);
+void omResetStatBit(omObjData *obj, u16 stat);
+void omSetTra(omObjData *obj, float x, float y, float z);
+void omSetRot(omObjData *obj, float x, float y, float z);
+void omSetSca(omObjData *obj, float x, float y, float z);
+void omMain(void);
+void omAllPause(BOOL pause);
+char omPauseChk(void);
+OverlayID omCurrentOvlGet(void);
+
+
+void omDLLDBGOut(void);
+void omDLLInit(FileListEntry *ovl_list);
+int omDLLStart(s16 ovl, s16 dll);
+void omDLLNumEnd(s16 ovl, s16 arg2);
+
+void omSysPauseEnable(BOOL flag);
+
+
 void WipeCreate(char dir, char type, short duration);
 
-u16 print8(s16 x, s16 y, float scale, char *str, ...);
+void pfInit(void);
+void pfClsScr(void);
+s16 print8(s16 x, s16 y, float scale, char *str, ...);
+s16 printWin(s16 x, s16 y, s16 w, s16 h, GXColor *color);
+void pfDrawFonts(void);
+
+void *HuDvdDataRead(char *path);
+void **HuDvdDataReadMulti(char **paths);
+void *HuDvdDataReadDirect(char *path, HeapID heap);
+void *HuDvdDataFastRead(s32 entrynum);
+void *HuDvdDataFastReadNum(s32 entrynum, s32 num);
+void *HuDvdDataFastReadAsync(s32 entrynum, DataReadStat *stat);
+void HuDvdDataClose(void *ptr);
+void HuDvdErrorWatch();
+
+void HuDataInit(void);
+int HuDataReadChk(s32 data_num);
+DataReadStat *HuDataGetStatus(void *dir_ptr);
+void *HuDataGetDirPtr(s32 data_num);
+DataReadStat *HuDataDirRead(s32 data_num);
+DataReadStat *HuDataDirReadNum(s32 data_num, s32 num);
+DataReadStat *HuDataDirSet(void *dir_ptr, s32 data_num);
+void HuDataDirReadAsyncCallBack(s32 result, DVDFileInfo* fileInfo);
+s32 HuDataDirReadAsync(s32 data_num);
+s32 HuDataDirReadNumAsync(s32 data_num, s32 num);
+BOOL HuDataGetAsyncStat(s32 status);
+void *HuDataRead(s32 data_num);
+void *HuDataReadNum(s32 data_num, s32 num);
+void *HuDataSelHeapRead(s32 data_num, HeapID heap);
+void *HuDataSelHeapReadNum(s32 data_num, s32 num, HeapID heap);
+void **HuDataReadMulti(s32 *data_ids);
+s32 HuDataGetSize(s32 data_num);
+void HuDataClose(void *ptr);
+void HuDataCloseMulti(void **ptrs);
+void HuDataDirClose(s32 data_id);
+void HuDataDirCloseNum(s32 num);
+void *HuDataReadNumHeapShortForce(s32 data_id, s32 num, HeapID heap);
+
+void *HuARDirCheck(s32 dir);
+void HuAR_ARAMtoMRAM(void *dst);
+void HuAR_ARAMtoMRAMNum(void *dst, s32 num);
+BOOL HuARDMACheck();
+
+void Hu3DModelPosSet(s16 index, float x, float y, float z);
+void Hu3DModelRotSet(s16 index, float x, float y, float z);
+void Hu3DModelScaleSet(s16 index, float x, float y, float z);
+
+void espInit(void);
+
+void HuSprClose(void);
+
+void HuWinAllKill(void);
+
+void HuPadRumbleAllStop(void);
+
+void HuAudFXListnerKill(void);
+void HuAudDllSndGrpSet(u16 ovl);
+void fn_800338EC(s16 ovl);
+
+void fn_80035A0C(void);
+
+void fn_8003F3AC(void);
+void fn_8004D6F4(s16 arg);
+
+s32 _CheckFlag(u32 flag);
+
+void BoardMessCreate(s16, s32, s32);
+void BoardMessKill(void);
+void BoardMessWait(void);
 
 #endif