summaryrefslogtreecommitdiff
path: root/maps/NewBarkTown.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/NewBarkTown.asm')
-rw-r--r--maps/NewBarkTown.asm53
1 files changed, 29 insertions, 24 deletions
diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm
index 915da5ff2..3d6aea445 100644
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -1,3 +1,8 @@
+const_value set 2
+ const NEWBARKTOWN_TEACHER
+ const NEWBARKTOWN_FISHER
+ const NEWBARKTOWN_SILVER
+
NewBarkTown_MapScriptHeader:
.MapTriggers:
db 2
@@ -25,48 +30,48 @@ NewBarkTown_MapScriptHeader:
UnknownScript_0x1a8016:
playmusic MUSIC_MOM
- spriteface $2, LEFT
+ spriteface NEWBARKTOWN_TEACHER, LEFT
loadfont
writetext UnknownText_0x1a8134
+ waitbutton
closetext
- loadmovesprites
spriteface PLAYER, RIGHT
- applymovement $2, MovementData_0x1a80d4
+ applymovement NEWBARKTOWN_TEACHER, MovementData_0x1a80d4
loadfont
writetext UnknownText_0x1a813e
+ waitbutton
closetext
- loadmovesprites
- follow $2, PLAYER
- applymovement $2, MovementData_0x1a80e0
+ follow NEWBARKTOWN_TEACHER, PLAYER
+ applymovement NEWBARKTOWN_TEACHER, MovementData_0x1a80e0
stopfollow
loadfont
writetext UnknownText_0x1a815e
+ waitbutton
closetext
- loadmovesprites
special RestartMapMusic
end
UnknownScript_0x1a8041:
playmusic MUSIC_MOM
- spriteface $2, LEFT
+ spriteface NEWBARKTOWN_TEACHER, LEFT
loadfont
writetext UnknownText_0x1a8134
+ waitbutton
closetext
- loadmovesprites
spriteface PLAYER, RIGHT
- applymovement $2, MovementData_0x1a80d9
+ applymovement NEWBARKTOWN_TEACHER, MovementData_0x1a80d9
spriteface PLAYER, UP
loadfont
writetext UnknownText_0x1a813e
+ waitbutton
closetext
- loadmovesprites
- follow $2, PLAYER
- applymovement $2, MovementData_0x1a80e6
+ follow NEWBARKTOWN_TEACHER, PLAYER
+ applymovement NEWBARKTOWN_TEACHER, MovementData_0x1a80e6
stopfollow
loadfont
writetext UnknownText_0x1a815e
+ waitbutton
closetext
- loadmovesprites
special RestartMapMusic
end
@@ -80,26 +85,26 @@ TeacherScript_0x1a806f:
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue UnknownScript_0x1a8089
writetext UnknownText_0x1a80f7
+ waitbutton
closetext
- loadmovesprites
end
UnknownScript_0x1a8089:
writetext UnknownText_0x1a81c4
+ waitbutton
closetext
- loadmovesprites
end
UnknownScript_0x1a808f:
writetext UnknownText_0x1a81f2
+ waitbutton
closetext
- loadmovesprites
end
UnknownScript_0x1a8095:
writetext UnknownText_0x1a8236
+ waitbutton
closetext
- loadmovesprites
end
FisherScript_0x1a809b:
@@ -108,22 +113,22 @@ FisherScript_0x1a809b:
SilverScript_0x1a809e:
loadfont
writetext UnknownText_0x1a82a6
+ waitbutton
closetext
- loadmovesprites
- spriteface $4, LEFT
+ spriteface NEWBARKTOWN_SILVER, LEFT
loadfont
writetext UnknownText_0x1a82cd
+ waitbutton
closetext
- loadmovesprites
- follow PLAYER, $4
+ follow PLAYER, NEWBARKTOWN_SILVER
applymovement PLAYER, MovementData_0x1a80ed
stopfollow
pause 5
- spriteface $4, DOWN
+ spriteface NEWBARKTOWN_SILVER, DOWN
pause 5
playsound SFX_TACKLE
applymovement PLAYER, MovementData_0x1a80f0
- applymovement $4, MovementData_0x1a80f5
+ applymovement NEWBARKTOWN_SILVER, MovementData_0x1a80f5
end
MapNewBarkTownSignpost0Script: