summaryrefslogtreecommitdiff
path: root/maps/PewterCity.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/PewterCity.asm')
-rw-r--r--maps/PewterCity.asm38
1 files changed, 19 insertions, 19 deletions
diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm
index 1ee798544..3537949a5 100644
--- a/maps/PewterCity.asm
+++ b/maps/PewterCity.asm
@@ -1,8 +1,8 @@
PewterCity_MapScriptHeader:
- ; trigger count
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 1
; callbacks
@@ -151,7 +151,7 @@ PewterCity_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 5
warp_def $d, $1d, 1, GROUP_PEWTER_NIDORAN_SPEECH_HOUSE, MAP_PEWTER_NIDORAN_SPEECH_HOUSE
warp_def $11, $10, 1, GROUP_PEWTER_GYM, MAP_PEWTER_GYM
@@ -159,23 +159,23 @@ PewterCity_MapEventHeader:
warp_def $19, $d, 1, GROUP_PEWTER_POKECENTER_1F, MAP_PEWTER_POKECENTER_1F
warp_def $1d, $7, 1, GROUP_PEWTER_SNOOZE_SPEECH_HOUSE, MAP_PEWTER_SNOOZE_SPEECH_HOUSE
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 7
- signpost 23, 25, $0, PewterCitySign
- signpost 17, 11, $0, PewterGymSign
- signpost 9, 15, $0, PewterMuseumSign
- signpost 19, 33, $0, PewterCityMtMoonGiftShopSign
- signpost 29, 19, $0, PewterCityWelcomeSign
- signpost 25, 14, $0, PewterCityPokeCenterSign
- signpost 17, 24, $0, PewterCityMartSign
-
- ; people-events
+ 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:
db 5
- person_event SPRITE_COOLTRAINER_F, 15, 23, $2, $22, 255, 255, $a0, 0, CooltrainerFScript_0x18c009, -1
- person_event SPRITE_BUG_CATCHER, 33, 18, $2, $22, 255, 255, $80, 0, BugCatcherScript_0x18c00c, -1
- person_event SPRITE_GRAMPS, 21, 33, $5, $2, 255, 255, $90, 0, GrampsScript_0x18c00f, -1
- person_event SPRITE_FRUIT_TREE, 7, 36, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x18c03e, -1
- person_event SPRITE_FRUIT_TREE, 7, 34, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x18c040, -1
+ person_event SPRITE_COOLTRAINER_F, 15, 23, OW_DOWN | $2, $22, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x18c009, -1
+ person_event SPRITE_BUG_CATCHER, 33, 18, OW_DOWN | $2, $22, -1, -1, (PAL_OW_RED << 4) | $80, 0, BugCatcherScript_0x18c00c, -1
+ person_event SPRITE_GRAMPS, 21, 33, OW_UP | $1, $2, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrampsScript_0x18c00f, -1
+ person_event SPRITE_FRUIT_TREE, 7, 36, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x18c03e, -1
+ person_event SPRITE_FRUIT_TREE, 7, 34, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x18c040, -1