summaryrefslogtreecommitdiff
path: root/maps/Route40.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route40.asm')
-rw-r--r--maps/Route40.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/maps/Route40.asm b/maps/Route40.asm
index 73f089bd2..9124da140 100644
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -12,13 +12,13 @@ const_value set 2
const ROUTE40_LASS2
const ROUTE40_STANDING_YOUNGSTER
-Route40_MapScriptHeader:
+Route40_MapScripts:
.SceneScripts:
db 0
.MapCallbacks:
db 1
- dbw MAPCALLBACK_OBJECTS, .MonicaCallback
+ callback MAPCALLBACK_OBJECTS, .MonicaCallback
.MonicaCallback:
clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
@@ -79,7 +79,7 @@ Route40Lass1Script:
jumptextfaceplayer Route40Lass1Text
PokefanMScript_0x1a61c7:
- special Mobile_DummyReturnFalse
+ special Special_Mobile_DummyReturnFalse
iftrue .mobile
jumptextfaceplayer UnknownText_0x1a646a
@@ -135,7 +135,7 @@ Route40Rock:
jumpstd smashrock
Route40HiddenHyperPotion:
- dwb EVENT_ROUTE_40_HIDDEN_HYPER_POTION, HYPER_POTION
+ hiddenitem EVENT_ROUTE_40_HIDDEN_HYPER_POTION, HYPER_POTION
MovementData_0x1a621c:
step RIGHT
@@ -337,7 +337,7 @@ Route40SignText:
line "OLIVINE CITY"
done
-Route40_MapEventHeader:
+Route40_MapEvents:
; filler
db 0, 0