kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix includes, hsfload, mess, update aurora (#584)

Browse source 
* Fix REL includes till mgmodedll

* hsfload fixes

* update aurora, fixups

* Minor tweaks

* update aurora

* Mess byteswapping and comment out 3D render code
This commit is contained in:
Dávid Balatoni 2025-04-16 06:04:54 +02:00 • committed by GitHub
parent 4b18de8528
commit af7c7a0064
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
135 changed files with 742 additions and 926 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/REL/m407dll.h
View file

@ -18,6 +18,9 @@ void fn_1_334(void);
void fn_1_388(u8, s32);
void fn_1_3C4(u8);
void fn_1_404(void);
#ifndef __MWERKS__
s32 fn_1_4C0(u8 arg0);
#endif
s32 fn_1_508(u8);
s32 fn_1_53C(u8);
void fn_1_568(s16, s16, s16);
@ -37,6 +40,7 @@ void fn_1_2564(void);
void fn_1_25C0(void);
s32 fn_1_2880(void);
#ifndef __MWERKS__
void fn_1_2770(u8 arg0);
s16 fn_1_28B8(u8 arg0);
s16 fn_1_28D4(void);
#endif

5
include/REL/m410Dll.h
View file

@ -205,6 +205,10 @@ void fn_1_28AC(s32 arg0);
s32 fn_1_28DC(void);
float fn_1_2FD4(float arg8, float arg9, float argA);
float fn_1_30F0(float arg8, float arg9);
void fn_1_31A4(Process *process);
void fn_1_31F8(void);
void fn_1_33A8(Process *objman);
void fn_1_3484(void);
s32 fn_1_76B8(Vec arg0, Vec arg1, u16 arg2);
void fn_1_77E8(void *arg0);
void fn_1_77F8(u16 arg0, Vec *arg1);
@ -213,5 +217,6 @@ void fn_1_7888(u16 arg0, u16 arg1, Vec *arg2);
s32 fn_1_79F8(s16 arg0, char *arg1, Mtx arg2);
void fn_1_7AC4(HsfObject *arg0, Mtx arg1, char *arg2, Mtx arg3);
void fn_1_7E30(Process *objman);
void fn_1_806C(void);
#endif

6
include/REL/m415Dll.h
View file

@ -257,6 +257,7 @@ float fn_1_7520(float, float *, float *, float *, s32);
void fn_1_7674(float *, Vec *, Vec *, s32);
void fn_1_7A54(float, Vec *, float *, Vec *, Vec *, s32);
// map.c
void fn_1_8780(s16 arg0, s16 arg1);
void fn_1_95C0(ModelData *, Mtx);
AnimData **fn_1_9734(s16);
void fn_1_9DC8(unkSubStruct2 *);
@ -266,11 +267,16 @@ s16 fn_1_A94C(u32, s16, s16);
void fn_1_ACF4(s16, s16, s16, s16, s16, s16);
void fn_1_AF48(s16);
u8 fn_1_AFC8(s16, u8, s32, s16, s16);
u8 fn_1_B038(s16 arg0, u8 arg1, s32 arg2);
s32 fn_1_B0B8(s16, u8, s16);
void fn_1_B634(void);
void fn_1_B864(s16, float, float, float);
void fn_1_B8D0(s16 arg0, s16 arg1, f32 arg8, f32 arg9, f32 argA);
void fn_1_BB4C(s16, float, float, float);
void fn_1_BC9C(s16, float, float, float);
void fn_1_BD08(s16, s16, float, float, float);
void fn_1_BE30(s16 arg0, s16 arg1, s32 arg2);
void fn_1_C110(s16 arg0, s16 arg1, u8 arg2, u8 arg3, u8 arg4, u8 arg5);
void fn_1_C264(s16, u8);
void fn_1_C2D0(s16, s16, u8);
void fn_1_C410(s16, s16, u8, u8);

8
include/REL/m424Dll.h
View file

@ -1,4 +1,5 @@
#include "dolphin.h"
#ifndef M424DLL_H
#define M424DLL_H
#include "game/object.h"
@ -31,6 +32,7 @@ extern M424DllBallStruct2 lbl_1_bss_60[9];
extern u8 lbl_1_bss_58;
extern s16 lbl_1_bss_24[4];
s32 fn_1_FE0(void);
float fn_1_1358(float, float);
float fn_1_1470(float, float, float);
omObjData *fn_1_1AB8(Process *);
@ -42,9 +44,13 @@ void fn_1_2720(Process *);
void fn_1_2880(void);
Vec *fn_1_8A00(u8);
s32 fn_1_8A2C(void);
s32 fn_1_907C(Vec *arg0, Vec *arg1);
omObjData *fn_1_93F0(Process *);
void fn_1_94A4(void);
s32 fn_1_B804(void);
s32 fn_1_B888(void);
s32 fn_1_B8AC(void);
s32 fn_1_B924(void);
void fn_1_C2E0(s32 arg0);
#endif

3
include/REL/m434Dll.h
View file

@ -6,6 +6,9 @@
void fn_1_1C44(s32 arg0, s32 arg1);
s32 fn_1_1C88(s32 arg0);
s32 fn_1_1CB8(void);
#ifndef __MWERKS__
s16 fn_1_1D44(void);
#endif
s32 fn_1_1D54(void);
void fn_1_1D64(s32 arg0);
s32 fn_1_1D74(s32 arg0);

1
include/REL/m440Dll.h
View file

@ -241,6 +241,7 @@ typedef struct _unkObjStruct {
float unk68;
float unk6C;
float unk70;
char unk74[0x4];
} unkObjStruct;
#if VERSION_NTSC

1
include/REL/m446Dll.h
View file

@ -235,6 +235,7 @@ void fn_1_34A0(unkStruct5 *, unkStruct4 **, s32, s32);
s32 m446DeckPushCard(unkStruct5 *, unkStruct4 *, s32);
s32 m446DeckPopCard(unkStruct2 **, unkStruct4 **);
void fn_1_38B0(unkStruct2 **);
// void fn_1_38E0(u32 arg0); // TODO
s32 fn_1_38F0(void);
// table.c
s32 fn_1_3924(void);

2
include/game/hsfdraw.h
View file

@ -70,7 +70,7 @@ void Hu3DModelObjMtxGet(s16 arg0, char *arg1, Mtx arg2);
void PGObjCall(ModelData *arg0, HsfObject *arg1);
void PGObjCalc(ModelData *arg0, HsfObject *arg1);
void PGObjReplica(ModelData *arg0, HsfObject *arg1);
HsfObject *Hu3DObjDuplicate(HsfData *arg0, u32 arg1);
HsfObject *Hu3DObjDuplicate(HsfData *arg0, uintptr_t arg1);
void Hu3DModelObjDrawInit(void);
void Hu3DModelObjDraw(s16 arg0, char *arg1, Mtx arg2);

3
include/game/hsfformat.h
View file

@ -277,7 +277,8 @@ typedef struct hsf_object_data {
HsfCluster **cluster;
u32 cenvCnt;
HsfCenv *cenv;
void *file[2];
HsfVector3f *vtxtop;
HsfVector3f *normtop;
} HsfObjectData;
typedef struct hsf_camera {

3
include/game/hsfman.h
View file

@ -284,6 +284,9 @@ void Hu3DLLightStaticSet(s16, s16, s32);
s32 Hu3DModelLightInfoSet(s16, s16);
s16 Hu3DLightSet(ModelData *, Mtx *, Mtx *, float);
void lightSet(LightData *arg0, s16 arg1, Mtx *arg2, Mtx *arg3, float arg8);
#ifndef __MWERKS__
void Hu3DReflectMapSet(AnimData* arg0);
#endif
void Hu3DReflectNoSet(s16 arg0);
void Hu3DFogSet(float, float, u8, u8, u8);
void Hu3DFogClear(void);

32
include/port/byteswap.h
View file

@ -156,6 +156,22 @@ typedef struct HsfShape32b {
u32 vertex;
} HsfShape32b;
typedef struct HsfCenvDual32b {
u32 target1;
u32 target2;
u32 weightCnt;
u32 weight;
} HsfCenvDual32b;
typedef struct HsfCenvMulti32b {
u32 weightCnt;
u16 pos;
u16 posCnt;
u16 normal;
u16 normalCnt;
u32 weight;
} HsfCenvMulti32b;
typedef struct HsfCenv32b {
u32 name;
u32 singleData;
@ -200,7 +216,8 @@ typedef struct HsfObjectData32b {
u32 cluster;
u32 cenvCnt;
u32 cenv;
u32 file[2];
u32 vtxtop;
u32 normtop;
} HsfObjectData32b;
typedef struct HsfObject32b {
@ -265,6 +282,12 @@ typedef struct HsfFace32b {
Vec nbt;
} HsfFace32b;
typedef struct HsfMatrix32b {
u32 base_idx;
u32 count;
u32 data;
} HsfMatrix32b;
void byteswap_u16(u16 *src);
void byteswap_s16(s16 *src);
void byteswap_u32(u32 *src);
@ -285,7 +308,7 @@ void byteswap_hsfattribute(HsfAttribute32b *src, HsfAttribute *dest);
void byteswap_hsfmaterial(HsfMaterial32b *src, HsfMaterial *dest);
void byteswap_hsfscene(HsfScene *src);
void byteswap_hsfbuffer(HsfBuffer32b *src, HsfBuffer *dest);
void byteswap_hsfmatrix(HsfMatrix *src);
void byteswap_hsfmatrix(HsfMatrix32b *src, HsfMatrix *dest);
void byteswap_hsfpalette(HsfPalette32b *src, HsfPalette *dest);
void byteswap_hsfpart(HsfPart32b *src, HsfPart *dest);
void byteswap_hsfbitmap(HsfBitmap32b *src, HsfBitmap *dest);
@ -304,7 +327,6 @@ void byteswap_hsfattribute(HsfAttribute32b *src, HsfAttribute *dest);
void byteswap_hsfmaterial(HsfMaterial32b *src, HsfMaterial *dest);
void byteswap_hsfscene(HsfScene *src);
void byteswap_hsfbuffer(HsfBuffer32b *src, HsfBuffer *dest);
void byteswap_hsfmatrix(HsfMatrix *src);
void byteswap_hsfpalette(HsfPalette32b *src, HsfPalette *dest);
void byteswap_hsfpart(HsfPart32b *src, HsfPart *dest);
void byteswap_hsfbitmap(HsfBitmap32b *src, HsfBitmap *dest);
@ -312,6 +334,10 @@ void byteswap_hsfmapattr(HsfMapAttr32b *src, HsfMapAttr *dest);
void byteswap_hsfskeleton(HsfSkeleton32b *src, HsfSkeleton *dest);
void byteswap_hsfshape(HsfShape32b *src, HsfShape *dest);
void byteswap_hsfcenv_single(HsfCenvSingle *src);
void byteswap_hsfcenv_dual_weight(HsfCenvDualWeight *src);
void byteswap_hsfcenv_dual(HsfCenvDual32b *src, HsfCenvDual *dest);
void byteswap_hsfcenv_multi_weight(HsfCenvMultiWeight *src);
void byteswap_hsfcenv_multi(HsfCenvMulti32b *src, HsfCenvMulti *dest);
void byteswap_hsfcenv(HsfCenv32b *src, HsfCenv *dest);
void byteswap_hsfobject(HsfObject32b *src, HsfObject *dest);
void byteswap_hsfbitmapkey(HsfBitmapKey32b *src, HsfBitmapKey *dest);