diff options
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 | 8 |
2 files changed, 6 insertions, 6 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 9a90f23f9..5c1af6700 100644 --- a/data/maps/BattleFrontier_OutsideEast/scripts.inc +++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc @@ -1,6 +1,6 @@ BattleFrontier_OutsideEast_MapScripts:: @ 8242C04 - map_script 5, BattleFrontier_OutsideEast_MapScript1_242C0F - map_script 3, BattleFrontier_OutsideEast_MapScript1_242C2D + map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_OutsideEast_MapScript1_242C0F + map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_OutsideEast_MapScript1_242C2D .byte 0 BattleFrontier_OutsideEast_MapScript1_242C0F: @ 8242C0F @@ -10,12 +10,12 @@ 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 BattleFrontier_OutsideEast_MapScript1_242C2D: @ 8242C2D - setvar VAR_0x40BC, 0 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 setflag FLAG_HIDE_BATTLE_TOWER_REPORTER call_if_unset FLAG_DEFEATED_SUDOWOODO, BattleFrontier_OutsideEast_EventScript_242C3F end |