summaryrefslogtreecommitdiff
path: root/maps/NewBarkTown.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-02-25 20:05:37 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2018-02-25 20:05:37 -0500
commitf964d04a873769c0aa1d27a7dd032170f55853fd (patch)
treeddc0ac1a1081b3b81fd3b7a041943e9571bb8e2e /maps/NewBarkTown.asm
parentbe28a0ff4eb4ba04dcbd0fc025b3a68af535a0a1 (diff)
* loadmenuheader -> loadmenu (ead103d)
* objectface -> turnobject (c834bda)
Diffstat (limited to 'maps/NewBarkTown.asm')
-rw-r--r--maps/NewBarkTown.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm
index d4ae92d48..7f2f044b8 100644
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -24,12 +24,12 @@ NewBarkTown_MapScripts:
NewBarkTown_TeacherStopsYouScene1:
playmusic MUSIC_MOM
- objectface NEWBARKTOWN_TEACHER, LEFT
+ turnobject NEWBARKTOWN_TEACHER, LEFT
opentext
writetext Text_WaitPlayer
waitbutton
closetext
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
applymovement NEWBARKTOWN_TEACHER, Movement_TeacherRunsToYou1_NBT
opentext
writetext Text_WhatDoYouThinkYoureDoing
@@ -47,14 +47,14 @@ NewBarkTown_TeacherStopsYouScene1:
NewBarkTown_TeacherStopsYouScene2:
playmusic MUSIC_MOM
- objectface NEWBARKTOWN_TEACHER, LEFT
+ turnobject NEWBARKTOWN_TEACHER, LEFT
opentext
writetext Text_WaitPlayer
waitbutton
closetext
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
applymovement NEWBARKTOWN_TEACHER, Movement_TeacherRunsToYou2_NBT
- objectface PLAYER, UP
+ turnobject PLAYER, UP
opentext
writetext Text_WhatDoYouThinkYoureDoing
waitbutton
@@ -109,7 +109,7 @@ NewBarkTownSilverScript:
writetext NewBarkTownRivalText1
waitbutton
closetext
- objectface NEWBARKTOWN_SILVER, LEFT
+ turnobject NEWBARKTOWN_SILVER, LEFT
opentext
writetext NewBarkTownRivalText2
waitbutton
@@ -118,7 +118,7 @@ NewBarkTownSilverScript:
applymovement PLAYER, Movement_SilverPushesYouAway_NBT
stopfollow
pause 5
- objectface NEWBARKTOWN_SILVER, DOWN
+ turnobject NEWBARKTOWN_SILVER, DOWN
pause 5
playsound SFX_TACKLE
applymovement PLAYER, Movement_SilverShovesYouOut_NBT