diff options
Diffstat (limited to 'maps/PewterCity.asm')
| -rw-r--r-- | maps/PewterCity.asm | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 04d5c0d8f..44ea440a7 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -158,29 +158,29 @@ PewterCity_MapEventHeader: .Warps: db 5 - warp_def $d, $1d, 1, PEWTER_NIDORAN_SPEECH_HOUSE - warp_def $11, $10, 1, PEWTER_GYM - warp_def $11, $17, 2, PEWTER_MART - warp_def $19, $d, 1, PEWTER_POKECENTER_1F - warp_def $1d, $7, 1, PEWTER_SNOOZE_SPEECH_HOUSE + warp_def 29, 13, 1, PEWTER_NIDORAN_SPEECH_HOUSE + warp_def 16, 17, 1, PEWTER_GYM + warp_def 23, 17, 2, PEWTER_MART + warp_def 13, 25, 1, PEWTER_POKECENTER_1F + warp_def 7, 29, 1, PEWTER_SNOOZE_SPEECH_HOUSE .CoordEvents: db 0 .BGEvents: db 7 - bg_event 23, 25, BGEVENT_READ, PewterCitySign - bg_event 17, 11, BGEVENT_READ, PewterGymSign - bg_event 9, 15, BGEVENT_READ, PewterMuseumSign - bg_event 19, 33, BGEVENT_READ, PewterCityMtMoonGiftShopSign - bg_event 29, 19, BGEVENT_READ, PewterCityWelcomeSign - bg_event 25, 14, BGEVENT_READ, PewterCityPokecenterSign - bg_event 17, 24, BGEVENT_READ, PewterCityMartSign + bg_event 25, 23, BGEVENT_READ, PewterCitySign + bg_event 11, 17, BGEVENT_READ, PewterGymSign + bg_event 15, 9, BGEVENT_READ, PewterMuseumSign + bg_event 33, 19, BGEVENT_READ, PewterCityMtMoonGiftShopSign + bg_event 19, 29, BGEVENT_READ, PewterCityWelcomeSign + bg_event 14, 25, BGEVENT_READ, PewterCityPokecenterSign + bg_event 24, 17, BGEVENT_READ, PewterCityMartSign .ObjectEvents: db 5 - object_event SPRITE_COOLTRAINER_F, 11, 19, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterCityCooltrainerFScript, -1 - object_event SPRITE_BUG_CATCHER, 29, 14, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterCityBugCatcherScript, -1 - object_event SPRITE_GRAMPS, 17, 29, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x18c00f, -1 - object_event SPRITE_FRUIT_TREE, 3, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c03e, -1 - object_event SPRITE_FRUIT_TREE, 3, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c040, -1 + object_event 19, 11, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PewterCityCooltrainerFScript, -1 + object_event 14, 29, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterCityBugCatcherScript, -1 + object_event 29, 17, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, GrampsScript_0x18c00f, -1 + object_event 32, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c03e, -1 + object_event 30, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, FruitTreeScript_0x18c040, -1 |