ntsc-beta: Get game functions in their correct places

src/include/constants.h

@@ -3,6 +3,13 @@
 #include "files.h"
 #include "sfx.h"
 
+#define VERSION_NTSC_BETA  0
+#define VERSION_NTSC_1_0   1
+#define VERSION_NTSC_FINAL 2
+#define VERSION_PAL_BETA   3
+#define VERSION_PAL_FINAL  4
+#define VERSION_JPN_FINAL  5
+
 #define FALSE 0
 #define TRUE  1
 
@@ -27,7 +34,13 @@
 #define PLAYERCOUNT3012()   ((g_Vars.players[3] ? 1 : 0) + (g_Vars.players[0] ? 1 : 0) + (g_Vars.players[1] ? 1 : 0) + (g_Vars.players[2] ? 1 : 0))
 #define SECSTOTIME240(secs) (secs * 240)
 #define SECSTOTIME60(secs)  (secs * 60)
+
+#if VERSION >= VERSION_NTSC_1_0
 #define VOLUME(volume)      (volume > 0x5000 ? 0x5000 : volume)
+#else
+#define VOLUME(volume)      (volume)
+#endif
+
 #define EYESPYINACTIVE()    (!g_Vars.currentplayer->eyespy || (g_Vars.currentplayer->eyespy && !g_Vars.currentplayer->eyespy->active))
 
 #define ERASERSQDIST(p) ( \
@@ -3254,13 +3267,6 @@
 #define VEHICLEMODE_ENGINESTART 1
 #define VEHICLEMODE_RUNNING     2
 
-#define VERSION_NTSC_BETA  0
-#define VERSION_NTSC_1_0   1
-#define VERSION_NTSC_FINAL 2
-#define VERSION_PAL_BETA   3
-#define VERSION_PAL_FINAL  4
-#define VERSION_JPN_FINAL  5
-
 #define VIMODE_DEFAULT 0
 #define VIMODE_HIRES   1
 

src/include/data.h

@@ -307,8 +307,13 @@ extern s32 g_ScissorX2;
 extern s32 g_ScissorY1;
 extern s32 g_ScissorY2;
 extern u32 var800711f0;
+#if VERSION >= VERSION_NTSC_1_0
 extern char *g_StringPointer;
 extern char *g_StringPointer2;
+#else
+extern char g_StringPointer[125];
+extern char g_StringPointer2[125];
+#endif
 extern s32 g_MpPlayerNum;
 extern u32 var800714d8;
 extern u16 g_ControlStyleOptions[];

src/include/game/chr/chraction.h

@@ -204,7 +204,13 @@ bool chrSetChrPresetToChrNearPad(u32 checktype, struct chrdata *chr, f32 distanc
 bool chrSetChrPresetToChrNearPos(u8 checktype, struct chrdata *chr, f32 distance, struct coord *pos, s16 *room);
 bool chrSetPadPresetToPadOnRouteToTarget(struct chrdata *chr);
 u32 func0f04aeb0(void);
+
+#if VERSION >= VERSION_NTSC_1_0
 bool func0f04af84(f32 chrwidth, struct coord *pos, s16 *rooms, f32 angle, bool arg4, bool arg5, bool arg6);
+#else
+bool func0f04af84(f32 chrwidth, struct coord *pos, s16 *rooms, f32 angle, bool arg4, bool arg5);
+#endif
+
 struct prop *chrSpawnAtCoord(s32 body, s32 head, struct coord *pos, s16 *room, f32 arg4, u8 *ailist, u32 flags);
 bool func0f04b658(struct chrdata *chr);
 bool chrMoveToPos(struct chrdata *chr, struct coord *pos, s16 *room, f32 angle, bool allowonscreen);

src/include/game/debug.h

@@ -6,8 +6,8 @@
 
 u32 dprint();
 s32 debug0f11ed70(void);
-bool debug0f11ed78(void);
-bool debug0f11ed80(void);
+bool debugEnableBgRendering(void);
+bool debugEnablePropRendering(void);
 bool debug0f11edb0(void);
 bool debug0f11edb8(void);
 bool debugIsRoomStateDebugEnabled(void);
@@ -19,7 +19,7 @@ u32 debugGetSlowMotion(void);
 bool debug0f11ee88(void);
 bool debug0f11ee90(void);
 bool debug0f11eea8(void);
-bool debug0f11eeb0(void);
+bool debugDangerousProps(void);
 s32 debugGetMotionBlur(void);
 bool debugEnableFootsteps(void);
 bool debugAllowEndLevel(void);

src/include/game/mplayer/setup.h

@@ -114,7 +114,7 @@ void mpCreateScenarioHudmsg(s32 playernum, char *message);
 bool mpChrsAreSameTeam(s32 arg0, s32 arg1);
 u32 chrGiveBriefcase(struct chrdata *chr, struct prop *prop);
 void func0f187288(struct chrdata *chr, struct prop *prop);
-bool chrGiveUplink(struct chrdata *chr, struct prop *prop);
+s32 chrGiveUplink(struct chrdata *chr, struct prop *prop);
 void scenarioHtmActivateUplink(struct chrdata *chr, struct prop *prop);
 s32 menuhandlerMpDropOut(s32 operation, struct menuitem *item, union handlerdata *data);
 s32 menuhandlerMpTeamsLabel(s32 operation, struct menuitem *item, union handlerdata *data);

src/include/game/options.h

@@ -44,7 +44,7 @@ s32 optionsGetScreenRatio(void);
 void optionsSetScreenRatio(s32 ratio);
 u8 optionsGetScreenSplit(void);
 void optionsSetScreenSplit(u8 split);
-s32 optionsGetMusicVolume(void);
+u16 optionsGetMusicVolume(void);
 void optionsSetMusicVolume(u16 volume);
 
 #endif

src/include/types.h

@@ -1300,8 +1300,12 @@ struct chrdata {
 	/*0x192*/ u16 hidden2; // First 3 bits are a number
 	/*0x194*/ f32 magicframe;
 	/*0x198*/ f32 magicspeed;
+#if VERSION >= VERSION_NTSC_1_0
 	/*0x19c*/ s16 magicanim;
 	/*0x19e*/ s16 goposforce;
+#else
+	/*0x19c*/ s32 magicanim;
+#endif
 	/*0x1a0*/ s32 bdlist[60];
 	/*0x290*/ u8 bdstart;
 	/*0x291*/ u8 goposhitcount;
@@ -6895,7 +6899,9 @@ struct audiochannel {
 	/*0x54*/ struct coord *posptr;
 	/*0x58*/ struct coord pos;
 	/*0x64*/ s16 rooms[8];
+#if VERSION >= VERSION_NTSC_1_0
 	/*0x74*/ u32 uuid;
+#endif
 };
 
 struct var8007e3d0_data {