diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-25 02:24:20 -0500 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-25 02:24:20 -0500 |
| commit | 4e5fae008625d236d98d4958594c938bc17f83da (patch) | |
| tree | 38d9d2e8215684ff90f8e50c7dd2efd40a2cbc71 /data/maps/BattleFrontier_OutsideEast | |
| parent | 87859a655b810aeaad7e7e1f5b066731f7e79ece (diff) | |
| parent | a589d4a630a130e78bdf0819b807a133562d4449 (diff) | |
Merge branch 'master' into event-vars
Diffstat (limited to 'data/maps/BattleFrontier_OutsideEast')
| -rw-r--r-- | data/maps/BattleFrontier_OutsideEast/map.json | 4 | ||||
| -rw-r--r-- | data/maps/BattleFrontier_OutsideEast/scripts.inc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/BattleFrontier_OutsideEast/map.json b/data/maps/BattleFrontier_OutsideEast/map.json index e119f89a0..341b20321 100644 --- a/data/maps/BattleFrontier_OutsideEast/map.json +++ b/data/maps/BattleFrontier_OutsideEast/map.json @@ -515,7 +515,7 @@ "y": 51, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "BattleFrontier_OutsideEast_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -523,7 +523,7 @@ "y": 51, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "BattleFrontier_OutsideEast_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" } ] }
\ No newline at end of file diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc index 2016df74c..5958860eb 100644 --- a/data/maps/BattleFrontier_OutsideEast/scripts.inc +++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc @@ -10,7 +10,7 @@ BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, 7 - goto_if_ne BattleFrontier_OutsideEast_EventScript_27374E + goto_if_ne Common_EventScript_NopReturn removeobject VAR_LAST_TALKED return |