pal-final: Get game .rodata matching

src/include/constants.h

@@ -19,7 +19,6 @@
 #define ALIGN64(val)        ((((u32)val) + 0x3f | 0x3f) ^ 0x3f)
 #define ARRAYCOUNT(a)       (s32)(sizeof(a) / sizeof(a[0]))
 #define CHRRACE(chr)        (chr ? chr->race : RACE_HUMAN)
-#define FRAMEDURATION       (1 / 60.0f)
 #define IS4MB()             (g_Is4Mb == true)
 #define IS8MB()             (g_Is4Mb != true)
 #define PLAYERCOUNT()       ((g_Vars.players[0] ? 1 : 0) + (g_Vars.players[1] ? 1 : 0) + (g_Vars.players[2] ? 1 : 0) + (g_Vars.players[3] ? 1 : 0))
@@ -36,11 +35,13 @@
 		(p[2] - g_Vars.currentplayer->eraserpos.f[2]) * (p[2] - g_Vars.currentplayer->eraserpos.f[2]))
 
 #if PAL
-#define TIME60TOFRAMES(val) (val * 50 / 60)
-#define FRAMESTOTIME60(val) (val * 1.2f)
+#define TIME60TOFRAMES(val) ((val) * 50 / 60)
+#define FRAMESTOTIME60(val) ((val) * 1.2f)
+#define FRAMEDURATION       (1 / 50.0f)
 #else
 #define TIME60TOFRAMES(val) (val)
 #define FRAMESTOTIME60(val) (val)
+#define FRAMEDURATION       (1 / 60.0f)
 #endif
 
 // Macro to convert an ASCII character to N64 font code.

src/include/game/chr/chr.h

@@ -17,7 +17,7 @@ void func0f020d44(struct prop *prop, bool removechr);
 void chrUpdateAimProperties(struct chrdata *chr);
 void func0f02133c(struct chrdata *chr);
 void chrDoFlinchcntThing(struct chrdata *chr, f32 arg1);
-u32 func0f02143c(void);
+f32 func0f02143c(struct chrdata *chr);
 void func0f021fa8(struct chrdata *chr, struct coord *pos, s16 *rooms);
 void func0f0220ec(struct chrdata *chr, s32 arg1, s32 arg2);
 u32 func0f022214(void);

src/include/game/game_005fd0.h

@@ -8,10 +8,5 @@ bool func0f005fd0(s32 arg0);
 s32 chrChooseFootstepSound(struct chrdata *chr, u32 arg1);
 void func0f0061dc(struct chrdata *chr);
 void func0f006520(struct chrdata *chr);
-u32 colourBlend(u32 a, u32 b, u32 weight);
-void func0f0069dc(void);
-f32 func0f006b08(f32 arg0);
-f32 func0f006b54(f32 arg0);
-u32 func0f006ba0(void);
 
 #endif

src/include/game/game_006900.h

@@ -0,0 +1,13 @@
+#ifndef IN_GAME_GAME_006900_H
+#define IN_GAME_GAME_006900_H
+#include <ultra64.h>
+#include "data.h"
+#include "types.h"
+
+u32 colourBlend(u32 a, u32 b, u32 weight);
+void func0f0069dc(void);
+f32 func0f006b08(f32 arg0);
+f32 func0f006b54(f32 arg0);
+u32 func0f006ba0(void);
+
+#endif

src/include/game/game_0125a0.h

@@ -6,6 +6,5 @@
 
 void func0f0125a0(s32 animnum, s32 loopframe, s32 endframe, s32 *arg3);
 void currentPlayerInitAnimation(void);
-void func0f012aa0(void);
 
 #endif

src/include/game/game_012aa0

@@ -0,0 +1,11 @@
+#ifndef IN_GAME_GAME_0125A0_H
+#define IN_GAME_GAME_0125A0_H
+#include <ultra64.h>
+#include "data.h"
+#include "types.h"
+
+void func0f0125a0(s32 animnum, s32 loopframe, s32 endframe, s32 *arg3);
+void currentPlayerInitAnimation(void);
+void func0f012aa0(void);
+
+#endif

src/include/game/game_012aa0.h

@@ -0,0 +1,9 @@
+#ifndef IN_GAME_GAME_012AA0_H
+#define IN_GAME_GAME_012AA0_H
+#include <ultra64.h>
+#include "data.h"
+#include "types.h"
+
+void func0f012aa0(void);
+
+#endif

src/include/game/game_0147d0.h

@@ -8,6 +8,5 @@ void func0f0147d0(void);
 void lasersightsReset(void);
 void mpRemoveAllSimulants(void);
 void aibotAllocate(s32 chrnum, s32 aibotnum);
-void aibotAllocateInventory(struct chrdata *chr, s32 maxitems);
 
 #endif

src/include/game/game_014e90.h

@@ -0,0 +1,9 @@
+#ifndef _IN_GAME_GAME_014E90_H
+#define _IN_GAME_GAME_014E90_H
+#include <ultra64.h>
+#include "data.h"
+#include "types.h"
+
+void aibotAllocateInventory(struct chrdata *chr, s32 maxitems);
+
+#endif

src/include/game/wallhit.h

@@ -9,7 +9,7 @@ void func0f13e1b0(struct var800a41b0 *arg0);
 void func0f13e40c(struct prop *prop, s8 arg1);
 bool chrIsUsingPaintball(struct chrdata *chr);
 void func0f13e5c8(struct prop *prop);
-void func0f13e640(struct var800a41b0 *thing, s32 arg1);
+void func0f13e640(struct var800a41b0 *thing, u32 arg1);
 u32 func0f13e744(void);
 u32 func0f13e994(void);
 void func0f13eb44(void);