From 744828b4ce69a34f29619d4858e459e7193b671f Mon Sep 17 00:00:00 2001 From: BRODY MORAN Date: Tue, 24 May 2022 12:27:13 +0000 Subject: [PATCH 1/2] chore: disable union room for emulator users This will speed up the game on mGBA, but will disable Wireless Adapter features. Therefore, I will also start releasing builds without this patch. All previous releases have full Wireless Adapter support. --- agbcc | 1 + data/scripts/cable_club.inc | 2 +- data/scripts/pkmn_center_nurse.inc | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) create mode 160000 agbcc diff --git a/agbcc b/agbcc new file mode 160000 index 0000000..faa413e --- /dev/null +++ b/agbcc @@ -0,0 +1 @@ +Subproject commit faa413eb0e76fad87875b7680f77e0c43df694cd diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 0ab93c4..6f25f94 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 to increase performance, as mGBA does not support emulating a Wireless Adapter. end MossdeepCity_GameCorner_1F_EventScript_InfoMan2:: diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc index b145287..f9c45fe 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 goto EventScript_PkmnCenterNurse_ReturnPkmn @ disable Union Room to increase performance. 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:: From f0dc04e0e238688815a11e15114672675ce46b41 Mon Sep 17 00:00:00 2001 From: BRODY MORAN Date: Tue, 24 May 2022 12:32:02 +0000 Subject: [PATCH 2/2] chore: remove agbcc --- agbcc | 1 - 1 file changed, 1 deletion(-) delete mode 160000 agbcc diff --git a/agbcc b/agbcc deleted file mode 160000 index faa413e..0000000 --- a/agbcc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit faa413eb0e76fad87875b7680f77e0c43df694cd