diff options
Diffstat (limited to 'maps/LancesRoom.asm')
| -rw-r--r-- | maps/LancesRoom.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index e06a9b89d..8636fc9b1 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -44,12 +44,12 @@ LancesRoom_MapScripts: Script_ApproachLanceFromLeft: special FadeOutMusic applymovement PLAYER, MovementData_ApproachLanceFromLeft - jump LanceScript_0x180e7b + jump LancesRoomLanceScript Script_ApproachLanceFromRight: special FadeOutMusic applymovement PLAYER, MovementData_ApproachLanceFromRight -LanceScript_0x180e7b: +LancesRoomLanceScript: turnobject LANCESROOM_LANCE, LEFT opentext writetext LanceBattleIntroText @@ -351,6 +351,6 @@ LancesRoom_MapEvents: db 0 ; bg events db 3 ; object events - object_event 5, 3, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceScript_0x180e7b, -1 + object_event 5, 3, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LancesRoomLanceScript, -1 object_event 4, 7, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY object_event 4, 7, SPRITE_OAK, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY |