diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-06-14 12:50:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-14 12:50:57 -0400 |
| commit | 308bf88e6078a243c3172f8f5312de6dd5f28a7b (patch) | |
| tree | 68f06b5917facd553e4260b64684e60b133671d7 /data/maps | |
| parent | 117c3fb8cc0f476cc3408afdb316f3ece41a1fe4 (diff) | |
| parent | cac04f6033d63dd645e4d54da458ad32ea32efa6 (diff) | |
Merge pull request #68 from pret/ss_anne
Ss anne
Diffstat (limited to 'data/maps')
| -rw-r--r-- | data/maps/SSAnne_Exterior/scripts.inc | 4 | ||||
| -rw-r--r-- | data/maps/VermilionCity/map.json | 4 | ||||
| -rw-r--r-- | data/maps/VermilionCity/scripts.inc | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index 0d08a0152..b0112c459 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -20,13 +20,13 @@ SSAnne_Exterior_160859:: @ 8160859 call_if 4, EventScript_1608AC fadenewbgm BGM_FRLG_SURF delay 50 - special sub_815D334 + special Special_SSAnneDepartureCutscene waitstate removeobject 1 applymovement 255, Movement_1608B7 waitmovement 0 setvar VAR_MAP_SCENE_VERMILION_CITY, 2 - setvar VAR_0x4053, 0 + setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 0 warp MAP_VERMILION_CITY, 255, 23, 34 waitstate releaseall diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index 30efc81c4..d041e9157 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -207,7 +207,7 @@ "x": 22, "y": 33, "elevation": 0, - "var": "VAR_0x4053", + "var": "VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER", "var_value": 0, "script": "VermilionCity_EventScript_166B8A" }, @@ -216,7 +216,7 @@ "x": 23, "y": 33, "elevation": 0, - "var": "VAR_0x4053", + "var": "VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER", "var_value": 0, "script": "VermilionCity_EventScript_166B91" }, diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index 1f476abf3..c809fd7bd 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -200,7 +200,7 @@ VermilionCity_EventScript_166B91:: @ 8166B91 VermilionCity_EventScript_166B98:: @ 8166B98 lockall - setvar VAR_0x4053, 0 + setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 0 releaseall end @@ -215,7 +215,7 @@ EventScript_166BA0:: @ 8166BA0 checkflag FLAG_0x234 goto_if 0, EventScript_166BDE msgbox gUnknown_817FA77 - setvar VAR_0x4053, 1 + setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 1 releaseall end |