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

chore: disable union room for emulator users #7

Closed
supersonicsataa wants to merge 2 commits from no-union-check into main
pull from: no-union-check
merge into: tbld:main
Conversation 6 Commits 2 Files Changed 2 +4 -3
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 744828b4ce - Show all commits

1
agbcc Submodule

@ -0,0 +1 @@
Subproject commit faa413eb0e76fad87875b7680f77e0c43df694cd

2
data/scripts/cable_club.inc
View File

@ -1258,7 +1258,7 @@ EventScript_CloseMossdeepGameCornerBarrier::
return return
CableClub_OnResume: CableClub_OnResume:
special InitUnionRoom @ special InitUnionRoom commented out to increase performance, as mGBA does not support emulating a Wireless Adapter.
end end
MossdeepCity_GameCorner_1F_EventScript_InfoMan2:: MossdeepCity_GameCorner_1F_EventScript_InfoMan2::

4
data/scripts/pkmn_center_nurse.inc
View File

@ -17,7 +17,7 @@ EventScript_PkmnCenterNurse_HealPkmn::
waitmessage waitmessage
call EventScript_PkmnCenterNurse_TakeAndHealPkmn call EventScript_PkmnCenterNurse_TakeAndHealPkmn
goto_if_unset FLAG_POKERUS_EXPLAINED, EventScript_PkmnCenterNurse_CheckPokerus 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 end
EventScript_PkmnCenterNurse_IllTakeYourPkmn:: EventScript_PkmnCenterNurse_IllTakeYourPkmn::
@ -75,7 +75,7 @@ EventScript_PkmnCenterNurse_PlayerWaitingInUnionRoom::
EventScript_PkmnCenterNurse_CheckPokerus:: EventScript_PkmnCenterNurse_CheckPokerus::
specialvar VAR_RESULT, IsPokerusInParty specialvar VAR_RESULT, IsPokerusInParty
goto_if_eq VAR_RESULT, TRUE, EventScript_PkmnCenterNurse_ExplainPokerus 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 end
EventScript_PkmnCenterNurse_ExplainPokerus:: EventScript_PkmnCenterNurse_ExplainPokerus::