Merge remote-tracking branch 'neon-fgs/coup' into port-friends-of-joanna

Author: cylonicboom

.github/workflows/c-cpp.yml

@@ -2,9 +2,9 @@ name: C/C++ CI
 
 on:
   push:
-    branches: [ "port", "port-friends-of-joanna" ]
+    branches: [  ]
   pull_request:
-    branches: [ "port" ]
+    branches: [  ]
   workflow_dispatch:
 
 jobs:
@@ -284,24 +284,16 @@ jobs:
         cache-key: flatpak-builder-${{ github.sha }}
         upload-artifact: false
 
-    # - name: Build Flatpak bundle
-    #   run: |
-    #     cd dist/linux/
-    #     flatpak-builder build --force-clean io.github.fgsfdsfgs.perfect_dark.yaml
-    #     flatpak build-export export build
-    #     flatpak build-bundle export io.github.fgsfdsfgs.perfect_dark.flatpak io.github.fgsfdsfgs.perfect_dark
-
     - name: Upload artifact
       uses: actions/upload-artifact@v4
       with:
         name: io.github.fgsfdsfgs.perfect_dark.flatpak
         path: io.github.fgsfdsfgs.perfect_dark.flatpak
         retention-days: 0
 
-
   publish-latest-build:
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/port'
+    if: github.ref == 'refs/heads/coup' || startsWith(github.ref, 'refs/heads/mod/') || startsWith(github.ref, 'refs/heads/builds/')
     needs: [build-i686-windows, build-i686-linux, build-x86_64-windows, build-x86_64-linux, build-arm64-nswitch, build-x86_64-osx, build-arm64-osx, build-flatpak-bundle]
     permissions:
       contents: write
@@ -323,7 +315,6 @@ jobs:
           zip -r ../ci-release/pd-i686-windows.zip pd-i686-windows
           zip -r ../ci-release/pd-x86_64-windows.zip pd-x86_64-windows
           zip -r ../ci-release/pd-arm64-nswitch.zip pd-arm64-nswitch
-          mv io.github.fgsfdsfgs.perfect_dark.flatpak/io.github.fgsfdsfgs.perfect_dark.flatpak ../ci-release/
           popd
           git tag --force ci-dev-build port
           git push --force origin ci-dev-build

README.md

