diff options
Diffstat (limited to 'data/maps/FallarborTown')
| -rw-r--r-- | data/maps/FallarborTown/map.json | 8 | ||||
| -rw-r--r-- | data/maps/FallarborTown/scripts.inc | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json index 4afffa73c..863319184 100644 --- a/data/maps/FallarborTown/map.json +++ b/data/maps/FallarborTown/map.json @@ -123,7 +123,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FallarborTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -131,7 +131,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FallarborTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -147,7 +147,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FallarborTown_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -163,7 +163,7 @@ "y": 15, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "FallarborTown_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc index 5e06ed4cb..50e19cfe5 100644 --- a/data/maps/FallarborTown/scripts.inc +++ b/data/maps/FallarborTown/scripts.inc @@ -1,10 +1,10 @@ FallarborTown_MapScripts:: @ 81EB1FA - map_script 3, FallarborTown_MapScript1_1EB200 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_MapScript1_1EB200 .byte 0 FallarborTown_MapScript1_1EB200: @ 81EB200 setflag FLAG_VISITED_FALLARBOR_TOWN - setvar VAR_0x4086, 0 + setvar VAR_LINK_CONTEST_ROOM_STATE, 0 clearflag FLAG_CONTEST_SKETCH_CREATED end |