summaryrefslogtreecommitdiff
path: root/maps/NewBarkTown.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/NewBarkTown.asm')
-rw-r--r--maps/NewBarkTown.asm14
1 files changed, 5 insertions, 9 deletions
diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm
index d382a4cf1..050582f6d 100644
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -6,21 +6,17 @@ const_value set 2
NewBarkTown_MapScriptHeader:
.MapTriggers:
db 2
-
- ; triggers
- maptrigger .Trigger0
- maptrigger .Trigger1
+ maptrigger .DummyTrigger0
+ maptrigger .DummyTrigger1
.MapCallbacks:
db 1
-
- ; callbacks
dbw MAPCALLBACK_NEWMAP, .FlyPoint
-.Trigger0:
+.DummyTrigger0:
end
-.Trigger1:
+.DummyTrigger1:
end
.FlyPoint:
@@ -311,5 +307,5 @@ NewBarkTown_MapEventHeader:
.PersonEvents:
db 3
person_event SPRITE_TEACHER, 8, 6, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NewBarkTownTeacherScript, -1
- person_event SPRITE_FISHER, 9, 12, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, NewBarkTownFisherScript, -1
+ person_event SPRITE_FISHER, 9, 12, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, PAL_NPC_GREEN, PERSONTYPE_SCRIPT, 0, NewBarkTownFisherScript, -1
person_event SPRITE_SILVER, 2, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, NewBarkTownSilverScript, EVENT_RIVAL_NEW_BARK_TOWN