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

34
src/game/hsfman.c
View file

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