From c834bdadf2f3e38d684f798dfa67d7cd751a6a65 Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 2 Feb 2018 21:50:43 -0500 Subject: =?UTF-8?q?spriteface=20=E2=86=92=20objectface,=20consistent=20wit?= =?UTF-8?q?h=20the=20other=20script=20commands?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- engine/events/std_scripts.asm | 8 ++++---- engine/scripting.asm | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'engine') diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index d075b5a6b..e3dbd92df 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 - 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 diff --git a/engine/scripting.asm b/engine/scripting.asm index ae6ce75c8..86719ac23 100644 --- 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 -- cgit v1.2.3