diff options
Diffstat (limited to 'maps/SaffronTrainStation.asm')
| -rw-r--r-- | maps/SaffronTrainStation.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm index eaf819d1a..6ba8972a9 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronTrainStation.asm @@ -1,11 +1,11 @@ SaffronTrainStation_MapScriptHeader: - ; trigger count +.MapTriggers: db 1 ; triggers dw UnknownScript_0x18a81d, $0000 - ; callback count +.MapCallbacks: db 0 UnknownScript_0x18a81d: @@ -33,7 +33,7 @@ UnknownScript_0x18a82c: applymovement $2, MovementData_0x18a88f applymovement $0, MovementData_0x18a898 writebyte $1 - special Function8cc04 + special Special_MagnetTrain warpcheck newloadmap $f9 applymovement $0, MovementData_0x18a854 @@ -215,23 +215,23 @@ SaffronTrainStation_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 4 warp_def $11, $8, 6, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $11, $9, 6, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY warp_def $5, $6, 4, GROUP_GOLDENROD_MAGNET_TRAIN_STATION, MAP_GOLDENROD_MAGNET_TRAIN_STATION warp_def $5, $b, 3, GROUP_GOLDENROD_MAGNET_TRAIN_STATION, MAP_GOLDENROD_MAGNET_TRAIN_STATION - ; xy triggers +.XYTriggers: db 1 xy_trigger 0, $6, $b, $0, UnknownScript_0x18a862, $0, $0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 4 - person_event SPRITE_OFFICER, 13, 13, $6, $0, 255, 255, $0, 0, OfficerScript_0x18a81e, -1 - person_event SPRITE_GYM_GUY, 18, 14, $2, $11, 255, 255, $0, 0, GymGuyScript_0x18a875, -1 - person_event SPRITE_TEACHER, 15, 10, $9, $0, 255, 255, $0, 0, TeacherScript_0x18a889, EVENT_772 - person_event SPRITE_LASS, 14, 10, $7, $0, 255, 255, $a0, 0, LassScript_0x18a88c, EVENT_772 + person_event SPRITE_OFFICER, 13, 13, OW_UP | $2, $0, -1, -1, $0, 0, OfficerScript_0x18a81e, -1 + person_event SPRITE_GYM_GUY, 18, 14, OW_DOWN | $2, $11, -1, -1, $0, 0, GymGuyScript_0x18a875, -1 + person_event SPRITE_TEACHER, 15, 10, OW_LEFT | $1, $0, -1, -1, $0, 0, TeacherScript_0x18a889, EVENT_SAFFRON_TRAIN_STATION_POPULATION + person_event SPRITE_LASS, 14, 10, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x18a88c, EVENT_SAFFRON_TRAIN_STATION_POPULATION |