diff options
Diffstat (limited to 'maps/CeladonMansion1F.asm')
| -rw-r--r-- | maps/CeladonMansion1F.asm | 55 |
1 files changed, 24 insertions, 31 deletions
diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index 4f6e0f94d..2e856fd79 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const CELADONMANSION1F_GRANNY const CELADONMANSION1F_GROWLITHE1 const CELADONMANSION1F_CLEFAIRY const CELADONMANSION1F_GROWLITHE2 CeladonMansion1F_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks CeladonMansionManager: jumptextfaceplayer CeladonMansionManagerText @@ -75,29 +73,24 @@ CeladonMansionManagersSuiteSignText: done CeladonMansion1F_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 5 - warp_def 6, 9, 2, CELADON_CITY - warp_def 7, 9, 2, CELADON_CITY - warp_def 3, 0, 3, CELADON_CITY - warp_def 0, 0, 1, CELADON_MANSION_2F - warp_def 7, 0, 4, CELADON_MANSION_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 3 - bg_event 5, 8, BGEVENT_UP, CeladonMansionManagersSuiteSign - bg_event 0, 3, BGEVENT_READ, CeladonMansion1fBookshelf - bg_event 2, 3, BGEVENT_READ, CeladonMansion1fBookshelf - -.ObjectEvents: - db 4 - 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 + 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 + + 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 + + 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 |