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 6ea37bbf9..04d5c0d8f 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -6,7 +6,7 @@ const_value set 2 const PEWTERCITY_FRUIT_TREE2 PewterCity_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -164,23 +164,23 @@ PewterCity_MapEventHeader: warp_def $19, $d, 1, PEWTER_POKECENTER_1F warp_def $1d, $7, 1, PEWTER_SNOOZE_SPEECH_HOUSE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 7 - signpost 23, 25, SIGNPOST_READ, PewterCitySign - signpost 17, 11, SIGNPOST_READ, PewterGymSign - signpost 9, 15, SIGNPOST_READ, PewterMuseumSign - signpost 19, 33, SIGNPOST_READ, PewterCityMtMoonGiftShopSign - signpost 29, 19, SIGNPOST_READ, PewterCityWelcomeSign - signpost 25, 14, SIGNPOST_READ, PewterCityPokecenterSign - signpost 17, 24, SIGNPOST_READ, PewterCityMartSign - -.PersonEvents: + 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 + +.ObjectEvents: db 5 - person_event SPRITE_COOLTRAINER_F, 11, 19, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, PewterCityCooltrainerFScript, -1 - person_event SPRITE_BUG_CATCHER, 29, 14, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_RED, PERSONTYPE_SCRIPT, 0, PewterCityBugCatcherScript, -1 - person_event SPRITE_GRAMPS, 17, 29, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 2, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, GrampsScript_0x18c00f, -1 - person_event SPRITE_FRUIT_TREE, 3, 32, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x18c03e, -1 - person_event SPRITE_FRUIT_TREE, 3, 30, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, FruitTreeScript_0x18c040, -1 + 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 |