@@ -8,6 +8,41 @@ Counter-op is highly experimental and mostly untested.
 
 [Setup instructions below.](https://github.com/cylonicboom/perfect-dark-neon/tree/port-friends-of-joanna?tab=readme-ov-file#building--setup-friends-of-joanna)
 
+# Catherine's Opinionated Unofficial Patches
+
+## `port` + Catherine's mods
+
+This is a collection of all my port mods merged together:
+
+![Screenshot 2025-03-16 at 03 35 29](https://github.com/user-attachments/assets/f479809d-e91f-4869-8c8b-c478ad5af590)
+
+
+# Mod: Moon Jump
+
+Reimplements the classic Moon Jump Gameshark code, with some differences: changing the player's elevation is not required to jump, and I added a seperate button for toggling gravity.
+
+![image](https://github.com/user-attachments/assets/09d3ef02-be38-4d54-921c-79cb9f6cf0f4)
+
+[Perfect Dark PC Port - Moon Jump [nRP5k1Zn1mc].webm](https://github.com/user-attachments/assets/52401da4-d36b-4e70-a66b-eff8815e889e)
+
+# Mod: Toggle Gangsta
+
+Adds a bindable button for toggling gangsta mode.
+
+![Screenshot 2025-02-21 at 19 23 56](https://github.com/user-attachments/assets/8de027b9-f40b-40da-913a-d15c9c41dcf5)
+![Screenshot 2025-02-21 at 19 24 38](https://github.com/user-attachments/assets/dc6b5a8f-5601-41d0-a273-f8f65c043c78)
+
+# Mod: Perfect Dark without Pausing
+
+[![](http://img.youtube.com/vi/MHwGS0cP-3g/0.jpg)](https://www.youtube.com/watch?v=MHwGS0cP-3g)
+
+
+The pausing-blur effect can now be disabled via an in-game option. Leave it off for an extra challenge. 
+
+To toggle: `Options -> Extended -> Video -> Enable Local Pausing`
+
+This branch closely follows `fgsfdsfgs/perfect_dark`@`port`
+
 # Perfect Dark port
 
 # Perfect Dark port (`port-net`)

include/PR/os_cont.h

@@ -21,7 +21,7 @@
 
 /*---------------------------------------------------------------------*
         Copyright (C) 1998 Nintendo. (Originated by SGI)
-        
+
         $RCSfile: os_cont.h,v $
         $Revision: 1.1 $
         $Date: 1998/10/09 08:01:05 $
@@ -47,7 +47,7 @@ extern "C" {
  */
 
 /*
- * Structure for controllers 
+ * Structure for controllers
  */
 
 typedef struct {
@@ -100,7 +100,7 @@ typedef struct {
 #ifdef _HW_VERSION_1
 #define CONT_FRAME_ERROR                0x2
 #define CONT_COLLISION_ERROR            0x1
-#endif 
+#endif
 
 /* Controller type */
 

port/src/main.c

@@ -182,6 +182,7 @@ PD_CONSTRUCTOR static void gameConfigInit(void)
 	configRegisterInt("Game.CenterHUD", &g_HudCenter, 0, 2);
 	configRegisterInt("Game.MenuMouseControl", &g_MenuMouseControl, 0, 1);
 	configRegisterFloat("Game.ScreenShakeIntensity", &g_ViShakeIntensityMult, 0.f, 10.f);
+	configRegisterInt("Game.PausingEnabled", &g_PausingEnabled, 0, 1);
 	configRegisterInt("Game.TickRateDivisor", &g_TickRateDiv, 0, 10);
 	configRegisterInt("Game.ExtraSleep", &g_TickExtraSleep, 0, 1);
 	configRegisterInt("Game.SkipIntro", &g_SkipIntro, 0, 1);

port/src/optionsmenu.c

@@ -980,6 +980,20 @@ static MenuItemHandlerResult menuhandlerCenterHUD(s32 operation, struct menuitem
 	return 0;
 }
 
+static MenuItemHandlerResult menuhandlerSetPausingEnabled(s32 operation, struct menuitem *item, union handlerdata *data)
+{
+	switch (operation) {
+	case MENUOP_GET:
+		return g_PausingEnabled;
+		break;
+	case MENUOP_SET:
+		g_PausingEnabled = data->checkbox.value;
+		break;
+	}
+
+	return 0;
+}
+
 static MenuItemHandlerResult menuhandlerScreenShake(s32 operation, struct menuitem *item, union handlerdata *data)
 {
 	switch (operation) {
@@ -1139,6 +1153,14 @@ struct menuitem g_ExtendedVideoMenuItems[] = {
 		20,
 		menuhandlerScreenShake,
 	},
+	{
+		MENUITEMTYPE_CHECKBOX,
+		0,
+		MENUITEMFLAG_LITERAL_TEXT,
+		(uintptr_t)"Enable Local Pausing",
+		20,
+		menuhandlerSetPausingEnabled,
+	},
 	{
 		MENUITEMTYPE_SEPARATOR,
 		0,
@@ -1646,7 +1668,10 @@ static const struct menubind menuBinds[] = {
 	{ CK_8000,   "Cycle Crouch [+]\n",  "N64 Ext 8000\n" },
 	{ CK_4000,   "Half Crouch [+]\n",   "N64 Ext 4000\n" },
 	{ CK_2000,   "Full Crouch [+]\n",   "N64 Ext 2000\n" },
-	{ CK_0040,   "Toggle Eyelids [+]\n", "N64 Ext 0040\n" },
+	{ CK_0080,   "Moon Jump [+]\n",     "N64 Ext 0080\n" }, // TODO: gate this behind a cheat
+	{ CK_0100,   "Toggle Gravity [+]\n","N64 Ext 0100\n" }, // TODO: gate this behind a cheat
+	{ CK_0040,   "Toggle Eyelids [+]\n","N64 Ext 0040\n" },
+	{ CK_0200,   "Toggle Gangsta [+]\n","N64 Ext 0200\n" },
 	{ CK_ACCEPT, "UI Accept [+]\n",     "EXT UI Accept\n" },
 	{ CK_CANCEL, "UI Cancel [+]\n",     "EXT UI Cancel\n" },
 };
@@ -1688,6 +1713,10 @@ struct menuitem g_ExtendedBindsMenuItems[] = {
 	DEFINE_MENU_BIND(),
 	DEFINE_MENU_BIND(),
 	DEFINE_MENU_BIND(),
+	DEFINE_MENU_BIND(),
+	DEFINE_MENU_BIND(),
+	DEFINE_MENU_BIND(),
+	DEFINE_MENU_BIND(),
 	{
 		MENUITEMTYPE_SEPARATOR,
 		0,

src/game/bondbike.c

@@ -209,7 +209,7 @@ void bbikeApplyMoveData(struct movedata *data)
 				|| contmode == CONTROLMODE_13
 				|| contmode == CONTROLMODE_11
 				|| contmode == CONTROLMODE_PC)
-			&& !lvIsPaused()) {
+			&& !g_Vars.currentplayer->pausemode) {
 		u32 lmask, rmask;
 		if (contmode == CONTROLMODE_PC) {
 			lmask = L_CBUTTONS;
@@ -218,8 +218,10 @@ void bbikeApplyMoveData(struct movedata *data)
 			lmask = L_JPAD | L_CBUTTONS;
 			rmask = R_JPAD | R_CBUTTONS;
 		}
-		data->digitalstepleft = joyCountButtonsOnSpecificSamples(0, contnum, lmask);
-		data->digitalstepright = joyCountButtonsOnSpecificSamples(0, contnum, rmask);
+		if (g_Vars.currentplayer->pausemode == PAUSEMODE_UNPAUSED) {
+			data->digitalstepleft = joyCountButtonsOnSpecificSamples(0, contnum, lmask);
+			data->digitalstepright = joyCountButtonsOnSpecificSamples(0, contnum, rmask);
+		}
 	}
 
 	// Forward/back

src/game/bondeyespy.c

@@ -9,6 +9,7 @@
 #include "game/player.h"
 #include "game/hudmsg.h"
 #include "game/inv.h"
+#include "game/lv.h"
 #include "game/mplayer/ingame.h"
 #include "game/playermgr.h"
 #include "game/stagetable.h"
@@ -702,7 +703,9 @@ void eyespyProcessInput(bool allowbuttons)
 	s8 c1sticky = joyGetStickY(contpad1);
 	s8 c2sticky;
 	u32 c1buttons = allowbuttons ? joyGetButtons(contpad1, 0xffffffff) : 0;
+	u32 c1buttonsthisframe = allowbuttons ? joyGetButtonsPressedThisFrame(contpad1, 0xffffffff): 0;
 	u32 c2buttons;
+	u32 c2buttonsthisframe;
 	bool domovecentre = true;
 	s32 controlmode = optionsGetControlMode(g_Vars.currentplayerstats->mpindex);
 
@@ -722,6 +725,7 @@ void eyespyProcessInput(bool allowbuttons)
 	f32 tmp;
 	u32 umask, dmask, lmask, rmask;
 
+	bool pausepressed;
 	if (controlmode == CONTROLMODE_PC) {
 		umask = U_CBUTTONS;
 		dmask = D_CBUTTONS;
@@ -740,6 +744,7 @@ void eyespyProcessInput(bool allowbuttons)
 		c2sticky = joyGetStickY(contpad2);
 
 		c2buttons = allowbuttons ? joyGetButtons(contpad2, 0xffffffff) : 0;
+		c2buttonsthisframe = allowbuttons ? joyGetButtonsPressedThisFrame(contpad2, 0xffffffff) : 0;
 	} else {
 #ifndef PLATFORM_N64
 		if (controlmode == CONTROLMODE_PC) {
@@ -753,25 +758,27 @@ void eyespyProcessInput(bool allowbuttons)
 		}
 #endif
 		c2buttons = c1buttons;
+		c2buttonsthisframe = c1buttonsthisframe;
 	}
 
+	pausepressed = c1buttonsthisframe & START_BUTTON;
 	if (controlmode == CONTROLMODE_13 || controlmode == CONTROLMODE_14) {
 		aimpressed = c1buttons & Z_TRIG;
 		shootpressed = c1buttons & A_BUTTON;
-		exitpressed = c1buttons & R_TRIG;
-		activatepressed = c1buttons & B_BUTTON;
+		exitpressed = c1buttonsthisframe & R_TRIG;
+		activatepressed = c1buttonsthisframe & B_BUTTON;
 	} else if (controlmode <= CONTROLMODE_14 || controlmode == CONTROLMODE_PC) {
 		aimpressed = c1buttons & (R_TRIG);
 		shootpressed = c1buttons & Z_TRIG;
 #ifndef PLATFORM_N64
 		if (controlmode == CONTROLMODE_PC) {
-			exitpressed = c1buttons & (BUTTON_WPNBACK | BUTTON_RADIAL);
-			activatepressed = c1buttons & (BUTTON_CANCEL_USE | BUTTON_ACCEPT_USE);
+			exitpressed = c1buttonsthisframe & (BUTTON_WPNBACK | BUTTON_RADIAL);
+			activatepressed = c1buttonsthisframe & (BUTTON_CANCEL_USE | BUTTON_ACCEPT_USE);
 		} else
 #endif
 		{
-			exitpressed = (c1buttons | c2buttons) & A_BUTTON;
-			activatepressed = (c1buttons | c2buttons) & B_BUTTON;
+			exitpressed = (c1buttonsthisframe | c2buttonsthisframe) & A_BUTTON;
+			activatepressed = (c1buttonsthisframe | c2buttonsthisframe) & B_BUTTON;
 		}
 	} else {
 		if (controlmode >= CONTROLMODE_23) {
@@ -782,8 +789,8 @@ void eyespyProcessInput(bool allowbuttons)
 			shootpressed = c1buttons & Z_TRIG;
 		}
 
-		exitpressed = (c1buttons | c2buttons) & A_BUTTON;
-		activatepressed = (c1buttons | c2buttons) & B_BUTTON;
+		exitpressed = (c1buttonsthisframe | c2buttonsthisframe) & A_BUTTON;
+		activatepressed = (c1buttonsthisframe | c2buttonsthisframe) & B_BUTTON;
 	}
 
 	// Apply safe zone for c1stickx
@@ -932,7 +939,7 @@ void eyespyProcessInput(bool allowbuttons)
 				&& g_Vars.currentplayer->pausemode == PAUSEMODE_UNPAUSED
 				&& (c1buttons & START_BUTTON)) {
 			if (!g_Vars.mplayerisrunning) {
-				playerPause(MENUROOT_MAINMENU);
+				playerStartPause(MENUROOT_MAINMENU);
 			} else {
 				mpPushPauseDialog();
 			}
@@ -1187,33 +1194,49 @@ void eyespyProcessInput(bool allowbuttons)
 		return;
 	}
 
-	// Handle trigger
-	if (g_Vars.currentplayer->eyespy->camerashuttertime <= 0 && shootpressed && g_Vars.currentplayer->eyespy->active) {
-		if (g_Vars.currentplayer->eyespy->camerabuttonheld == false) {
-			g_Vars.currentplayer->eyespy->camerabuttonheld = true;
-			g_Vars.currentplayer->eyespy->camerashuttertime = TICKS(24);
+	// handle pause menu
+	if (!g_Vars.currentplayer->pausemode) {
+		if (g_Vars.currentplayer->eyespy->active && !g_Vars.currentplayer->isdead) {
+			if (!( g_Vars.currentplayer->pausemode & (PAUSEMODE_PAUSED | PAUSEMODE_PAUSING) ) && (pausepressed)) {
+				if (g_Vars.mplayerisrunning == false) {
+					if (g_Vars.lvframenum > 15) {
+						playerStartPause(MENUROOT_MAINMENU);
+					}
+				} else {
+					mpPushPauseDialog();
+				}
+			}
+
+		}
+		// Handle trigger
+		if (g_Vars.currentplayer->eyespy->camerashuttertime <= 0 && shootpressed && g_Vars.currentplayer->eyespy->active) {
+			if (g_Vars.currentplayer->eyespy->camerabuttonheld == false) {
+				g_Vars.currentplayer->eyespy->camerabuttonheld = true;
+				g_Vars.currentplayer->eyespy->camerashuttertime = TICKS(24);
+			}
+		} else {
+			g_Vars.currentplayer->eyespy->camerabuttonheld = false;
 		}
-	} else {
-		g_Vars.currentplayer->eyespy->camerabuttonheld = false;
-	}
 
-	// Handle exit
-	if (exitpressed && g_Vars.currentplayer->eyespy->active) {
-		g_Vars.currentplayer->eyespy->active = false;
-		g_Vars.currentplayer->devicesactive &= ~DEVICE_EYESPY;
-	}
+		// Handle exit
+		if (exitpressed && g_Vars.currentplayer->eyespy->active) {
+			g_Vars.currentplayer->eyespy->active = false;
+			g_Vars.currentplayer->devicesactive &= ~DEVICE_EYESPY;
+		}
 
-	// Handle B button activation
-	if (activatepressed && g_Vars.currentplayer->eyespy->active) {
-		if (g_Vars.currentplayer->eyespy->buttonheld == false) {
-			g_Vars.currentplayer->eyespy->buttonheld = true;
-			g_Vars.currentplayer->eyespy->opendoor = true;
+		// Handle B button activation
+		// but only if not in a pause-like state
+		if (activatepressed && g_Vars.currentplayer->eyespy->active) {
+			if (g_Vars.currentplayer->eyespy->buttonheld == false) {
+				g_Vars.currentplayer->eyespy->buttonheld = true;
+				g_Vars.currentplayer->eyespy->opendoor = true;
+			} else {
+				g_Vars.currentplayer->eyespy->opendoor = false;
+			}
 		} else {
 			g_Vars.currentplayer->eyespy->opendoor = false;
+			g_Vars.currentplayer->eyespy->buttonheld = false;
 		}
-	} else {
-		g_Vars.currentplayer->eyespy->opendoor = false;
-		g_Vars.currentplayer->eyespy->buttonheld = false;
 	}
 
 	g_Vars.currentplayer->eyespy->hit = g_EyespyHit;

src/game/bondgun.c

@@ -3645,6 +3645,13 @@ u8 *bgunGetGunMem(void)
 	return g_Vars.currentplayer->gunctrl.gunmem;
 }
 
+#ifndef PLATFORM_N64
+u8 *bgunGetInvMem(void)
+{
+	return g_Vars.currentplayer->gunctrl.invmem;
+}
+#endif
+
 u32 bgunCalculateGunMemCapacity(void)
 {
 	if (IS4MB() && PLAYERCOUNT() == 2) {
@@ -3662,7 +3669,8 @@ u32 bgunCalculateGunMemCapacity(void)
 			 return g_BgunGunMemBaseSizeDefault + 25 * 1024;
 		}
 #else
-		return g_BgunGunMemBaseSizeDefault + stageGetCurrent()->extragunmem;
+		// extra space to store invmen
+		return (g_BgunGunMemBaseSizeDefault * 2) + stageGetCurrent()->extragunmem;
 #endif
 	}
 

src/game/bondgunreset.c

@@ -151,6 +151,8 @@ void bgunReset(void)
 	}
 
 	g_Vars.currentplayer->gunctrl.gunmem = mempAlloc(i, MEMPOOL_STAGE);
+	g_Vars.currentplayer->gunctrl.wantsgangsta = 0;
+	g_Vars.currentplayer->gunctrl.invmem = mempAlloc(i, MEMPOOL_STAGE);
 	g_Vars.currentplayer->gunctrl.handfilenum = 0;
 	g_Vars.currentplayer->gunctrl.handmemloadptr = 0;
 	g_Vars.currentplayer->gunctrl.handmemloadremaining = 0;