diff options
Diffstat (limited to 'maps/CharcoalKiln.asm')
| -rw-r--r-- | maps/CharcoalKiln.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index cfad6ab1d..2b5942001 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -154,20 +154,20 @@ CharcoalKiln_MapEventHeader: .Warps: db 2 - warp_def $7, $2, 2, AZALEA_TOWN - warp_def $7, $3, 2, AZALEA_TOWN + warp_def 2, 7, 2, AZALEA_TOWN + warp_def 3, 7, 2, AZALEA_TOWN .CoordEvents: db 0 .BGEvents: db 3 - bg_event 1, 0, BGEVENT_READ, CharcoalKilnBookshelf + bg_event 0, 1, BGEVENT_READ, CharcoalKilnBookshelf bg_event 1, 1, BGEVENT_READ, CharcoalKilnBookshelf - bg_event 1, 7, BGEVENT_READ, CharcoalKilnRadio + bg_event 7, 1, BGEVENT_READ, CharcoalKilnRadio .ObjectEvents: db 3 - object_event SPRITE_BLACK_BELT, 3, 2, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS - object_event SPRITE_YOUNGSTER, 3, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE - object_event SPRITE_MOLTRES, 6, 5, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D + object_event 2, 3, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS + object_event 5, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE + object_event 5, 6, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D |