diff options
| author | huderlem <huderlem@gmail.com> | 2019-11-08 17:23:11 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-08 17:23:11 -0600 |
| commit | b38bc9a3a2d93e3482643b257685057e339dec9f (patch) | |
| tree | 1175aa70b24f9c07b8089e23b2e8e7fdcba1b524 /data/scripts | |
| parent | 030784dece994daf90ac1cb06a44912245b519ea (diff) | |
| parent | 9140594b233b08d05d0832b62d3e64d50528a460 (diff) | |
Merge pull request #885 from GriffinRichards/doc-littleroot
Document Littleroot scripts
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/hall_of_fame.inc | 4 | ||||
| -rw-r--r-- | data/scripts/players_house.inc | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/data/scripts/hall_of_fame.inc b/data/scripts/hall_of_fame.inc index c57358dd5..91a88f348 100644 --- a/data/scripts/hall_of_fame.inc +++ b/data/scripts/hall_of_fame.inc @@ -43,8 +43,8 @@ EverGrandeCity_HallOfFame_EventScript_ShowStevensHouseBeldum:: @ 827183F return EverGrandeCity_HallOfFame_EventScript_ReadyReceiveSSTicketEvent:: @ 8271843 - setvar VAR_LITTLEROOT_HOUSES_STATE, 3 - setvar VAR_LITTLEROOT_HOUSES_STATE_2, 3 + setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 3 + setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 3 clearflag FLAG_HIDE_PLAYERS_HOUSE_DAD return diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index acb1536e8..3a0675e5e 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -305,9 +305,9 @@ PlayersHouse_1F_Movement_MomReturnToSeatFemale: @ 82929C1 PlayersHouse_1F_EventScript_Mom:: @ 82929C5 lock faceplayer - compare VAR_LITTLEROOT_HOUSES_STATE, 4 + compare VAR_LITTLEROOT_HOUSES_STATE_MAY, 4 goto_if_eq PlayersHouse_1F_EventScript_DontPushYourselfTooHard - compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 + compare VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 4 goto_if_eq PlayersHouse_1F_EventScript_DontPushYourselfTooHard goto_if_set FLAG_HAS_MATCH_CALL, PlayersHouse_1F_EventScript_TryRegisterMom goto_if_set FLAG_RESCUED_BIRCH, PlayersHouse_1F_EventScript_MomHealsParty @@ -502,8 +502,8 @@ PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV:: @ 8292AF2 copyvar VAR_ROAMER_POKEMON, VAR_RESULT msgbox PlayersHouse_1F_Text_StillUnknownPokemon, MSGBOX_DEFAULT closemessage - setvar VAR_LITTLEROOT_HOUSES_STATE, 4 - setvar VAR_LITTLEROOT_HOUSES_STATE_2, 4 + setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 4 + setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 4 releaseall end |