diff options
Diffstat (limited to 'maps/AzaleaTown.asm')
| -rw-r--r-- | maps/AzaleaTown.asm | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 61dd4acff..5bb751a7f 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -457,41 +457,41 @@ AzaleaTown_MapEvents: db 0, 0 ; filler db 8 ; warp events - warp_event 15, 9, AZALEA_POKECENTER_1F, 1 + warp_event 15, 9, AZALEA_POKECENTER_1F, 1 warp_event 21, 13, CHARCOAL_KILN, 1 - warp_event 21, 5, AZALEA_MART, 2 - warp_event 9, 5, KURTS_HOUSE, 1 + warp_event 21, 5, AZALEA_MART, 2 + warp_event 9, 5, KURTS_HOUSE, 1 warp_event 10, 15, AZALEA_GYM, 1 - warp_event 31, 7, SLOWPOKE_WELL_B1F, 1 - warp_event 2, 10, ILEX_FOREST_AZALEA_GATE, 3 - warp_event 2, 11, ILEX_FOREST_AZALEA_GATE, 4 + warp_event 31, 7, SLOWPOKE_WELL_B1F, 1 + warp_event 2, 10, ILEX_FOREST_AZALEA_GATE, 3 + warp_event 2, 11, ILEX_FOREST_AZALEA_GATE, 4 db 3 ; coord events - coord_event 5, 10, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene1 - coord_event 5, 11, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene2 - coord_event 9, 6, SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL, AzaleaTownCelebiScene + coord_event 5, 10, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene1 + coord_event 5, 11, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene2 + coord_event 9, 6, SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL, AzaleaTownCelebiScene db 9 ; bg events - bg_event 19, 9, BGEVENT_READ, AzaleaTownSign - bg_event 10, 9, BGEVENT_READ, KurtsHouseSign + bg_event 19, 9, BGEVENT_READ, AzaleaTownSign + bg_event 10, 9, BGEVENT_READ, KurtsHouseSign bg_event 14, 15, BGEVENT_READ, AzaleaGymSign - bg_event 29, 7, BGEVENT_READ, SlowpokeWellSign + bg_event 29, 7, BGEVENT_READ, SlowpokeWellSign bg_event 19, 13, BGEVENT_READ, CharcoalKilnSign - bg_event 16, 9, BGEVENT_READ, AzaleaTownPokecenterSign - bg_event 22, 5, BGEVENT_READ, AzaleaTownMartSign - bg_event 3, 9, BGEVENT_READ, AzaleaTownIlextForestSign - bg_event 31, 6, BGEVENT_ITEM, AzaleaTownHiddenFullHeal + bg_event 16, 9, BGEVENT_READ, AzaleaTownPokecenterSign + bg_event 22, 5, BGEVENT_READ, AzaleaTownMartSign + bg_event 3, 9, BGEVENT_READ, AzaleaTownIlextForestSign + bg_event 31, 6, BGEVENT_ITEM, AzaleaTownHiddenFullHeal db 12 ; object events - object_event 31, 9, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket1Script, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET - object_event 21, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownGrampsScript, -1 + object_event 31, 9, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket1Script, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET + object_event 21, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownGrampsScript, -1 object_event 15, 13, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, AzaleaTownTeacherScript, -1 - object_event 7, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaTownYoungsterScript, -1 - object_event 8, 17, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES - object_event 18, 9, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES - object_event 29, 9, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES + object_event 7, 9, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaTownYoungsterScript, -1 + object_event 8, 17, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES + object_event 18, 9, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES + object_event 29, 9, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES object_event 15, 15, SPRITE_SLOWPOKE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownSlowpokeScript, EVENT_AZALEA_TOWN_SLOWPOKES - object_event 8, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WhiteApricornTree, -1 + object_event 8, 2, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WhiteApricornTree, -1 object_event 11, 10, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN object_event 10, 16, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket2Script, EVENT_SLOWPOKE_WELL_ROCKETS - object_event 6, 5, SPRITE_KURT_OUTSIDE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownKurtScript, EVENT_AZALEA_TOWN_KURT + object_event 6, 5, SPRITE_KURT_OUTSIDE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownKurtScript, EVENT_AZALEA_TOWN_KURT |