From d8145641351c3d43f4ae9bb4eb86772463d153e6 Mon Sep 17 00:00:00 2001
From: laserXdolphin <107103137+laserXdolphin@users.noreply.github.com>
Date: Wed, 17 Jul 2024 15:19:21 +0200
Subject: [PATCH] =?UTF-8?q?Implemented=20Disabling=20Union=20Room=20check?=
 =?UTF-8?q?=20when=20entering=20Pok=C3=A9mon=20Centers=20https://github.co?=
 =?UTF-8?q?m/pret/pokeemerald/wiki/Disabling-Union-Room-check-when-enterin?=
 =?UTF-8?q?g-Pok%C3%A9mon-Centers?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/scripts/cable_club.inc        | 1 -
 data/scripts/pkmn_center_nurse.inc | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index e810e354a5b8..488b55be7482 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -1257,7 +1257,6 @@ EventScript_CloseMossdeepGameCornerBarrier::
 	return
 
 CableClub_OnResume:
-	special InitUnionRoom
 	end
 
 MossdeepCity_GameCorner_1F_EventScript_InfoMan2::
diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc
index 64ccdfa77e55..c6d602067d92 100644
--- a/data/scripts/pkmn_center_nurse.inc
+++ b/data/scripts/pkmn_center_nurse.inc
@@ -21,7 +21,7 @@ EventScript_PkmnCenterNurse_HealPkmn::
 	waitmessage
 	call EventScript_PkmnCenterNurse_TakeAndHealPkmn
 	goto_if_unset FLAG_POKERUS_EXPLAINED, EventScript_PkmnCenterNurse_CheckPokerus
-	goto EventScript_PkmnCenterNurse_CheckTrainerHillAndUnionRoom
+	goto EventScript_PkmnCenterNurse_ReturnPkmn
 	end
 
 EventScript_PkmnCenterNurse_IllTakeYourPkmn::
@@ -83,7 +83,7 @@ EventScript_PkmnCenterNurse_PlayerWaitingInUnionRoom::
 EventScript_PkmnCenterNurse_CheckPokerus::
 	specialvar VAR_RESULT, IsPokerusInParty
 	goto_if_eq VAR_RESULT, TRUE, EventScript_PkmnCenterNurse_ExplainPokerus
-	goto_if_eq VAR_RESULT, FALSE, EventScript_PkmnCenterNurse_CheckTrainerHillAndUnionRoom
+	goto EventScript_PkmnCenterNurse_ReturnPkmn
 	end
 
 EventScript_PkmnCenterNurse_ExplainPokerus::