diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-09 11:14:37 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-09 11:14:37 -0700 |
| commit | 84c5825c8ecc9804313ec3b1a8dcc0271ee4c2cc (patch) | |
| tree | c90f705e43f2b1728ed1e0400312b7d6c5c81c21 /data/scripts | |
| parent | 562dcc4bcdc14d5b6c0bb2a638410156945cdd41 (diff) | |
| parent | 91f869d1e6ed1ef12ad4b2255d3762e3b1b51429 (diff) | |
Merge pull request #589 from PikalaxALT/unk_debug_menu_3
Unk Debug Menu 3 and Start Menu Debug
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/maps/LilycoveCity_Harbor.inc | 2 | ||||
| -rw-r--r-- | data/scripts/maps/SouthernIsland_Interior.inc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 5dc217585..d32107396 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -106,7 +106,7 @@ LilycoveCity_Harbor_EventScript_1599E4:: @ 81599E4 LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE goto_if_unset FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_1598BA - goto_if_set FLAG_ECOUNTERED_LATIAS_OR_LATIOS, LilycoveCity_Harbor_EventScript_1598BA + goto_if_set FLAG_ENCOUNTERED_LATIAS_OR_LATIOS, LilycoveCity_Harbor_EventScript_1598BA goto_if_unset FLAG_SYS_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_1598BA msgbox LilycoveCity_Harbor_Text_1C50F2, 4 closemessage diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 5878a43d5..1a537cfb0 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -43,9 +43,9 @@ SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B end SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 - goto_if_set FLAG_ECOUNTERED_LATIAS_OR_LATIOS, SouthernIsland_Interior_EventScript_160C08 + goto_if_set FLAG_ENCOUNTERED_LATIAS_OR_LATIOS, SouthernIsland_Interior_EventScript_160C08 goto_if_unset FLAG_SYS_HAS_EON_TICKET, SouthernIsland_Interior_EventScript_160C08 - setflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS + setflag FLAG_ENCOUNTERED_LATIAS_OR_LATIOS special SpawnCameraDummy applymovement 127, SouthernIsland_Interior_Movement_160C12 waitmovement 0 |