tbld
/
tumbledemerald-legacy
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases 5 Wiki Activity

Merge branch 'no-union-check' into 'main' 

chore: disable union room for emulator users

See merge request tbld/game!4
This commit is contained in:
Jess 2022-05-24 13:29:41 +00:00
parent 5408877964 f0dc04e0e2
commit bf59ed991b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/scripts/cable_club.inc
View File

@ -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::

4
data/scripts/pkmn_center_nurse.inc
View File

@ -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::