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

src/include/constants.h

@@ -1692,6 +1692,10 @@
 #define MENUITEMTYPE_CONTROLLER  0x19
 #define MENUITEMTYPE_END         0x1a
 
+#ifndef PLATFORM_N64
+#define MENUITEMTYPE_COLORBOX    0x1b
+#endif 
+
 #define MENUMODELFLAG_HASSCALE    0x01
 #define MENUMODELFLAG_HASPOSITION 0x02
 #define MENUMODELFLAG_HASROTATION 0x04
@@ -2885,6 +2889,7 @@
 #define MPOPTION_HTM_SHOWONRADAR        0x00040000
 #define MPOPTION_PAC_HIGHLIGHTTARGET    0x00080000
 #define MPOPTION_PAC_SHOWONRADAR        0x00100000
+#define MPOPTION_SPAWNWITHWEAPON        0x00200000
 
 #define MPPAUSEMODE_UNPAUSED 0
 #define MPPAUSEMODE_PAUSED   1
@@ -4714,6 +4719,10 @@ enum weaponnum {
 #define CROUCHMODE_TOGGLE 2 // press the crouch buttons to toggle stance
 #define CROUCHMODE_TOGGLE_ANALOG (CROUCHMODE_ANALOG | CROUCHMODE_TOGGLE)
 
+#define CROSSHAIR_HEALTH_OFF 0
+#define CROSSHAIR_HEALTH_ON_GREEN 1
+#define CROSSHAIR_HEALTH_ON_WHITE 2
+
 #endif
 
 #endif

src/include/data.h

@@ -545,8 +545,11 @@ extern u32 g_HudAlignModeR;
 extern s32 g_PrevFrameFb;
 extern s32 g_BlurFb;
 extern s32 g_BlurFbCapTimer;
+extern bool g_BlurFbDirty;
 extern s32 g_TickRateDiv;
 extern s32 g_MusicDisableMpDeath;
+extern s32 g_BgunGeMuzzleFlashes;
+extern s32 g_FileAutoSelect;
 
 #define PLAYER_EXTCFG() g_PlayerExtCfg[g_Vars.currentplayerstats->mpindex & 3]
 #define PLAYER_DEFAULT_FOV (PLAYER_EXTCFG().fovy)

src/include/game/menuitem.h

@@ -32,6 +32,10 @@ Gfx *menuitemLabelRender(Gfx *gdl, struct menurendercontext *context);
 
 Gfx *menuitemMeterRender(Gfx *gdl, struct menurendercontext *context);
 
+#ifndef PLATFORM_N64
+Gfx *menuitemColorBoxRender(Gfx *gdl, struct menurendercontext *context);
+#endif
+
 Gfx *menuitemSelectableRender(Gfx *gdl, struct menurendercontext *context);
 bool menuitemSelectableTick(struct menuitem *item, struct menuinputs *inputs, u32 tickflags);
 

src/include/types.h

@@ -6139,6 +6139,9 @@ struct extplayerconfig {
 	f32 radialmenuspeed;
 	f32 crosshairsway;
 	s32 extcontrols;
+	u32 crosshaircolour;
+	u32 crosshairsize;
+	s32 crosshairhealth;
 };
 
 #endif