summaryrefslogtreecommitdiff
path: root/data/maps/MossdeepCity_Gym/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/MossdeepCity_Gym/scripts.inc')
-rw-r--r--data/maps/MossdeepCity_Gym/scripts.inc12
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc
index fc1a73b4d..7fc98dc54 100644
--- a/data/maps/MossdeepCity_Gym/scripts.inc
+++ b/data/maps/MossdeepCity_Gym/scripts.inc
@@ -1,5 +1,5 @@
MossdeepCity_Gym_MapScripts:: @ 8220800
- map_script 1, MossdeepCity_Gym_MapScript1_220806
+ map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_Gym_MapScript1_220806
.byte 0
MossdeepCity_Gym_MapScript1_220806: @ 8220806
@@ -57,7 +57,7 @@ MossdeepCity_Gym_EventScript_220898:: @ 8220898
MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1
message MossdeepCity_Gym_Text_22196A
waitmessage
- call MossdeepCity_Gym_EventScript_27207E
+ call Common_EventScript_PlayGymBadgeFanfare
msgbox MossdeepCity_Gym_Text_221999, MSGBOX_DEFAULT
setflag FLAG_DEFEATED_MOSSDEEP_GYM
setflag FLAG_BADGE07_GET
@@ -71,9 +71,9 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1
clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA
clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA
clearflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN
- setvar VAR_0x405D, 1
+ setvar VAR_MOSSDEEP_STATE, 1
setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN
- setvar VAR_0x409F, 1
+ setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 1
call MossdeepCity_Gym_EventScript_22095B
closemessage
delay 30
@@ -89,7 +89,7 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1
MossdeepCity_Gym_EventScript_220937:: @ 8220937
giveitem_std ITEM_TM04
compare VAR_RESULT, 0
- goto_if_eq MossdeepCity_Gym_EventScript_272054
+ goto_if_eq Common_EventScript_ShowBagIsFull
msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT
setflag FLAG_RECEIVED_TM04
release
@@ -98,7 +98,7 @@ MossdeepCity_Gym_EventScript_220937:: @ 8220937
MossdeepCity_Gym_EventScript_22095B:: @ 822095B
giveitem_std ITEM_TM04
compare VAR_RESULT, 0
- goto_if_eq MossdeepCity_Gym_EventScript_27205E
+ goto_if_eq Common_EventScript_BagIsFull
msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT
setflag FLAG_RECEIVED_TM04
return