diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/events/std_scripts.asm | 10 | ||||
| -rw-r--r-- | engine/scripting.asm | 8 |
2 files changed, 9 insertions, 9 deletions
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 |