From 7d8b1ff8a70d896362d595b20a487d2f8431da0f Mon Sep 17 00:00:00 2001 From: BRODY MORAN Date: Tue, 11 Oct 2022 00:31:02 +0000 Subject: [PATCH] Union room shenanigans (fixes !4) --- data/scripts/cable_club.inc | 2 +- data/scripts/pkmn_center_nurse.inc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 0ab93c4..53ad8e6 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -1258,7 +1258,7 @@ EventScript_CloseMossdeepGameCornerBarrier:: return CableClub_OnResume: - special InitUnionRoom +@ special InitUnionRoom commented out by default, but can be easily re-enabled, see docs. end MossdeepCity_GameCorner_1F_EventScript_InfoMan2:: diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc index b145287..87f511e 100644 --- a/data/scripts/pkmn_center_nurse.inc +++ b/data/scripts/pkmn_center_nurse.inc @@ -17,7 +17,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:: @@ -75,7 +75,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_if_eq VAR_RESULT, FALSE, EventScript_PkmnCenterNurse_ReturnPkmn end EventScript_PkmnCenterNurse_ExplainPokerus::