Start matching instdll

include/game/audio.h

@@ -3,6 +3,15 @@
 
 #include "dolphin.h"
 
+typedef struct hu_snd_grp_data {
+    /* 0x00 */ s16 ovl;
+    /* 0x02 */ s16 grpset;
+    /* 0x04 */ s32 auxANo;
+    /* 0x08 */ s32 auxBNo;
+    /* 0x0C */ s8 auxAVol;
+    /* 0x0D */ s8 auxBVol;
+} HuSndGrpData;
+
 void HuAudInit(void);
 s32 HuAudStreamPlay(void);
 void HuAudStreamVolSet(s16 vol);
@@ -64,4 +73,6 @@ extern float Snd3DDistOffset;
 extern s32 musicOffF;
 extern u8 fadeStat;
 
+extern HuSndGrpData HuSndGrpTbl[];
+
 #endif

include/game/gamework_data.h

@@ -45,7 +45,7 @@ typedef struct system_state {
     };
 /* 0x32 */ s8 unk_32;
 /* 0x34 */ u16 mg_next;
-/* 0x36 */ s16 mg_next_type;
+/* 0x36 */ s16 mg_type;
 /* 0x38 */ u16 unk_38;
 /* 0x3A */ u8 flag[3][16];
 /* 0x6A */ u8 unk_6A[0x72];
@@ -153,6 +153,16 @@ static inline s32 GWTeamGet(void)
     return GWSystem.team;
 }
 
+static inline s32 GWMGTypeGet(void)
+{
+	return GWSystem.mg_type;
+}
+
+static inline void GWMGTypeSet(s32 type)
+{
+	GWSystem.mg_type = type;
+}
+
 static inline s32 GWPartyGet(void)
 {
     return GWSystem.party;

include/game/hsfanim.h

@@ -3,7 +3,7 @@
 
 #include "game/hsfformat.h"
 #include "game/hsfman.h"
-#include "game/sprite.h"
+#include "game/animdata.h"
 
 typedef struct model_data ModelData;
 typedef struct particle_data ParticleData;

include/game/hsfformat.h

@@ -2,7 +2,7 @@
 #define _GAME_HSFFORMAT_H
 
 #include "dolphin.h"
-#include "game/sprite.h"
+#include "game/animdata.h"
 
 #define HSF_OBJ_NULL1 0
 #define HSF_OBJ_REPLICA 1

include/game/minigame_seq.h

@@ -2,6 +2,39 @@
 #define _GAME_MINIGAME_SEQ_H
 
 #include "game/object.h"
+#include "stdarg.h"
+
+typedef struct seq_work SeqWork;
+
+typedef int (*SeqUpdateFunc)(SeqWork *work);
+typedef int (*SeqInitFunc)(SeqWork *work, va_list params);
+
+typedef struct seq_work {
+	SeqUpdateFunc update;
+	char *data;
+	float x;
+	float y;
+	float scale_x;
+	float scale_y;
+	float unk_18;
+	float angle;
+	float win_scale;
+	float unk_24;
+	s16 time;
+	s16 time_max;
+	s16 timer_val;
+	s16 state;
+	s16 alt_word_len;
+	s16 word_len;
+	s16 param[2];
+	s16 type;
+	s16 spr_grp[16];
+	s16 sprite[16];
+	u8 seq_no;
+	u8 stat;
+	u8 unk_7C;
+	u8 unk_7D;
+} SeqWork;
 
 void MGSeqInit(void);
 void MGSeqMain(void);

include/game/sprite.h

@@ -113,7 +113,6 @@ void HuSprGrpCenterSet(s16 group, float x, float y);
 void HuSprGrpZRotSet(s16 group, float z_rot);
 void HuSprGrpScaleSet(s16 group, float x, float y);
 void HuSprGrpTPLvlSet(s16 group, float tp_lvl);
-s32 HuSprGrpDrawNoSet(s16 group, s32 draw_no);
 void HuSprDrawNoSet(s16 group, s16 member, s32 draw_no);
 void HuSprPriSet(s16 group, s16 member, s16 prio);
 void HuSprGrpScissorSet(s16 group, s16 x, s16 y, s16 w, s16 h);

include/game/window.h

@@ -1,7 +1,7 @@
 #ifndef _GAME_WINDOW_H
 #define _GAME_WINDOW_H
 
-#include "game/sprite.h"
+#include "game/animdata.h"
 #include "dolphin.h"
 
 #define MAKE_MESSID(bank, mess) (((bank) << 16)+(mess))