diff options
Diffstat (limited to 'maps/FuchsiaCity.asm')
| -rw-r--r-- | maps/FuchsiaCity.asm | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 90694e6e7..7dcb20190 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -1,8 +1,8 @@ FuchsiaCity_MapScriptHeader: - ; trigger count +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 1 ; callbacks @@ -124,7 +124,7 @@ FuchsiaCity_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 11 warp_def $d, $5, 2, GROUP_FUCHSIA_MART, MAP_FUCHSIA_MART warp_def $d, $16, 1, GROUP_SAFARI_ZONE_MAIN_OFFICE, MAP_SAFARI_ZONE_MAIN_OFFICE @@ -138,23 +138,23 @@ FuchsiaCity_MapEventHeader: warp_def $23, $7, 1, GROUP_ROUTE_19___FUCHSIA_GATE, MAP_ROUTE_19___FUCHSIA_GATE warp_def $23, $8, 2, GROUP_ROUTE_19___FUCHSIA_GATE, MAP_ROUTE_19___FUCHSIA_GATE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 8 - signpost 15, 21, $0, FuchsiaCitySign - signpost 29, 5, $0, FuchsiaGymSign - signpost 15, 25, $0, SafariZoneOfficeSign - signpost 29, 27, $0, WardensHomeSign - signpost 5, 17, $0, SafariZoneClosedSign - signpost 15, 13, $0, NoLitteringSign - signpost 27, 20, $0, FuchsiaCityPokeCenterSign - signpost 13, 6, $0, FuchsiaCityMartSign - - ; people-events + signpost 15, 21, SIGNPOST_READ, FuchsiaCitySign + signpost 29, 5, SIGNPOST_READ, FuchsiaGymSign + signpost 15, 25, SIGNPOST_READ, SafariZoneOfficeSign + signpost 29, 27, SIGNPOST_READ, WardensHomeSign + signpost 5, 17, SIGNPOST_READ, SafariZoneClosedSign + signpost 15, 13, SIGNPOST_READ, NoLitteringSign + signpost 27, 20, SIGNPOST_READ, FuchsiaCityPokeCenterSign + signpost 13, 6, SIGNPOST_READ, FuchsiaCityMartSign + +.PersonEvents: db 4 - person_event SPRITE_YOUNGSTER, 22, 27, $2, $11, 255, 255, $a0, 0, YoungsterScript_0x194b22, -1 - person_event SPRITE_POKEFAN_M, 12, 17, $2, $11, 255, 255, $b0, 0, PokefanMScript_0x194b25, -1 - person_event SPRITE_TEACHER, 18, 20, $2, $11, 255, 255, $80, 0, TeacherScript_0x194b28, -1 - person_event SPRITE_FRUIT_TREE, 5, 12, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x194b43, -1 + person_event SPRITE_YOUNGSTER, 22, 27, OW_DOWN | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x194b22, -1 + person_event SPRITE_POKEFAN_M, 12, 17, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanMScript_0x194b25, -1 + person_event SPRITE_TEACHER, 18, 20, OW_DOWN | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, TeacherScript_0x194b28, -1 + person_event SPRITE_FRUIT_TREE, 5, 12, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x194b43, -1 |