summaryrefslogtreecommitdiff
path: root/maps/Route29.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route29.asm')
-rw-r--r--maps/Route29.asm80
1 files changed, 45 insertions, 35 deletions
diff --git a/maps/Route29.asm b/maps/Route29.asm
index d33e4050b..4fe73be62 100644
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -1,3 +1,13 @@
+const_value set 2
+ const ROUTE29_COOLTRAINER_M1
+ const ROUTE29_YOUNGSTER
+ const ROUTE29_TEACHER1
+ const ROUTE29_FRUIT_TREE
+ const ROUTE29_FISHER
+ const ROUTE29_COOLTRAINER_M2
+ const ROUTE29_TEACHER2
+ const ROUTE29_POKE_BALL
+
Route29_MapScriptHeader:
.MapTriggers:
db 2
@@ -24,78 +34,78 @@ TuscanyCallback:
iftrue .DoesTuscanyAppear
.TuscanyDisappears
- disappear $8
+ disappear ROUTE29_TEACHER2
return
.DoesTuscanyAppear
checkcode VAR_WEEKDAY
if_not_equal TUESDAY, .TuscanyDisappears
- appear $8
+ appear ROUTE29_TEACHER2
return
UnknownScript_0x1a0f6d:
- spriteface $2, UP
- showemote EMOTE_SHOCK, $2, 15
- applymovement $2, MovementData_0x1a108d
+ spriteface ROUTE29_COOLTRAINER_M1, UP
+ showemote EMOTE_SHOCK, ROUTE29_COOLTRAINER_M1, 15
+ applymovement ROUTE29_COOLTRAINER_M1, MovementData_0x1a108d
spriteface PLAYER, LEFT
setevent EVENT_DUDE_TALKED_TO_YOU
loadfont
writetext UnknownText_0x1a10df
yesorno
iffalse UnknownScript_0x1a0fd9
- loadmovesprites
- follow $2, PLAYER
- applymovement $2, MovementData_0x1a109a
+ closetext
+ follow ROUTE29_COOLTRAINER_M1, PLAYER
+ applymovement ROUTE29_COOLTRAINER_M1, MovementData_0x1a109a
stopfollow
- loadpokedata RATTATA, 5
+ scriptedpokedata RATTATA, 5
catchtutorial BATTLETYPE_TUTORIAL
- spriteface $2, UP
+ spriteface ROUTE29_COOLTRAINER_M1, UP
loadfont
writetext UnknownText_0x1a114d
+ waitbutton
closetext
- loadmovesprites
dotrigger $0
setevent EVENT_LEARNED_TO_CATCH_POKEMON
end
UnknownScript_0x1a0fa3:
- spriteface $2, UP
- showemote EMOTE_SHOCK, $2, 15
- applymovement $2, MovementData_0x1a1094
+ spriteface ROUTE29_COOLTRAINER_M1, UP
+ showemote EMOTE_SHOCK, ROUTE29_COOLTRAINER_M1, 15
+ applymovement ROUTE29_COOLTRAINER_M1, MovementData_0x1a1094
spriteface PLAYER, LEFT
setevent EVENT_DUDE_TALKED_TO_YOU
loadfont
writetext UnknownText_0x1a10df
yesorno
iffalse UnknownScript_0x1a0fe5
- loadmovesprites
- follow $2, PLAYER
- applymovement $2, MovementData_0x1a10a1
+ closetext
+ follow ROUTE29_COOLTRAINER_M1, PLAYER
+ applymovement ROUTE29_COOLTRAINER_M1, MovementData_0x1a10a1
stopfollow
- loadpokedata RATTATA, 5
+ scriptedpokedata RATTATA, 5
catchtutorial BATTLETYPE_TUTORIAL
- spriteface $2, UP
+ spriteface ROUTE29_COOLTRAINER_M1, UP
loadfont
writetext UnknownText_0x1a114d
+ waitbutton
closetext
- loadmovesprites
dotrigger $0
setevent EVENT_LEARNED_TO_CATCH_POKEMON
end
UnknownScript_0x1a0fd9:
writetext UnknownText_0x1a1197
+ waitbutton
closetext
- loadmovesprites
- applymovement $2, MovementData_0x1a109a
+ applymovement ROUTE29_COOLTRAINER_M1, MovementData_0x1a109a
dotrigger $0
end
UnknownScript_0x1a0fe5:
writetext UnknownText_0x1a1197
+ waitbutton
closetext
- loadmovesprites
- applymovement $2, MovementData_0x1a10a1
+ applymovement ROUTE29_COOLTRAINER_M1, MovementData_0x1a10a1
dotrigger $0
end
@@ -111,26 +121,26 @@ CooltrainerMScript_0x1a0ff1:
writetext UnknownText_0x1a11e3
yesorno
iffalse UnknownScript_0x1a1022
- loadmovesprites
- loadpokedata RATTATA, 5
+ closetext
+ scriptedpokedata RATTATA, 5
catchtutorial BATTLETYPE_TUTORIAL
loadfont
writetext UnknownText_0x1a114d
+ waitbutton
closetext
- loadmovesprites
setevent EVENT_LEARNED_TO_CATCH_POKEMON
end
UnknownScript_0x1a101c:
writetext UnknownText_0x1a10a7
+ waitbutton
closetext
- loadmovesprites
end
UnknownScript_0x1a1022:
writetext UnknownText_0x1a1197
+ waitbutton
closetext
- loadmovesprites
end
YoungsterScript_0x1a1028:
@@ -151,14 +161,14 @@ CooltrainerMScript_0x1a1031:
iftrue UnknownScript_0x1a1043
UnknownScript_0x1a103d:
writetext UnknownText_0x1a134c
+ waitbutton
closetext
- loadmovesprites
end
UnknownScript_0x1a1043:
writetext UnknownText_0x1a137c
+ waitbutton
closetext
- loadmovesprites
end
TuscanyScript:
@@ -180,21 +190,21 @@ TuscanyScript:
iffalse TuscanyDoneScript
setevent EVENT_GOT_PINK_BOW_FROM_TUSCANY
writetext TuscanyGaveGiftText
+ waitbutton
closetext
- loadmovesprites
end
TuscanyTuesdayScript:
writetext TuscanyTuesdayText
- closetext
+ waitbutton
TuscanyDoneScript:
- loadmovesprites
+ closetext
end
TuscanyNotTuesdayScript:
writetext TuscanyNotTuesdayText
+ waitbutton
closetext
- loadmovesprites
end
MapRoute29Signpost0Script: