Matched ShapeExec, esprite, and jmp

include/game/ShapeExec.h

@@ -0,0 +1,8 @@
+#ifndef _GAME_SHAPE_EXEC_H
+#define _GAME_SHAPE_EXEC_H
+
+#include "game/hsfformat.h"
+
+void ShapeProc(HsfData *arg0);
+
+#endif

include/game/esprite.h

@@ -0,0 +1,24 @@
+#ifndef _GAME_ESPRITE_H
+#define _GAME_ESPRITE_H
+
+#include "dolphin.h"
+
+void espInit(void);
+s16 espEntry(s32 arg0, s16 arg1, s16 arg2);
+void espKill(s16 arg0);
+s16 espGrpIDGet(void);
+void espDispOn(s16 arg0);
+void espDispOff(s16 arg0);
+void espAttrSet(s16 arg0, u16 arg1);
+void espAttrReset(s16 arg0, u16 arg1);
+void espPosSet(s16 arg0, float arg1, float arg2);
+void espScaleSet(s16 arg0, float arg1, float arg2);
+void espZRotSet(s16 arg0, float arg1);
+void espTPLvlSet(s16 arg0, float arg1);
+void espColorSet(s16 arg0, u8 arg1, u8 arg2, u8 arg3);
+void espSpeedSet(s16 arg0, float arg1);
+void espBankSet(s16 arg0, s16 arg1);
+void espDrawNoSet(s16 arg0, s16 arg1);
+void espPriSet(s16 arg0, s16 arg1);
+
+#endif

include/game/hsfman.h

@@ -118,7 +118,6 @@ typedef struct light_data {
 } LightData;
 
 extern void GXWaitDrawDone();                                 /* extern */
-extern void ShapeProc(HsfData*);                              /* extern */
 extern void GXInitSpecularDir(GXLightObj*, f32, f32, f32);
 
 void Hu3DInit(void);

include/game/jmp.h

@@ -0,0 +1,19 @@
+#ifndef _GAME_JMP_H
+#define _GAME_JMP_H
+
+#include "dolphin.h"
+
+typedef struct jump_buf {
+    u32 lr;
+    u32 cr;
+    u32 sp;
+    u32 r2;
+    u32 pad;
+    u32 regs[19];
+    double flt_regs[19];
+} jmp_buf;
+
+int gcsetjmp(jmp_buf *jump);
+int gclongjmp(jmp_buf *jump, int status);
+
+#endif

include/game/process.h

@@ -1,6 +1,7 @@
 #ifndef _GAME_PROCESS_H
 #define _GAME_PROCESS_H
 
+#include "game/jmp.h"
 #include "dolphin/types.h"
 
 #define PROCESS_STAT_PAUSE 0x1
@@ -8,16 +9,6 @@
 #define PROCESS_STAT_PAUSE_EN 0x4
 #define PROCESS_STAT_UPAUSE_EN 0x8
 
-typedef struct jump_buf {
-    u32 lr;
-    u32 cr;
-    u32 sp;
-    u32 r2;
-    u32 pad;
-    u32 regs[19];
-    double flt_regs[19];
-} jmp_buf;
-
 typedef struct process {
     struct process *next;
     struct process *prev;

include/unsplit.h

@@ -3,25 +3,6 @@
 
 #include "dolphin.h"
 
-void Hu3D2Dto3D(Vec*, s16, Vec*);
-void HuAudFadeOut(s32 arg0);
-
-void Hu3DModelPosSet(s16 index, float x, float y, float z);
-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 HuAudFXListnerKill(void);
-void HuAudDllSndGrpSet(u16 ovl);
-void HuAudVoiceInit(s16 ovl);
-
 void MGSeqKillAll(void);
 
 void MGSeqPracticeStart(void);