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

Merge branch 'unionpatch' into 'main' 

Union room shenanigans (fixes !4)

See merge request tbld/game!10
This commit is contained in:
Jess 2022-10-11 17:52:45 +00:00
parent f0a61f8324 7d8b1ff8a7
commit cb19ebccec
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 by default, but can be easily re-enabled, see docs.
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 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::