From 8637a00fdec66ab4e1c867b183d1aaf8c86785fb Mon Sep 17 00:00:00 2001 From: Rainchus Date: Wed, 29 Nov 2023 14:31:44 -0600 Subject: [PATCH] move global function signatures to variables.h --- include/REL/w10Dll.h | 84 +++++--------------------------------------- include/functions.h | 70 +++++++++++++++++++++++++++++++++++- include/variables.h | 1 + 3 files changed, 78 insertions(+), 77 deletions(-) diff --git a/include/REL/w10Dll.h b/include/REL/w10Dll.h index 0bcd9075..faf94109 100644 --- a/include/REL/w10Dll.h +++ b/include/REL/w10Dll.h @@ -3,8 +3,6 @@ #define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0])) -s16 HuWinCreate(float x, float y, s16 w, s16 h, s16 frame); - typedef struct unkw10Dll { Vec3f unk0; Vec3f unk0C; @@ -20,10 +18,13 @@ typedef struct w10DllUnk01 { f32 unk10; } w10DllUnk01; //sizeof ? -typedef struct w10DllUnk02 { +typedef struct m456DllUnk02 { char unk00[0x5C]; w10DllUnk01* unk5C; -} w10DllUnk02; //sizeof ? +} m456DllUnk02; //sizeof ? + +//this belongs to m456Dll +m456DllUnk02** fn_8002FAC0(Process*, s32); typedef struct w10DllUnk03 { s16 unk0; @@ -37,95 +38,27 @@ typedef struct w10DllUnk04 { void (*unk4)(); } w10DllUnk04; -//this belongs to m456Dll -w10DllUnk02** fn_8002FAC0(Process*, s32); -u8 fn_80041600(void); -s16 HuPadStatGet(s16); -void espDispOn(s16); -void espPosSet(s16, f32, f32); -void espScaleSet(s16, f32, f32); -void fn_1_C10(s16); -void fn_8005D8E8(void); -void fn_8005DB6C(s16, Vec3f*, s32, f32, f32, s32); -void fn_8005E0C0(void); -void fn_80074210(s32, s32, Vec3f*); -void fn_8007A360(s32); -void fn_8007F894(void); -void fn_80083F84(void); -void fn_800884F4(s32); -void fn_800A4C88(void); -void fn_800A6B10(void); extern s16 lbl_1_bss_20; extern s16 lbl_1_bss_22[]; -void espScaleSet(s16, f32, f32); extern s16 lbl_1_bss_20; -s16 espEntry(s32, s32, s32); -void espDispOff(s16); -void fn_8008853C(s32); extern s32 lbl_801A52E8; -void fn_800B42B4(s32); -void fn_80082AAC(s32); -void fn_800B4264(s32, s32, s32); + +void fn_1_C10(s16); void fn_1_1FB0(void); void fn_1_1E3C(s16, s16, s16); -void fn_8007500C(s32); void fn_1_BA0(s32); -void fn_8006F0D4(s32, f32); -f32 fn_8006F128(s32); -f64 fmod(f32, f64); void fn_1_C20(void); -void fn_8006F61C(s16, s32); -void fn_800B42BC(s16); -void Hu3DModelLightInfoSet(s32, s32); -s32 fn_8006DBD4(s16); -void fn_8005B150(void*, void*); void fn_1_6D8(void); void fn_1_E0(void); -void fn_8006F2E8(s32, Vec3f*); -void HuWinMesSet(s16, s32); void fn_1_1D68(void); void fn_1_1DEC(void); void fn_1_AEC(void); -void HuWinKill(s16); -void HuWinPriSet(s16, s32); -void HuWinMesPalSet(s16, s32, s32, s32, s32); -void HuWinMesSpeedSet(s16, s32); -void HuWinMesMaxSizeGet(s32, f32*, ...); -void fn_8005D10C(void*, void*); -s16 fn_8006D9A4(s32, void*, s32); -void fn_8006DB90(s16); -void fn_8006DDE8(s16, f32); -void fn_8006E2B8(s16, s32, s32); -void fn_8006E878(s16, f32); -void fn_8006F158(s16, void*); -void fn_8006F1A8(s16, f32, f32, f32); -s32 fn_8006F220(s16 arg0, Vec3f* arg1); -void fn_8006F50C(s16, s32); -void fn_80073FF4(void*); -void fn_80073FFC(void*); -void fn_80074004(void*); -s32 fn_800745F0(s32, s32); -void fn_800772EC(s32); -void fn_80077A3C(void); -void fn_80077AAC(s16); -void fn_8007A83C(s16); -void fn_80083EDC(s16); -void fn_800A4F6C(s16); -void fn_800B3FD8(void*); -void fn_800B4274(s32, s32); int fn_1_1AAC(s16, s32); void fn_1_8C0(void); void fn_1_904(void); void fn_1_908(void); s32 fn_1_90C(void); void fn_1_91C(void); -void Hu3D2Dto3D(Vec3f*, s32, Vec3f*); -void fn_8005D5C0(Vec3f*); -void fn_8006F338(s16, f32, f32, f32); -s32 fn_8005B6A8(void); -void fn_8006EFBC(s16, Mtx); -void fn_8006F270(s16, f32, f32, f32); -void espKill(s16); void fn_1_13A4(void); void fn_1_176C(void); void fn_1_179C(void); @@ -192,5 +125,4 @@ extern s16 lbl_1_data_32; extern s32 lbl_1_data_54[2]; extern s32 lbl_1_data_5C[2]; extern s32 lbl_1_data_64[2]; -extern s32 lbl_1_data_6C[2]; -extern BoardState lbl_8018FCF8; \ No newline at end of file +extern s32 lbl_1_data_6C[2]; \ No newline at end of file diff --git a/include/functions.h b/include/functions.h index b23fdd75..54a992a7 100644 --- a/include/functions.h +++ b/include/functions.h @@ -4,9 +4,11 @@ #include "types.h" #include "common_structs.h" #include "common_enums.h" - +#include "dolphin/mtx.h" #include "dolphin/gx/GXStruct.h" +void Hu3D2Dto3D(Vec3f*, s32, Vec3f*); +void Hu3DModelLightInfoSet(s32, s32); void Hu3DBGColorSet(u8, u8, u8); void Hu3DCameraCreate(s16); void Hu3DCameraPerspectiveSet(s16, f32, f32, f32, f32); @@ -149,12 +151,26 @@ void Hu3DModelRotSet(s16 index, float x, float y, float z); void Hu3DModelScaleSet(s16 index, float x, float y, float z); void espInit(void); +void espScaleSet(s16, f32, f32); +s16 espEntry(s32, s32, s32); +void espDispOff(s16); +void espKill(s16); +void espDispOn(s16); +void espPosSet(s16, f32, f32); void HuSprClose(void); void HuWinAllKill(void); +void HuWinMesSet(s16, s32); +void HuWinKill(s16); +void HuWinPriSet(s16, s32); +void HuWinMesPalSet(s16, s32, s32, s32, s32); +void HuWinMesSpeedSet(s16, s32); +void HuWinMesMaxSizeGet(s32, f32*, ...); +s16 HuWinCreate(float x, float y, s16 w, s16 h, s16 frame); void HuPadRumbleAllStop(void); +s16 HuPadStatGet(s16); void HuAudFXListnerKill(void); void HuAudDllSndGrpSet(u16 ovl); @@ -171,4 +187,56 @@ void BoardMessCreate(s16, s32, s32); void BoardMessKill(void); void BoardMessWait(void); +void fn_8005D8E8(void); +void fn_8005DB6C(s16, Vec3f*, s32, f32, f32, s32); +void fn_8005E0C0(void); +void fn_80074210(s32, s32, Vec3f*); +void fn_8007A360(s32); +void fn_8007F894(void); +void fn_80083F84(void); +void fn_800884F4(s32); +void fn_800A4C88(void); +void fn_800A6B10(void); +u8 fn_80041600(void); +void fn_8008853C(s32); +void fn_800B42B4(s32); +void fn_80082AAC(s32); +void fn_800B4264(s32, s32, s32); +void fn_8007500C(s32); +void fn_8006F0D4(s32, f32); +f32 fn_8006F128(s32); +f64 fmod(f32, f64); +void fn_8006F61C(s16, s32); +void fn_800B42BC(s16); +s32 fn_8006DBD4(s16); +void fn_8005B150(void*, void*); +void fn_8006F2E8(s32, Vec3f*); +void fn_8005D10C(void*, void*); +s16 fn_8006D9A4(s32, void*, s32); +void fn_8006DB90(s16); +void fn_8006DDE8(s16, f32); +void fn_8006E2B8(s16, s32, s32); +void fn_8006E878(s16, f32); +void fn_8006F158(s16, void*); +void fn_8006F1A8(s16, f32, f32, f32); +s32 fn_8006F220(s16 arg0, Vec3f* arg1); +void fn_8006F50C(s16, s32); +void fn_80073FF4(void*); +void fn_80073FFC(void*); +void fn_80074004(void*); +s32 fn_800745F0(s32, s32); +void fn_800772EC(s32); +void fn_80077A3C(void); +void fn_80077AAC(s16); +void fn_8007A83C(s16); +void fn_80083EDC(s16); +void fn_800A4F6C(s16); +void fn_800B3FD8(void*); +void fn_800B4274(s32, s32); +void fn_8005D5C0(Vec3f*); +void fn_8006F338(s16, f32, f32, f32); +s32 fn_8005B6A8(void); +void fn_8006EFBC(s16, Mtx); +void fn_8006F270(s16, f32, f32, f32); + #endif diff --git a/include/variables.h b/include/variables.h index a2c884cf..cdebbfe0 100644 --- a/include/variables.h +++ b/include/variables.h @@ -44,5 +44,6 @@ extern s16 omdispinfo; extern char omSysPauseEnableFlag; extern OverlayID omprevovl; extern Player gPlayerData[4]; +extern BoardState lbl_8018FCF8; #endif