diff --git a/docs/event_commands.md b/docs/event_commands.md
index fdf611cbf..bb6d4def4 100644
--- a/docs/event_commands.md
+++ b/docs/event_commands.md
@@ -163,7 +163,7 @@ Until this document is filled out, the [G/S Scripting Compendium](https://hax.ii
## `$4E`: `yesorno`
-## `$4F`: loadmenuheader menu_header
+## `$4F`: loadmenu menu_header
## `$50`: `closewindow`
@@ -241,7 +241,7 @@ Until this document is filled out, the [G/S Scripting Compendium](https://hax.ii
## `$75`: showemote emote_id, object_id, length
-## `$76`: objectface object_id, facing
+## `$76`: turnobject object_id, facing
## `$77`: follownotexact object2, object1
diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm
index e3dbd92df..85d6e7dc5 100644
--- a/engine/events/std_scripts.asm
+++ b/engine/events/std_scripts.asm
@@ -109,7 +109,7 @@ PokecenterNurseScript:
farwritetext NurseTakePokemonText
pause 20
special StubbedTrainerRankings_Healings
- objectface LAST_TALKED, LEFT
+ turnobject LAST_TALKED, LEFT
pause 10
special HealParty
playmusic MUSIC_NONE
@@ -117,7 +117,7 @@ PokecenterNurseScript:
special HealMachineAnim
pause 30
special RestartMapMusic
- objectface LAST_TALKED, DOWN
+ turnobject LAST_TALKED, DOWN
pause 10
checkphonecall ; elm already called about pokerus
@@ -134,9 +134,9 @@ PokecenterNurseScript:
.done
farwritetext NurseGoodbyeText
- objectface LAST_TALKED, UP
+ turnobject LAST_TALKED, UP
pause 10
- objectface LAST_TALKED, DOWN
+ turnobject LAST_TALKED, DOWN
pause 10
waitbutton
@@ -1811,7 +1811,7 @@ CoinVendor_IntroScript: ; 0xbcde0
.loop ; 0xbcde4
special DisplayMoneyAndCoinBalance
- loadmenuheader .MenuHeader
+ loadmenu .MenuHeader
verticalmenu
closewindow
ifequal 1, .Buy50
diff --git a/engine/scripting.asm b/engine/scripting.asm
index f1c7ef7b0..f65f2f9c0 100644
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -144,7 +144,7 @@ ScriptCommandTable:
dw Script_writetext ; 4c
dw Script_repeattext ; 4d
dw Script_yesorno ; 4e
- dw Script_loadmenuheader ; 4f
+ dw Script_loadmenu ; 4f
dw Script_closewindow ; 50
dw Script_jumptextfaceplayer ; 51
if _CRYSTAL
@@ -185,7 +185,7 @@ endc
dw Script_writeobjectxy ; 73
dw Script_loademote ; 74
dw Script_showemote ; 75
- dw Script_objectface ; 76
+ dw Script_turnobject ; 76
dw Script_follownotexact ; 77
dw Script_earthquake ; 78
dw Script_changemap ; 79
@@ -432,7 +432,7 @@ Script_yesorno:
ld [wScriptVar], a
ret
-Script_loadmenuheader:
+Script_loadmenu:
; script command 0x4f
; parameters: menu_header
@@ -1052,7 +1052,7 @@ Script_faceobject:
call ApplyObjectFacing
ret
-Script_objectface:
+Script_turnobject:
; script command 0x76
; parameters: object_id, facing
diff --git a/macros/legacy.asm b/macros/legacy.asm
index a8a89829a..245e24c6e 100644
--- a/macros/legacy.asm
+++ b/macros/legacy.asm
@@ -25,14 +25,17 @@ checkmaptriggers EQUS "checkmapscene"
domaptrigger EQUS "setmapscene"
checktriggers EQUS "checkscene"
dotrigger EQUS "setscene"
+
faceperson EQUS "faceobject"
moveperson EQUS "moveobject"
writepersonxy EQUS "writeobjectxy"
-spriteface EQUS "objectface"
+spriteface EQUS "turnobject"
+objectface EQUS "turnobject"
RAM2MEM EQUS "vartomem"
loadfont EQUS "opentext"
-loadmenudata EQUS "loadmenuheader"
+loadmenudata EQUS "loadmenu"
+loadmenuheader EQUS "loadmenu"
writebackup EQUS "closewindow"
interpretmenu EQUS "_2dmenu"
interpretmenu2 EQUS "verticalmenu"
diff --git a/macros/scripts/battle_anims.asm b/macros/scripts/battle_anims.asm
index 5c7aabed3..76300e78f 100644
--- a/macros/scripts/battle_anims.asm
+++ b/macros/scripts/battle_anims.asm
@@ -1,6 +1,6 @@
anim_wait: MACRO
if \1 >= $d0
- flip out
+ fail "anim_wait argument must be less than $d0."
endc
db \1
ENDM
diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm
index 6f6d1992d..869dd7edf 100644
--- a/macros/scripts/events.asm
+++ b/macros/scripts/events.asm
@@ -516,9 +516,9 @@ yesorno: MACRO
db yesorno_command
ENDM
- enum loadmenuheader_command ; $4f
-loadmenuheader: MACRO
- db loadmenuheader_command
+ enum loadmenu_command ; $4f
+loadmenu: MACRO
+ db loadmenu_command
dw \1 ; menu_header
ENDM
@@ -747,9 +747,9 @@ showemote: MACRO
db \3 ; time
ENDM
- enum objectface_command ; $76
-objectface: MACRO
- db objectface_command
+ enum turnobject_command ; $76
+turnobject: MACRO
+ db turnobject_command
db \1 ; object id
db \2 ; facing
ENDM
diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm
index cbfe8b425..4a55e5ac0 100644
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -36,23 +36,23 @@ AzaleaTown_MapScripts:
AzaleaTownRivalBattleScene1:
moveobject AZALEATOWN_SILVER, 11, 11
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
pause 15
appear AZALEATOWN_SILVER
applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement1
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
jump AzaleaTownRivalBattleScript
AzaleaTownRivalBattleScene2:
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
pause 15
appear AZALEATOWN_SILVER
applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement2
- objectface PLAYER, UP
+ turnobject PLAYER, UP
AzaleaTownRivalBattleScript:
playmusic MUSIC_RIVAL_ENCOUNTER
opentext
@@ -96,7 +96,7 @@ AzaleaTownRivalBattleScript:
writetext AzaleaTownRivalAfterText
waitbutton
closetext
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleExitMovement
playsound SFX_EXIT_BUILDING
disappear AZALEATOWN_SILVER
@@ -158,13 +158,13 @@ AzaleaTownCelebiScene:
opentext
writetext AzaleaTownKurtText1
buttonsound
- objectface AZALEATOWN_KURT_OUTSIDE, RIGHT
+ turnobject AZALEATOWN_KURT_OUTSIDE, RIGHT
writetext AzaleaTownKurtText2
buttonsound
writetext AzaleaTownKurtText3
waitbutton
verbosegiveitem GS_BALL
- objectface AZALEATOWN_KURT_OUTSIDE, LEFT
+ turnobject AZALEATOWN_KURT_OUTSIDE, LEFT
setflag ENGINE_FOREST_IS_RESTLESS
clearevent EVENT_ILEX_FOREST_LASS
setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS
@@ -177,7 +177,7 @@ AzaleaTownKurtScript:
opentext
writetext AzaleaTownKurtText3
waitbutton
- objectface AZALEATOWN_KURT_OUTSIDE, LEFT
+ turnobject AZALEATOWN_KURT_OUTSIDE, LEFT
closetext
end
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm
index ef2d5a7f8..474d3c04a 100644
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -176,10 +176,10 @@ UnreferencedScript_0x9e4be:
ifequal $a, Script_Menu_ChallengeExplanationCancel
ifnotequal $0, Script_MobileError
writetext Text_ReceivedAListOfLeadersOnTheHonorRoll
- objectface BATTLETOWER1F_RECEPTIONIST, LEFT
+ turnobject BATTLETOWER1F_RECEPTIONIST, LEFT
writetext Text_PleaseConfirmOnThisMonitor
waitbutton
- objectface BATTLETOWER1F_RECEPTIONIST, DOWN
+ turnobject BATTLETOWER1F_RECEPTIONIST, DOWN
closetext
end
@@ -250,7 +250,7 @@ YoungsterScript_0x9e55d:
writetext Text_BattleTowerYoungster
waitbutton
closetext
- objectface BATTLETOWER1F_YOUNGSTER, RIGHT
+ turnobject BATTLETOWER1F_YOUNGSTER, RIGHT
end
CooltrainerFScript_0x9e568:
diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm
index b0df5c97f..074d3997a 100644
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -36,7 +36,7 @@ BurnedTower1F_MapScripts:
return
.MeetEusine:
- objectface BURNEDTOWER1F_EUSINE, DOWN
+ turnobject BURNEDTOWER1F_EUSINE, DOWN
showemote EMOTE_SHOCK, BURNEDTOWER1F_EUSINE, 15
applymovement BURNEDTOWER1F_EUSINE, BurnedTower1FEusineMovement
opentext
@@ -51,7 +51,7 @@ BurnedTowerRivalBattleScript:
showemote EMOTE_SHOCK, BURNEDTOWER1F_SILVER, 15
special FadeOutMusic
pause 15
- objectface BURNEDTOWER1F_SILVER, RIGHT
+ turnobject BURNEDTOWER1F_SILVER, RIGHT
pause 15
applymovement PLAYER, BurnedTowerMovement_PlayerWalksToSilver
applymovement BURNEDTOWER1F_SILVER, BurnedTowerMovement_SilverWalksToPlayer
diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm
index 17c3bc1e3..32d3b57d2 100644
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -34,48 +34,48 @@ ReleaseTheBeasts:
playmusic MUSIC_NONE
pause 30
appear BURNEDTOWERB1F_RAIKOU1
- objectface PLAYER, UP
+ turnobject PLAYER, UP
pause 5
disappear BURNEDTOWERB1F_RAIKOU2
pause 15
cry RAIKOU
appear BURNEDTOWERB1F_ENTEI1
- objectface PLAYER, UP
+ turnobject PLAYER, UP
pause 5
disappear BURNEDTOWERB1F_ENTEI2
pause 15
cry ENTEI
appear BURNEDTOWERB1F_SUICUNE1
- objectface PLAYER, UP
+ turnobject PLAYER, UP
pause 5
disappear BURNEDTOWERB1F_SUICUNE2
pause 15
cry SUICUNE
pause 15
playsound SFX_WARP_FROM
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
applymovement BURNEDTOWERB1F_RAIKOU1, BurnedTowerRaikouMovement
disappear BURNEDTOWERB1F_RAIKOU1
waitsfx
playsound SFX_WARP_FROM
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
applymovement BURNEDTOWERB1F_ENTEI1, BurnedTowerEnteiMovement
disappear BURNEDTOWERB1F_ENTEI1
waitsfx
pause 15
playsound SFX_WARP_FROM
- objectface PLAYER, UP
+ turnobject PLAYER, UP
applymovement BURNEDTOWERB1F_SUICUNE1, BurnedTowerSuicuneMovement1
playsound SFX_WARP_FROM
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
applymovement BURNEDTOWERB1F_SUICUNE1, BurnedTowerSuicuneMovement2
- objectface PLAYER, UP
+ turnobject PLAYER, UP
pause 20
cry SUICUNE
pause 30
playsound SFX_WARP_FROM
applymovement BURNEDTOWERB1F_SUICUNE1, BurnedTowerSuicuneMovement3
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
disappear BURNEDTOWERB1F_SUICUNE1
waitsfx
special RestartMapMusic
diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm
index e2485619b..89588ddd3 100644
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@@ -28,7 +28,7 @@ CeladonCafeFisher1:
writetext Fisher1Text_Concentration
waitbutton
closetext
- objectface CELADONCAFE_FISHER1, LEFT
+ turnobject CELADONCAFE_FISHER1, LEFT
end
CeladonCafeFisher2:
@@ -41,7 +41,7 @@ CeladonCafeFisher2:
writetext Fisher2Text_Quantity
waitbutton
closetext
- objectface CELADONCAFE_FISHER2, RIGHT
+ turnobject CELADONCAFE_FISHER2, RIGHT
end
CeladonCafeFisher3:
@@ -54,7 +54,7 @@ CeladonCafeFisher3:
writetext Fisher3Text_GoldenrodIsBest
waitbutton
closetext
- objectface CELADONCAFE_FISHER3, RIGHT
+ turnobject CELADONCAFE_FISHER3, RIGHT
end
CeladonCafeTeacher:
@@ -69,7 +69,7 @@ CeladonCafeTeacher:
writetext TeacherText_NoCoinCase
waitbutton
closetext
- objectface CELADONCAFE_TEACHER, LEFT
+ turnobject CELADONCAFE_TEACHER, LEFT
end
.HasCoinCase:
@@ -77,12 +77,12 @@ CeladonCafeTeacher:
writetext TeacherText_KeepEating
waitbutton
closetext
- objectface CELADONCAFE_TEACHER, RIGHT
+ turnobject CELADONCAFE_TEACHER, RIGHT
opentext
writetext TeacherText_MoreChef
waitbutton
closetext
- objectface CELADONCAFE_TEACHER, LEFT
+ turnobject CELADONCAFE_TEACHER, LEFT
end
EatathonContestPoster:
diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm
index eafcc6382..6424102cd 100644
--- a/maps/CeladonDeptStore3F.asm
+++ b/maps/CeladonDeptStore3F.asm
@@ -26,7 +26,7 @@ CeladonDeptStore3FGameboyKid1Script:
writetext CeladonDeptStore3FGameboyKid1Text
waitbutton
closetext
- objectface CELADONDEPTSTORE3F_GAMEBOY_KID1, DOWN
+ turnobject CELADONDEPTSTORE3F_GAMEBOY_KID1, DOWN
end
CeladonDeptStore3FGameboyKid2Script:
@@ -35,7 +35,7 @@ CeladonDeptStore3FGameboyKid2Script:
writetext CeladonDeptStore3FGameboyKid2Text
waitbutton
closetext
- objectface CELADONDEPTSTORE3F_GAMEBOY_KID2, DOWN
+ turnobject CELADONDEPTSTORE3F_GAMEBOY_KID2, DOWN
end
CeladonDeptStore3FSuperNerdScript:
diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm
index 243c8d11a..bc67437e5 100644
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -23,7 +23,7 @@ CeladonDeptStore6FVendingMachine:
writetext CeladonVendingText
.Start:
special PlaceMoneyTopRight
- loadmenuheader .MenuHeader
+ loadmenu .MenuHeader
verticalmenu
closewindow
ifequal 1, .FreshWater
diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm
index 5bbcb42ef..9b95241e3 100644
--- a/maps/CeladonGameCorner.asm
+++ b/maps/CeladonGameCorner.asm
@@ -26,7 +26,7 @@ CeladonGameCornerPokefanMScript:
writetext CeladonGameCornerPokefanMText
waitbutton
closetext
- objectface CELADONGAMECORNER_POKEFAN_M, LEFT
+ turnobject CELADONGAMECORNER_POKEFAN_M, LEFT
end
CeladonGameCornerTeacherScript:
@@ -35,7 +35,7 @@ CeladonGameCornerTeacherScript:
writetext CeladonGameCornerTeacherText
waitbutton
closetext
- objectface CELADONGAMECORNER_TEACHER, RIGHT
+ turnobject CELADONGAMECORNER_TEACHER, RIGHT
end
CeladonGameCornerFishingGuruScript:
@@ -44,7 +44,7 @@ CeladonGameCornerFishingGuruScript:
writetext CeladonGameCornerFishingGuruText
waitbutton
closetext
- objectface CELADONGAMECORNER_FISHING_GURU, RIGHT
+ turnobject CELADONGAMECORNER_FISHING_GURU, RIGHT
end
CeladonGameCornerFisherScript:
@@ -66,7 +66,7 @@ CeladonGameCornerFisherScript:
writetext CeladonGameCornerFisherText2
waitbutton
closetext
- objectface LAST_TALKED, LEFT
+ turnobject LAST_TALKED, LEFT
end
.GiveCoins:
@@ -80,14 +80,14 @@ CeladonGameCornerFisherScript:
writetext CeladonGameCornerFisherNoCoinCaseText
waitbutton
closetext
- objectface LAST_TALKED, LEFT
+ turnobject LAST_TALKED, LEFT
end
.FullCoinCase:
writetext CeladonGameCornerFisherFullCoinCaseText
waitbutton
closetext
- objectface LAST_TALKED, LEFT
+ turnobject LAST_TALKED, LEFT
end
CeladonGymGuyScript:
@@ -99,7 +99,7 @@ CeladonGameCornerGrampsScript:
writetext CeladonGameCornerGrampsText
waitbutton
closetext
- objectface CELADONGAMECORNER_GRAMPS, LEFT
+ turnobject CELADONGAMECORNER_GRAMPS, LEFT
end
CeladonGameCornerPoster1Script:
diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm
index 0141f21f3..fdeeefc3c 100644
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -23,7 +23,7 @@ CeladonGameCornerPrizeRoomTMVendor:
writetext CeladonPrizeRoom_AskWhichPrizeText
CeladonPrizeRoom_tmcounterloop:
special DisplayCoinCaseBalance
- loadmenuheader CeladonPrizeRoom_TMMenuHeader
+ loadmenu CeladonPrizeRoom_TMMenuHeader
verticalmenu
closewindow
ifequal 1, .doubleteam
@@ -124,7 +124,7 @@ CeladonGameCornerPrizeRoomPokemonVendor:
.loop
writetext CeladonPrizeRoom_AskWhichPrizeText
special DisplayCoinCaseBalance
- loadmenuheader .MenuHeader
+ loadmenu .MenuHeader
verticalmenu
closewindow
ifequal 1, .pikachu
diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm
index 34727e077..38fdc9a41 100644
--- a/maps/CeruleanCity.asm
+++ b/maps/CeruleanCity.asm
@@ -49,7 +49,7 @@ CeruleanCityCooltrainerFScript:
writetext CeruleanCityCooltrainerFText1
waitbutton
closetext
- objectface CERULEANCITY_COOLTRAINER_F, LEFT
+ turnobject CERULEANCITY_COOLTRAINER_F, LEFT
opentext
writetext CeruleanCityCooltrainerFText2
waitbutton
@@ -113,7 +113,7 @@ CeruleanCityYoungsterScript:
playsound SFX_TRANSACTION
waitsfx
showemote EMOTE_SHOCK, CERULEANCITY_YOUNGSTER, 15
- objectface CERULEANCITY_YOUNGSTER, LEFT
+ turnobject CERULEANCITY_YOUNGSTER, LEFT
opentext
writetext CeruleanCityYoungsterText2
waitbutton
diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm
index a7e81fea5..7e5f62973 100644
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -52,7 +52,7 @@ CeruleanGym_MapScripts:
waitsfx
special RestartMapMusic
pause 15
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
pause 15
end
diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm
index 3fc6df5b8..3831a8f35 100644
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -42,28 +42,28 @@ CherrygroveCityGuideGent:
waitbutton
closetext
applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement2
- objectface PLAYER, UP
+ turnobject PLAYER, UP
opentext
writetext GuideGentMartText
waitbutton
closetext
applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement3
- objectface PLAYER, UP
+ turnobject PLAYER, UP
opentext
writetext GuideGentRoute30Text
waitbutton
closetext
applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement4
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
opentext
writetext GuideGentSeaText
waitbutton
closetext
applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement5
- objectface PLAYER, UP
+ turnobject PLAYER, UP
pause 60
- objectface CHERRYGROVECITY_GRAMPS, LEFT
- objectface PLAYER, RIGHT
+ turnobject CHERRYGROVECITY_GRAMPS, LEFT
+ turnobject PLAYER, RIGHT
opentext
writetext GuideGentGiftText
buttonsound
@@ -77,7 +77,7 @@ CherrygroveCityGuideGent:
closetext
stopfollow
special RestartMapMusic
- objectface PLAYER, UP
+ turnobject PLAYER, UP
applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement6
playsound SFX_ENTER_DOOR
disappear CHERRYGROVECITY_GRAMPS
@@ -101,13 +101,13 @@ CherrygroveCityGuideGent:
CherrygroveSilverSceneSouth:
moveobject CHERRYGROVECITY_SILVER, 39, 7
CherrygroveSilverSceneNorth:
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
pause 15
appear CHERRYGROVECITY_SILVER
applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalWalksToYou
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
playmusic MUSIC_RIVAL_ENCOUNTER
opentext
writetext UnknownText_0x19c4e2
@@ -166,7 +166,7 @@ CherrygroveSilverSceneNorth:
.FinishRival:
playsound SFX_TACKLE
applymovement PLAYER, CherrygroveCity_RivalPushesYouOutOfTheWay
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalExitsStageLeft
disappear CHERRYGROVECITY_SILVER
setscene SCENE_CHERRYGROVECITY_NOTHING
diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm
index 38b6982e2..15bb6d7bb 100644
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -36,12 +36,12 @@ CianwoodCity_MapScripts:
return
CianwoodCitySuicuneAndEusine:
- objectface PLAYER, UP
+ turnobject PLAYER, UP
showemote EMOTE_SHOCK, PLAYER, 15
pause 15
playsound SFX_WARP_FROM
applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00da
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
pause 15
playsound SFX_WARP_FROM
applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00e0
diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm
index 4e76b7385..1f24dc448 100644
--- a/maps/CianwoodGym.asm
+++ b/maps/CianwoodGym.asm
@@ -22,7 +22,7 @@ ChuckScript_0x9d60f:
writetext ChuckIntroText1
waitbutton
closetext
- objectface CIANWOODGYM_CHUCK, RIGHT
+ turnobject CIANWOODGYM_CHUCK, RIGHT
opentext
writetext ChuckIntroText2
waitbutton
diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm
index ccff4b538..9ca05c6db 100644
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -28,7 +28,7 @@ DragonShrine_MapScripts:
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
writetext DragonShrineQuestion1Text
buttonsound
- loadmenuheader DragonShrineQuestion1_MenuHeader
+ loadmenu DragonShrineQuestion1_MenuHeader
verticalmenu
closewindow
ifequal 1, .RightAnswer
@@ -40,7 +40,7 @@ DragonShrine_MapScripts:
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
writetext DragonShrineQuestion2Text
buttonsound
- loadmenuheader DragonShrineQuestion2_MenuHeader
+ loadmenu DragonShrineQuestion2_MenuHeader
verticalmenu
closewindow
ifequal 1, .RightAnswer
@@ -50,7 +50,7 @@ DragonShrine_MapScripts:
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_4
writetext DragonShrineQuestion3Text
buttonsound
- loadmenuheader DragonShrineQuestion3_MenuHeader
+ loadmenu DragonShrineQuestion3_MenuHeader
verticalmenu
closewindow
ifequal 1, .WrongAnswer
@@ -60,7 +60,7 @@ DragonShrine_MapScripts:
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_5
writetext DragonShrineQuestion4Text
buttonsound
- loadmenuheader DragonShrineQuestion4_MenuHeader
+ loadmenu DragonShrineQuestion4_MenuHeader
verticalmenu
closewindow
ifequal 1, .RightAnswer
@@ -70,7 +70,7 @@ DragonShrine_MapScripts:
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_6
writetext DragonShrineQuestion5Text
buttonsound
- loadmenuheader DragonShrineQuestion5_MenuHeader
+ loadmenu DragonShrineQuestion5_MenuHeader
verticalmenu
closewindow
ifequal 1, .WrongAnswer
@@ -91,12 +91,12 @@ DragonShrine_MapScripts:
iftrue .Question2
.WrongAnswer:
closetext
- objectface DRAGONSHRINE_ELDER1, LEFT
+ turnobject DRAGONSHRINE_ELDER1, LEFT
opentext
writetext DragonShrineWrongAnswerText1
waitbutton
closetext
- objectface DRAGONSHRINE_ELDER1, DOWN
+ turnobject DRAGONSHRINE_ELDER1, DOWN
opentext
writetext DragonShrineWrongAnswerText2
waitbutton
@@ -122,12 +122,12 @@ DragonShrine_MapScripts:
playmusic MUSIC_CLAIR
appear DRAGONSHRINE_CLAIR
waitsfx
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
pause 30
applymovement DRAGONSHRINE_CLAIR, DragonShrineClairWalkInMovement
- objectface DRAGONSHRINE_CLAIR, RIGHT
- objectface PLAYER, LEFT
- objectface DRAGONSHRINE_ELDER1, LEFT
+ turnobject DRAGONSHRINE_CLAIR, RIGHT
+ turnobject PLAYER, LEFT
+ turnobject DRAGONSHRINE_ELDER1, LEFT
opentext
writetext DragonShrineClairYouPassedText
waitbutton
@@ -144,7 +144,7 @@ DragonShrine_MapScripts:
waitbutton
closetext
applymovement DRAGONSHRINE_ELDER1, DragonShrineElderWalkToClairMovement
- objectface DRAGONSHRINE_CLAIR, UP
+ turnobject DRAGONSHRINE_CLAIR, UP
opentext
writetext DragonShrineMustIInformLanceText
waitbutton
@@ -171,9 +171,9 @@ DragonShrine_MapScripts:
waitbutton
closetext
applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2ce
- objectface DRAGONSHRINE_CLAIR, UP
+ turnobject DRAGONSHRINE_CLAIR, UP
applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2d1
- objectface PLAYER, UP
+ turnobject PLAYER, UP
opentext
writetext DragonShrineElderScoldsClairText
waitbutton
diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm
index 2404cebe1..74a803768 100644
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -47,7 +47,7 @@ DragonsDenB1F_ClairScene:
pause 30
closetext
showemote EMOTE_SHOCK, PLAYER, 15
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
playmusic MUSIC_CLAIR
applymovement DRAGONSDENB1F_CLAIR, MovementDragonsDen_ClairWalksToYou
opentext
diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm
index 9fa76633d..2456550b9 100644
--- a/maps/EarlsPokemonAcademy.asm
+++ b/maps/EarlsPokemonAcademy.asm
@@ -45,7 +45,7 @@ EarlsPokemonAcademyGameboyKid1Script:
writetext EarlsPokemonAcademyGameboyKid1Text
waitbutton
closetext
- objectface EARLSPOKEMONACADEMY_GAMEBOY_KID1, DOWN
+ turnobject EARLSPOKEMONACADEMY_GAMEBOY_KID1, DOWN
end
EarlsPokemonAcademyGameboyKid2Script:
@@ -54,7 +54,7 @@ EarlsPokemonAcademyGameboyKid2Script:
writetext EarlsPokemonAcademyGameboyKid2Text
waitbutton
closetext
- objectface EARLSPOKEMONACADEMY_GAMEBOY_KID2, DOWN
+ turnobject EARLSPOKEMONACADEMY_GAMEBOY_KID2, DOWN
end
EarlsPokemonAcademyYoungster2Script:
@@ -64,7 +64,7 @@ AcademyBlackboard:
opentext
writetext AcademyBlackboardText
.Loop:
- loadmenuheader .BlackboardMenuHeader
+ loadmenu .BlackboardMenuHeader
_2dmenu
closewindow
ifequal 1, .Poison
diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm
index 3456e6577..eceb7a5ef 100644
--- a/maps/EcruteakPokecenter1F.asm
+++ b/maps/EcruteakPokecenter1F.asm
@@ -26,15 +26,15 @@ EcruteakPokecenter1F_MapScripts:
waitsfx
applymovement ECRUTEAKPOKECENTER1F_BILL, EcruteakPokecenter1FBillMovement1
applymovement PLAYER, EcruteakPokecenter1FPlayerMovement1
- objectface ECRUTEAKPOKECENTER1F_NURSE, UP
+ turnobject ECRUTEAKPOKECENTER1F_NURSE, UP
pause 10
- objectface ECRUTEAKPOKECENTER1F_NURSE, DOWN
+ turnobject ECRUTEAKPOKECENTER1F_NURSE, DOWN
pause 30
- objectface ECRUTEAKPOKECENTER1F_NURSE, UP
+ turnobject ECRUTEAKPOKECENTER1F_NURSE, UP
pause 10
- objectface ECRUTEAKPOKECENTER1F_NURSE, DOWN
+ turnobject ECRUTEAKPOKECENTER1F_NURSE, DOWN
pause 20
- objectface ECRUTEAKPOKECENTER1F_BILL, DOWN
+ turnobject ECRUTEAKPOKECENTER1F_BILL, DOWN
pause 10
opentext
writetext EcruteakPokecenter1F_BillText1
@@ -45,7 +45,7 @@ EcruteakPokecenter1F_MapScripts:
writetext EcruteakPokecenter1F_BillText2
waitbutton
closetext
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
applymovement ECRUTEAKPOKECENTER1F_BILL, EcruteakPokecenter1FBillMovement2
playsound SFX_EXIT_BUILDING
disappear ECRUTEAKPOKECENTER1F_BILL
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index 332dedcaf..8490fed48 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -47,7 +47,7 @@ ElmsLab_MapScripts:
.WalkUpToElm:
applymovement PLAYER, ElmsLab_WalkUpToElmMovement
showemote EMOTE_SHOCK, ELMSLAB_ELM, 15
- objectface ELMSLAB_ELM, RIGHT
+ turnobject ELMSLAB_ELM, RIGHT
opentext
writetext ElmText_Intro
.MustSayYes:
@@ -65,20 +65,20 @@ ElmsLab_MapScripts:
playsound SFX_GLASS_TING
pause 30
showemote EMOTE_SHOCK, ELMSLAB_ELM, 10
- objectface ELMSLAB_ELM, DOWN
+ turnobject ELMSLAB_ELM, DOWN
opentext
writetext ElmText_GotAnEmail
waitbutton
closetext
opentext
- objectface ELMSLAB_ELM, RIGHT
+ turnobject ELMSLAB_ELM, RIGHT
writetext ElmText_MissionFromMrPokemon
waitbutton
closetext
applymovement ELMSLAB_ELM, ElmsLab_ElmToDefaultPositionMovement1
- objectface PLAYER, UP
+ turnobject PLAYER, UP
applymovement ELMSLAB_ELM, ElmsLab_ElmToDefaultPositionMovement2
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
opentext
writetext ElmText_ChooseAPokemon
waitbutton
@@ -147,7 +147,7 @@ ElmCheckGotEggAgain:
end
LabTryToLeaveScript:
- objectface ELMSLAB_ELM, DOWN
+ turnobject ELMSLAB_ELM, DOWN
opentext
writetext LabWhereGoingText
waitbutton
@@ -158,7 +158,7 @@ LabTryToLeaveScript:
CyndaquilPokeBallScript:
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue LookAtElmPokeBallScript
- objectface ELMSLAB_ELM, DOWN
+ turnobject ELMSLAB_ELM, DOWN
refreshscreen
pokepic CYNDAQUIL
cry CYNDAQUIL
@@ -188,7 +188,7 @@ CyndaquilPokeBallScript:
TotodilePokeBallScript:
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue LookAtElmPokeBallScript
- objectface ELMSLAB_ELM, DOWN
+ turnobject ELMSLAB_ELM, DOWN
refreshscreen
pokepic TOTODILE
cry TOTODILE
@@ -216,7 +216,7 @@ TotodilePokeBallScript:
ChikoritaPokeBallScript:
checkevent EVENT_GOT_A_POKEMON_FROM_ELM
iftrue LookAtElmPokeBallScript
- objectface ELMSLAB_ELM, DOWN
+ turnobject ELMSLAB_ELM, DOWN
refreshscreen
pokepic CHIKORITA
cry CHIKORITA
@@ -248,7 +248,7 @@ DidntChooseStarterScript:
end
ElmDirectionsScript:
- objectface PLAYER, UP
+ turnobject PLAYER, UP
opentext
writetext ElmDirectionsText1
waitbutton
@@ -260,12 +260,12 @@ ElmDirectionsScript:
waitsfx
waitbutton
closetext
- objectface ELMSLAB_ELM, LEFT
+ turnobject ELMSLAB_ELM, LEFT
opentext
writetext ElmDirectionsText2
waitbutton
closetext
- objectface ELMSLAB_ELM, DOWN
+ turnobject ELMSLAB_ELM, DOWN
opentext
writetext ElmDirectionsText3
waitbutton
@@ -457,14 +457,14 @@ ElmJumpRightScript:
AideScript_WalkPotion1:
applymovement ELMSLAB_ELMS_AIDE, AideWalksRight1
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
scall AideScript_GivePotion
applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft1
end
AideScript_WalkPotion2:
applymovement ELMSLAB_ELMS_AIDE, AideWalksRight2
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
scall AideScript_GivePotion
applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft2
end
@@ -482,14 +482,14 @@ AideScript_GivePotion:
AideScript_WalkBalls1:
applymovement ELMSLAB_ELMS_AIDE, AideWalksRight1
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
scall AideScript_GiveYouBalls
applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft1
end
AideScript_WalkBalls2:
applymovement ELMSLAB_ELMS_AIDE, AideWalksRight2
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
scall AideScript_GiveYouBalls
applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft2
end
@@ -550,7 +550,7 @@ MeetCopScript2:
MeetCopScript:
applymovement PLAYER, MeetCopScript_WalkUp
CopScript:
- objectface ELMSLAB_OFFICER, LEFT
+ turnobject ELMSLAB_OFFICER, LEFT
opentext
writetext ElmsLabOfficerText1
buttonsound
diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm
index 9d880cfa2..76516f107 100644
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -130,7 +130,7 @@ WorriedGrandpaSceneLeft:
writetext UnknownText_0x75412
waitbutton
closetext
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x75222
disappear FASTSHIP1F_GENTLEMAN
setscene SCENE_DEFAULT
diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
index 67109ec4c..5c61d99a0 100644
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -36,7 +36,7 @@ SSAquaCaptain:
end
SSAquaGranddaughterBefore:
- objectface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, RIGHT
+ turnobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, RIGHT
opentext
writetext SSAquaGranddaughterCaptainPlayWithMeText
waitbutton
@@ -52,13 +52,13 @@ SSAquaGranddaughterBefore:
applymovement PLAYER, MovementData_0x76004
moveobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, 3, 19
appear FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1
- objectface PLAYER, UP
- objectface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, UP
+ turnobject PLAYER, UP
+ turnobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, UP
special FadeInQuickly
- objectface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, DOWN
+ turnobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, DOWN
showemote EMOTE_SHOCK, FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, 15
applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, MovementData_0x7600c
- objectface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, RIGHT
+ turnobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, RIGHT
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .PlayerIsFemale
opentext
@@ -73,7 +73,7 @@ SSAquaGranddaughterBefore:
waitbutton
closetext
.cont:
- objectface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, DOWN
+ turnobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, DOWN
applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, MovementData_0x76010
opentext
writetext SSAquaEntertainedGranddaughterText
diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm
index 5474b85e7..97486ae06 100644
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -63,7 +63,7 @@ MoveTutorScript:
checkcoins 4000
ifequal HAVE_LESS, .NotEnoughMoney
writetext UnknownText_0x1990ce
- loadmenuheader .MoveMenuHeader
+ loadmenu .MoveMenuHeader
verticalmenu
closewindow
ifequal MOVETUTOR_FLAMETHROWER, .Flamethrower
@@ -210,7 +210,7 @@ GoldenrodCityRocketScoutScript:
writetext GoldenrodCityRocketScoutText2
waitbutton
closetext
- objectface GOLDENRODCITY_ROCKETSCOUT, UP
+ turnobject GOLDENRODCITY_ROCKETSCOUT, UP
end
GoldenrodCityRocket1Script:
diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm
index 1f9a6a92d..2b77d5ae1 100644
--- a/maps/GoldenrodDeptStore4F.asm
+++ b/maps/GoldenrodDeptStore4F.asm
@@ -28,7 +28,7 @@ GameboyKidScript_0x55ef7:
writetext UnknownText_0x55f74
waitbutton
closetext
- objectface GOLDENRODDEPTSTORE4F_GAMEBOY_KID, DOWN
+ turnobject GOLDENRODDEPTSTORE4F_GAMEBOY_KID, DOWN
end
GoldenrodDeptStore4FDirectory:
diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm
index bf510a58f..fa21f5e92 100644
--- a/maps/GoldenrodDeptStore6F.asm
+++ b/maps/GoldenrodDeptStore6F.asm
@@ -12,7 +12,7 @@ GoldenrodVendingMachine:
writetext GoldenrodVendingText
.Start:
special PlaceMoneyTopRight
- loadmenuheader .MenuHeader
+ loadmenu .MenuHeader
verticalmenu
closewindow
ifequal 1, .FreshWater
diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm
index cd6162349..a41e2f9b0 100644
--- a/maps/GoldenrodDeptStoreRoof.asm
+++ b/maps/GoldenrodDeptStoreRoof.asm
@@ -52,7 +52,7 @@ FisherScript_0x56749:
writetext UnknownText_0x567d2
waitbutton
closetext
- objectface GOLDENRODDEPTSTOREROOF_FISHER, UP
+ turnobject GOLDENRODDEPTSTOREROOF_FISHER, UP
end
GoldenrodDeptStoreRoofTwinScript:
@@ -63,12 +63,12 @@ SuperNerdScript_0x56757:
writetext UnknownText_0x56867
waitbutton
closetext
- objectface GOLDENRODDEPTSTOREROOF_SUPER_NERD, UP
+ turnobject GOLDENRODDEPTSTOREROOF_SUPER_NERD, UP
opentext
writetext UnknownText_0x56871
waitbutton
closetext
- objectface GOLDENRODDEPTSTOREROOF_SUPER_NERD, RIGHT
+ turnobject GOLDENRODDEPTSTOREROOF_SUPER_NERD, RIGHT
end
GoldenrodDeptStoreRoofPokefanMScript:
diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm
index 6c73499b6..ea060d0d3 100644
--- a/maps/GoldenrodFlowerShop.asm
+++ b/maps/GoldenrodFlowerShop.asm
@@ -30,7 +30,7 @@ FlowerShopTeacherScript:
end
.Lalala:
- objectface GOLDENRODFLOWERSHOP_TEACHER, LEFT
+ turnobject GOLDENRODFLOWERSHOP_TEACHER, LEFT
opentext
writetext UnknownText_0x5552e
waitbutton
diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm
index c1accf826..dee306ba7 100644
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -43,7 +43,7 @@ GoldenrodGameCornerPokefanM3Script:
writetext GoldenrodGameCornerPokefanM3Text
waitbutton
closetext
- objectface GOLDENRODGAMECORNER_POKEFAN_M3, RIGHT
+ turnobject GOLDENRODGAMECORNER_POKEFAN_M3, RIGHT
end
GoldenrodGmeCornerCoinVendorScript:
@@ -59,7 +59,7 @@ GoldenrodGmeCornerTMVendorScript:
writetext GoldenrodGameCornerPrizeVendorWhichPrizeText
GoldenrodGmeCornerTMVendor_LoopScript: ; 056c36
special DisplayCoinCaseBalance
- loadmenuheader GoldenrodGameCornerTMVendorMenuHeader
+ loadmenu GoldenrodGameCornerTMVendorMenuHeader
verticalmenu
closewindow
ifequal 1, .Thunder
@@ -160,7 +160,7 @@ GoldenrodGameCornerPrizeMonVendorScript:
.loop
writetext GoldenrodGameCornerPrizeVendorWhichPrizeText
special DisplayCoinCaseBalance
- loadmenuheader .MenuHeader
+ loadmenu .MenuHeader
verticalmenu
closewindow
ifequal 1, .abra
@@ -242,7 +242,7 @@ GoldenrodGameCornerPharmacistScript:
writetext GoldenrodGameCornerPharmacistText
waitbutton
closetext
- objectface LAST_TALKED, LEFT
+ turnobject LAST_TALKED, LEFT
end
GoldenrodGameCornerPokefanM1Script:
@@ -251,7 +251,7 @@ GoldenrodGameCornerPokefanM1Script:
writetext GoldenrodGameCornerPokefanM1Text
waitbutton
closetext
- objectface GOLDENRODGAMECORNER_POKEFAN_M1, RIGHT
+ turnobject GOLDENRODGAMECORNER_POKEFAN_M1, RIGHT
end
GoldenrodGameCornerCooltrainerMScript:
@@ -260,7 +260,7 @@ GoldenrodGameCornerCooltrainerMScript:
writetext GoldenrodGameCornerCooltrainerMText
waitbutton
closetext
- objectface GOLDENRODGAMECORNER_COOLTRAINER_M, LEFT
+ turnobject GOLDENRODGAMECORNER_COOLTRAINER_M, LEFT
end
GoldenrodGameCornerPokefanFScript:
@@ -269,7 +269,7 @@ GoldenrodGameCornerPokefanFScript:
writetext GoldenrodGameCornerPokefanFText
waitbutton
closetext
- objectface GOLDENRODGAMECORNER_POKEFAN_F, RIGHT
+ turnobject GOLDENRODGAMECORNER_POKEFAN_F, RIGHT
end
GoldenrodGameCornerCooltrainerFScript:
@@ -281,7 +281,7 @@ GoldenrodGameCornerGentlemanScript:
writetext GoldenrodGameCornerGentlemanText
waitbutton
closetext
- objectface GOLDENRODGAMECORNER_GENTLEMAN, RIGHT
+ turnobject GOLDENRODGAMECORNER_GENTLEMAN, RIGHT
end
GoldenrodGameCornerPokefanM2Script:
diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm
index 9f9524596..cdf754bad 100644
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@@ -104,7 +104,7 @@ TrainerLassCarrie:
WhitneyCriesScript:
showemote EMOTE_SHOCK, GOLDENRODGYM_LASS2, 15
applymovement GOLDENRODGYM_LASS2, BridgetWalksUpMovement
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
opentext
writetext BridgetWhitneyCriesText
waitbutton
diff --git a/maps/GoldenrodPokecenter1F.asm b/maps/GoldenrodPokecenter1F.asm
index bdaea95ea..9e5173fb7 100644
--- a/maps/GoldenrodPokecenter1F.asm
+++ b/maps/GoldenrodPokecenter1F.asm
@@ -28,7 +28,7 @@ GoldenrodPokecenter1F_GSBallSceneLeft:
appear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST
playmusic MUSIC_SHOW_ME_AROUND
applymovement GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, MovementData_0x6105a
- objectface PLAYER, UP
+ turnobject PLAYER, UP
opentext
writetext UnknownText_0x622f0
waitbutton
@@ -60,7 +60,7 @@ GoldenrodPokecenter1F_GSBallSceneRight:
appear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST
playmusic MUSIC_SHOW_ME_AROUND
applymovement GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, MovementData_0x61065
- objectface PLAYER, UP
+ turnobject PLAYER, UP
opentext
writetext UnknownText_0x622f0
waitbutton
diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
index a3733aaec..9e08b0448 100644
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -117,7 +117,7 @@ TeacherScript_0x7ca7d:
jumptextfaceplayer GoldenrodUndergroundSwitchRoomEntrances_TeacherText
UndergroundSilverScene1:
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
pause 15
@@ -125,7 +125,7 @@ UndergroundSilverScene1:
appear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
waitsfx
applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverApproachMovement1
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
scall UndergroundSilverBattleScript
applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement1
playsound SFX_EXIT_BUILDING
@@ -136,7 +136,7 @@ UndergroundSilverScene1:
end
UndergroundSilverScene2:
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
pause 15
@@ -144,7 +144,7 @@ UndergroundSilverScene2:
appear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
waitsfx
applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverApproachMovement2
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
scall UndergroundSilverBattleScript
applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement2
playsound SFX_EXIT_BUILDING
diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm
index e3541bbd3..3d9492f14 100644
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -19,12 +19,12 @@ HallOfFame_MapScripts:
follow HALLOFFAME_LANCE, PLAYER
applymovement HALLOFFAME_LANCE, HallOfFame_WalkUpWithLance
stopfollow
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
opentext
writetext HallOfFame_LanceText
waitbutton
closetext
- objectface HALLOFFAME_LANCE, UP
+ turnobject HALLOFFAME_LANCE, UP
applymovement PLAYER, HallOfFame_SlowlyApproachMachine
setscene SCENE_FINISHED
pause 15
diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm
index 94e1b0eb0..3c6f2343a 100644
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -460,7 +460,7 @@ MapIlexForestSignpost4Script:
special FadeOutMusic
applymovement PLAYER, MovementData_0x6ef58
pause 30
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
pause 20
clearflag ENGINE_FOREST_IS_RESTLESS
special CelebiShrineEvent
diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm
index ce5a3b782..b44f56b2d 100644
--- a/maps/IndigoPlateauPokecenter1F.asm
+++ b/maps/IndigoPlateauPokecenter1F.asm
@@ -54,13 +54,13 @@ PlateauRivalBattle1:
ifequal SATURDAY, PlateauRivalScriptDone
moveobject INDIGOPLATEAUPOKECENTER1F_SILVER, 17, 9
appear INDIGOPLATEAUPOKECENTER1F_SILVER
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
pause 15
applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalMovement1
playmusic MUSIC_RIVAL_ENCOUNTER
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
jump PlateauRivalBattleCommon
PlateauRivalBattle2:
@@ -75,13 +75,13 @@ PlateauRivalBattle2:
ifequal FRIDAY, PlateauRivalScriptDone
ifequal SATURDAY, PlateauRivalScriptDone
appear INDIGOPLATEAUPOKECENTER1F_SILVER
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
pause 15
applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalMovement2
playmusic MUSIC_RIVAL_ENCOUNTER
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
PlateauRivalBattleCommon:
opentext
writetext PlateauRivalText1
@@ -125,7 +125,7 @@ PlateauRivalPostBattle:
writetext PlateauRivalText2
waitbutton
closetext
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalLeavesMovement
disappear INDIGOPLATEAUPOKECENTER1F_SILVER
setscene SCENE_DEFAULT
diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm
index 97e2d5ebe..6710c7e5e 100644
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -46,7 +46,7 @@ KurtScript_0x18e178:
setevent EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
checkcode VAR_FACING
ifequal UP, .RunAround
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
playsound SFX_FLY
applymovement KURTSHOUSE_KURT1, MovementData_0x18e466
playsound SFX_EXIT_BUILDING
@@ -56,7 +56,7 @@ KurtScript_0x18e178:
end
.RunAround:
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
playsound SFX_FLY
applymovement KURTSHOUSE_KURT1, MovementData_0x18e46c
playsound SFX_EXIT_BUILDING
@@ -294,13 +294,13 @@ KurtScript_0x18e178:
showemote EMOTE_SHOCK, KURTSHOUSE_KURT1, 30
checkcode VAR_FACING
ifequal UP, .GSBallRunAround
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
playsound SFX_FLY
applymovement KURTSHOUSE_KURT1, MovementData_0x18e466
jump .KurtHasLeftTheBuilding
.GSBallRunAround:
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
playsound SFX_FLY
applymovement KURTSHOUSE_KURT1, MovementData_0x18e46c
.KurtHasLeftTheBuilding:
@@ -323,21 +323,21 @@ KurtMakingBallsScript:
writetext UnknownText_0x18e7d8
waitbutton
closetext
- objectface KURTSHOUSE_KURT2, UP
+ turnobject KURTSHOUSE_KURT2, UP
end
Script_FirstTimeBuggingKurt:
writetext UnknownText_0x18e863
waitbutton
closetext
- objectface KURTSHOUSE_KURT2, UP
+ turnobject KURTSHOUSE_KURT2, UP
setevent EVENT_BUGGING_KURT_TOO_MUCH
end
KurtScript_ImCheckingItNow:
writetext UnknownText_0x18e934
waitbutton
- objectface KURTSHOUSE_KURT2, UP
+ turnobject KURTSHOUSE_KURT2, UP
writetext UnknownText_0x18e949
waitbutton
closetext
@@ -393,14 +393,14 @@ KurtsGranddaughter2Subscript:
writetext KurtsGranddaughterHelpText
waitbutton
closetext
- objectface KURTSHOUSE_TWIN2, RIGHT
+ turnobject KURTSHOUSE_TWIN2, RIGHT
end
.GSBall:
writetext KurtsGranddaughterGSBallText
waitbutton
closetext
- objectface KURTSHOUSE_TWIN2, RIGHT
+ turnobject KURTSHOUSE_TWIN2, RIGHT
end
KurtsGranddaughterFunScript:
diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm
index 5e60b2718..b6cdcfb56 100644
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -50,7 +50,7 @@ Script_ApproachLanceFromRight:
special FadeOutMusic
applymovement PLAYER, MovementData_ApproachLanceFromRight
LanceScript_0x180e7b:
- objectface LANCESROOM_LANCE, LEFT
+ turnobject LANCESROOM_LANCE, LEFT
opentext
writetext LanceBattleIntroText
waitbutton
@@ -74,9 +74,9 @@ LanceScript_0x180e7b:
musicfadeout MUSIC_BEAUTY_ENCOUNTER, 16
pause 30
showemote EMOTE_SHOCK, LANCESROOM_LANCE, 15
- objectface LANCESROOM_LANCE, DOWN
+ turnobject LANCESROOM_LANCE, DOWN
pause 10
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
appear LANCESROOM_MARY
applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryRushesIn
opentext
@@ -88,27 +88,27 @@ LanceScript_0x180e7b:
follow LANCESROOM_MARY, LANCESROOM_OAK
applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryYieldsToOak
stopfollow
- objectface LANCESROOM_OAK, UP
- objectface LANCESROOM_LANCE, LEFT
+ turnobject LANCESROOM_OAK, UP
+ turnobject LANCESROOM_LANCE, LEFT
opentext
writetext UnknownText_0x18121b
waitbutton
closetext
applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryInterviewChampion
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
opentext
writetext UnknownText_0x18134b
waitbutton
closetext
applymovement LANCESROOM_LANCE, LancesRoomMovementData_LancePositionsSelfToGuidePlayerAway
- objectface PLAYER, UP
+ turnobject PLAYER, UP
opentext
writetext UnknownText_0x18137b
waitbutton
closetext
follow LANCESROOM_LANCE, PLAYER
- objectface LANCESROOM_MARY, UP
- objectface LANCESROOM_OAK, UP
+ turnobject LANCESROOM_MARY, UP
+ turnobject LANCESROOM_OAK, UP
applymovement LANCESROOM_LANCE, LancesRoomMovementData_LanceLeadsPlayerToHallOfFame
stopfollow
playsound SFX_EXIT_BUILDING
diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm
index 3976a4968..242aa0ed8 100644
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -91,7 +91,7 @@ UnknownScript_0x6c38f:
reloadmappart
closetext
setevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART
- objectface MAHOGANYMART1F_LANCE, LEFT
+ turnobject MAHOGANYMART1F_LANCE, LEFT
opentext
writetext UnknownText_0x6c5ba
waitbutton
diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm
index 6677679e7..bf070a5f3 100644
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -28,7 +28,7 @@ UnknownScript_0x190013:
follow PLAYER, MAHOGANYTOWN_POKEFAN_M
applymovement PLAYER, MovementData_0x1900a7
stopfollow
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
scall UnknownScript_0x19002f
applymovement MAHOGANYTOWN_POKEFAN_M, MovementData_0x1900ad
end
diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm
index 829dcf1d9..1385f8e5d 100644
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -16,7 +16,7 @@ MountMoon_MapScripts:
end
.RivalBattle:
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
pause 15
diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm
index 502c752d3..29784336e 100644
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -34,7 +34,7 @@ ClefairyDance:
applymovement PLAYER, PlayerWalksUpToDancingClefairies
pause 15
appear MOUNTMOONSQUARE_ROCK
- objectface MOUNTMOONSQUARE_FAIRY1, RIGHT
+ turnobject MOUNTMOONSQUARE_FAIRY1, RIGHT
cry CLEFAIRY
waitsfx
pause 30
@@ -54,10 +54,10 @@ ClefairyDance:
follow MOUNTMOONSQUARE_FAIRY1, MOUNTMOONSQUARE_FAIRY2
applymovement MOUNTMOONSQUARE_FAIRY1, ClefairyDanceStep7
stopfollow
- objectface MOUNTMOONSQUARE_FAIRY1, DOWN
+ turnobject MOUNTMOONSQUARE_FAIRY1, DOWN
pause 10
showemote EMOTE_SHOCK, MOUNTMOONSQUARE_FAIRY1, 15
- objectface MOUNTMOONSQUARE_FAIRY1, DOWN
+ turnobject MOUNTMOONSQUARE_FAIRY1, DOWN
cry CLEFAIRY
pause 15
follow MOUNTMOONSQUARE_FAIRY1, MOUNTMOONSQUARE_FAIRY2
diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm
index 53358e632..5f40fac1b 100644
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -18,7 +18,7 @@ MrPokemonsHouse_MapScripts:
.MrPokemonEvent:
showemote EMOTE_SHOCK, MRPOKEMONSHOUSE_GENTLEMAN, 15
- objectface MRPOKEMONSHOUSE_GENTLEMAN, DOWN
+ turnobject MRPOKEMONSHOUSE_GENTLEMAN, DOWN
opentext
writetext MrPokemonIntroText1
waitbutton
@@ -37,11 +37,11 @@ MrPokemonsHouse_MapScripts:
blackoutmod CHERRYGROVE_CITY
writetext MrPokemonIntroText3
buttonsound
- objectface MRPOKEMONSHOUSE_GENTLEMAN, RIGHT
+ turnobject MRPOKEMONSHOUSE_GENTLEMAN, RIGHT
writetext MrPokemonIntroText4
buttonsound
- objectface MRPOKEMONSHOUSE_GENTLEMAN, DOWN
- objectface MRPOKEMONSHOUSE_OAK, LEFT
+ turnobject MRPOKEMONSHOUSE_GENTLEMAN, DOWN
+ turnobject MRPOKEMONSHOUSE_OAK, LEFT
writetext MrPokemonIntroText5
waitbutton
closetext
@@ -84,7 +84,7 @@ MrPokemonsHouse_MrPokemonScript:
MrPokemonsHouse_OakScript:
playmusic MUSIC_PROF_OAK
applymovement MRPOKEMONSHOUSE_OAK, MrPokemonsHouse_OakWalksToPlayer
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
opentext
writetext MrPokemonsHouse_OakText1
buttonsound
@@ -96,14 +96,14 @@ MrPokemonsHouse_OakScript:
writetext MrPokemonsHouse_OakText2
waitbutton
closetext
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
applymovement MRPOKEMONSHOUSE_OAK, MrPokemonsHouse_OakExits
playsound SFX_EXIT_BUILDING
disappear MRPOKEMONSHOUSE_OAK
waitsfx
special RestartMapMusic
pause 15
- objectface PLAYER, UP
+ turnobject PLAYER, UP
opentext
writetext MrPokemonsHouse_MrPokemonHealText
waitbutton
diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm
index d28654bdd..0dfccb037 100644
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -66,7 +66,7 @@ GameboyKidScript_0x5c037:
writetext UnknownText_0x5c42a
waitbutton
closetext
- objectface NATIONALPARK_GAMEBOY_KID, DOWN
+ turnobject NATIONALPARK_GAMEBOY_KID, DOWN
end
TrainerSchoolboyJack1:
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
diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm
index 053001a47..380f71bab 100644
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -23,7 +23,7 @@ OlivineCity_MapScripts:
return
UnknownScript_0x1a8833:
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
pause 15
@@ -37,7 +37,7 @@ UnknownScript_0x1a8833:
waitbutton
closetext
applymovement PLAYER, MovementData_0x1a88f4
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88db
setscene SCENE_FINISHED
disappear OLIVINECITY_OLIVINE_RIVAL
@@ -47,7 +47,7 @@ UnknownScript_0x1a8833:
end
UnknownScript_0x1a886b:
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
pause 15
@@ -61,7 +61,7 @@ UnknownScript_0x1a886b:
waitbutton
closetext
applymovement PLAYER, MovementData_0x1a88f7
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88e8
disappear OLIVINECITY_OLIVINE_RIVAL
setscene SCENE_FINISHED
diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm
index 8023a6a3c..ed244cc7c 100644
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@@ -34,9 +34,9 @@ UnknownScript_0x60bab:
writetext UnknownText_0x60dea
waitbutton
closetext
- objectface OLIVINELIGHTHOUSE6F_JASMINE, RIGHT
+ turnobject OLIVINELIGHTHOUSE6F_JASMINE, RIGHT
pause 15
- objectface OLIVINELIGHTHOUSE6F_MONSTER, LEFT
+ turnobject OLIVINELIGHTHOUSE6F_MONSTER, LEFT
opentext
playmusic MUSIC_HEAL
writetext UnknownText_0x60e44
@@ -52,13 +52,13 @@ UnknownScript_0x60bab:
writetext UnknownText_0x60f3d
waitbutton
closetext
- objectface OLIVINELIGHTHOUSE6F_MONSTER, RIGHT
+ turnobject OLIVINELIGHTHOUSE6F_MONSTER, RIGHT
pause 10
- objectface OLIVINELIGHTHOUSE6F_MONSTER, LEFT
+ turnobject OLIVINELIGHTHOUSE6F_MONSTER, LEFT
pause 10
- objectface OLIVINELIGHTHOUSE6F_MONSTER, RIGHT
+ turnobject OLIVINELIGHTHOUSE6F_MONSTER, RIGHT
pause 10
- objectface OLIVINELIGHTHOUSE6F_MONSTER, LEFT
+ turnobject OLIVINELIGHTHOUSE6F_MONSTER, LEFT
pause 10
faceplayer
opentext
@@ -88,9 +88,9 @@ UnknownScript_0x60c25:
writetext UnknownText_0x60edf
waitbutton
closetext
- objectface OLIVINELIGHTHOUSE6F_JASMINE, RIGHT
+ turnobject OLIVINELIGHTHOUSE6F_JASMINE, RIGHT
pause 15
- objectface OLIVINELIGHTHOUSE6F_MONSTER, LEFT
+ turnobject OLIVINELIGHTHOUSE6F_MONSTER, LEFT
opentext
writetext UnknownText_0x60ef1
waitbutton
diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm
index fec26c331..558812ebe 100644
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -37,7 +37,7 @@ SailorScript_0x748c0:
writetext UnknownText_0x74a55
waitbutton
closetext
- objectface OLIVINEPORT_SAILOR1, DOWN
+ turnobject OLIVINEPORT_SAILOR1, DOWN
pause 10
playsound SFX_EXIT_BUILDING
disappear OLIVINEPORT_SAILOR1
@@ -73,12 +73,12 @@ UnknownScript_0x74919:
end
UnknownScript_0x7491f:
- objectface OLIVINEPORT_SAILOR3, RIGHT
+ turnobject OLIVINEPORT_SAILOR3, RIGHT
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
iftrue UnknownScript_0x7498b
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
iftrue UnknownScript_0x7498b
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
opentext
checkevent EVENT_FAST_SHIP_FIRST_TIME
iffalse UnknownScript_0x7494e
@@ -201,7 +201,7 @@ FishingGuruScript_0x74a01:
writetext UnknownText_0x74bf4
waitbutton
closetext
- objectface OLIVINEPORT_FISHING_GURU1, UP
+ turnobject OLIVINEPORT_FISHING_GURU1, UP
end
FishingGuruScript_0x74a0c:
@@ -210,7 +210,7 @@ FishingGuruScript_0x74a0c:
writetext UnknownText_0x74c35
waitbutton
closetext
- objectface OLIVINEPORT_FISHING_GURU2, UP
+ turnobject OLIVINEPORT_FISHING_GURU2, UP
end
YoungsterScript_0x74a17:
@@ -219,7 +219,7 @@ YoungsterScript_0x74a17:
writetext UnknownText_0x74c76
waitbutton
closetext
- objectface OLIVINEPORT_YOUNGSTER, DOWN
+ turnobject OLIVINEPORT_YOUNGSTER, DOWN
end
CooltrainerFScript_0x74a22:
@@ -228,7 +228,7 @@ CooltrainerFScript_0x74a22:
writetext UnknownText_0x74ca2
waitbutton
closetext
- objectface OLIVINEPORT_COOLTRAINER_F, DOWN
+ turnobject OLIVINEPORT_COOLTRAINER_F, DOWN
end
OlivinePortHiddenProtein:
diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm
index 1e9f368d4..397981e54 100644
--- a/maps/PlayersHouse1F.asm
+++ b/maps/PlayersHouse1F.asm
@@ -24,7 +24,7 @@ UnknownScript_0x7a4d8:
UnknownScript_0x7a4db:
playmusic MUSIC_MOM
showemote EMOTE_SHOCK, PLAYERSHOUSE1F_MOM1, 15
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
iffalse UnknownScript_0x7a4f2
applymovement PLAYERSHOUSE1F_MOM1, MovementData_0x7a5fc
@@ -96,7 +96,7 @@ UnknownScript_0x7a564:
UnknownScript_0x7a56b:
special RestartMapMusic
- objectface PLAYERSHOUSE1F_MOM1, LEFT
+ turnobject PLAYERSHOUSE1F_MOM1, LEFT
end
UnknownScript_0x7a572:
@@ -179,7 +179,7 @@ NeighborScript:
writetext NeighborText
waitbutton
closetext
- objectface PLAYERSHOUSE1F_POKEFAN_F, RIGHT
+ turnobject PLAYERSHOUSE1F_POKEFAN_F, RIGHT
end
TVScript:
diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm
index 1e7f7222b..6e2583c5b 100644
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -426,7 +426,7 @@ Pokecenter2F_CheckGender:
waitbutton
closetext
applymovement2 Pokecenter2FMovementData_ReceptionistLooksRight
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
opentext
writetext Text_ChangeTheLook
waitbutton
@@ -533,7 +533,7 @@ TimeCapsuleScript_CheckPlayerGender:
closetext
checkcode VAR_FACING
ifnotequal UP, .FemaleChangeApperance
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
.FemaleChangeApperance:
opentext
writetext Text_ChangeTheLook
diff --git a/maps/PokecomCenterAdminRoomMobile.asm b/maps/PokecomCenterAdminRoomMobile.asm
index 96d319cc2..840d3a771 100644
--- a/maps/PokecomCenterAdminRoomMobile.asm
+++ b/maps/PokecomCenterAdminRoomMobile.asm
@@ -23,7 +23,7 @@ PokecomCenterAdminRoomMobileSignpost0Script:
waitbutton
UnknownScript_0x625df:
reloadmappart
- loadmenuheader MenuHeader_0x62602
+ loadmenu MenuHeader_0x62602
verticalmenu
closewindow
ifequal 1, UnknownScript_0x625f0
@@ -65,7 +65,7 @@ PokecomCenterAdminRoomMobileSignpost1Script:
waitbutton
UnknownScript_0x62629:
reloadmappart
- loadmenuheader MenuHeader_0x6264c
+ loadmenu MenuHeader_0x6264c
verticalmenu
closewindow
ifequal 1, UnknownScript_0x6263a
diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm
index 89ec341b2..73b1b0aed 100644
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -26,19 +26,19 @@ PowerPlantGuardPhoneScript:
waitsfx
pause 30
applymovement POWERPLANT_OFFICER1, MovementData_0x188ed5
- objectface POWERPLANT_GYM_GUY1, DOWN
- objectface POWERPLANT_GYM_GUY2, DOWN
+ turnobject POWERPLANT_GYM_GUY1, DOWN
+ turnobject POWERPLANT_GYM_GUY2, DOWN
opentext
writetext UnknownText_0x188f22
waitbutton
closetext
- objectface POWERPLANT_OFFICER1, LEFT
- objectface PLAYER, RIGHT
+ turnobject POWERPLANT_OFFICER1, LEFT
+ turnobject PLAYER, RIGHT
opentext
writetext UnknownText_0x188f7f
waitbutton
closetext
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
applymovement POWERPLANT_OFFICER1, MovementData_0x188eda
setscene SCENE_POWERPLANT_NOTHING
end
diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm
index 0c992176d..004fe2f77 100644
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -120,17 +120,17 @@ Buena:
writetext UnknownText_0x5de84
waitbutton
closetext
- objectface RADIOTOWER2F_BUENA, RIGHT
+ turnobject RADIOTOWER2F_BUENA, RIGHT
checkcode VAR_FACING
ifnotequal RIGHT, UnknownScript_0x5d7be
applymovement PLAYER, MovementData_0x5d921
UnknownScript_0x5d7be:
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
opentext
writetext UnknownText_0x5dedd
waitbutton
closetext
- objectface RADIOTOWER2F_BUENA, DOWN
+ turnobject RADIOTOWER2F_BUENA, DOWN
refreshscreen
special BuenasPassword
closetext
@@ -146,7 +146,7 @@ UnknownScript_0x5d7be:
playsound SFX_TRANSACTION
setflag ENGINE_BUENAS_PASSWORD_2
pause 20
- objectface RADIOTOWER2F_BUENA, RIGHT
+ turnobject RADIOTOWER2F_BUENA, RIGHT
opentext
writetext UnknownText_0x5e054
waitbutton
@@ -172,14 +172,14 @@ UnknownScript_0x5d80a:
checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER
iftrue UnknownScript_0x5d8cc
UnknownScript_0x5d81a:
- objectface RADIOTOWER2F_BUENA, RIGHT
+ turnobject RADIOTOWER2F_BUENA, RIGHT
end
UnknownScript_0x5d81e:
writetext UnknownText_0x5df29
waitbutton
closetext
- objectface RADIOTOWER2F_BUENA, RIGHT
+ turnobject RADIOTOWER2F_BUENA, RIGHT
special FadeOutMusic
pause 20
special RestartMapMusic
@@ -194,7 +194,7 @@ UnknownScript_0x5d82f:
checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER
iftrue UnknownScript_0x5d8cc
UnknownScript_0x5d83f:
- objectface RADIOTOWER2F_BUENA, RIGHT
+ turnobject RADIOTOWER2F_BUENA, RIGHT
pause 10
end
@@ -204,13 +204,13 @@ UnknownScript_0x5d845:
writetext UnknownText_0x5e01c
waitbutton
closetext
- objectface RADIOTOWER2F_BUENA, RIGHT
+ turnobject RADIOTOWER2F_BUENA, RIGHT
pause 20
opentext
writetext UnknownText_0x5e054
waitbutton
closetext
- objectface RADIOTOWER2F_BUENA, RIGHT
+ turnobject RADIOTOWER2F_BUENA, RIGHT
special FadeOutMusic
pause 20
special RestartMapMusic
@@ -231,7 +231,7 @@ UnknownScript_0x5d86b:
checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
iftrue UnknownScript_0x5d8cc
UnknownScript_0x5d87b:
- objectface RADIOTOWER2F_BUENA, RIGHT
+ turnobject RADIOTOWER2F_BUENA, RIGHT
end
UnknownScript_0x5d87f:
@@ -243,7 +243,7 @@ UnknownScript_0x5d87f:
checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
iftrue UnknownScript_0x5d8cc
UnknownScript_0x5d88f:
- objectface RADIOTOWER2F_BUENA, RIGHT
+ turnobject RADIOTOWER2F_BUENA, RIGHT
end
UnknownScript_0x5d893:
@@ -261,9 +261,9 @@ UnknownScript_0x5d8a4:
checkcellnum PHONE_BUENA
iftrue UnknownScript_0x5d8fe
pause 20
- objectface RADIOTOWER2F_BUENA, DOWN
+ turnobject RADIOTOWER2F_BUENA, DOWN
pause 15
- objectface PLAYER, UP
+ turnobject PLAYER, UP
pause 15
checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
iftrue UnknownScript_0x5d8cc
@@ -288,7 +288,7 @@ UnknownScript_0x5d8d0:
writetext UnknownText_0x5e310
waitbutton
closetext
- objectface RADIOTOWER2F_BUENA, RIGHT
+ turnobject RADIOTOWER2F_BUENA, RIGHT
addcellnum PHONE_BUENA
end
@@ -296,14 +296,14 @@ UnknownScript_0x5d8ed:
writetext UnknownText_0x5e33c
waitbutton
closetext
- objectface RADIOTOWER2F_BUENA, RIGHT
+ turnobject RADIOTOWER2F_BUENA, RIGHT
end
UnknownScript_0x5d8f6:
writetext UnknownText_0x5e35e
waitbutton
closetext
- objectface RADIOTOWER2F_BUENA, RIGHT
+ turnobject RADIOTOWER2F_BUENA, RIGHT
UnknownScript_0x5d8fe:
end
diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm
index ceeb94cde..13f0800d7 100644
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -23,7 +23,7 @@ RadioTower5F_MapScripts:
end
FakeDirectorScript:
- objectface RADIOTOWER5F_DIRECTOR, UP
+ turnobject RADIOTOWER5F_DIRECTOR, UP
showemote EMOTE_SHOCK, RADIOTOWER5F_DIRECTOR, 15
opentext
writetext FakeDirectorTextBefore1
@@ -79,7 +79,7 @@ TrainerExecutivef1:
RadioTower5FRocketBossScene:
applymovement PLAYER, MovementData_0x60125
playmusic MUSIC_ROCKET_ENCOUNTER
- objectface RADIOTOWER5F_ROCKET, RIGHT
+ turnobject RADIOTOWER5F_ROCKET, RIGHT
opentext
writetext RadioTower5FRocketBossBeforeText
waitbutton
@@ -116,7 +116,7 @@ RadioTower5FRocketBossScene:
moveobject RADIOTOWER5F_DIRECTOR, 12, 0
appear RADIOTOWER5F_DIRECTOR
applymovement RADIOTOWER5F_DIRECTOR, RadioTower5FDirectorWalksIn
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
opentext
writetext RadioTower5FDirectorThankYouText
buttonsound
diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm
index 0eb121e05..1c5aacc12 100644
--- a/maps/Route16Gate.asm
+++ b/maps/Route16Gate.asm
@@ -20,7 +20,7 @@ UnknownScript_0x733ed:
UnknownScript_0x733f3:
showemote EMOTE_SHOCK, ROUTE16GATE_OFFICER, 15
- objectface PLAYER, UP
+ turnobject PLAYER, UP
opentext
writetext UnknownText_0x73496
waitbutton
diff --git a/maps/Route17Route18Gate.asm b/maps/Route17Route18Gate.asm
index dcf24da14..e682c4a79 100644
--- a/maps/Route17Route18Gate.asm
+++ b/maps/Route17Route18Gate.asm
@@ -20,7 +20,7 @@ UnknownScript_0x73611:
UnknownScript_0x73617:
showemote EMOTE_SHOCK, ROUTE17ROUTE18GATE_OFFICER, 15
- objectface PLAYER, UP
+ turnobject PLAYER, UP
opentext
writetext UnknownText_0x7364d
waitbutton
diff --git a/maps/Route25.asm b/maps/Route25.asm
index 62e247756..20179b4b4 100644
--- a/maps/Route25.asm
+++ b/maps/Route25.asm
@@ -28,21 +28,21 @@ Route25MistyDate1Script:
showemote EMOTE_HEART, ROUTE25_MISTY, 15
pause 30
showemote EMOTE_SHOCK, ROUTE25_COOLTRAINER_M1, 10
- objectface ROUTE25_MISTY, DOWN
+ turnobject ROUTE25_MISTY, DOWN
applymovement ROUTE25_COOLTRAINER_M1, MovementData_0x19efe8
disappear ROUTE25_COOLTRAINER_M1
pause 15
playmusic MUSIC_BEAUTY_ENCOUNTER
- objectface ROUTE25_MISTY, UP
+ turnobject ROUTE25_MISTY, UP
pause 10
applymovement ROUTE25_MISTY, MovementData_0x19efed
opentext
writetext Route25MistyDateText
waitbutton
closetext
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
applymovement ROUTE25_MISTY, MovementData_0x19effa
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
applymovement ROUTE25_MISTY, MovementData_0x19f000
disappear ROUTE25_MISTY
clearevent EVENT_TRAINERS_IN_CERULEAN_GYM
@@ -54,21 +54,21 @@ Route25MistyDate2Script:
showemote EMOTE_HEART, ROUTE25_MISTY, 15
pause 30
showemote EMOTE_SHOCK, ROUTE25_COOLTRAINER_M1, 10
- objectface ROUTE25_MISTY, DOWN
+ turnobject ROUTE25_MISTY, DOWN
applymovement ROUTE25_COOLTRAINER_M1, MovementData_0x19efea
disappear ROUTE25_COOLTRAINER_M1
pause 15
playmusic MUSIC_BEAUTY_ENCOUNTER
- objectface ROUTE25_MISTY, UP
+ turnobject ROUTE25_MISTY, UP
pause 10
applymovement ROUTE25_MISTY, MovementData_0x19eff4
opentext
writetext Route25MistyDateText
waitbutton
closetext
- objectface PLAYER, UP
+ turnobject PLAYER, UP
applymovement ROUTE25_MISTY, MovementData_0x19effd
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
applymovement ROUTE25_MISTY, MovementData_0x19f000
disappear ROUTE25_MISTY
clearevent EVENT_TRAINERS_IN_CERULEAN_GYM
diff --git a/maps/Route27.asm b/maps/Route27.asm
index f19acf508..dd11206a3 100644
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -23,17 +23,17 @@ Route27_MapScripts:
end
UnknownScript_0x1a0873:
- objectface ROUTE27_FISHER, LEFT
+ turnobject ROUTE27_FISHER, LEFT
showemote EMOTE_SHOCK, ROUTE27_FISHER, 15
applymovement ROUTE27_FISHER, MovementData_0x1a0a66
jump UnknownScript_0x1a088c
UnknownScript_0x1a0881:
- objectface ROUTE27_FISHER, LEFT
+ turnobject ROUTE27_FISHER, LEFT
showemote EMOTE_SHOCK, ROUTE27_FISHER, 15
applymovement ROUTE27_FISHER, MovementData_0x1a0a69
UnknownScript_0x1a088c:
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
opentext
writetext Route27FisherHeyText
buttonsound
diff --git a/maps/Route29.asm b/maps/Route29.asm
index e8fc8878a..f5a2cff8b 100644
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -37,10 +37,10 @@ Route29_MapScripts:
return
Route29Tutorial1:
- objectface ROUTE29_COOLTRAINER_M1, UP
+ turnobject ROUTE29_COOLTRAINER_M1, UP
showemote EMOTE_SHOCK, ROUTE29_COOLTRAINER_M1, 15
applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData1a
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
setevent EVENT_DUDE_TALKED_TO_YOU
opentext
writetext CatchingTutorialIntroText
@@ -52,7 +52,7 @@ Route29Tutorial1:
stopfollow
loadwildmon RATTATA, 5
catchtutorial BATTLETYPE_TUTORIAL
- objectface ROUTE29_COOLTRAINER_M1, UP
+ turnobject ROUTE29_COOLTRAINER_M1, UP
opentext
writetext CatchingTutorialDebriefText
waitbutton
@@ -62,10 +62,10 @@ Route29Tutorial1:
end
Route29Tutorial2:
- objectface ROUTE29_COOLTRAINER_M1, UP
+ turnobject ROUTE29_COOLTRAINER_M1, UP
showemote EMOTE_SHOCK, ROUTE29_COOLTRAINER_M1, 15
applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData2a
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
setevent EVENT_DUDE_TALKED_TO_YOU
opentext
writetext CatchingTutorialIntroText
@@ -77,7 +77,7 @@ Route29Tutorial2:
stopfollow
loadwildmon RATTATA, 5
catchtutorial BATTLETYPE_TUTORIAL
- objectface ROUTE29_COOLTRAINER_M1, UP
+ turnobject ROUTE29_COOLTRAINER_M1, UP
opentext
writetext CatchingTutorialDebriefText
waitbutton
diff --git a/maps/Route30.asm b/maps/Route30.asm
index 5f20a239d..a7d066601 100644
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -29,7 +29,7 @@ YoungsterJoey_ImportantBattleScript:
faceplayer
writetext Text_ThisIsABigBattle
waitbutton
- objectface ROUTE30_YOUNGSTER1, UP
+ turnobject ROUTE30_YOUNGSTER1, UP
closetext
playsound SFX_TACKLE
applymovement ROUTE30_MONSTER1, Route30_MikeysRattataAttacksMovement
diff --git a/maps/Route32.asm b/maps/Route32.asm
index cbfe311cd..0402dd7f7 100644
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -85,8 +85,8 @@ Route32CooltrainerMContinueScene:
end
Route32CooltrainerMStopsYouScene:
- objectface ROUTE32_COOLTRAINER_M, LEFT
- objectface PLAYER, RIGHT
+ turnobject ROUTE32_COOLTRAINER_M, LEFT
+ turnobject PLAYER, RIGHT
opentext
writetext Route32CooltrainerMText_WhatsTheHurry
waitbutton
@@ -94,7 +94,7 @@ Route32CooltrainerMStopsYouScene:
follow PLAYER, ROUTE32_COOLTRAINER_M
applymovement PLAYER, Movement_Route32CooltrainerMPushesYouBackToViolet
stopfollow
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
scall Route32CooltrainerMContinueScene
applymovement ROUTE32_COOLTRAINER_M, Movement_Route32CooltrainerMReset1
applymovement ROUTE32_COOLTRAINER_M, Movement_Route32CooltrainerMReset2
@@ -118,8 +118,8 @@ Route32RoarTMGuyScript:
end
Route32WannaBuyASlowpokeTailScript:
- objectface ROUTE32_FISHER4, DOWN
- objectface PLAYER, UP
+ turnobject ROUTE32_FISHER4, DOWN
+ turnobject PLAYER, UP
jump _OfferToSellSlowpokeTail
SlowpokeTailSalesmanScript:
diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm
index 19291b412..95d45ecc7 100644
--- a/maps/Route34IlexForestGate.asm
+++ b/maps/Route34IlexForestGate.asm
@@ -26,12 +26,12 @@ UnknownScript_0x62d3d:
checkevent EVENT_FOREST_IS_RESTLESS
iffalse UnknownScript_0x62d62
showemote EMOTE_SHOCK, ROUTE34ILEXFORESTGATE_TEACHER2, 20
- objectface ROUTE34ILEXFORESTGATE_TEACHER2, LEFT
- objectface PLAYER, RIGHT
+ turnobject ROUTE34ILEXFORESTGATE_TEACHER2, LEFT
+ turnobject PLAYER, RIGHT
follow PLAYER, ROUTE34ILEXFORESTGATE_TEACHER2
applymovement PLAYER, MovementData_0x62d97
stopfollow
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
opentext
writetext UnknownText_0x62e41
waitbutton
diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm
index 4bde14d74..4e4229428 100644
--- a/maps/Route35NationalParkGate.asm
+++ b/maps/Route35NationalParkGate.asm
@@ -53,7 +53,7 @@ Route35NationalParkGate_MapScripts:
.LeavingContestEarly:
applymovement PLAYER, MovementData_0x6a2e2
- objectface ROUTE35NATIONALPARKGATE_OFFICER1, RIGHT
+ turnobject ROUTE35NATIONALPARKGATE_OFFICER1, RIGHT
opentext
checkcode VAR_CONTESTMINUTES
addvar 1
diff --git a/maps/Route36.asm b/maps/Route36.asm
index 0a46f1ca7..d5f9d3787 100644
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -37,10 +37,10 @@ Route36SuicuneScript:
showemote EMOTE_SHOCK, PLAYER, 15
pause 15
playsound SFX_WARP_FROM
- objectface PLAYER, UP
+ turnobject PLAYER, UP
applymovement ROUTE36_SUICUNE, Route36SuicuneMovement
disappear ROUTE36_SUICUNE
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
pause 10
setscene SCENE_ROUTE36_NOTHING
clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm
index 7afa94b5e..198536229 100644
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -62,7 +62,7 @@ Route36NationalParkGate_MapScripts:
return
.LeavingContestEarly:
- objectface PLAYER, UP
+ turnobject PLAYER, UP
opentext
checkcode VAR_CONTESTMINUTES
addvar 1
@@ -87,7 +87,7 @@ Route36NationalParkGate_MapScripts:
writetext UnknownText_0x6b300
waitbutton
closetext
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
playsound SFX_EXIT_BUILDING
special FadeOutPalettes
waitsfx
@@ -170,7 +170,7 @@ Route36OfficerScriptContest:
closetext
setflag ENGINE_BUG_CONTEST_TIMER
special GiveParkBalls
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
playsound SFX_EXIT_BUILDING
special FadeOutPalettes
waitsfx
diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm
index f1bbdcad4..61b99e037 100644
--- a/maps/Route39Barn.asm
+++ b/maps/Route39Barn.asm
@@ -16,14 +16,14 @@ TwinScript_0x9cc76:
writetext Text_MoomooIsSick
waitbutton
closetext
- objectface ROUTE39BARN_TWIN1, RIGHT
+ turnobject ROUTE39BARN_TWIN1, RIGHT
end
.FeedingMooMoo:
writetext Text_WereFeedingMoomoo
waitbutton
closetext
- objectface ROUTE39BARN_TWIN1, RIGHT
+ turnobject ROUTE39BARN_TWIN1, RIGHT
end
TwinScript_0x9cc90:
@@ -34,14 +34,14 @@ TwinScript_0x9cc90:
writetext Text_MoomooIsSick
waitbutton
closetext
- objectface ROUTE39BARN_TWIN2, LEFT
+ turnobject ROUTE39BARN_TWIN2, LEFT
end
.FeedingMooMoo:
writetext Text_WereFeedingMoomoo
waitbutton
closetext
- objectface ROUTE39BARN_TWIN2, LEFT
+ turnobject ROUTE39BARN_TWIN2, LEFT
end
MooMoo:
diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm
index 9b24aaf25..69869991d 100644
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -42,7 +42,7 @@ RocketScript_Southbound:
applymovement PLAYER, PlayerStepsIn
showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET2, 15
applymovement ROUTE43GATE_ROCKET2, Rocket2Script_BlocksYouSouth
- objectface ROUTE43GATE_ROCKET1, UP
+ turnobject ROUTE43GATE_ROCKET1, UP
showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET1, 15
applymovement ROUTE43GATE_ROCKET1, Rocket1Script_BlocksYouSouth
opentext
@@ -74,7 +74,7 @@ RocketScript_ShakeDownSouth:
RocketScript_Northbound:
showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET1, 15
applymovement ROUTE43GATE_ROCKET1, Rocket1Script_BlocksYouNorth
- objectface ROUTE43GATE_ROCKET2, DOWN
+ turnobject ROUTE43GATE_ROCKET2, DOWN
showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET2, 15
applymovement ROUTE43GATE_ROCKET2, Rocket2Script_BlocksYouNorth
opentext
diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm
index fed2ca1f5..c56f6d1d0 100644
--- a/maps/RuinsOfAlphKabutoChamber.asm
+++ b/maps/RuinsOfAlphKabutoChamber.asm
@@ -95,7 +95,7 @@ UnknownScript_0x587c0:
writetext UnknownText_0x588f5
waitbutton
closetext
- objectface RUINSOFALPHKABUTOCHAMBER_SCIENTIST, UP
+ turnobject RUINSOFALPHKABUTOCHAMBER_SCIENTIST, UP
end
UnknownScript_0x587c9:
diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm
index 9c6c3da41..71ac65040 100644
--- a/maps/RuinsOfAlphOutside.asm
+++ b/maps/RuinsOfAlphOutside.asm
@@ -42,13 +42,13 @@ RuinsOfAlphOutside_MapScripts:
return
RuinsOfAlphOutsideScientistScene1:
- objectface RUINSOFALPHOUTSIDE_SCIENTIST, UP
- objectface PLAYER, DOWN
+ turnobject RUINSOFALPHOUTSIDE_SCIENTIST, UP
+ turnobject PLAYER, DOWN
jump UnknownScript_0x58044
RuinsOfAlphOutsideScientistScene2:
- objectface RUINSOFALPHOUTSIDE_SCIENTIST, LEFT
- objectface PLAYER, RIGHT
+ turnobject RUINSOFALPHOUTSIDE_SCIENTIST, LEFT
+ turnobject PLAYER, RIGHT
jump UnknownScript_0x58044
ScientistScript_0x58043:
@@ -96,7 +96,7 @@ YoungsterScript_0x5807e:
writetext UnknownText_0x5848e
waitbutton
closetext
- objectface RUINSOFALPHOUTSIDE_YOUNGSTER3, UP
+ turnobject RUINSOFALPHOUTSIDE_YOUNGSTER3, UP
end
TrainerPsychicNathan:
diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm
index 0b136853f..c05583cd4 100644
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -38,7 +38,7 @@ RuinsOfAlphResearchCenter_MapScripts:
pause 30
playsound SFX_TRANSACTION
pause 30
- objectface RUINSOFALPHRESEARCHCENTER_SCIENTIST3, DOWN
+ turnobject RUINSOFALPHRESEARCHCENTER_SCIENTIST3, DOWN
opentext
writetext UnknownText_0x59278
waitbutton
diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm
index d5ad15387..e1af3bfcf 100644
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -48,7 +48,7 @@ TrainerGruntM1:
moveobject SLOWPOKEWELLB1F_KURT, 11, 6
appear SLOWPOKEWELLB1F_KURT
applymovement SLOWPOKEWELLB1F_KURT, KurtSlowpokeWellVictoryMovementData
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
opentext
writetext KurtLeaveSlowpokeWellText
waitbutton
diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm
index 78c58eca0..8121d2d4a 100644
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -21,7 +21,7 @@ SproutTower3F_MapScripts:
end
UnknownScript_0x184947:
- objectface PLAYER, UP
+ turnobject PLAYER, UP
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
playsound SFX_TACKLE
@@ -38,7 +38,7 @@ UnknownScript_0x184947:
waitbutton
closetext
showemote EMOTE_SHOCK, SPROUTTOWER3F_SILVER, 15
- objectface SPROUTTOWER3F_SILVER, DOWN
+ turnobject SPROUTTOWER3F_SILVER, DOWN
pause 15
applymovement SPROUTTOWER3F_SILVER, MovementData_0x184a24
playmusic MUSIC_RIVAL_ENCOUNTER
@@ -46,7 +46,7 @@ UnknownScript_0x184947:
writetext UnknownText_0x184aec
waitbutton
closetext
- objectface SPROUTTOWER3F_SILVER, UP
+ turnobject SPROUTTOWER3F_SILVER, UP
opentext
writetext UnknownText_0x184bc8
pause 15
diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm
index 4aad71817..3985c5c3e 100644
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -30,7 +30,7 @@ SecurityCamera1a:
playmusic MUSIC_ROCKET_ENCOUNTER
moveobject TEAMROCKETBASEB1F_ROCKET1, 19, 2
appear TEAMROCKETBASEB1F_ROCKET1
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
scall TrainerCameraGrunt1
ifequal TRUE, NoSecurityCamera
@@ -55,7 +55,7 @@ SecurityCamera1b:
playmusic MUSIC_ROCKET_ENCOUNTER
moveobject TEAMROCKETBASEB1F_ROCKET1, 19, 3
appear TEAMROCKETBASEB1F_ROCKET1
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
scall TrainerCameraGrunt1
ifequal TRUE, NoSecurityCamera
@@ -80,14 +80,14 @@ SecurityCamera2a:
playmusic MUSIC_ROCKET_ENCOUNTER
moveobject TEAMROCKETBASEB1F_ROCKET1, 4, 7
appear TEAMROCKETBASEB1F_ROCKET1
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement2
scall TrainerCameraGrunt1
ifequal TRUE, NoSecurityCamera
scall PlaySecurityCameraSounds
showemote EMOTE_SHOCK, PLAYER, 15
playmusic MUSIC_ROCKET_ENCOUNTER
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
moveobject TEAMROCKETBASEB1F_ROCKET1, 12, 5
appear TEAMROCKETBASEB1F_ROCKET1
applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement3
@@ -106,14 +106,14 @@ SecurityCamera2b:
playmusic MUSIC_ROCKET_ENCOUNTER
moveobject TEAMROCKETBASEB1F_ROCKET1, 4, 8
appear TEAMROCKETBASEB1F_ROCKET1
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement4
scall TrainerCameraGrunt1
ifequal TRUE, NoSecurityCamera
scall PlaySecurityCameraSounds
showemote EMOTE_SHOCK, PLAYER, 15
playmusic MUSIC_ROCKET_ENCOUNTER
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
moveobject TEAMROCKETBASEB1F_ROCKET1, 12, 5
appear TEAMROCKETBASEB1F_ROCKET1
applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement5
@@ -132,14 +132,14 @@ SecurityCamera3a:
playmusic MUSIC_ROCKET_ENCOUNTER
moveobject TEAMROCKETBASEB1F_ROCKET1, 19, 6
appear TEAMROCKETBASEB1F_ROCKET1
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
scall TrainerCameraGrunt1
ifequal TRUE, NoSecurityCamera
scall PlaySecurityCameraSounds
showemote EMOTE_SHOCK, PLAYER, 15
playmusic MUSIC_ROCKET_ENCOUNTER
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
moveobject TEAMROCKETBASEB1F_ROCKET1, 25, 11
appear TEAMROCKETBASEB1F_ROCKET1
applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement6
@@ -158,14 +158,14 @@ SecurityCamera3b:
playmusic MUSIC_ROCKET_ENCOUNTER
moveobject TEAMROCKETBASEB1F_ROCKET1, 19, 7
appear TEAMROCKETBASEB1F_ROCKET1
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
scall TrainerCameraGrunt1
ifequal TRUE, NoSecurityCamera
scall PlaySecurityCameraSounds
showemote EMOTE_SHOCK, PLAYER, 15
playmusic MUSIC_ROCKET_ENCOUNTER
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
moveobject TEAMROCKETBASEB1F_ROCKET1, 25, 12
appear TEAMROCKETBASEB1F_ROCKET1
applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement7
@@ -184,14 +184,14 @@ SecurityCamera4:
playmusic MUSIC_ROCKET_ENCOUNTER
moveobject TEAMROCKETBASEB1F_ROCKET1, 17, 16
appear TEAMROCKETBASEB1F_ROCKET1
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
scall TrainerCameraGrunt1
ifequal TRUE, NoSecurityCamera
scall PlaySecurityCameraSounds
showemote EMOTE_SHOCK, PLAYER, 15
playmusic MUSIC_ROCKET_ENCOUNTER
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
moveobject TEAMROCKETBASEB1F_ROCKET1, 25, 11
appear TEAMROCKETBASEB1F_ROCKET1
applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement8
@@ -210,14 +210,14 @@ SecurityCamera5:
playmusic MUSIC_ROCKET_ENCOUNTER
moveobject TEAMROCKETBASEB1F_ROCKET1, 3, 16
appear TEAMROCKETBASEB1F_ROCKET1
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
scall TrainerCameraGrunt1
ifequal TRUE, NoSecurityCamera
scall PlaySecurityCameraSounds
showemote EMOTE_SHOCK, PLAYER, 15
playmusic MUSIC_ROCKET_ENCOUNTER
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
moveobject TEAMROCKETBASEB1F_ROCKET1, 14, 16
appear TEAMROCKETBASEB1F_ROCKET1
applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement9
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index 511a79bd8..c5caaed7a 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -61,20 +61,20 @@ UnknownScript_0x6cfac:
writetext UnknownText_0x6d2ad
waitbutton
closetext
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
showemote EMOTE_SHOCK, PLAYER, 15
applymovement PLAYER, MovementData_0x6d21f
playmusic MUSIC_ROCKET_ENCOUNTER
applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d224
- objectface PLAYER, UP
+ turnobject PLAYER, UP
applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x6d22f
opentext
writetext UnknownText_0x6d2c3
waitbutton
closetext
cry DRAGONITE
- objectface TEAMROCKETBASEB2F_ROCKET_GIRL, LEFT
- objectface PLAYER, LEFT
+ turnobject TEAMROCKETBASEB2F_ROCKET_GIRL, LEFT
+ turnobject PLAYER, LEFT
appear TEAMROCKETBASEB2F_DRAGON
applymovement TEAMROCKETBASEB2F_DRAGON, MovementData_0x6d236
applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d23b
@@ -85,7 +85,7 @@ UnknownScript_0x6cfac:
writetext UnknownText_0x6d38c
waitbutton
closetext
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d241
opentext
writetext UnknownText_0x6d3bd
@@ -118,13 +118,13 @@ UnknownScript_0x6cfac:
special FadeInQuickly
setscene SCENE_TEAMROCKETBASEB2F_ELECTRODES
clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE
- objectface TEAMROCKETBASEB2F_LANCE, DOWN
+ turnobject TEAMROCKETBASEB2F_LANCE, DOWN
opentext
writetext UnknownText_0x6d5d8
waitbutton
closetext
applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d250
- objectface PLAYER, UP
+ turnobject PLAYER, UP
opentext
writetext UnknownText_0x6d64e
waitbutton
@@ -153,12 +153,12 @@ UnknownScript_0x6d07a:
end
LanceHealsScript1:
- objectface PLAYER, UP
+ turnobject PLAYER, UP
jump LanceHealsCommon
LanceHealsScript2:
- objectface PLAYER, RIGHT
- objectface TEAMROCKETBASEB2F_LANCE, LEFT
+ turnobject PLAYER, RIGHT
+ turnobject TEAMROCKETBASEB2F_LANCE, LEFT
LanceHealsCommon:
opentext
writetext LanceHealsText1
@@ -281,7 +281,7 @@ UnknownScript_0x6d184:
moveobject TEAMROCKETBASEB2F_LANCE, 18, 6
appear TEAMROCKETBASEB2F_LANCE
applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d27a
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
opentext
writetext UnknownText_0x6d809
buttonsound
@@ -290,12 +290,12 @@ UnknownScript_0x6d184:
writetext UnknownText_0x6d8f8
waitbutton
closetext
- objectface TEAMROCKETBASEB2F_LANCE, DOWN
+ turnobject TEAMROCKETBASEB2F_LANCE, DOWN
opentext
writetext UnknownText_0x6d994
waitbutton
closetext
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d283
disappear TEAMROCKETBASEB2F_LANCE
setevent EVENT_CLEARED_ROCKET_HIDEOUT
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
index db2b7dcf8..53fc9e44e 100644
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -47,9 +47,9 @@ TeamRocketBaseB3F_MapScripts:
return
LanceGetPasswordScript:
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
pause 5
- objectface TEAMROCKETBASEB3F_MOLTRES, RIGHT
+ turnobject TEAMROCKETBASEB3F_MOLTRES, RIGHT
pause 20
applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12a
opentext
@@ -62,12 +62,12 @@ LanceGetPasswordScript:
end
RocketBaseRival:
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
appear TEAMROCKETBASEB3F_SILVER
applymovement TEAMROCKETBASEB3F_SILVER, RocketBaseRivalEnterMovement
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
playmusic MUSIC_RIVAL_ENCOUNTER
opentext
writetext RocketBaseRivalText
@@ -94,7 +94,7 @@ UnknownScript_0x6e056:
pause 30
showemote EMOTE_SHOCK, TEAMROCKETBASEB3F_ROCKET1, 15
playmusic MUSIC_ROCKET_ENCOUNTER
- objectface TEAMROCKETBASEB3F_ROCKET1, DOWN
+ turnobject TEAMROCKETBASEB3F_ROCKET1, DOWN
opentext
writetext UnknownText_0x6e400
waitbutton
diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm
index 77fa5b83e..821658d0d 100644
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -88,7 +88,7 @@ TinTower1F_MapScripts:
special MonCheck
iftrue .Next1 ; if player caught Raikou, he doesn't appear in Tin Tower
applymovement TINTOWER1F_RAIKOU, TinTowerRaikouMovement1
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
cry RAIKOU
pause 10
playsound SFX_WARP_FROM
@@ -101,7 +101,7 @@ TinTower1F_MapScripts:
special MonCheck
iftrue .Next2 ; if player caught Entei, he doesn't appear in Tin Tower
applymovement TINTOWER1F_ENTEI, TinTowerEnteiMovement1
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
cry ENTEI
pause 10
playsound SFX_WARP_FROM
@@ -110,7 +110,7 @@ TinTower1F_MapScripts:
playsound SFX_EXIT_BUILDING
waitsfx
.Next2:
- objectface PLAYER, UP
+ turnobject PLAYER, UP
pause 10
applymovement PLAYER, TinTowerPlayerMovement2
applymovement TINTOWER1F_SUICUNE, TinTowerSuicuneMovement
@@ -132,7 +132,7 @@ TinTower1F_MapScripts:
clearevent EVENT_SET_WHEN_FOUGHT_HO_OH
reloadmapafterbattle
pause 20
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
playmusic MUSIC_MYSTICALMAN_ENCOUNTER
playsound SFX_ENTER_DOOR
moveobject TINTOWER1F_EUSINE, 10, 15
@@ -153,7 +153,7 @@ TinTower1F_MapScripts:
moveobject TINTOWER1F_SAGE1, 7, 13
moveobject TINTOWER1F_SAGE2, 9, 13
moveobject TINTOWER1F_SAGE3, 11, 13
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
opentext
writetext TinTowerEusineSuicuneText
waitbutton
diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm
index 6ed62935d..b37be60a7 100644
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@@ -12,7 +12,7 @@ TrainerHouseB1F_MapScripts:
end
TrainerHouseReceptionistScript:
- objectface PLAYER, UP
+ turnobject PLAYER, UP
opentext
checkflag ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY
iftrue .FoughtTooManyTimes
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm
index 2a7d6a5f9..8d8ed3ea8 100644
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -43,7 +43,7 @@ SailorScript_0x74dc4:
writetext UnknownText_0x74f06
waitbutton
closetext
- objectface VERMILIONPORT_SAILOR1, DOWN
+ turnobject VERMILIONPORT_SAILOR1, DOWN
pause 10
playsound SFX_EXIT_BUILDING
disappear VERMILIONPORT_SAILOR1
@@ -77,12 +77,12 @@ UnknownScript_0x74e1a:
end
UnknownScript_0x74e20:
- objectface VERMILIONPORT_SAILOR2, RIGHT
+ turnobject VERMILIONPORT_SAILOR2, RIGHT
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
iftrue UnknownScript_0x74e86
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
iftrue UnknownScript_0x74e86
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
opentext
checkcode VAR_WEEKDAY
ifequal MONDAY, UnknownScript_0x74e72
diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm
index 46fb6d892..cf2219908 100644
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -21,7 +21,7 @@ VictoryRoad_MapScripts:
UnknownScript_0x74492:
moveobject VICTORYROAD_SILVER, 18, 11
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
pause 15
@@ -35,7 +35,7 @@ UnknownScript_0x74492:
end
UnknownScript_0x744b5:
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
pause 15
@@ -49,7 +49,7 @@ UnknownScript_0x744b5:
end
UnknownScript_0x744d4:
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
playmusic MUSIC_RIVAL_ENCOUNTER
opentext
writetext UnknownText_0x7455f
diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm
index 124905729..451bf9371 100644
--- a/maps/VictoryRoadGate.asm
+++ b/maps/VictoryRoadGate.asm
@@ -17,7 +17,7 @@ VictoryRoadGate_MapScripts:
end
VictoryRoadGateBadgeCheckScene:
- objectface PLAYER, LEFT
+ turnobject PLAYER, LEFT
jump VictoryRoadGateBadgeCheckScript
VictoryRoadGateOfficerScript:
diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm
index d4ece46fb..024dbde82 100644
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -40,7 +40,7 @@ VioletCityEarlScript:
playmusic MUSIC_SHOW_ME_AROUND
follow VIOLETCITY_EARL, PLAYER
applymovement VIOLETCITY_EARL, VioletCityFollowEarl_MovementData
- objectface PLAYER, UP
+ turnobject PLAYER, UP
applymovement VIOLETCITY_EARL, VioletCitySpinningEarl_MovementData
stopfollow
special RestartMapMusic
diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm
index 5795f1591..ca11063d6 100644
--- a/maps/VioletPokecenter1F.asm
+++ b/maps/VioletPokecenter1F.asm
@@ -36,7 +36,7 @@ VioletPokecenter1F_ElmsAideScript:
closetext
checkcode VAR_FACING
ifequal UP, .AideWalksAroundPlayer
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideWalksStraightOutOfPokecenter
playsound SFX_EXIT_BUILDING
disappear VIOLETPOKECENTER1F_SCIENTIST
@@ -45,7 +45,7 @@ VioletPokecenter1F_ElmsAideScript:
.AideWalksAroundPlayer:
applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideWalksLeftToExitPokecenter
- objectface PLAYER, DOWN
+ turnobject PLAYER, DOWN
applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideFinishesLeavingPokecenter
playsound SFX_EXIT_BUILDING
disappear VIOLETPOKECENTER1F_SCIENTIST
diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm
index 46dc964f2..2eca18e19 100644
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@@ -51,19 +51,19 @@ WiseTriosRoomSage3Script:
jumptextfaceplayer WiseTriosRoomSage3Text
UnknownScript_0x985a3:
- objectface WISETRIOSROOM_SAGE3, UP
- objectface PLAYER, DOWN
+ turnobject WISETRIOSROOM_SAGE3, UP
+ turnobject PLAYER, DOWN
showemote EMOTE_SHOCK, WISETRIOSROOM_SAGE3, 20
follow PLAYER, WISETRIOSROOM_SAGE3
applymovement PLAYER, MovementData_0x98622
stopfollow
- objectface PLAYER, RIGHT
+ turnobject PLAYER, RIGHT
opentext
writetext UnknownText_0x98712
waitbutton
closetext
applymovement WISETRIOSROOM_SAGE3, MovementData_0x98625
- objectface WISETRIOSROOM_SAGE3, LEFT
+ turnobject WISETRIOSROOM_SAGE3, LEFT
end
TrainerSageGaku:
@@ -101,7 +101,7 @@ TrainerSageKoji:
waitbutton
closetext
applymovement WISETRIOSROOM_SAGE6, MovementData_0x98628
- objectface WISETRIOSROOM_SAGE6, UP
+ turnobject WISETRIOSROOM_SAGE6, UP
setevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
setscene SCENE_FINISHED
end