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

Merge branch 'main' of https://github.com/Rainchus/mp4-dtk into main

Browse source
This commit is contained in:
CreateSource 2023-12-06 20:33:30 -05:00
commit 8509e9a40b
4 changed files with 28 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/game/hsfformat.h
View file

@ -69,10 +69,10 @@ typedef struct hsf_header {
} HsfHeader; } HsfHeader;
typedef struct hsf_scene { typedef struct hsf_scene {
GXColor unk0; GXFogType fogType;
f32 unk4; f32 start;
f32 unk8; f32 end;
u32 unkC; GXColor color;
} HsfScene; } HsfScene;
typedef struct hsf_bitmap { typedef struct hsf_bitmap {

6
include/game/hsfman.h
View file

@ -53,7 +53,7 @@ typedef struct ThreeDCameraStruct {
typedef struct ThreeDProjectionStruct { typedef struct ThreeDProjectionStruct {
s8 unk_00; s8 unk_00;
char unk_01[0x3]; char unk_01[0x3];
u32 unk_04; AnimData *unk_04;
char unk_08[0xC]; char unk_08[0xC];
Point3d unk_14; Point3d unk_14;
Point3d unk_20; Point3d unk_20;
@ -67,6 +67,7 @@ typedef struct ThreeDShadowStruct {
void*unk_04; void*unk_04;
char unk_08[0x90]; char unk_08[0x90];
} ThreeDShadowStruct; } ThreeDShadowStruct;
<<<<<<< HEAD
typedef struct fog_data { typedef struct fog_data {
GXFogType fogType; GXFogType fogType;
f32 start; f32 start;
@ -82,4 +83,7 @@ void Hu3DProjectionKill(s16);
void Hu3DProjectionPosSet(s16, Vec, Vec, Vec); void Hu3DProjectionPosSet(s16, Vec, Vec, Vec);
void Hu3DProjectionTPLvlSet(s16, f32); void Hu3DProjectionTPLvlSet(s16, f32);
void Hu3DMipMapSet(char*, s16, s32, f32); void Hu3DMipMapSet(char*, s16, s32, f32);
=======
>>>>>>> b4e58bdf23b3e769e0ca1dbe9167e3775049e51d
#endif #endif

4
src/game/hsfload.c
View file

@ -257,8 +257,8 @@ static void SceneLoad(void)
if(head.scene.count) { if(head.scene.count) {
file_scene = (HsfScene *)((u32)fileptr+head.scene.ofs); file_scene = (HsfScene *)((u32)fileptr+head.scene.ofs);
new_scene = file_scene; new_scene = file_scene;
new_scene->unk8 = file_scene->unk8; new_scene->end = file_scene->end;
new_scene->unk4 = file_scene->unk4; new_scene->start = file_scene->start;
Model.scene = new_scene; Model.scene = new_scene;
Model.sceneCnt = head.scene.count; Model.sceneCnt = head.scene.count;
} }

34
src/game/hsfman.c
View file

@ -11,11 +11,11 @@ ModelData Hu3DData[0x200] = {};
ThreeDCameraStruct Hu3DCamera[0x10] = {}; ThreeDCameraStruct Hu3DCamera[0x10] = {};
s16 layerNum[8] = {}; s16 layerNum[8] = {};
void (*layerHook[8])(s16) = {}; void (*layerHook[8])(s16) = {};
char *reflectAnim[5] = {}; AnimData *reflectAnim[5] = {};
char *hiliteAnim[4] = {}; AnimData *hiliteAnim[4] = {};
ThreeDProjectionStruct Hu3DProjection[4] = {}; ThreeDProjectionStruct Hu3DProjection[4] = {};
ThreeDShadowStruct Hu3DShadowData = {}; ThreeDShadowStruct Hu3DShadowData = {};
FogStruct FogData = {}; HsfScene FogData = {};
Mtx Hu3DCameraMtx = {}; Mtx Hu3DCameraMtx = {};
Mtx Hu3DCameraMtxXPose = {}; Mtx Hu3DCameraMtxXPose = {};
s16 Hu3DPauseF; s16 Hu3DPauseF;
@ -25,20 +25,20 @@ s32 Hu3DShadowF;
u16 NoSyncF; u16 NoSyncF;
f32 lbl_801D4AB0; f32 lbl_801D4AB0;
s32 modelKillAllF; s32 modelKillAllF;
char refMapData0[0x1240] = {}; #include "refMapData0.inc"
char refMapData1[0x1100] = {}; #include "refMapData1.inc"
char refMapData2[0x2080] = {}; #include "refMapData2.inc"
char refMapData3[0x2080] = {}; #include "refMapData3.inc"
char refMapData4[0x2080] = {}; #include "refMapData4.inc"
char toonMapData[0x880] = {}; #include "toonMapData.inc"
char toonMapData2[0x1080] = {}; #include "toonMapData2.inc"
char hiliteData[0x480] = {}; #include "hiliteData.inc"
char hiliteData2[0x480] = {}; #include "hiliteData2.inc"
char hiliteData3[0x480] = {}; #include "hiliteData3.inc"
char hiliteData4[0x480] = {}; #include "hiliteData4.inc"
const char lbl_8012D630[] = "Error: Not Found %s for MipMapSet\n"; const char lbl_8012D630[] = "Error: Not Found %s for MipMapSet\n";
s16 reflectMapNo; s16 reflectMapNo;
char *toonAnim; AnimData *toonAnim;
GXColor BGColor; GXColor BGColor;
extern s16 Hu3DCameraBit; extern s16 Hu3DCameraBit;
@ -91,7 +91,7 @@ void Hu3DInit(void) {
Hu3DAnimInit(); Hu3DAnimInit();
Hu3DParManInit(); Hu3DParManInit();
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
Hu3DProjection[i].unk_04 = 0; Hu3DProjection[i].unk_04 = NULL;
} }
Hu3DShadowCamBit = 0; Hu3DShadowCamBit = 0;
Hu3DShadowData.unk_04 = 0; Hu3DShadowData.unk_04 = 0;
@ -294,7 +294,7 @@ void Hu3DShadowSizeSet(u16 arg0) {
void Hu3DProjectionKill(s16 arg0) { void Hu3DProjectionKill(s16 arg0) {
HuSprAnimKill(Hu3DProjection[arg0].unk_04); HuSprAnimKill(Hu3DProjection[arg0].unk_04);
Hu3DProjection[arg0].unk_04 = 0; Hu3DProjection[arg0].unk_04 = NULL;
} }
void Hu3DProjectionPosSet(s16 arg0, Vec arg1, Vec arg2, Vec arg3) { void Hu3DProjectionPosSet(s16 arg0, Vec arg1, Vec arg2, Vec arg3) {