spriteface → objectface, consistent with the other script commands

2025-01-23 09:16:20 -08:00 · 2018-02-02 21:50:43 -05:00 · 2018-02-02 21:50:43 -05:00 · c834bdadf2
commit c834bdadf2
parent aa8db1632c
80 changed files with 323 additions and 323 deletions
--- a/docs/event_commands.md
+++ b/docs/event_commands.md
@ -241,7 +241,7 @@ Until this document is filled out, the [G/S Scripting Compendium](https://hax.ii
 ## `$75`: <code>showemote <i>emote_id</i>, <i>object_id</i>, <i>length</i></code>
-## `$76`: <code>spriteface <i>object_id</i>, <i>facing</i></code>
+## `$76`: <code>objectface <i>object_id</i>, <i>facing</i></code>
 ## `$77`: <code>follownotexact <i>object2</i>, <i>object1</i></code>
--- a/engine/events/std_scripts.asm
+++ b/engine/events/std_scripts.asm
@ -109,7 +109,7 @@ PokecenterNurseScript:
 	farwritetext NurseTakePokemonText
 	pause 20
 	special StubbedTrainerRankings_Healings
-	spriteface LAST_TALKED, LEFT
+	objectface LAST_TALKED, LEFT
 	pause 10
 	special HealParty
 	playmusic MUSIC_NONE
@ -117,7 +117,7 @@ PokecenterNurseScript:
 	special HealMachineAnim
 	pause 30
 	special RestartMapMusic
-	spriteface LAST_TALKED, DOWN
+	objectface LAST_TALKED, DOWN
 	pause 10
 	checkphonecall ; elm already called about pokerus
@ -134,9 +134,9 @@ PokecenterNurseScript:
 .done
 	farwritetext NurseGoodbyeText
-	spriteface LAST_TALKED, UP
+	objectface LAST_TALKED, UP
 	pause 10
-	spriteface LAST_TALKED, DOWN
+	objectface LAST_TALKED, DOWN
 	pause 10
 	waitbutton
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@ -185,7 +185,7 @@ endc
 	dw Script_writeobjectxy              ; 73
 	dw Script_loademote                  ; 74
 	dw Script_showemote                  ; 75
-	dw Script_spriteface                 ; 76
+	dw Script_objectface                 ; 76
 	dw Script_follownotexact             ; 77
 	dw Script_earthquake                 ; 78
 	dw Script_changemap                  ; 79
@ -1052,7 +1052,7 @@ Script_faceobject:
 	call ApplyObjectFacing
 	ret
-Script_spriteface:
+Script_objectface:
 ; script command 0x76
 ; parameters: object_id, facing
--- a/macros/scripts/events.asm
+++ b/macros/scripts/events.asm
@ -747,9 +747,9 @@ showemote: MACRO
 	db \3 ; time
 ENDM
-	enum spriteface_command ; $76
+	enum objectface_command ; $76
-spriteface: MACRO
+objectface: MACRO
-	db spriteface_command
+	db objectface_command
 	db \1 ; object id
 	db \2 ; facing
 ENDM
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@ -36,23 +36,23 @@ AzaleaTown_MapScripts:
 AzaleaTownRivalBattleScene1:
 	moveobject AZALEATOWN_SILVER, 11, 11
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
 	appear AZALEATOWN_SILVER
 	applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement1
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	jump AzaleaTownRivalBattleScript
 AzaleaTownRivalBattleScene2:
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
 	appear AZALEATOWN_SILVER
 	applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement2
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 AzaleaTownRivalBattleScript:
 	playmusic MUSIC_RIVAL_ENCOUNTER
 	opentext
@ -96,7 +96,7 @@ AzaleaTownRivalBattleScript:
 	writetext AzaleaTownRivalAfterText
 	waitbutton
 	closetext
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleExitMovement
 	playsound SFX_EXIT_BUILDING
 	disappear AZALEATOWN_SILVER
@ -158,13 +158,13 @@ AzaleaTownCelebiScene:
 	opentext
 	writetext AzaleaTownKurtText1
 	buttonsound
-	spriteface AZALEATOWN_KURT_OUTSIDE, RIGHT
+	objectface AZALEATOWN_KURT_OUTSIDE, RIGHT
 	writetext AzaleaTownKurtText2
 	buttonsound
 	writetext AzaleaTownKurtText3
 	waitbutton
 	verbosegiveitem GS_BALL
-	spriteface AZALEATOWN_KURT_OUTSIDE, LEFT
+	objectface 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
-	spriteface AZALEATOWN_KURT_OUTSIDE, LEFT
+	objectface AZALEATOWN_KURT_OUTSIDE, LEFT
 	closetext
 	end
--- 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
-	spriteface BATTLETOWER1F_RECEPTIONIST, LEFT
+	objectface BATTLETOWER1F_RECEPTIONIST, LEFT
 	writetext Text_PleaseConfirmOnThisMonitor
 	waitbutton
-	spriteface BATTLETOWER1F_RECEPTIONIST, DOWN
+	objectface BATTLETOWER1F_RECEPTIONIST, DOWN
 	closetext
 	end
@ -250,7 +250,7 @@ YoungsterScript_0x9e55d:
 	writetext Text_BattleTowerYoungster
 	waitbutton
 	closetext
-	spriteface BATTLETOWER1F_YOUNGSTER, RIGHT
+	objectface BATTLETOWER1F_YOUNGSTER, RIGHT
 	end
 CooltrainerFScript_0x9e568:
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@ -36,7 +36,7 @@ BurnedTower1F_MapScripts:
 	return
 .MeetEusine:
-	spriteface BURNEDTOWER1F_EUSINE, DOWN
+	objectface 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
-	spriteface BURNEDTOWER1F_SILVER, RIGHT
+	objectface BURNEDTOWER1F_SILVER, RIGHT
 	pause 15
 	applymovement PLAYER, BurnedTowerMovement_PlayerWalksToSilver
 	applymovement BURNEDTOWER1F_SILVER, BurnedTowerMovement_SilverWalksToPlayer
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@ -34,48 +34,48 @@ ReleaseTheBeasts:
 	playmusic MUSIC_NONE
 	pause 30
 	appear BURNEDTOWERB1F_RAIKOU1
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	pause 5
 	disappear BURNEDTOWERB1F_RAIKOU2
 	pause 15
 	cry RAIKOU
 	appear BURNEDTOWERB1F_ENTEI1
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	pause 5
 	disappear BURNEDTOWERB1F_ENTEI2
 	pause 15
 	cry ENTEI
 	appear BURNEDTOWERB1F_SUICUNE1
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	pause 5
 	disappear BURNEDTOWERB1F_SUICUNE2
 	pause 15
 	cry SUICUNE
 	pause 15
 	playsound SFX_WARP_FROM
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	applymovement BURNEDTOWERB1F_RAIKOU1, BurnedTowerRaikouMovement
 	disappear BURNEDTOWERB1F_RAIKOU1
 	waitsfx
 	playsound SFX_WARP_FROM
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	applymovement BURNEDTOWERB1F_ENTEI1, BurnedTowerEnteiMovement
 	disappear BURNEDTOWERB1F_ENTEI1
 	waitsfx
 	pause 15
 	playsound SFX_WARP_FROM
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	applymovement BURNEDTOWERB1F_SUICUNE1, BurnedTowerSuicuneMovement1
 	playsound SFX_WARP_FROM
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	applymovement BURNEDTOWERB1F_SUICUNE1, BurnedTowerSuicuneMovement2
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	pause 20
 	cry SUICUNE
 	pause 30
 	playsound SFX_WARP_FROM
 	applymovement BURNEDTOWERB1F_SUICUNE1, BurnedTowerSuicuneMovement3
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	disappear BURNEDTOWERB1F_SUICUNE1
 	waitsfx
 	special RestartMapMusic
--- a/maps/CeladonCafe.asm
+++ b/maps/CeladonCafe.asm
@ -28,7 +28,7 @@ CeladonCafeFisher1:
 	writetext Fisher1Text_Concentration
 	waitbutton
 	closetext
-	spriteface CELADONCAFE_FISHER1, LEFT
+	objectface CELADONCAFE_FISHER1, LEFT
 	end
 CeladonCafeFisher2:
@ -41,7 +41,7 @@ CeladonCafeFisher2:
 	writetext Fisher2Text_Quantity
 	waitbutton
 	closetext
-	spriteface CELADONCAFE_FISHER2, RIGHT
+	objectface CELADONCAFE_FISHER2, RIGHT
 	end
 CeladonCafeFisher3:
@ -54,7 +54,7 @@ CeladonCafeFisher3:
 	writetext Fisher3Text_GoldenrodIsBest
 	waitbutton
 	closetext
-	spriteface CELADONCAFE_FISHER3, RIGHT
+	objectface CELADONCAFE_FISHER3, RIGHT
 	end
 CeladonCafeTeacher:
@ -69,7 +69,7 @@ CeladonCafeTeacher:
 	writetext TeacherText_NoCoinCase
 	waitbutton
 	closetext
-	spriteface CELADONCAFE_TEACHER, LEFT
+	objectface CELADONCAFE_TEACHER, LEFT
 	end
 .HasCoinCase:
@ -77,12 +77,12 @@ CeladonCafeTeacher:
 	writetext TeacherText_KeepEating
 	waitbutton
 	closetext
-	spriteface CELADONCAFE_TEACHER, RIGHT
+	objectface CELADONCAFE_TEACHER, RIGHT
 	opentext
 	writetext TeacherText_MoreChef
 	waitbutton
 	closetext
-	spriteface CELADONCAFE_TEACHER, LEFT
+	objectface CELADONCAFE_TEACHER, LEFT
 	end
 EatathonContestPoster:
--- a/maps/CeladonDeptStore3F.asm
+++ b/maps/CeladonDeptStore3F.asm
@ -26,7 +26,7 @@ CeladonDeptStore3FGameboyKid1Script:
 	writetext CeladonDeptStore3FGameboyKid1Text
 	waitbutton
 	closetext
-	spriteface CELADONDEPTSTORE3F_GAMEBOY_KID1, DOWN
+	objectface CELADONDEPTSTORE3F_GAMEBOY_KID1, DOWN
 	end
 CeladonDeptStore3FGameboyKid2Script:
@ -35,7 +35,7 @@ CeladonDeptStore3FGameboyKid2Script:
 	writetext CeladonDeptStore3FGameboyKid2Text
 	waitbutton
 	closetext
-	spriteface CELADONDEPTSTORE3F_GAMEBOY_KID2, DOWN
+	objectface CELADONDEPTSTORE3F_GAMEBOY_KID2, DOWN
 	end
 CeladonDeptStore3FSuperNerdScript:
--- a/maps/CeladonGameCorner.asm
+++ b/maps/CeladonGameCorner.asm
@ -26,7 +26,7 @@ CeladonGameCornerPokefanMScript:
 	writetext CeladonGameCornerPokefanMText
 	waitbutton
 	closetext
-	spriteface CELADONGAMECORNER_POKEFAN_M, LEFT
+	objectface CELADONGAMECORNER_POKEFAN_M, LEFT
 	end
 CeladonGameCornerTeacherScript:
@ -35,7 +35,7 @@ CeladonGameCornerTeacherScript:
 	writetext CeladonGameCornerTeacherText
 	waitbutton
 	closetext
-	spriteface CELADONGAMECORNER_TEACHER, RIGHT
+	objectface CELADONGAMECORNER_TEACHER, RIGHT
 	end
 CeladonGameCornerFishingGuruScript:
@ -44,7 +44,7 @@ CeladonGameCornerFishingGuruScript:
 	writetext CeladonGameCornerFishingGuruText
 	waitbutton
 	closetext
-	spriteface CELADONGAMECORNER_FISHING_GURU, RIGHT
+	objectface CELADONGAMECORNER_FISHING_GURU, RIGHT
 	end
 CeladonGameCornerFisherScript:
@ -66,7 +66,7 @@ CeladonGameCornerFisherScript:
 	writetext CeladonGameCornerFisherText2
 	waitbutton
 	closetext
-	spriteface LAST_TALKED, LEFT
+	objectface LAST_TALKED, LEFT
 	end
 .GiveCoins:
@ -80,14 +80,14 @@ CeladonGameCornerFisherScript:
 	writetext CeladonGameCornerFisherNoCoinCaseText
 	waitbutton
 	closetext
-	spriteface LAST_TALKED, LEFT
+	objectface LAST_TALKED, LEFT
 	end
 .FullCoinCase:
 	writetext CeladonGameCornerFisherFullCoinCaseText
 	waitbutton
 	closetext
-	spriteface LAST_TALKED, LEFT
+	objectface LAST_TALKED, LEFT
 	end
 CeladonGymGuyScript:
@ -99,7 +99,7 @@ CeladonGameCornerGrampsScript:
 	writetext CeladonGameCornerGrampsText
 	waitbutton
 	closetext
-	spriteface CELADONGAMECORNER_GRAMPS, LEFT
+	objectface CELADONGAMECORNER_GRAMPS, LEFT
 	end
 CeladonGameCornerPoster1Script:
--- a/maps/CeruleanCity.asm
+++ b/maps/CeruleanCity.asm
@ -49,7 +49,7 @@ CeruleanCityCooltrainerFScript:
 	writetext CeruleanCityCooltrainerFText1
 	waitbutton
 	closetext
-	spriteface CERULEANCITY_COOLTRAINER_F, LEFT
+	objectface CERULEANCITY_COOLTRAINER_F, LEFT
 	opentext
 	writetext CeruleanCityCooltrainerFText2
 	waitbutton
@ -113,7 +113,7 @@ CeruleanCityYoungsterScript:
 	playsound SFX_TRANSACTION
 	waitsfx
 	showemote EMOTE_SHOCK, CERULEANCITY_YOUNGSTER, 15
-	spriteface CERULEANCITY_YOUNGSTER, LEFT
+	objectface CERULEANCITY_YOUNGSTER, LEFT
 	opentext
 	writetext CeruleanCityYoungsterText2
 	waitbutton
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@ -52,7 +52,7 @@ CeruleanGym_MapScripts:
 	waitsfx
 	special RestartMapMusic
 	pause 15
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	pause 15
 	end
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@ -42,28 +42,28 @@ CherrygroveCityGuideGent:
 	waitbutton
 	closetext
 	applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement2
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	opentext
 	writetext GuideGentMartText
 	waitbutton
 	closetext
 	applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement3
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	opentext
 	writetext GuideGentRoute30Text
 	waitbutton
 	closetext
 	applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement4
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	opentext
 	writetext GuideGentSeaText
 	waitbutton
 	closetext
 	applymovement CHERRYGROVECITY_GRAMPS, GuideGentMovement5
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	pause 60
-	spriteface CHERRYGROVECITY_GRAMPS, LEFT
+	objectface CHERRYGROVECITY_GRAMPS, LEFT
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	opentext
 	writetext GuideGentGiftText
 	buttonsound
@ -77,7 +77,7 @@ CherrygroveCityGuideGent:
 	closetext
 	stopfollow
 	special RestartMapMusic
-	spriteface PLAYER, UP
+	objectface 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:
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
 	appear CHERRYGROVECITY_SILVER
 	applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalWalksToYou
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	playmusic MUSIC_RIVAL_ENCOUNTER
 	opentext
 	writetext UnknownText_0x19c4e2
@ -166,7 +166,7 @@ CherrygroveSilverSceneNorth:
 .FinishRival:
 	playsound SFX_TACKLE
 	applymovement PLAYER, CherrygroveCity_RivalPushesYouOutOfTheWay
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalExitsStageLeft
 	disappear CHERRYGROVECITY_SILVER
 	setscene SCENE_CHERRYGROVECITY_NOTHING
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@ -36,12 +36,12 @@ CianwoodCity_MapScripts:
 	return
 CianwoodCitySuicuneAndEusine:
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	showemote EMOTE_SHOCK, PLAYER, 15
 	pause 15
 	playsound SFX_WARP_FROM
 	applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00da
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	pause 15
 	playsound SFX_WARP_FROM
 	applymovement CIANWOODCITY_SUICUNE, MovementData_0x1a00e0
--- a/maps/CianwoodGym.asm
+++ b/maps/CianwoodGym.asm
@ -22,7 +22,7 @@ ChuckScript_0x9d60f:
 	writetext ChuckIntroText1
 	waitbutton
 	closetext
-	spriteface CIANWOODGYM_CHUCK, RIGHT
+	objectface CIANWOODGYM_CHUCK, RIGHT
 	opentext
 	writetext ChuckIntroText2
 	waitbutton
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@ -91,12 +91,12 @@ DragonShrine_MapScripts:
 	iftrue .Question2
 .WrongAnswer:
 	closetext
-	spriteface DRAGONSHRINE_ELDER1, LEFT
+	objectface DRAGONSHRINE_ELDER1, LEFT
 	opentext
 	writetext DragonShrineWrongAnswerText1
 	waitbutton
 	closetext
-	spriteface DRAGONSHRINE_ELDER1, DOWN
+	objectface DRAGONSHRINE_ELDER1, DOWN
 	opentext
 	writetext DragonShrineWrongAnswerText2
 	waitbutton
@ -122,12 +122,12 @@ DragonShrine_MapScripts:
 	playmusic MUSIC_CLAIR
 	appear DRAGONSHRINE_CLAIR
 	waitsfx
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	pause 30
 	applymovement DRAGONSHRINE_CLAIR, DragonShrineClairWalkInMovement
-	spriteface DRAGONSHRINE_CLAIR, RIGHT
+	objectface DRAGONSHRINE_CLAIR, RIGHT
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
-	spriteface DRAGONSHRINE_ELDER1, LEFT
+	objectface DRAGONSHRINE_ELDER1, LEFT
 	opentext
 	writetext DragonShrineClairYouPassedText
 	waitbutton
@ -144,7 +144,7 @@ DragonShrine_MapScripts:
 	waitbutton
 	closetext
 	applymovement DRAGONSHRINE_ELDER1, DragonShrineElderWalkToClairMovement
-	spriteface DRAGONSHRINE_CLAIR, UP
+	objectface DRAGONSHRINE_CLAIR, UP
 	opentext
 	writetext DragonShrineMustIInformLanceText
 	waitbutton
@ -171,9 +171,9 @@ DragonShrine_MapScripts:
 	waitbutton
 	closetext
 	applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2ce
-	spriteface DRAGONSHRINE_CLAIR, UP
+	objectface DRAGONSHRINE_CLAIR, UP
 	applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2d1
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	opentext
 	writetext DragonShrineElderScoldsClairText
 	waitbutton
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@ -47,7 +47,7 @@ DragonsDenB1F_ClairScene:
 	pause 30
 	closetext
 	showemote EMOTE_SHOCK, PLAYER, 15
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	playmusic MUSIC_CLAIR
 	applymovement DRAGONSDENB1F_CLAIR, MovementDragonsDen_ClairWalksToYou
 	opentext
--- a/maps/EarlsPokemonAcademy.asm
+++ b/maps/EarlsPokemonAcademy.asm
@ -45,7 +45,7 @@ EarlsPokemonAcademyGameboyKid1Script:
 	writetext EarlsPokemonAcademyGameboyKid1Text
 	waitbutton
 	closetext
-	spriteface EARLSPOKEMONACADEMY_GAMEBOY_KID1, DOWN
+	objectface EARLSPOKEMONACADEMY_GAMEBOY_KID1, DOWN
 	end
 EarlsPokemonAcademyGameboyKid2Script:
@ -54,7 +54,7 @@ EarlsPokemonAcademyGameboyKid2Script:
 	writetext EarlsPokemonAcademyGameboyKid2Text
 	waitbutton
 	closetext
-	spriteface EARLSPOKEMONACADEMY_GAMEBOY_KID2, DOWN
+	objectface EARLSPOKEMONACADEMY_GAMEBOY_KID2, DOWN
 	end
 EarlsPokemonAcademyYoungster2Script:
--- a/maps/EcruteakPokecenter1F.asm
+++ b/maps/EcruteakPokecenter1F.asm
@ -26,15 +26,15 @@ EcruteakPokecenter1F_MapScripts:
 	waitsfx
 	applymovement ECRUTEAKPOKECENTER1F_BILL, EcruteakPokecenter1FBillMovement1
 	applymovement PLAYER, EcruteakPokecenter1FPlayerMovement1
-	spriteface ECRUTEAKPOKECENTER1F_NURSE, UP
+	objectface ECRUTEAKPOKECENTER1F_NURSE, UP
 	pause 10
-	spriteface ECRUTEAKPOKECENTER1F_NURSE, DOWN
+	objectface ECRUTEAKPOKECENTER1F_NURSE, DOWN
 	pause 30
-	spriteface ECRUTEAKPOKECENTER1F_NURSE, UP
+	objectface ECRUTEAKPOKECENTER1F_NURSE, UP
 	pause 10
-	spriteface ECRUTEAKPOKECENTER1F_NURSE, DOWN
+	objectface ECRUTEAKPOKECENTER1F_NURSE, DOWN
 	pause 20
-	spriteface ECRUTEAKPOKECENTER1F_BILL, DOWN
+	objectface ECRUTEAKPOKECENTER1F_BILL, DOWN
 	pause 10
 	opentext
 	writetext EcruteakPokecenter1F_BillText1
@ -45,7 +45,7 @@ EcruteakPokecenter1F_MapScripts:
 	writetext EcruteakPokecenter1F_BillText2
 	waitbutton
 	closetext
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	applymovement ECRUTEAKPOKECENTER1F_BILL, EcruteakPokecenter1FBillMovement2
 	playsound SFX_EXIT_BUILDING
 	disappear ECRUTEAKPOKECENTER1F_BILL
--- 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
-	spriteface ELMSLAB_ELM, RIGHT
+	objectface 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
-	spriteface ELMSLAB_ELM, DOWN
+	objectface ELMSLAB_ELM, DOWN
 	opentext
 	writetext ElmText_GotAnEmail
 	waitbutton
 	closetext
 	opentext
-	spriteface ELMSLAB_ELM, RIGHT
+	objectface ELMSLAB_ELM, RIGHT
 	writetext ElmText_MissionFromMrPokemon
 	waitbutton
 	closetext
 	applymovement ELMSLAB_ELM, ElmsLab_ElmToDefaultPositionMovement1
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	applymovement ELMSLAB_ELM, ElmsLab_ElmToDefaultPositionMovement2
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	opentext
 	writetext ElmText_ChooseAPokemon
 	waitbutton
@ -147,7 +147,7 @@ ElmCheckGotEggAgain:
 	end
 LabTryToLeaveScript:
-	spriteface ELMSLAB_ELM, DOWN
+	objectface ELMSLAB_ELM, DOWN
 	opentext
 	writetext LabWhereGoingText
 	waitbutton
@ -158,7 +158,7 @@ LabTryToLeaveScript:
 CyndaquilPokeBallScript:
 	checkevent EVENT_GOT_A_POKEMON_FROM_ELM
 	iftrue LookAtElmPokeBallScript
-	spriteface ELMSLAB_ELM, DOWN
+	objectface ELMSLAB_ELM, DOWN
 	refreshscreen
 	pokepic CYNDAQUIL
 	cry CYNDAQUIL
@ -188,7 +188,7 @@ CyndaquilPokeBallScript:
 TotodilePokeBallScript:
 	checkevent EVENT_GOT_A_POKEMON_FROM_ELM
 	iftrue LookAtElmPokeBallScript
-	spriteface ELMSLAB_ELM, DOWN
+	objectface ELMSLAB_ELM, DOWN
 	refreshscreen
 	pokepic TOTODILE
 	cry TOTODILE
@ -216,7 +216,7 @@ TotodilePokeBallScript:
 ChikoritaPokeBallScript:
 	checkevent EVENT_GOT_A_POKEMON_FROM_ELM
 	iftrue LookAtElmPokeBallScript
-	spriteface ELMSLAB_ELM, DOWN
+	objectface ELMSLAB_ELM, DOWN
 	refreshscreen
 	pokepic CHIKORITA
 	cry CHIKORITA
@ -248,7 +248,7 @@ DidntChooseStarterScript:
 	end
 ElmDirectionsScript:
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	opentext
 	writetext ElmDirectionsText1
 	waitbutton
@ -260,12 +260,12 @@ ElmDirectionsScript:
 	waitsfx
 	waitbutton
 	closetext
-	spriteface ELMSLAB_ELM, LEFT
+	objectface ELMSLAB_ELM, LEFT
 	opentext
 	writetext ElmDirectionsText2
 	waitbutton
 	closetext
-	spriteface ELMSLAB_ELM, DOWN
+	objectface ELMSLAB_ELM, DOWN
 	opentext
 	writetext ElmDirectionsText3
 	waitbutton
@ -457,14 +457,14 @@ ElmJumpRightScript:
 AideScript_WalkPotion1:
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksRight1
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	scall AideScript_GivePotion
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft1
 	end
 AideScript_WalkPotion2:
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksRight2
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	scall AideScript_GivePotion
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft2
 	end
@ -482,14 +482,14 @@ AideScript_GivePotion:
 AideScript_WalkBalls1:
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksRight1
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	scall AideScript_GiveYouBalls
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft1
 	end
 AideScript_WalkBalls2:
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksRight2
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	scall AideScript_GiveYouBalls
 	applymovement ELMSLAB_ELMS_AIDE, AideWalksLeft2
 	end
@ -550,7 +550,7 @@ MeetCopScript2:
 MeetCopScript:
 	applymovement PLAYER, MeetCopScript_WalkUp
 CopScript:
-	spriteface ELMSLAB_OFFICER, LEFT
+	objectface ELMSLAB_OFFICER, LEFT
 	opentext
 	writetext ElmsLabOfficerText1
 	buttonsound
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@ -130,7 +130,7 @@ WorriedGrandpaSceneLeft:
 	writetext UnknownText_0x75412
 	waitbutton
 	closetext
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x75222
 	disappear FASTSHIP1F_GENTLEMAN
 	setscene SCENE_DEFAULT
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@ -36,7 +36,7 @@ SSAquaCaptain:
 	end
 SSAquaGranddaughterBefore:
-	spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, RIGHT
+	objectface 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
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
-	spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, UP
+	objectface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, UP
 	special FadeInQuickly
-	spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, DOWN
+	objectface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, DOWN
 	showemote EMOTE_SHOCK, FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, 15
 	applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, MovementData_0x7600c
-	spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, RIGHT
+	objectface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, RIGHT
 	checkflag ENGINE_PLAYER_IS_FEMALE
 	iftrue .PlayerIsFemale
 	opentext
@ -73,7 +73,7 @@ SSAquaGranddaughterBefore:
 	waitbutton
 	closetext
 .cont:
-	spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, DOWN
+	objectface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, DOWN
 	applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, MovementData_0x76010
 	opentext
 	writetext SSAquaEntertainedGranddaughterText
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@ -210,7 +210,7 @@ GoldenrodCityRocketScoutScript:
 	writetext GoldenrodCityRocketScoutText2
 	waitbutton
 	closetext
-	spriteface GOLDENRODCITY_ROCKETSCOUT, UP
+	objectface GOLDENRODCITY_ROCKETSCOUT, UP
 	end
 GoldenrodCityRocket1Script:
--- a/maps/GoldenrodDeptStore4F.asm
+++ b/maps/GoldenrodDeptStore4F.asm
@ -28,7 +28,7 @@ GameboyKidScript_0x55ef7:
 	writetext UnknownText_0x55f74
 	waitbutton
 	closetext
-	spriteface GOLDENRODDEPTSTORE4F_GAMEBOY_KID, DOWN
+	objectface GOLDENRODDEPTSTORE4F_GAMEBOY_KID, DOWN
 	end
 GoldenrodDeptStore4FDirectory:
--- a/maps/GoldenrodDeptStoreRoof.asm
+++ b/maps/GoldenrodDeptStoreRoof.asm
@ -52,7 +52,7 @@ FisherScript_0x56749:
 	writetext UnknownText_0x567d2
 	waitbutton
 	closetext
-	spriteface GOLDENRODDEPTSTOREROOF_FISHER, UP
+	objectface GOLDENRODDEPTSTOREROOF_FISHER, UP
 	end
 GoldenrodDeptStoreRoofTwinScript:
@ -63,12 +63,12 @@ SuperNerdScript_0x56757:
 	writetext UnknownText_0x56867
 	waitbutton
 	closetext
-	spriteface GOLDENRODDEPTSTOREROOF_SUPER_NERD, UP
+	objectface GOLDENRODDEPTSTOREROOF_SUPER_NERD, UP
 	opentext
 	writetext UnknownText_0x56871
 	waitbutton
 	closetext
-	spriteface GOLDENRODDEPTSTOREROOF_SUPER_NERD, RIGHT
+	objectface GOLDENRODDEPTSTOREROOF_SUPER_NERD, RIGHT
 	end
 GoldenrodDeptStoreRoofPokefanMScript:
--- a/maps/GoldenrodFlowerShop.asm
+++ b/maps/GoldenrodFlowerShop.asm
@ -30,7 +30,7 @@ FlowerShopTeacherScript:
 	end
 .Lalala:
-	spriteface GOLDENRODFLOWERSHOP_TEACHER, LEFT
+	objectface GOLDENRODFLOWERSHOP_TEACHER, LEFT
 	opentext
 	writetext UnknownText_0x5552e
 	waitbutton
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@ -43,7 +43,7 @@ GoldenrodGameCornerPokefanM3Script:
 	writetext GoldenrodGameCornerPokefanM3Text
 	waitbutton
 	closetext
-	spriteface GOLDENRODGAMECORNER_POKEFAN_M3, RIGHT
+	objectface GOLDENRODGAMECORNER_POKEFAN_M3, RIGHT
 	end
 GoldenrodGmeCornerCoinVendorScript:
@ -242,7 +242,7 @@ GoldenrodGameCornerPharmacistScript:
 	writetext GoldenrodGameCornerPharmacistText
 	waitbutton
 	closetext
-	spriteface LAST_TALKED, LEFT
+	objectface LAST_TALKED, LEFT
 	end
 GoldenrodGameCornerPokefanM1Script:
@ -251,7 +251,7 @@ GoldenrodGameCornerPokefanM1Script:
 	writetext GoldenrodGameCornerPokefanM1Text
 	waitbutton
 	closetext
-	spriteface GOLDENRODGAMECORNER_POKEFAN_M1, RIGHT
+	objectface GOLDENRODGAMECORNER_POKEFAN_M1, RIGHT
 	end
 GoldenrodGameCornerCooltrainerMScript:
@ -260,7 +260,7 @@ GoldenrodGameCornerCooltrainerMScript:
 	writetext GoldenrodGameCornerCooltrainerMText
 	waitbutton
 	closetext
-	spriteface GOLDENRODGAMECORNER_COOLTRAINER_M, LEFT
+	objectface GOLDENRODGAMECORNER_COOLTRAINER_M, LEFT
 	end
 GoldenrodGameCornerPokefanFScript:
@ -269,7 +269,7 @@ GoldenrodGameCornerPokefanFScript:
 	writetext GoldenrodGameCornerPokefanFText
 	waitbutton
 	closetext
-	spriteface GOLDENRODGAMECORNER_POKEFAN_F, RIGHT
+	objectface GOLDENRODGAMECORNER_POKEFAN_F, RIGHT
 	end
 GoldenrodGameCornerCooltrainerFScript:
@ -281,7 +281,7 @@ GoldenrodGameCornerGentlemanScript:
 	writetext GoldenrodGameCornerGentlemanText
 	waitbutton
 	closetext
-	spriteface GOLDENRODGAMECORNER_GENTLEMAN, RIGHT
+	objectface GOLDENRODGAMECORNER_GENTLEMAN, RIGHT
 	end
 GoldenrodGameCornerPokefanM2Script:
--- a/maps/GoldenrodGym.asm
+++ b/maps/GoldenrodGym.asm
@ -104,7 +104,7 @@ TrainerLassCarrie:
 WhitneyCriesScript:
 	showemote EMOTE_SHOCK, GOLDENRODGYM_LASS2, 15
 	applymovement GOLDENRODGYM_LASS2, BridgetWalksUpMovement
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	opentext
 	writetext BridgetWhitneyCriesText
 	waitbutton
--- 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
-	spriteface PLAYER, UP
+	objectface 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
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	opentext
 	writetext UnknownText_0x622f0
 	waitbutton
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@ -117,7 +117,7 @@ TeacherScript_0x7ca7d:
 	jumptextfaceplayer GoldenrodUndergroundSwitchRoomEntrances_TeacherText
 UndergroundSilverScene1:
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
@ -125,7 +125,7 @@ UndergroundSilverScene1:
 	appear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
 	waitsfx
 	applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverApproachMovement1
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	scall UndergroundSilverBattleScript
 	applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement1
 	playsound SFX_EXIT_BUILDING
@ -136,7 +136,7 @@ UndergroundSilverScene1:
 	end
 UndergroundSilverScene2:
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
@ -144,7 +144,7 @@ UndergroundSilverScene2:
 	appear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
 	waitsfx
 	applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverApproachMovement2
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	scall UndergroundSilverBattleScript
 	applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement2
 	playsound SFX_EXIT_BUILDING
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@ -19,12 +19,12 @@ HallOfFame_MapScripts:
 	follow HALLOFFAME_LANCE, PLAYER
 	applymovement HALLOFFAME_LANCE, HallOfFame_WalkUpWithLance
 	stopfollow
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	opentext
 	writetext HallOfFame_LanceText
 	waitbutton
 	closetext
-	spriteface HALLOFFAME_LANCE, UP
+	objectface HALLOFFAME_LANCE, UP
 	applymovement PLAYER, HallOfFame_SlowlyApproachMachine
 	setscene SCENE_FINISHED
 	pause 15
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@ -460,7 +460,7 @@ MapIlexForestSignpost4Script:
 	special FadeOutMusic
 	applymovement PLAYER, MovementData_0x6ef58
 	pause 30
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	pause 20
 	clearflag ENGINE_FOREST_IS_RESTLESS
 	special CelebiShrineEvent
--- a/maps/IndigoPlateauPokecenter1F.asm
+++ b/maps/IndigoPlateauPokecenter1F.asm
@ -54,13 +54,13 @@ PlateauRivalBattle1:
 	ifequal SATURDAY, PlateauRivalScriptDone
 	moveobject INDIGOPLATEAUPOKECENTER1F_SILVER, 17, 9
 	appear INDIGOPLATEAUPOKECENTER1F_SILVER
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
 	applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalMovement1
 	playmusic MUSIC_RIVAL_ENCOUNTER
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	jump PlateauRivalBattleCommon
 PlateauRivalBattle2:
@ -75,13 +75,13 @@ PlateauRivalBattle2:
 	ifequal FRIDAY, PlateauRivalScriptDone
 	ifequal SATURDAY, PlateauRivalScriptDone
 	appear INDIGOPLATEAUPOKECENTER1F_SILVER
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
 	applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalMovement2
 	playmusic MUSIC_RIVAL_ENCOUNTER
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 PlateauRivalBattleCommon:
 	opentext
 	writetext PlateauRivalText1
@ -125,7 +125,7 @@ PlateauRivalPostBattle:
 	writetext PlateauRivalText2
 	waitbutton
 	closetext
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalLeavesMovement
 	disappear INDIGOPLATEAUPOKECENTER1F_SILVER
 	setscene SCENE_DEFAULT
--- 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
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	playsound SFX_FLY
 	applymovement KURTSHOUSE_KURT1, MovementData_0x18e466
 	playsound SFX_EXIT_BUILDING
@ -56,7 +56,7 @@ KurtScript_0x18e178:
 	end
 .RunAround:
-	spriteface PLAYER, DOWN
+	objectface 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
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	playsound SFX_FLY
 	applymovement KURTSHOUSE_KURT1, MovementData_0x18e466
 	jump .KurtHasLeftTheBuilding
 .GSBallRunAround:
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	playsound SFX_FLY
 	applymovement KURTSHOUSE_KURT1, MovementData_0x18e46c
 .KurtHasLeftTheBuilding:
@ -323,21 +323,21 @@ KurtMakingBallsScript:
 	writetext UnknownText_0x18e7d8
 	waitbutton
 	closetext
-	spriteface KURTSHOUSE_KURT2, UP
+	objectface KURTSHOUSE_KURT2, UP
 	end
 Script_FirstTimeBuggingKurt:
 	writetext UnknownText_0x18e863
 	waitbutton
 	closetext
-	spriteface KURTSHOUSE_KURT2, UP
+	objectface KURTSHOUSE_KURT2, UP
 	setevent EVENT_BUGGING_KURT_TOO_MUCH
 	end
 KurtScript_ImCheckingItNow:
 	writetext UnknownText_0x18e934
 	waitbutton
-	spriteface KURTSHOUSE_KURT2, UP
+	objectface KURTSHOUSE_KURT2, UP
 	writetext UnknownText_0x18e949
 	waitbutton
 	closetext
@ -393,14 +393,14 @@ KurtsGranddaughter2Subscript:
 	writetext KurtsGranddaughterHelpText
 	waitbutton
 	closetext
-	spriteface KURTSHOUSE_TWIN2, RIGHT
+	objectface KURTSHOUSE_TWIN2, RIGHT
 	end
 .GSBall:
 	writetext KurtsGranddaughterGSBallText
 	waitbutton
 	closetext
-	spriteface KURTSHOUSE_TWIN2, RIGHT
+	objectface KURTSHOUSE_TWIN2, RIGHT
 	end
 KurtsGranddaughterFunScript:
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@ -50,7 +50,7 @@ Script_ApproachLanceFromRight:
 	special FadeOutMusic
 	applymovement PLAYER, MovementData_ApproachLanceFromRight
 LanceScript_0x180e7b:
-	spriteface LANCESROOM_LANCE, LEFT
+	objectface 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
-	spriteface LANCESROOM_LANCE, DOWN
+	objectface LANCESROOM_LANCE, DOWN
 	pause 10
-	spriteface PLAYER, DOWN
+	objectface 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
-	spriteface LANCESROOM_OAK, UP
+	objectface LANCESROOM_OAK, UP
-	spriteface LANCESROOM_LANCE, LEFT
+	objectface LANCESROOM_LANCE, LEFT
 	opentext
 	writetext UnknownText_0x18121b
 	waitbutton
 	closetext
 	applymovement LANCESROOM_MARY, LancesRoomMovementData_MaryInterviewChampion
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	opentext
 	writetext UnknownText_0x18134b
 	waitbutton
 	closetext
 	applymovement LANCESROOM_LANCE, LancesRoomMovementData_LancePositionsSelfToGuidePlayerAway
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	opentext
 	writetext UnknownText_0x18137b
 	waitbutton
 	closetext
 	follow LANCESROOM_LANCE, PLAYER
-	spriteface LANCESROOM_MARY, UP
+	objectface LANCESROOM_MARY, UP
-	spriteface LANCESROOM_OAK, UP
+	objectface LANCESROOM_OAK, UP
 	applymovement LANCESROOM_LANCE, LancesRoomMovementData_LanceLeadsPlayerToHallOfFame
 	stopfollow
 	playsound SFX_EXIT_BUILDING
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@ -91,7 +91,7 @@ UnknownScript_0x6c38f:
 	reloadmappart
 	closetext
 	setevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART
-	spriteface MAHOGANYMART1F_LANCE, LEFT
+	objectface MAHOGANYMART1F_LANCE, LEFT
 	opentext
 	writetext UnknownText_0x6c5ba
 	waitbutton
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@ -28,7 +28,7 @@ UnknownScript_0x190013:
 	follow PLAYER, MAHOGANYTOWN_POKEFAN_M
 	applymovement PLAYER, MovementData_0x1900a7
 	stopfollow
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	scall UnknownScript_0x19002f
 	applymovement MAHOGANYTOWN_POKEFAN_M, MovementData_0x1900ad
 	end
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@ -16,7 +16,7 @@ MountMoon_MapScripts:
 	end
 .RivalBattle:
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@ -34,7 +34,7 @@ ClefairyDance:
 	applymovement PLAYER, PlayerWalksUpToDancingClefairies
 	pause 15
 	appear MOUNTMOONSQUARE_ROCK
-	spriteface MOUNTMOONSQUARE_FAIRY1, RIGHT
+	objectface MOUNTMOONSQUARE_FAIRY1, RIGHT
 	cry CLEFAIRY
 	waitsfx
 	pause 30
@ -54,10 +54,10 @@ ClefairyDance:
 	follow MOUNTMOONSQUARE_FAIRY1, MOUNTMOONSQUARE_FAIRY2
 	applymovement MOUNTMOONSQUARE_FAIRY1, ClefairyDanceStep7
 	stopfollow
-	spriteface MOUNTMOONSQUARE_FAIRY1, DOWN
+	objectface MOUNTMOONSQUARE_FAIRY1, DOWN
 	pause 10
 	showemote EMOTE_SHOCK, MOUNTMOONSQUARE_FAIRY1, 15
-	spriteface MOUNTMOONSQUARE_FAIRY1, DOWN
+	objectface MOUNTMOONSQUARE_FAIRY1, DOWN
 	cry CLEFAIRY
 	pause 15
 	follow MOUNTMOONSQUARE_FAIRY1, MOUNTMOONSQUARE_FAIRY2
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@ -18,7 +18,7 @@ MrPokemonsHouse_MapScripts:
 .MrPokemonEvent:
 	showemote EMOTE_SHOCK, MRPOKEMONSHOUSE_GENTLEMAN, 15
-	spriteface MRPOKEMONSHOUSE_GENTLEMAN, DOWN
+	objectface MRPOKEMONSHOUSE_GENTLEMAN, DOWN
 	opentext
 	writetext MrPokemonIntroText1
 	waitbutton
@ -37,11 +37,11 @@ MrPokemonsHouse_MapScripts:
 	blackoutmod CHERRYGROVE_CITY
 	writetext MrPokemonIntroText3
 	buttonsound
-	spriteface MRPOKEMONSHOUSE_GENTLEMAN, RIGHT
+	objectface MRPOKEMONSHOUSE_GENTLEMAN, RIGHT
 	writetext MrPokemonIntroText4
 	buttonsound
-	spriteface MRPOKEMONSHOUSE_GENTLEMAN, DOWN
+	objectface MRPOKEMONSHOUSE_GENTLEMAN, DOWN
-	spriteface MRPOKEMONSHOUSE_OAK, LEFT
+	objectface MRPOKEMONSHOUSE_OAK, LEFT
 	writetext MrPokemonIntroText5
 	waitbutton
 	closetext
@ -84,7 +84,7 @@ MrPokemonsHouse_MrPokemonScript:
 MrPokemonsHouse_OakScript:
 	playmusic MUSIC_PROF_OAK
 	applymovement MRPOKEMONSHOUSE_OAK, MrPokemonsHouse_OakWalksToPlayer
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	opentext
 	writetext MrPokemonsHouse_OakText1
 	buttonsound
@ -96,14 +96,14 @@ MrPokemonsHouse_OakScript:
 	writetext MrPokemonsHouse_OakText2
 	waitbutton
 	closetext
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	applymovement MRPOKEMONSHOUSE_OAK, MrPokemonsHouse_OakExits
 	playsound SFX_EXIT_BUILDING
 	disappear MRPOKEMONSHOUSE_OAK
 	waitsfx
 	special RestartMapMusic
 	pause 15
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	opentext
 	writetext MrPokemonsHouse_MrPokemonHealText
 	waitbutton
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@ -66,7 +66,7 @@ GameboyKidScript_0x5c037:
 	writetext UnknownText_0x5c42a
 	waitbutton
 	closetext
-	spriteface NATIONALPARK_GAMEBOY_KID, DOWN
+	objectface NATIONALPARK_GAMEBOY_KID, DOWN
 	end
 TrainerSchoolboyJack1:
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@ -24,12 +24,12 @@ NewBarkTown_MapScripts:
 NewBarkTown_TeacherStopsYouScene1:
 	playmusic MUSIC_MOM
-	spriteface NEWBARKTOWN_TEACHER, LEFT
+	objectface NEWBARKTOWN_TEACHER, LEFT
 	opentext
 	writetext Text_WaitPlayer
 	waitbutton
 	closetext
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	applymovement NEWBARKTOWN_TEACHER, Movement_TeacherRunsToYou1_NBT
 	opentext
 	writetext Text_WhatDoYouThinkYoureDoing
@ -47,14 +47,14 @@ NewBarkTown_TeacherStopsYouScene1:
 NewBarkTown_TeacherStopsYouScene2:
 	playmusic MUSIC_MOM
-	spriteface NEWBARKTOWN_TEACHER, LEFT
+	objectface NEWBARKTOWN_TEACHER, LEFT
 	opentext
 	writetext Text_WaitPlayer
 	waitbutton
 	closetext
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	applymovement NEWBARKTOWN_TEACHER, Movement_TeacherRunsToYou2_NBT
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	opentext
 	writetext Text_WhatDoYouThinkYoureDoing
 	waitbutton
@ -109,7 +109,7 @@ NewBarkTownSilverScript:
 	writetext NewBarkTownRivalText1
 	waitbutton
 	closetext
-	spriteface NEWBARKTOWN_SILVER, LEFT
+	objectface NEWBARKTOWN_SILVER, LEFT
 	opentext
 	writetext NewBarkTownRivalText2
 	waitbutton
@ -118,7 +118,7 @@ NewBarkTownSilverScript:
 	applymovement PLAYER, Movement_SilverPushesYouAway_NBT
 	stopfollow
 	pause 5
-	spriteface NEWBARKTOWN_SILVER, DOWN
+	objectface NEWBARKTOWN_SILVER, DOWN
 	pause 5
 	playsound SFX_TACKLE
 	applymovement PLAYER, Movement_SilverShovesYouOut_NBT
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@ -23,7 +23,7 @@ OlivineCity_MapScripts:
 	return
 UnknownScript_0x1a8833:
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
@ -37,7 +37,7 @@ UnknownScript_0x1a8833:
 	waitbutton
 	closetext
 	applymovement PLAYER, MovementData_0x1a88f4
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88db
 	setscene SCENE_FINISHED
 	disappear OLIVINECITY_OLIVINE_RIVAL
@ -47,7 +47,7 @@ UnknownScript_0x1a8833:
 	end
 UnknownScript_0x1a886b:
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
@ -61,7 +61,7 @@ UnknownScript_0x1a886b:
 	waitbutton
 	closetext
 	applymovement PLAYER, MovementData_0x1a88f7
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88e8
 	disappear OLIVINECITY_OLIVINE_RIVAL
 	setscene SCENE_FINISHED
--- a/maps/OlivineLighthouse6F.asm
+++ b/maps/OlivineLighthouse6F.asm
@ -34,9 +34,9 @@ UnknownScript_0x60bab:
 	writetext UnknownText_0x60dea
 	waitbutton
 	closetext
-	spriteface OLIVINELIGHTHOUSE6F_JASMINE, RIGHT
+	objectface OLIVINELIGHTHOUSE6F_JASMINE, RIGHT
 	pause 15
-	spriteface OLIVINELIGHTHOUSE6F_MONSTER, LEFT
+	objectface OLIVINELIGHTHOUSE6F_MONSTER, LEFT
 	opentext
 	playmusic MUSIC_HEAL
 	writetext UnknownText_0x60e44
@ -52,13 +52,13 @@ UnknownScript_0x60bab:
 	writetext UnknownText_0x60f3d
 	waitbutton
 	closetext
-	spriteface OLIVINELIGHTHOUSE6F_MONSTER, RIGHT
+	objectface OLIVINELIGHTHOUSE6F_MONSTER, RIGHT
 	pause 10
-	spriteface OLIVINELIGHTHOUSE6F_MONSTER, LEFT
+	objectface OLIVINELIGHTHOUSE6F_MONSTER, LEFT
 	pause 10
-	spriteface OLIVINELIGHTHOUSE6F_MONSTER, RIGHT
+	objectface OLIVINELIGHTHOUSE6F_MONSTER, RIGHT
 	pause 10
-	spriteface OLIVINELIGHTHOUSE6F_MONSTER, LEFT
+	objectface OLIVINELIGHTHOUSE6F_MONSTER, LEFT
 	pause 10
 	faceplayer
 	opentext
@ -88,9 +88,9 @@ UnknownScript_0x60c25:
 	writetext UnknownText_0x60edf
 	waitbutton
 	closetext
-	spriteface OLIVINELIGHTHOUSE6F_JASMINE, RIGHT
+	objectface OLIVINELIGHTHOUSE6F_JASMINE, RIGHT
 	pause 15
-	spriteface OLIVINELIGHTHOUSE6F_MONSTER, LEFT
+	objectface OLIVINELIGHTHOUSE6F_MONSTER, LEFT
 	opentext
 	writetext UnknownText_0x60ef1
 	waitbutton
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@ -37,7 +37,7 @@ SailorScript_0x748c0:
 	writetext UnknownText_0x74a55
 	waitbutton
 	closetext
-	spriteface OLIVINEPORT_SAILOR1, DOWN
+	objectface OLIVINEPORT_SAILOR1, DOWN
 	pause 10
 	playsound SFX_EXIT_BUILDING
 	disappear OLIVINEPORT_SAILOR1
@ -73,12 +73,12 @@ UnknownScript_0x74919:
 	end
 UnknownScript_0x7491f:
-	spriteface OLIVINEPORT_SAILOR3, RIGHT
+	objectface OLIVINEPORT_SAILOR3, RIGHT
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	iftrue UnknownScript_0x7498b
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	iftrue UnknownScript_0x7498b
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	opentext
 	checkevent EVENT_FAST_SHIP_FIRST_TIME
 	iffalse UnknownScript_0x7494e
@ -201,7 +201,7 @@ FishingGuruScript_0x74a01:
 	writetext UnknownText_0x74bf4
 	waitbutton
 	closetext
-	spriteface OLIVINEPORT_FISHING_GURU1, UP
+	objectface OLIVINEPORT_FISHING_GURU1, UP
 	end
 FishingGuruScript_0x74a0c:
@ -210,7 +210,7 @@ FishingGuruScript_0x74a0c:
 	writetext UnknownText_0x74c35
 	waitbutton
 	closetext
-	spriteface OLIVINEPORT_FISHING_GURU2, UP
+	objectface OLIVINEPORT_FISHING_GURU2, UP
 	end
 YoungsterScript_0x74a17:
@ -219,7 +219,7 @@ YoungsterScript_0x74a17:
 	writetext UnknownText_0x74c76
 	waitbutton
 	closetext
-	spriteface OLIVINEPORT_YOUNGSTER, DOWN
+	objectface OLIVINEPORT_YOUNGSTER, DOWN
 	end
 CooltrainerFScript_0x74a22:
@ -228,7 +228,7 @@ CooltrainerFScript_0x74a22:
 	writetext UnknownText_0x74ca2
 	waitbutton
 	closetext
-	spriteface OLIVINEPORT_COOLTRAINER_F, DOWN
+	objectface OLIVINEPORT_COOLTRAINER_F, DOWN
 	end
 OlivinePortHiddenProtein:
--- 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
-	spriteface PLAYER, LEFT
+	objectface 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
-	spriteface PLAYERSHOUSE1F_MOM1, LEFT
+	objectface PLAYERSHOUSE1F_MOM1, LEFT
 	end
 UnknownScript_0x7a572:
@ -179,7 +179,7 @@ NeighborScript:
 	writetext NeighborText
 	waitbutton
 	closetext
-	spriteface PLAYERSHOUSE1F_POKEFAN_F, RIGHT
+	objectface PLAYERSHOUSE1F_POKEFAN_F, RIGHT
 	end
 TVScript:
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@ -426,7 +426,7 @@ Pokecenter2F_CheckGender:
 	waitbutton
 	closetext
 	applymovement2 Pokecenter2FMovementData_ReceptionistLooksRight
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	opentext
 	writetext Text_ChangeTheLook
 	waitbutton
@ -533,7 +533,7 @@ TimeCapsuleScript_CheckPlayerGender:
 	closetext
 	checkcode VAR_FACING
 	ifnotequal UP, .FemaleChangeApperance
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 .FemaleChangeApperance:
 	opentext
 	writetext Text_ChangeTheLook
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@ -26,19 +26,19 @@ PowerPlantGuardPhoneScript:
 	waitsfx
 	pause 30
 	applymovement POWERPLANT_OFFICER1, MovementData_0x188ed5
-	spriteface POWERPLANT_GYM_GUY1, DOWN
+	objectface POWERPLANT_GYM_GUY1, DOWN
-	spriteface POWERPLANT_GYM_GUY2, DOWN
+	objectface POWERPLANT_GYM_GUY2, DOWN
 	opentext
 	writetext UnknownText_0x188f22
 	waitbutton
 	closetext
-	spriteface POWERPLANT_OFFICER1, LEFT
+	objectface POWERPLANT_OFFICER1, LEFT
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	opentext
 	writetext UnknownText_0x188f7f
 	waitbutton
 	closetext
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	applymovement POWERPLANT_OFFICER1, MovementData_0x188eda
 	setscene SCENE_POWERPLANT_NOTHING
 	end
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@ -120,17 +120,17 @@ Buena:
 	writetext UnknownText_0x5de84
 	waitbutton
 	closetext
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	objectface RADIOTOWER2F_BUENA, RIGHT
 	checkcode VAR_FACING
 	ifnotequal RIGHT, UnknownScript_0x5d7be
 	applymovement PLAYER, MovementData_0x5d921
 UnknownScript_0x5d7be:
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	opentext
 	writetext UnknownText_0x5dedd
 	waitbutton
 	closetext
-	spriteface RADIOTOWER2F_BUENA, DOWN
+	objectface RADIOTOWER2F_BUENA, DOWN
 	refreshscreen
 	special BuenasPassword
 	closetext
@ -146,7 +146,7 @@ UnknownScript_0x5d7be:
 	playsound SFX_TRANSACTION
 	setflag ENGINE_BUENAS_PASSWORD_2
 	pause 20
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	objectface 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:
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	objectface RADIOTOWER2F_BUENA, RIGHT
 	end
 UnknownScript_0x5d81e:
 	writetext UnknownText_0x5df29
 	waitbutton
 	closetext
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	objectface 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:
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	objectface RADIOTOWER2F_BUENA, RIGHT
 	pause 10
 	end
@ -204,13 +204,13 @@ UnknownScript_0x5d845:
 	writetext UnknownText_0x5e01c
 	waitbutton
 	closetext
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	objectface RADIOTOWER2F_BUENA, RIGHT
 	pause 20
 	opentext
 	writetext UnknownText_0x5e054
 	waitbutton
 	closetext
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	objectface 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:
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	objectface 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:
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	objectface RADIOTOWER2F_BUENA, RIGHT
 	end
 UnknownScript_0x5d893:
@ -261,9 +261,9 @@ UnknownScript_0x5d8a4:
 	checkcellnum PHONE_BUENA
 	iftrue UnknownScript_0x5d8fe
 	pause 20
-	spriteface RADIOTOWER2F_BUENA, DOWN
+	objectface RADIOTOWER2F_BUENA, DOWN
 	pause 15
-	spriteface PLAYER, UP
+	objectface 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
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	objectface RADIOTOWER2F_BUENA, RIGHT
 	addcellnum PHONE_BUENA
 	end
@ -296,14 +296,14 @@ UnknownScript_0x5d8ed:
 	writetext UnknownText_0x5e33c
 	waitbutton
 	closetext
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	objectface RADIOTOWER2F_BUENA, RIGHT
 	end
 UnknownScript_0x5d8f6:
 	writetext UnknownText_0x5e35e
 	waitbutton
 	closetext
-	spriteface RADIOTOWER2F_BUENA, RIGHT
+	objectface RADIOTOWER2F_BUENA, RIGHT
 UnknownScript_0x5d8fe:
 	end
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@ -23,7 +23,7 @@ RadioTower5F_MapScripts:
 	end
 FakeDirectorScript:
-	spriteface RADIOTOWER5F_DIRECTOR, UP
+	objectface 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
-	spriteface RADIOTOWER5F_ROCKET, RIGHT
+	objectface RADIOTOWER5F_ROCKET, RIGHT
 	opentext
 	writetext RadioTower5FRocketBossBeforeText
 	waitbutton
@ -116,7 +116,7 @@ RadioTower5FRocketBossScene:
 	moveobject RADIOTOWER5F_DIRECTOR, 12, 0
 	appear RADIOTOWER5F_DIRECTOR
 	applymovement RADIOTOWER5F_DIRECTOR, RadioTower5FDirectorWalksIn
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	opentext
 	writetext RadioTower5FDirectorThankYouText
 	buttonsound
--- a/maps/Route16Gate.asm
+++ b/maps/Route16Gate.asm
@ -20,7 +20,7 @@ UnknownScript_0x733ed:
 UnknownScript_0x733f3:
 	showemote EMOTE_SHOCK, ROUTE16GATE_OFFICER, 15
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	opentext
 	writetext UnknownText_0x73496
 	waitbutton
--- a/maps/Route17Route18Gate.asm
+++ b/maps/Route17Route18Gate.asm
@ -20,7 +20,7 @@ UnknownScript_0x73611:
 UnknownScript_0x73617:
 	showemote EMOTE_SHOCK, ROUTE17ROUTE18GATE_OFFICER, 15
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	opentext
 	writetext UnknownText_0x7364d
 	waitbutton
--- 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
-	spriteface ROUTE25_MISTY, DOWN
+	objectface ROUTE25_MISTY, DOWN
 	applymovement ROUTE25_COOLTRAINER_M1, MovementData_0x19efe8
 	disappear ROUTE25_COOLTRAINER_M1
 	pause 15
 	playmusic MUSIC_BEAUTY_ENCOUNTER
-	spriteface ROUTE25_MISTY, UP
+	objectface ROUTE25_MISTY, UP
 	pause 10
 	applymovement ROUTE25_MISTY, MovementData_0x19efed
 	opentext
 	writetext Route25MistyDateText
 	waitbutton
 	closetext
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	applymovement ROUTE25_MISTY, MovementData_0x19effa
-	spriteface PLAYER, LEFT
+	objectface 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
-	spriteface ROUTE25_MISTY, DOWN
+	objectface ROUTE25_MISTY, DOWN
 	applymovement ROUTE25_COOLTRAINER_M1, MovementData_0x19efea
 	disappear ROUTE25_COOLTRAINER_M1
 	pause 15
 	playmusic MUSIC_BEAUTY_ENCOUNTER
-	spriteface ROUTE25_MISTY, UP
+	objectface ROUTE25_MISTY, UP
 	pause 10
 	applymovement ROUTE25_MISTY, MovementData_0x19eff4
 	opentext
 	writetext Route25MistyDateText
 	waitbutton
 	closetext
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	applymovement ROUTE25_MISTY, MovementData_0x19effd
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	applymovement ROUTE25_MISTY, MovementData_0x19f000
 	disappear ROUTE25_MISTY
 	clearevent EVENT_TRAINERS_IN_CERULEAN_GYM
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@ -23,17 +23,17 @@ Route27_MapScripts:
 	end
 UnknownScript_0x1a0873:
-	spriteface ROUTE27_FISHER, LEFT
+	objectface ROUTE27_FISHER, LEFT
 	showemote EMOTE_SHOCK, ROUTE27_FISHER, 15
 	applymovement ROUTE27_FISHER, MovementData_0x1a0a66
 	jump UnknownScript_0x1a088c
 UnknownScript_0x1a0881:
-	spriteface ROUTE27_FISHER, LEFT
+	objectface ROUTE27_FISHER, LEFT
 	showemote EMOTE_SHOCK, ROUTE27_FISHER, 15
 	applymovement ROUTE27_FISHER, MovementData_0x1a0a69
 UnknownScript_0x1a088c:
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	opentext
 	writetext Route27FisherHeyText
 	buttonsound
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@ -37,10 +37,10 @@ Route29_MapScripts:
 	return
 Route29Tutorial1:
-	spriteface ROUTE29_COOLTRAINER_M1, UP
+	objectface ROUTE29_COOLTRAINER_M1, UP
 	showemote EMOTE_SHOCK, ROUTE29_COOLTRAINER_M1, 15
 	applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData1a
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	setevent EVENT_DUDE_TALKED_TO_YOU
 	opentext
 	writetext CatchingTutorialIntroText
@ -52,7 +52,7 @@ Route29Tutorial1:
 	stopfollow
 	loadwildmon RATTATA, 5
 	catchtutorial BATTLETYPE_TUTORIAL
-	spriteface ROUTE29_COOLTRAINER_M1, UP
+	objectface ROUTE29_COOLTRAINER_M1, UP
 	opentext
 	writetext CatchingTutorialDebriefText
 	waitbutton
@ -62,10 +62,10 @@ Route29Tutorial1:
 	end
 Route29Tutorial2:
-	spriteface ROUTE29_COOLTRAINER_M1, UP
+	objectface ROUTE29_COOLTRAINER_M1, UP
 	showemote EMOTE_SHOCK, ROUTE29_COOLTRAINER_M1, 15
 	applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData2a
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	setevent EVENT_DUDE_TALKED_TO_YOU
 	opentext
 	writetext CatchingTutorialIntroText
@ -77,7 +77,7 @@ Route29Tutorial2:
 	stopfollow
 	loadwildmon RATTATA, 5
 	catchtutorial BATTLETYPE_TUTORIAL
-	spriteface ROUTE29_COOLTRAINER_M1, UP
+	objectface ROUTE29_COOLTRAINER_M1, UP
 	opentext
 	writetext CatchingTutorialDebriefText
 	waitbutton
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@ -29,7 +29,7 @@ YoungsterJoey_ImportantBattleScript:
 	faceplayer
 	writetext Text_ThisIsABigBattle
 	waitbutton
-	spriteface ROUTE30_YOUNGSTER1, UP
+	objectface ROUTE30_YOUNGSTER1, UP
 	closetext
 	playsound SFX_TACKLE
 	applymovement ROUTE30_MONSTER1, Route30_MikeysRattataAttacksMovement
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@ -85,8 +85,8 @@ Route32CooltrainerMContinueScene:
 	end
 Route32CooltrainerMStopsYouScene:
-	spriteface ROUTE32_COOLTRAINER_M, LEFT
+	objectface ROUTE32_COOLTRAINER_M, LEFT
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	opentext
 	writetext Route32CooltrainerMText_WhatsTheHurry
 	waitbutton
@ -94,7 +94,7 @@ Route32CooltrainerMStopsYouScene:
 	follow PLAYER, ROUTE32_COOLTRAINER_M
 	applymovement PLAYER, Movement_Route32CooltrainerMPushesYouBackToViolet
 	stopfollow
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	scall Route32CooltrainerMContinueScene
 	applymovement ROUTE32_COOLTRAINER_M, Movement_Route32CooltrainerMReset1
 	applymovement ROUTE32_COOLTRAINER_M, Movement_Route32CooltrainerMReset2
@ -118,8 +118,8 @@ Route32RoarTMGuyScript:
 	end
 Route32WannaBuyASlowpokeTailScript:
-	spriteface ROUTE32_FISHER4, DOWN
+	objectface ROUTE32_FISHER4, DOWN
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	jump _OfferToSellSlowpokeTail
 SlowpokeTailSalesmanScript:
--- 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
-	spriteface ROUTE34ILEXFORESTGATE_TEACHER2, LEFT
+	objectface ROUTE34ILEXFORESTGATE_TEACHER2, LEFT
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	follow PLAYER, ROUTE34ILEXFORESTGATE_TEACHER2
 	applymovement PLAYER, MovementData_0x62d97
 	stopfollow
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	opentext
 	writetext UnknownText_0x62e41
 	waitbutton
--- a/maps/Route35NationalParkGate.asm
+++ b/maps/Route35NationalParkGate.asm
@ -53,7 +53,7 @@ Route35NationalParkGate_MapScripts:
 .LeavingContestEarly:
 	applymovement PLAYER, MovementData_0x6a2e2
-	spriteface ROUTE35NATIONALPARKGATE_OFFICER1, RIGHT
+	objectface ROUTE35NATIONALPARKGATE_OFFICER1, RIGHT
 	opentext
 	checkcode VAR_CONTESTMINUTES
 	addvar 1
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@ -37,10 +37,10 @@ Route36SuicuneScript:
 	showemote EMOTE_SHOCK, PLAYER, 15
 	pause 15
 	playsound SFX_WARP_FROM
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	applymovement ROUTE36_SUICUNE, Route36SuicuneMovement
 	disappear ROUTE36_SUICUNE
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	pause 10
 	setscene SCENE_ROUTE36_NOTHING
 	clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@ -62,7 +62,7 @@ Route36NationalParkGate_MapScripts:
 	return
 .LeavingContestEarly:
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	opentext
 	checkcode VAR_CONTESTMINUTES
 	addvar 1
@ -87,7 +87,7 @@ Route36NationalParkGate_MapScripts:
 	writetext UnknownText_0x6b300
 	waitbutton
 	closetext
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	playsound SFX_EXIT_BUILDING
 	special FadeOutPalettes
 	waitsfx
@ -170,7 +170,7 @@ Route36OfficerScriptContest:
 	closetext
 	setflag ENGINE_BUG_CONTEST_TIMER
 	special GiveParkBalls
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	playsound SFX_EXIT_BUILDING
 	special FadeOutPalettes
 	waitsfx
--- a/maps/Route39Barn.asm
+++ b/maps/Route39Barn.asm
@ -16,14 +16,14 @@ TwinScript_0x9cc76:
 	writetext Text_MoomooIsSick
 	waitbutton
 	closetext
-	spriteface ROUTE39BARN_TWIN1, RIGHT
+	objectface ROUTE39BARN_TWIN1, RIGHT
 	end
 .FeedingMooMoo:
 	writetext Text_WereFeedingMoomoo
 	waitbutton
 	closetext
-	spriteface ROUTE39BARN_TWIN1, RIGHT
+	objectface ROUTE39BARN_TWIN1, RIGHT
 	end
 TwinScript_0x9cc90:
@ -34,14 +34,14 @@ TwinScript_0x9cc90:
 	writetext Text_MoomooIsSick
 	waitbutton
 	closetext
-	spriteface ROUTE39BARN_TWIN2, LEFT
+	objectface ROUTE39BARN_TWIN2, LEFT
 	end
 .FeedingMooMoo:
 	writetext Text_WereFeedingMoomoo
 	waitbutton
 	closetext
-	spriteface ROUTE39BARN_TWIN2, LEFT
+	objectface ROUTE39BARN_TWIN2, LEFT
 	end
 MooMoo:
--- 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
-	spriteface ROUTE43GATE_ROCKET1, UP
+	objectface 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
-	spriteface ROUTE43GATE_ROCKET2, DOWN
+	objectface ROUTE43GATE_ROCKET2, DOWN
 	showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET2, 15
 	applymovement ROUTE43GATE_ROCKET2, Rocket2Script_BlocksYouNorth
 	opentext
--- a/maps/RuinsOfAlphKabutoChamber.asm
+++ b/maps/RuinsOfAlphKabutoChamber.asm
@ -95,7 +95,7 @@ UnknownScript_0x587c0:
 	writetext UnknownText_0x588f5
 	waitbutton
 	closetext
-	spriteface RUINSOFALPHKABUTOCHAMBER_SCIENTIST, UP
+	objectface RUINSOFALPHKABUTOCHAMBER_SCIENTIST, UP
 	end
 UnknownScript_0x587c9:
--- a/maps/RuinsOfAlphOutside.asm
+++ b/maps/RuinsOfAlphOutside.asm
@ -42,13 +42,13 @@ RuinsOfAlphOutside_MapScripts:
 	return
 RuinsOfAlphOutsideScientistScene1:
-	spriteface RUINSOFALPHOUTSIDE_SCIENTIST, UP
+	objectface RUINSOFALPHOUTSIDE_SCIENTIST, UP
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	jump UnknownScript_0x58044
 RuinsOfAlphOutsideScientistScene2:
-	spriteface RUINSOFALPHOUTSIDE_SCIENTIST, LEFT
+	objectface RUINSOFALPHOUTSIDE_SCIENTIST, LEFT
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	jump UnknownScript_0x58044
 ScientistScript_0x58043:
@ -96,7 +96,7 @@ YoungsterScript_0x5807e:
 	writetext UnknownText_0x5848e
 	waitbutton
 	closetext
-	spriteface RUINSOFALPHOUTSIDE_YOUNGSTER3, UP
+	objectface RUINSOFALPHOUTSIDE_YOUNGSTER3, UP
 	end
 TrainerPsychicNathan:
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@ -38,7 +38,7 @@ RuinsOfAlphResearchCenter_MapScripts:
 	pause 30
 	playsound SFX_TRANSACTION
 	pause 30
-	spriteface RUINSOFALPHRESEARCHCENTER_SCIENTIST3, DOWN
+	objectface RUINSOFALPHRESEARCHCENTER_SCIENTIST3, DOWN
 	opentext
 	writetext UnknownText_0x59278
 	waitbutton
--- 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
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	opentext
 	writetext KurtLeaveSlowpokeWellText
 	waitbutton
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@ -21,7 +21,7 @@ SproutTower3F_MapScripts:
 	end
 UnknownScript_0x184947:
-	spriteface PLAYER, UP
+	objectface 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
-	spriteface SPROUTTOWER3F_SILVER, DOWN
+	objectface 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
-	spriteface SPROUTTOWER3F_SILVER, UP
+	objectface SPROUTTOWER3F_SILVER, UP
 	opentext
 	writetext UnknownText_0x184bc8
 	pause 15
--- 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
-	spriteface PLAYER, LEFT
+	objectface 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
-	spriteface PLAYER, LEFT
+	objectface 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
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement2
 	scall TrainerCameraGrunt1
 	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
-	spriteface PLAYER, RIGHT
+	objectface 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
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement4
 	scall TrainerCameraGrunt1
 	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
-	spriteface PLAYER, RIGHT
+	objectface 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
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
 	scall TrainerCameraGrunt1
 	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
-	spriteface PLAYER, RIGHT
+	objectface 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
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
 	scall TrainerCameraGrunt1
 	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
-	spriteface PLAYER, RIGHT
+	objectface 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
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
 	scall TrainerCameraGrunt1
 	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
-	spriteface PLAYER, RIGHT
+	objectface 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
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement1
 	scall TrainerCameraGrunt1
 	ifequal TRUE, NoSecurityCamera
 	scall PlaySecurityCameraSounds
 	showemote EMOTE_SHOCK, PLAYER, 15
 	playmusic MUSIC_ROCKET_ENCOUNTER
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	moveobject TEAMROCKETBASEB1F_ROCKET1, 14, 16
 	appear TEAMROCKETBASEB1F_ROCKET1
 	applymovement TEAMROCKETBASEB1F_ROCKET1, SecurityCameraMovement9
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@ -61,20 +61,20 @@ UnknownScript_0x6cfac:
 	writetext UnknownText_0x6d2ad
 	waitbutton
 	closetext
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	showemote EMOTE_SHOCK, PLAYER, 15
 	applymovement PLAYER, MovementData_0x6d21f
 	playmusic MUSIC_ROCKET_ENCOUNTER
 	applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d224
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x6d22f
 	opentext
 	writetext UnknownText_0x6d2c3
 	waitbutton
 	closetext
 	cry DRAGONITE
-	spriteface TEAMROCKETBASEB2F_ROCKET_GIRL, LEFT
+	objectface TEAMROCKETBASEB2F_ROCKET_GIRL, LEFT
-	spriteface PLAYER, LEFT
+	objectface 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
-	spriteface PLAYER, RIGHT
+	objectface 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
-	spriteface TEAMROCKETBASEB2F_LANCE, DOWN
+	objectface TEAMROCKETBASEB2F_LANCE, DOWN
 	opentext
 	writetext UnknownText_0x6d5d8
 	waitbutton
 	closetext
 	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d250
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	opentext
 	writetext UnknownText_0x6d64e
 	waitbutton
@ -153,12 +153,12 @@ UnknownScript_0x6d07a:
 	end
 LanceHealsScript1:
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	jump LanceHealsCommon
 LanceHealsScript2:
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
-	spriteface TEAMROCKETBASEB2F_LANCE, LEFT
+	objectface 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
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	opentext
 	writetext UnknownText_0x6d809
 	buttonsound
@ -290,12 +290,12 @@ UnknownScript_0x6d184:
 	writetext UnknownText_0x6d8f8
 	waitbutton
 	closetext
-	spriteface TEAMROCKETBASEB2F_LANCE, DOWN
+	objectface TEAMROCKETBASEB2F_LANCE, DOWN
 	opentext
 	writetext UnknownText_0x6d994
 	waitbutton
 	closetext
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d283
 	disappear TEAMROCKETBASEB2F_LANCE
 	setevent EVENT_CLEARED_ROCKET_HIDEOUT
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@ -47,9 +47,9 @@ TeamRocketBaseB3F_MapScripts:
 	return
 LanceGetPasswordScript:
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	pause 5
-	spriteface TEAMROCKETBASEB3F_MOLTRES, RIGHT
+	objectface TEAMROCKETBASEB3F_MOLTRES, RIGHT
 	pause 20
 	applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12a
 	opentext
@ -62,12 +62,12 @@ LanceGetPasswordScript:
 	end
 RocketBaseRival:
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	appear TEAMROCKETBASEB3F_SILVER
 	applymovement TEAMROCKETBASEB3F_SILVER, RocketBaseRivalEnterMovement
-	spriteface PLAYER, LEFT
+	objectface 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
-	spriteface TEAMROCKETBASEB3F_ROCKET1, DOWN
+	objectface TEAMROCKETBASEB3F_ROCKET1, DOWN
 	opentext
 	writetext UnknownText_0x6e400
 	waitbutton
--- 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
-	spriteface PLAYER, LEFT
+	objectface 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
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	cry ENTEI
 	pause 10
 	playsound SFX_WARP_FROM
@ -110,7 +110,7 @@ TinTower1F_MapScripts:
 	playsound SFX_EXIT_BUILDING
 	waitsfx
 .Next2:
-	spriteface PLAYER, UP
+	objectface 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
-	spriteface PLAYER, DOWN
+	objectface 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
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	opentext
 	writetext TinTowerEusineSuicuneText
 	waitbutton
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@ -12,7 +12,7 @@ TrainerHouseB1F_MapScripts:
 	end
 TrainerHouseReceptionistScript:
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	opentext
 	checkflag ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY
 	iftrue .FoughtTooManyTimes
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@ -43,7 +43,7 @@ SailorScript_0x74dc4:
 	writetext UnknownText_0x74f06
 	waitbutton
 	closetext
-	spriteface VERMILIONPORT_SAILOR1, DOWN
+	objectface VERMILIONPORT_SAILOR1, DOWN
 	pause 10
 	playsound SFX_EXIT_BUILDING
 	disappear VERMILIONPORT_SAILOR1
@ -77,12 +77,12 @@ UnknownScript_0x74e1a:
 	end
 UnknownScript_0x74e20:
-	spriteface VERMILIONPORT_SAILOR2, RIGHT
+	objectface VERMILIONPORT_SAILOR2, RIGHT
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	iftrue UnknownScript_0x74e86
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	iftrue UnknownScript_0x74e86
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	opentext
 	checkcode VAR_WEEKDAY
 	ifequal MONDAY, UnknownScript_0x74e72
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@ -21,7 +21,7 @@ VictoryRoad_MapScripts:
 UnknownScript_0x74492:
 	moveobject VICTORYROAD_SILVER, 18, 11
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
@ -35,7 +35,7 @@ UnknownScript_0x74492:
 	end
 UnknownScript_0x744b5:
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	showemote EMOTE_SHOCK, PLAYER, 15
 	special FadeOutMusic
 	pause 15
@ -49,7 +49,7 @@ UnknownScript_0x744b5:
 	end
 UnknownScript_0x744d4:
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	playmusic MUSIC_RIVAL_ENCOUNTER
 	opentext
 	writetext UnknownText_0x7455f
--- a/maps/VictoryRoadGate.asm
+++ b/maps/VictoryRoadGate.asm
@ -17,7 +17,7 @@ VictoryRoadGate_MapScripts:
 	end
 VictoryRoadGateBadgeCheckScene:
-	spriteface PLAYER, LEFT
+	objectface PLAYER, LEFT
 	jump VictoryRoadGateBadgeCheckScript
 VictoryRoadGateOfficerScript:
--- 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
-	spriteface PLAYER, UP
+	objectface PLAYER, UP
 	applymovement VIOLETCITY_EARL, VioletCitySpinningEarl_MovementData
 	stopfollow
 	special RestartMapMusic
--- a/maps/VioletPokecenter1F.asm
+++ b/maps/VioletPokecenter1F.asm
@ -36,7 +36,7 @@ VioletPokecenter1F_ElmsAideScript:
 	closetext
 	checkcode VAR_FACING
 	ifequal UP, .AideWalksAroundPlayer
-	spriteface PLAYER, DOWN
+	objectface 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
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	applymovement VIOLETPOKECENTER1F_SCIENTIST, MovementData_AideFinishesLeavingPokecenter
 	playsound SFX_EXIT_BUILDING
 	disappear VIOLETPOKECENTER1F_SCIENTIST
--- a/maps/WiseTriosRoom.asm
+++ b/maps/WiseTriosRoom.asm
@ -51,19 +51,19 @@ WiseTriosRoomSage3Script:
 	jumptextfaceplayer WiseTriosRoomSage3Text
 UnknownScript_0x985a3:
-	spriteface WISETRIOSROOM_SAGE3, UP
+	objectface WISETRIOSROOM_SAGE3, UP
-	spriteface PLAYER, DOWN
+	objectface PLAYER, DOWN
 	showemote EMOTE_SHOCK, WISETRIOSROOM_SAGE3, 20
 	follow PLAYER, WISETRIOSROOM_SAGE3
 	applymovement PLAYER, MovementData_0x98622
 	stopfollow
-	spriteface PLAYER, RIGHT
+	objectface PLAYER, RIGHT
 	opentext
 	writetext UnknownText_0x98712
 	waitbutton
 	closetext
 	applymovement WISETRIOSROOM_SAGE3, MovementData_0x98625
-	spriteface WISETRIOSROOM_SAGE3, LEFT
+	objectface WISETRIOSROOM_SAGE3, LEFT
 	end
 TrainerSageGaku:
@ -101,7 +101,7 @@ TrainerSageKoji:
 	waitbutton
 	closetext
 	applymovement WISETRIOSROOM_SAGE6, MovementData_0x98628
-	spriteface WISETRIOSROOM_SAGE6, UP
+	objectface WISETRIOSROOM_SAGE6, UP
 	setevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
 	setscene SCENE_FINISHED
 	end