diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-25 20:05:37 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-25 20:05:37 -0500 |
| commit | f964d04a873769c0aa1d27a7dd032170f55853fd (patch) | |
| tree | ddc0ac1a1081b3b81fd3b7a041943e9571bb8e2e /maps/LancesRoom.asm | |
| parent | be28a0ff4eb4ba04dcbd0fc025b3a68af535a0a1 (diff) | |
* loadmenuheader -> loadmenu (ead103d)
* objectface -> turnobject (c834bda)
Diffstat (limited to 'maps/LancesRoom.asm')
| -rw-r--r-- | maps/LancesRoom.asm | 18 |
1 files changed, 9 insertions, 9 deletions
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 |