Merge branch 'port' of https://github.com/fgsfdsfgs/perfect_dark into port-net

src/include/constants.h

@@ -70,7 +70,7 @@
 #define LINEHEIGHT          (VERSION == VERSION_JPN_FINAL ? 14 : 11)
 #define MIXCOLOUR(dialog, property) dialog->transitionfrac < 0.0f ? g_MenuColours[dialog->type].property : colourBlend(g_MenuColours[dialog->type2].property, g_MenuColours[dialog->type].property, dialog->colourweight)
 #define MPCHR(index)        ((index) < MAX_PLAYERS ? &g_PlayerConfigsArray[index].base : &g_BotConfigsArray[(index) - MAX_PLAYERS].base)
-#define RANDOMFRAC()        (random() * (1.0f / U32_MAX))
+#define RANDOMFRAC()        (rngRandom() * (1.0f / U32_MAX))
 #define SECSTOTIME240(secs) (secs * 240)
 #define SECSTOTIME60(secs)  (secs * 60)
 #define PFS(device)         (device == SAVEDEVICE_GAMEPAK ? NULL : &g_Pfses[device])

src/include/lib/rng.h

@@ -4,7 +4,7 @@
 #include "data.h"
 #include "types.h"
 
-u32 random(void);
+u32 rngRandom(void);
 u32 rngRotateSeed(u64 *value);
 
 #endif