diff options
Diffstat (limited to 'maps/EcruteakCity.asm')
| -rw-r--r-- | maps/EcruteakCity.asm | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index 9e359419b..322b403f6 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -265,42 +265,42 @@ EcruteakCity_MapEventHeader: .Warps: db 15 - warp_def $1a, $23, 1, ROUTE_42_ECRUTEAK_GATE - warp_def $1b, $23, 2, ROUTE_42_ECRUTEAK_GATE - warp_def $b, $12, 1, ECRUTEAK_HOUSE - warp_def $2, $14, 1, WISE_TRIOS_ROOM - warp_def $3, $14, 2, WISE_TRIOS_ROOM - warp_def $1b, $17, 1, ECRUTEAK_POKECENTER_1F - warp_def $15, $5, 1, ECRUTEAK_LUGIA_SPEECH_HOUSE - warp_def $15, $17, 1, DANCE_THEATRE - warp_def $15, $1d, 2, ECRUTEAK_MART - warp_def $1b, $6, 1, ECRUTEAK_GYM - warp_def $1b, $d, 1, ECRUTEAK_ITEMFINDER_HOUSE - warp_def $7, $25, 1, TIN_TOWER_1F - warp_def $5, $5, 1, BURNED_TOWER_1F - warp_def $12, $0, 3, ROUTE_38_ECRUTEAK_GATE - warp_def $13, $0, 4, ROUTE_38_ECRUTEAK_GATE + warp_def 35, 26, 1, ROUTE_42_ECRUTEAK_GATE + warp_def 35, 27, 2, ROUTE_42_ECRUTEAK_GATE + warp_def 18, 11, 1, ECRUTEAK_HOUSE + warp_def 20, 2, 1, WISE_TRIOS_ROOM + warp_def 20, 3, 2, WISE_TRIOS_ROOM + warp_def 23, 27, 1, ECRUTEAK_POKECENTER_1F + warp_def 5, 21, 1, ECRUTEAK_LUGIA_SPEECH_HOUSE + warp_def 23, 21, 1, DANCE_THEATRE + warp_def 29, 21, 2, ECRUTEAK_MART + warp_def 6, 27, 1, ECRUTEAK_GYM + warp_def 13, 27, 1, ECRUTEAK_ITEMFINDER_HOUSE + warp_def 37, 7, 1, TIN_TOWER_1F + warp_def 5, 5, 1, BURNED_TOWER_1F + warp_def 0, 18, 3, ROUTE_38_ECRUTEAK_GATE + warp_def 0, 19, 4, ROUTE_38_ECRUTEAK_GATE .CoordEvents: db 0 .BGEvents: db 8 - bg_event 21, 15, BGEVENT_READ, EcruteakCitySign - bg_event 10, 38, BGEVENT_READ, TinTowerSign - bg_event 28, 8, BGEVENT_READ, EcruteakGymSign + bg_event 15, 21, BGEVENT_READ, EcruteakCitySign + bg_event 38, 10, BGEVENT_READ, TinTowerSign + bg_event 8, 28, BGEVENT_READ, EcruteakGymSign bg_event 21, 21, BGEVENT_READ, EcruteakDanceTheaterSign - bg_event 10, 2, BGEVENT_READ, BurnedTowerSign - bg_event 27, 24, BGEVENT_READ, EcruteakCityPokecenterSign - bg_event 21, 30, BGEVENT_READ, EcruteakCityMartSign - bg_event 14, 23, BGEVENT_ITEM, EcruteakCityHiddenHyperPotion + bg_event 2, 10, BGEVENT_READ, BurnedTowerSign + bg_event 24, 27, BGEVENT_READ, EcruteakCityPokecenterSign + bg_event 30, 21, BGEVENT_READ, EcruteakCityMartSign + bg_event 23, 14, BGEVENT_ITEM, EcruteakCityHiddenHyperPotion .ObjectEvents: db 7 - object_event SPRITE_GRAMPS, 15, 18, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps1Script, -1 - object_event SPRITE_GRAMPS, 21, 20, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps2Script, -1 - object_event SPRITE_LASS, 29, 21, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, EcruteakCityLassScript, -1 - object_event SPRITE_LASS, 9, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LassScript_0x1a4015, -1 - object_event SPRITE_FISHER, 22, 9, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x1a4029, -1 - object_event SPRITE_YOUNGSTER, 14, 10, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakCityYoungsterScript, -1 - object_event SPRITE_GRAMPS, 7, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps3Script, EVENT_ECRUTEAK_CITY_GRAMPS + object_event 18, 15, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps1Script, -1 + object_event 20, 21, SPRITE_GRAMPS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps2Script, -1 + object_event 21, 29, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, EcruteakCityLassScript, -1 + object_event 3, 9, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LassScript_0x1a4015, -1 + object_event 9, 22, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FisherScript_0x1a4029, -1 + object_event 10, 14, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, EcruteakCityYoungsterScript, -1 + object_event 3, 7, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps3Script, EVENT_ECRUTEAK_CITY_GRAMPS |