diff options
Diffstat (limited to 'maps/CeladonCity.asm')
| -rw-r--r-- | maps/CeladonCity.asm | 51 |
1 files changed, 25 insertions, 26 deletions
diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 4641777b4..1d595b448 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -1,8 +1,8 @@ CeladonCity_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -66,8 +66,7 @@ CeladonCityPokeCenterSign: jumpstd pokecentersign MapCeladonCitySignpostItem7: - dw $00fd - db PP_UP + dwb EVENT_CELADON_CITY_HIDDEN_PP_UP, PP_UP UnknownText_0x1a9f7d: text "This POLIWRATH is" @@ -230,7 +229,7 @@ CeladonCity_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 9 warp_def $9, $4, 1, GROUP_CELADON_DEPT_STORE_1F, MAP_CELADON_DEPT_STORE_1F warp_def $9, $10, 1, GROUP_CELADON_MANSION_1F, MAP_CELADON_MANSION_1F @@ -242,28 +241,28 @@ CeladonCity_MapEventHeader: warp_def $1d, $a, 1, GROUP_CELADON_GYM, MAP_CELADON_GYM warp_def $1d, $19, 1, GROUP_CELADON_CAFE, MAP_CELADON_CAFE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 8 - signpost 21, 23, $0, CeladonCitySign - signpost 31, 11, $0, CeladonGymSign - signpost 9, 6, $0, CeladonCityDeptStoreSign - signpost 9, 13, $0, CeladonCityMansionSign - signpost 21, 19, $0, CeladonCityGameCornerSign - signpost 21, 29, $0, CeladonCityTrainerTips - signpost 9, 30, $0, CeladonCityPokeCenterSign - signpost 21, 37, $7, MapCeladonCitySignpostItem7 - - ; people-events + signpost 21, 23, SIGNPOST_READ, CeladonCitySign + signpost 31, 11, SIGNPOST_READ, CeladonGymSign + signpost 9, 6, SIGNPOST_READ, CeladonCityDeptStoreSign + signpost 9, 13, SIGNPOST_READ, CeladonCityMansionSign + signpost 21, 19, SIGNPOST_READ, CeladonCityGameCornerSign + signpost 21, 29, SIGNPOST_READ, CeladonCityTrainerTips + signpost 9, 30, SIGNPOST_READ, CeladonCityPokeCenterSign + signpost 21, 37, SIGNPOST_ITEM, MapCeladonCitySignpostItem7 + +.PersonEvents: db 9 - person_event SPRITE_FISHER, 15, 30, $9, $0, 255, 255, $a0, 0, FisherScript_0x1a9f43, $ffff - person_event SPRITE_POLIWAG, 15, 31, $16, $0, 255, 255, $90, 0, CeladonCityPoliwrath, $ffff - person_event SPRITE_TEACHER, 28, 24, $5, $2, 255, 255, $80, 0, TeacherScript_0x1a9f50, $ffff - person_event SPRITE_GRAMPS, 20, 18, $6, $0, 255, 255, $b0, 0, GrampsScript_0x1a9f53, $ffff - person_event SPRITE_GRAMPS, 35, 12, $7, $0, 255, 255, $80, 0, GrampsScript_0x1a9f56, $ffff - person_event SPRITE_YOUNGSTER, 17, 22, $5, $2, 255, 255, $90, 0, YoungsterScript_0x1a9f59, $ffff - person_event SPRITE_YOUNGSTER, 37, 28, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x1a9f5c, $ffff - person_event SPRITE_TEACHER, 18, 10, $2, $22, 255, 255, $a0, 0, TeacherScript_0x1a9f5f, $ffff - person_event SPRITE_LASS, 26, 11, $4, $20, 255, 255, $80, 0, LassScript_0x1a9f62, $ffff + person_event SPRITE_FISHER, 15, 30, OW_LEFT | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1a9f43, -1 + person_event SPRITE_POLIWAG, 15, 31, OW_UP | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CeladonCityPoliwrath, -1 + person_event SPRITE_TEACHER, 28, 24, OW_UP | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, TeacherScript_0x1a9f50, -1 + person_event SPRITE_GRAMPS, 20, 18, OW_UP | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrampsScript_0x1a9f53, -1 + person_event SPRITE_GRAMPS, 35, 12, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GrampsScript_0x1a9f56, -1 + person_event SPRITE_YOUNGSTER, 17, 22, OW_UP | $1, $2, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, YoungsterScript_0x1a9f59, -1 + person_event SPRITE_YOUNGSTER, 37, 28, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x1a9f5c, -1 + person_event SPRITE_TEACHER, 18, 10, OW_DOWN | $2, $22, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x1a9f5f, -1 + person_event SPRITE_LASS, 26, 11, OW_UP | $0, $20, -1, -1, (PAL_OW_RED << 4) | $80, 0, LassScript_0x1a9f62, -1 |