summaryrefslogtreecommitdiff
path: root/data/maps/NavelRock_Bottom/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/NavelRock_Bottom/scripts.inc')
-rw-r--r--data/maps/NavelRock_Bottom/scripts.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/NavelRock_Bottom/scripts.inc b/data/maps/NavelRock_Bottom/scripts.inc
index cd26de91d..8a617236c 100644
--- a/data/maps/NavelRock_Bottom/scripts.inc
+++ b/data/maps/NavelRock_Bottom/scripts.inc
@@ -1,6 +1,6 @@
NavelRock_Bottom_MapScripts:: @ 8269255
- map_script 3, NavelRock_Bottom_MapScript1_269260
- map_script 5, NavelRock_Bottom_MapScript1_269284
+ map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Bottom_MapScript1_269260
+ map_script MAP_SCRIPT_ON_RESUME, NavelRock_Bottom_MapScript1_269284
.byte 0
NavelRock_Bottom_MapScript1_269260: @ 8269260
@@ -13,7 +13,7 @@ NavelRock_Bottom_EventScript_269273:: @ 8269273
return
NavelRock_Bottom_EventScript_269277:: @ 8269277
- goto_if_set FLAG_DEFEATED_LUGIA, NavelRock_Bottom_EventScript_27374E
+ goto_if_set FLAG_DEFEATED_LUGIA, Common_EventScript_NopReturn
clearflag FLAG_HIDE_LUGIA
return
@@ -24,7 +24,7 @@ NavelRock_Bottom_MapScript1_269284: @ 8269284
NavelRock_Bottom_EventScript_26928E:: @ 826928E
specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, 7
- goto_if_ne NavelRock_Bottom_EventScript_27374E
+ goto_if_ne Common_EventScript_NopReturn
removeobject 1
return