From ec09d4a6ca2cd7a1425201757a257deddc80eb4c Mon Sep 17 00:00:00 2001
From: tmyqlfpir <80724828+tmyqlfpir@users.noreply.github.com>
Date: Sun, 20 Aug 2023 23:19:59 +1000
Subject: [PATCH] Use already existing JPN fix

---
 src/game/activemenu.c     | 4 ----
 src/game/activemenutick.c | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/game/activemenu.c b/src/game/activemenu.c
index 89ca6f5d7..f3f496a2a 100644
--- a/src/game/activemenu.c
+++ b/src/game/activemenu.c
@@ -609,9 +609,6 @@ void amChangeScreen(s32 step)
 		if (g_AmMenus[g_AmIndex].allbots) {
 			// Weapon selection, second function, and bot command menu
 
-#ifndef PLATFORM_N64 // fix for port
-			maxscreenindex = g_Vars.currentplayer->numaibuddies > 0 ? 2 : 1;
-#else
 			// @bug: This is missing a check to see if there are any bots on
 			// your team. In most cases this isn't a problem because the player
 			// opens the screen for a single bot then uses R to switch to all
@@ -621,7 +618,6 @@ void amChangeScreen(s32 step)
 			// part runs first and sets the screen index to an invalid value,
 			// causing a crash.
 			maxscreenindex = 2;
-#endif
 		} else {
 			// Weapon selection, second function and one for each AI buddy
 			maxscreenindex = g_Vars.currentplayer->numaibuddies + 1;
diff --git a/src/game/activemenutick.c b/src/game/activemenutick.c
index de1a0cd6e..71c96a318 100644
--- a/src/game/activemenutick.c
+++ b/src/game/activemenutick.c
@@ -77,7 +77,7 @@ void amTick(void)
 					}
 
 					if (buttonsstate & A_BUTTON) {
-#if VERSION >= VERSION_JPN_FINAL
+#if VERSION >= VERSION_JPN_FINAL || !defined(PLATFORM_N64)
 						if (g_Vars.currentplayer->numaibuddies > 0) {
 							g_AmMenus[g_AmIndex].allbots = true;
 						}
@@ -91,7 +91,7 @@ void amTick(void)
 					}
 
 					if ((buttonsstate & R_TRIG) || (buttonsstate & L_TRIG)) {
-#if VERSION >= VERSION_JPN_FINAL
+#if VERSION >= VERSION_JPN_FINAL || !defined(PLATFORM_N64)
 						if (g_Vars.currentplayer->numaibuddies > 0) {
 							g_AmMenus[g_AmIndex].allbots = true;
 						}