diff options
Diffstat (limited to 'data/maps/MossdeepCity/scripts.inc')
| -rw-r--r-- | data/maps/MossdeepCity/scripts.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index b504d7004..493cded0a 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -1,5 +1,5 @@ MossdeepCity_MapScripts:: @ 81E4A96 - map_script 3, MossdeepCity_MapScript1_1E4A9C + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_MapScript1_1E4A9C .byte 0 MossdeepCity_MapScript1_1E4A9C: @ 81E4A9C @@ -7,7 +7,7 @@ MossdeepCity_MapScript1_1E4A9C: @ 81E4A9C clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 - call_if_set FLAG_SYS_WEATHER_CTRL, MossdeepCity_EventScript_27207A + call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end MossdeepCity_EventScript_1E4AB2:: @ 81E4AB2 @@ -94,7 +94,7 @@ MossdeepCity_EventScript_1E4B41:: @ 81E4B41 removeobject 12 removeobject 13 delay 30 - setvar VAR_0x405D, 2 + setvar VAR_MOSSDEEP_STATE, 2 setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA releaseall end @@ -216,7 +216,7 @@ MossdeepCity_EventScript_1E4C10:: @ 81E4C10 lock faceplayer msgbox MossdeepCity_Text_1E5213, MSGBOX_DEFAULT - applymovement VAR_LAST_TALKED, MossdeepCity_Movement_2725A2 + applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end @@ -231,7 +231,7 @@ MossdeepCity_EventScript_1E4C26:: @ 81E4C26 msgbox MossdeepCity_Text_1E4D5B, MSGBOX_DEFAULT giveitem_std ITEM_KINGS_ROCK compare VAR_RESULT, 0 - goto_if_eq MossdeepCity_EventScript_272054 + goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_KINGS_ROCK release end @@ -259,7 +259,7 @@ MossdeepCity_EventScript_1E4C85:: @ 81E4C85 call_if_eq MossdeepCity_EventScript_1E4CB0 compare VAR_FACING, 4 call_if_eq MossdeepCity_EventScript_1E4CC2 - addvar VAR_0x40D1, 1 + addvar VAR_SCOTT_STATE, 1 removeobject 16 release end |