diff options
Diffstat (limited to 'maps/EcruteakCity.asm')
| -rw-r--r-- | maps/EcruteakCity.asm | 71 |
1 files changed, 32 insertions, 39 deletions
diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index 5e3dada98..c8bb4af5f 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -1,4 +1,4 @@ -const_value set 2 + const_def 2 ; object constants const ECRUTEAKCITY_GRAMPS1 const ECRUTEAKCITY_GRAMPS2 const ECRUTEAKCITY_LASS1 @@ -8,11 +8,9 @@ const_value set 2 const ECRUTEAKCITY_GRAMPS3 EcruteakCity_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: @@ -88,7 +86,7 @@ EcruteakCityMartSign: jumpstd martsign EcruteakCityHiddenHyperPotion: - hiddenitem EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION, HYPER_POTION + hiddenitem HYPER_POTION, EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION UnusedMissingDaughterText: ; This text is neither used nor referenced in the final game. @@ -260,47 +258,42 @@ BurnedTowerSignText: done EcruteakCity_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 15 - 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 + db 0, 0 ; filler + + db 15 ; warp events + warp_event 35, 26, ROUTE_42_ECRUTEAK_GATE, 1 + warp_event 35, 27, ROUTE_42_ECRUTEAK_GATE, 2 + warp_event 18, 11, ECRUTEAK_TIN_TOWER_ENTRANCE, 1 + warp_event 20, 2, WISE_TRIOS_ROOM, 1 + warp_event 20, 3, WISE_TRIOS_ROOM, 2 + warp_event 23, 27, ECRUTEAK_POKECENTER_1F, 1 + warp_event 5, 21, ECRUTEAK_LUGIA_SPEECH_HOUSE, 1 + warp_event 23, 21, DANCE_THEATRE, 1 + warp_event 29, 21, ECRUTEAK_MART, 2 + warp_event 6, 27, ECRUTEAK_GYM, 1 + warp_event 13, 27, ECRUTEAK_ITEMFINDER_HOUSE, 1 + warp_event 37, 7, TIN_TOWER_1F, 1 + warp_event 5, 5, BURNED_TOWER_1F, 1 + warp_event 0, 18, ROUTE_38_ECRUTEAK_GATE, 3 + warp_event 0, 19, ROUTE_38_ECRUTEAK_GATE, 4 + + db 0 ; coord events + + db 8 ; bg events bg_event 15, 21, BGEVENT_READ, EcruteakCitySign bg_event 38, 10, BGEVENT_READ, TinTowerSign - bg_event 8, 28, BGEVENT_READ, EcruteakGymSign + bg_event 8, 28, BGEVENT_READ, EcruteakGymSign bg_event 21, 21, BGEVENT_READ, EcruteakDanceTheaterSign - bg_event 2, 10, BGEVENT_READ, BurnedTowerSign + 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 + db 7 ; object events 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 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 + object_event 3, 7, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, EcruteakCityGramps3Script, EVENT_ECRUTEAK_CITY_GRAMPS |