diff options
Diffstat (limited to 'maps/CeladonMansion1F.asm')
| -rw-r--r-- | maps/CeladonMansion1F.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index 1746ce937..2e856fd79 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -76,21 +76,21 @@ CeladonMansion1F_MapEvents: db 0, 0 ; filler db 5 ; warp events - warp_event 6, 9, CELADON_CITY, 2 - warp_event 7, 9, CELADON_CITY, 2 - warp_event 3, 0, CELADON_CITY, 3 - warp_event 0, 0, CELADON_MANSION_2F, 1 - warp_event 7, 0, CELADON_MANSION_2F, 4 + warp_event 6, 9, CELADON_CITY, 2 + warp_event 7, 9, CELADON_CITY, 2 + warp_event 3, 0, CELADON_CITY, 3 + warp_event 0, 0, CELADON_MANSION_2F, 1 + warp_event 7, 0, CELADON_MANSION_2F, 4 db 0 ; coord events db 3 ; bg events - bg_event 5, 8, BGEVENT_UP, CeladonMansionManagersSuiteSign - bg_event 0, 3, BGEVENT_READ, CeladonMansion1fBookshelf - bg_event 2, 3, BGEVENT_READ, CeladonMansion1fBookshelf + bg_event 5, 8, BGEVENT_UP, CeladonMansionManagersSuiteSign + bg_event 0, 3, BGEVENT_READ, CeladonMansion1fBookshelf + bg_event 2, 3, BGEVENT_READ, CeladonMansion1fBookshelf db 4 ; object events - object_event 1, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansionManager, -1 - object_event 2, 6, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FMeowth, -1 - object_event 3, 4, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FClefairy, -1 - object_event 4, 4, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FNidoranF, -1 + object_event 1, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansionManager, -1 + object_event 2, 6, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FMeowth, -1 + object_event 3, 4, SPRITE_CLEFAIRY, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FClefairy, -1 + object_event 4, 4, SPRITE_GROWLITHE, SPRITEMOVEDATA_POKEMON, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FNidoranF, -1 |