summaryrefslogtreecommitdiff
path: root/maps/CeladonMansion1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/CeladonMansion1F.asm')
-rw-r--r--maps/CeladonMansion1F.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm
index 452ba96e8..892401afe 100644
--- a/maps/CeladonMansion1F.asm
+++ b/maps/CeladonMansion1F.asm
@@ -80,24 +80,24 @@ CeladonMansion1F_MapEventHeader:
.Warps:
db 5
- warp_def $9, $6, 2, CELADON_CITY
- warp_def $9, $7, 2, CELADON_CITY
- warp_def $0, $3, 3, CELADON_CITY
- warp_def $0, $0, 1, CELADON_MANSION_2F
- warp_def $0, $7, 4, CELADON_MANSION_2F
+ 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 8, 5, BGEVENT_UP, CeladonMansionManagersSuiteSign
- bg_event 3, 0, BGEVENT_READ, CeladonMansion1fBookshelf
- bg_event 3, 2, BGEVENT_READ, CeladonMansion1fBookshelf
+ 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 SPRITE_GRANNY, 5, 1, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansionManager, -1
- object_event SPRITE_GROWLITHE, 6, 2, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FMeowth, -1
- object_event SPRITE_CLEFAIRY, 4, 3, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonMansion1FClefairy, -1
- object_event SPRITE_GROWLITHE, 4, 4, SPRITEMOVEDATA_POKEMON, 0, 2, -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