summaryrefslogtreecommitdiff
path: root/maps/GoldenrodCity.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/GoldenrodCity.asm')
-rw-r--r--maps/GoldenrodCity.asm84
1 files changed, 42 insertions, 42 deletions
diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm
index d629d86c9..8e324a9bb 100644
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -560,54 +560,54 @@ GoldenrodCity_MapEventHeader:
.Warps:
db 15
- warp_def $7, $18, 1, GOLDENROD_GYM
- warp_def $1d, $1d, 1, GOLDENROD_BIKE_SHOP
- warp_def $15, $1f, 1, GOLDENROD_HAPPINESS_RATER
- warp_def $19, $5, 1, GOLDENROD_BILLS_HOUSE
- warp_def $d, $9, 2, GOLDENROD_MAGNET_TRAIN_STATION
- warp_def $5, $1d, 1, GOLDENROD_FLOWER_SHOP
- warp_def $9, $21, 1, GOLDENROD_PP_SPEECH_HOUSE
- warp_def $7, $f, 1, GOLDENROD_NAME_RATER
- warp_def $1b, $18, 1, GOLDENROD_DEPT_STORE_1F
- warp_def $15, $e, 1, GOLDENROD_GAME_CORNER
- warp_def $f, $5, 1, RADIO_TOWER_1F
- warp_def $1, $13, 3, ROUTE_35_GOLDENROD_GATE
- warp_def $5, $9, 8, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
- warp_def $1d, $b, 5, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
- warp_def $1b, $f, 1, GOLDENROD_POKECENTER_1F
+ warp_def 24, 7, 1, GOLDENROD_GYM
+ warp_def 29, 29, 1, GOLDENROD_BIKE_SHOP
+ warp_def 31, 21, 1, GOLDENROD_HAPPINESS_RATER
+ warp_def 5, 25, 1, GOLDENROD_BILLS_HOUSE
+ warp_def 9, 13, 2, GOLDENROD_MAGNET_TRAIN_STATION
+ warp_def 29, 5, 1, GOLDENROD_FLOWER_SHOP
+ warp_def 33, 9, 1, GOLDENROD_PP_SPEECH_HOUSE
+ warp_def 15, 7, 1, GOLDENROD_NAME_RATER
+ warp_def 24, 27, 1, GOLDENROD_DEPT_STORE_1F
+ warp_def 14, 21, 1, GOLDENROD_GAME_CORNER
+ warp_def 5, 15, 1, RADIO_TOWER_1F
+ warp_def 19, 1, 3, ROUTE_35_GOLDENROD_GATE
+ warp_def 9, 5, 8, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
+ warp_def 11, 29, 5, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES
+ warp_def 15, 27, 1, GOLDENROD_POKECENTER_1F
.CoordEvents:
db 0
.BGEvents:
db 12
- bg_event 14, 10, BGEVENT_READ, GoldenrodCityStationSign
- bg_event 17, 4, BGEVENT_READ, GoldenrodCityRadioTowerSign
- bg_event 27, 26, BGEVENT_READ, GoldenrodDeptStoreSign
- bg_event 9, 26, BGEVENT_READ, GoldenrodGymSign
- bg_event 18, 22, BGEVENT_READ, GoldenrodCitySign
- bg_event 30, 28, BGEVENT_READ, GoldenrodCityBikeShopSign
- bg_event 22, 16, BGEVENT_READ, GoldenrodCityGameCornerSign
- bg_event 7, 12, BGEVENT_READ, GoldenrodCityNameRaterSign
- bg_event 6, 8, BGEVENT_READ, GoldenrodCityUndergroundSignNorth
- bg_event 30, 12, BGEVENT_READ, GoldenrodCityUndergroundSignSouth
- bg_event 27, 16, BGEVENT_UP, GoldenrodCityPokecenterSign
- bg_event 6, 30, BGEVENT_READ, GoldenrodCityFlowerShopSign
+ bg_event 10, 14, BGEVENT_READ, GoldenrodCityStationSign
+ bg_event 4, 17, BGEVENT_READ, GoldenrodCityRadioTowerSign
+ bg_event 26, 27, BGEVENT_READ, GoldenrodDeptStoreSign
+ bg_event 26, 9, BGEVENT_READ, GoldenrodGymSign
+ bg_event 22, 18, BGEVENT_READ, GoldenrodCitySign
+ bg_event 28, 30, BGEVENT_READ, GoldenrodCityBikeShopSign
+ bg_event 16, 22, BGEVENT_READ, GoldenrodCityGameCornerSign
+ bg_event 12, 7, BGEVENT_READ, GoldenrodCityNameRaterSign
+ bg_event 8, 6, BGEVENT_READ, GoldenrodCityUndergroundSignNorth
+ bg_event 12, 30, BGEVENT_READ, GoldenrodCityUndergroundSignSouth
+ bg_event 16, 27, BGEVENT_UP, GoldenrodCityPokecenterSign
+ bg_event 30, 6, BGEVENT_READ, GoldenrodCityFlowerShopSign
.ObjectEvents:
db 15
- object_event SPRITE_POKEFAN_M, 18, 7, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityPokefanMScript, EVENT_GOLDENROD_CITY_CIVILIANS
- object_event SPRITE_YOUNGSTER, 17, 30, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityYoungster1Script, EVENT_GOLDENROD_CITY_CIVILIANS
- object_event SPRITE_COOLTRAINER_F, 16, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x1989e9, EVENT_GOLDENROD_CITY_CIVILIANS
- object_event SPRITE_COOLTRAINER_F, 26, 20, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x1989fd, EVENT_GOLDENROD_CITY_CIVILIANS
- object_event SPRITE_YOUNGSTER, 17, 19, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodCityYoungster2Script, EVENT_GOLDENROD_CITY_CIVILIANS
- object_event SPRITE_LASS, 10, 17, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodCityLassScript, EVENT_GOLDENROD_CITY_CIVILIANS
- object_event SPRITE_GRAMPS, 27, 11, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityGrampsScript, EVENT_GOLDENROD_CITY_CIVILIANS
- object_event SPRITE_ROCKET, 16, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocketScoutScript, EVENT_GOLDENROD_CITY_ROCKET_SCOUT
- object_event SPRITE_ROCKET, 20, 28, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket1Script, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER
- object_event SPRITE_ROCKET, 15, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket2Script, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER
- object_event SPRITE_ROCKET, 23, 16, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket3Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
- object_event SPRITE_ROCKET, 20, 29, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket4Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
- object_event SPRITE_ROCKET, 7, 29, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket5Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
- object_event SPRITE_ROCKET, 10, 31, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket6Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
- object_event SPRITE_POKEFAN_M, 22, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MoveTutor, EVENT_GOLDENROD_CITY_MOVE_TUTOR
+ object_event 7, 18, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityPokefanMScript, EVENT_GOLDENROD_CITY_CIVILIANS
+ object_event 30, 17, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityYoungster1Script, EVENT_GOLDENROD_CITY_CIVILIANS
+ object_event 12, 16, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x1989e9, EVENT_GOLDENROD_CITY_CIVILIANS
+ object_event 20, 26, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CooltrainerFScript_0x1989fd, EVENT_GOLDENROD_CITY_CIVILIANS
+ object_event 19, 17, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodCityYoungster2Script, EVENT_GOLDENROD_CITY_CIVILIANS
+ object_event 17, 10, SPRITE_LASS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodCityLassScript, EVENT_GOLDENROD_CITY_CIVILIANS
+ object_event 11, 27, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityGrampsScript, EVENT_GOLDENROD_CITY_CIVILIANS
+ object_event 4, 16, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocketScoutScript, EVENT_GOLDENROD_CITY_ROCKET_SCOUT
+ object_event 28, 20, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket1Script, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER
+ object_event 8, 15, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket2Script, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER
+ object_event 16, 23, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket3Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+ object_event 29, 20, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket4Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+ object_event 29, 7, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket5Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+ object_event 31, 10, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodCityRocket6Script, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+ object_event 12, 22, SPRITE_POKEFAN_M, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, MoveTutor, EVENT_GOLDENROD_CITY_MOVE_TUTOR