summaryrefslogtreecommitdiff
path: root/maps/SaffronTrainStation.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/SaffronTrainStation.asm')
-rw-r--r--maps/SaffronTrainStation.asm8
1 files changed, 3 insertions, 5 deletions
diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm
index 5b14dc196..cfbbc078e 100644
--- a/maps/SaffronTrainStation.asm
+++ b/maps/SaffronTrainStation.asm
@@ -7,14 +7,12 @@ const_value set 2
SaffronTrainStation_MapScriptHeader:
.MapTriggers:
db 1
-
- ; triggers
- maptrigger .Trigger0
+ maptrigger .DummyTrigger
.MapCallbacks:
db 0
-.Trigger0:
+.DummyTrigger:
end
OfficerScript_0x18a81e:
@@ -240,4 +238,4 @@ SaffronTrainStation_MapEventHeader:
person_event SPRITE_OFFICER, 9, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OfficerScript_0x18a81e, -1
person_event SPRITE_GYM_GUY, 14, 10, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GymGuyScript_0x18a875, -1
person_event SPRITE_TEACHER, 11, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x18a889, EVENT_SAFFRON_TRAIN_STATION_POPULATION
- person_event SPRITE_LASS, 10, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x18a88c, EVENT_SAFFRON_TRAIN_STATION_POPULATION
+ person_event SPRITE_LASS, 10, 6, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, LassScript_0x18a88c, EVENT_SAFFRON_TRAIN_STATION_POPULATION