* loadmenuheader -> loadmenu (ead103d)

* objectface -> turnobject (c834bda)

Author: Rangi42

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`: <code>loadmenuheader <i>menu_header</i></code>
+## `$4F`: <code>loadmenu <i>menu_header</i></code>
 
 ## `$50`: `closewindow`
 
@@ -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>objectface <i>object_id</i>, <i>facing</i></code>
+## `$76`: <code>turnobject <i>object_id</i>, <i>facing</i></code>
 
 ## `$77`: <code>follownotexact <i>object2</i>, <i>object1</i></code>
 

engine/events/std_scripts.asm

@@ -109,15 +109,15 @@ PokecenterNurseScript:
 	farwritetext NurseTakePokemonText
 	pause 20
 	special StubbedTrainerRankings_Healings
-	objectface LAST_TALKED, LEFT
+	turnobject LAST_TALKED, LEFT
 	pause 10
 	special HealParty
 	playmusic MUSIC_NONE
 	writebyte HEALMACHINE_POKECENTER
 	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

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
 

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"

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

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

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
 

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:

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

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

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,20 +69,20 @@ CeladonCafeTeacher:
 	writetext TeacherText_NoCoinCase
 	waitbutton
 	closetext
-	objectface CELADONCAFE_TEACHER, LEFT
+	turnobject CELADONCAFE_TEACHER, LEFT
 	end
 
 .HasCoinCase:
 	opentext
 	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:

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:

maps/CeladonDeptStore6F.asm

@@ -23,7 +23,7 @@ CeladonDeptStore6FVendingMachine:
 	writetext CeladonVendingText
 .Start:
 	special PlaceMoneyTopRight
-	loadmenuheader .MenuHeader
+	loadmenu .MenuHeader
 	verticalmenu
 	closewindow
 	ifequal 1, .FreshWater