diff options
Diffstat (limited to 'maps/OlivineLighthouse6F.asm')
| -rw-r--r-- | maps/OlivineLighthouse6F.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index 713d08d43..686764bfd 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -263,9 +263,9 @@ OlivineLighthouse6F_MapEventHeader: .Warps: db 3 - warp_def $f, $9, 1, OLIVINE_LIGHTHOUSE_5F - warp_def $5, $10, 6, OLIVINE_LIGHTHOUSE_5F - warp_def $5, $11, 7, OLIVINE_LIGHTHOUSE_5F + warp_def 9, 15, 1, OLIVINE_LIGHTHOUSE_5F + warp_def 16, 5, 6, OLIVINE_LIGHTHOUSE_5F + warp_def 17, 5, 7, OLIVINE_LIGHTHOUSE_5F .CoordEvents: db 0 @@ -275,6 +275,6 @@ OlivineLighthouse6F_MapEventHeader: .ObjectEvents: db 3 - object_event SPRITE_JASMINE, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x60b91, EVENT_OLIVINE_LIGHTHOUSE_JASMINE - object_event SPRITE_MONSTER, 8, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MonsterScript_0x60c3a, -1 - object_event SPRITE_POKE_BALL, 4, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse6FSuperPotion, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION + object_event 8, 8, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, JasmineScript_0x60b91, EVENT_OLIVINE_LIGHTHOUSE_JASMINE + object_event 9, 8, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, MonsterScript_0x60c3a, -1 + object_event 3, 4, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, OlivineLighthouse6FSuperPotion, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION |