diff options
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 7cae63c73..f16dc0dfa 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -339,18 +339,18 @@ LancesRoom_MapEvents: db 0, 0 ; filler db 4 ; warp events - warp_event 4, 23, KARENS_ROOM, 3 - warp_event 5, 23, KARENS_ROOM, 4 - warp_event 4, 1, HALL_OF_FAME, 1 - warp_event 5, 1, HALL_OF_FAME, 2 + warp_event 4, 23, KARENS_ROOM, 3 + warp_event 5, 23, KARENS_ROOM, 4 + warp_event 4, 1, HALL_OF_FAME, 1 + warp_event 5, 1, HALL_OF_FAME, 2 db 2 ; coord events - coord_event 4, 5, SCENE_LANCESROOM_APPROACH_LANCE, Script_ApproachLanceFromLeft - coord_event 5, 5, SCENE_LANCESROOM_APPROACH_LANCE, Script_ApproachLanceFromRight + coord_event 4, 5, SCENE_LANCESROOM_APPROACH_LANCE, Script_ApproachLanceFromLeft + coord_event 5, 5, SCENE_LANCESROOM_APPROACH_LANCE, Script_ApproachLanceFromRight 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 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 + object_event 5, 3, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LanceScript_0x180e7b, -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 |