summaryrefslogtreecommitdiff
path: root/maps/Route29.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route29.asm')
-rw-r--r--maps/Route29.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/Route29.asm b/maps/Route29.asm
index cd91a1f3e..8cd26f84b 100644
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -16,7 +16,7 @@ Route29_MapScriptHeader:
.MapCallbacks:
db 1
- dbw MAPCALLBACK_OBJECTS, .Tuscany
+ callback MAPCALLBACK_OBJECTS, .Tuscany
.DummyScene0:
end
@@ -59,7 +59,7 @@ Route29Tutorial1:
writetext CatchingTutorialDebriefText
waitbutton
closetext
- setscene $0
+ setscene 0
setevent EVENT_LEARNED_TO_CATCH_POKEMON
end
@@ -84,7 +84,7 @@ Route29Tutorial2:
writetext CatchingTutorialDebriefText
waitbutton
closetext
- setscene $0
+ setscene 0
setevent EVENT_LEARNED_TO_CATCH_POKEMON
end
@@ -93,7 +93,7 @@ Script_RefusedTutorial1:
waitbutton
closetext
applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData1b
- setscene $0
+ setscene 0
end
Script_RefusedTutorial2:
@@ -101,14 +101,14 @@ Script_RefusedTutorial2:
waitbutton
closetext
applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData2b
- setscene $0
+ setscene 0
end
CatchingTutorialDudeScript:
faceplayer
opentext
checkcode VAR_BOXSPACE
- if_equal $0, .BoxFull
+ if_equal 0, .BoxFull
checkevent EVENT_LEARNED_TO_CATCH_POKEMON
iftrue .BoxFull
checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM
@@ -324,7 +324,7 @@ Route29FisherText:
line "progress."
done
-; possibly unused
+; unused
Text_WaitingForDay:
text "I'm waiting for"
line "#MON that"
@@ -421,7 +421,7 @@ Route29_MapEventHeader:
.Warps:
db 1
- warp_def 27, 1, 3, ROUTE_29_46_GATE
+ warp_def 27, 1, 3, ROUTE_29_ROUTE_46_GATE
.CoordEvents:
db 2