summaryrefslogtreecommitdiff
path: root/maps/Route18.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2015-11-03 07:56:05 -0500
committeryenatch <yenatch@gmail.com>2015-11-03 07:56:05 -0500
commit1c1fe276ca59726bb0008c60006c6b48cd093573 (patch)
tree817fb9c92dd798e89a891c3924bda3df955344e0 /maps/Route18.asm
parent25c126c69beebfdf26d0de286e25c65f6f3db16e (diff)
parent2faa4a0f70edd91bde908139b3fd5b6b5aebf017 (diff)
Merge pull request #324 from PikalaxALT/master
Movement and map objects
Diffstat (limited to 'maps/Route18.asm')
-rw-r--r--maps/Route18.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/maps/Route18.asm b/maps/Route18.asm
index 00728f8d2..f11e06b5d 100644
--- a/maps/Route18.asm
+++ b/maps/Route18.asm
@@ -6,7 +6,7 @@ Route18_MapScriptHeader:
db 0
TrainerBird_keeperBoris:
- trainer EVENT_BEAT_BIRD_KEEPER_BORIS, BIRD_KEEPER, BORIS, Bird_keeperBorisSeenText, Bird_keeperBorisBeatenText, $0000, Bird_keeperBorisScript
+ trainer EVENT_BEAT_BIRD_KEEPER_BORIS, BIRD_KEEPER, BORIS, Bird_keeperBorisSeenText, Bird_keeperBorisBeatenText, 0, Bird_keeperBorisScript
Bird_keeperBorisScript:
talkaftercancel
@@ -17,7 +17,7 @@ Bird_keeperBorisScript:
end
TrainerBird_keeperBob:
- trainer EVENT_BEAT_BIRD_KEEPER_BOB, BIRD_KEEPER, BOB, Bird_keeperBobSeenText, Bird_keeperBobBeatenText, $0000, Bird_keeperBobScript
+ trainer EVENT_BEAT_BIRD_KEEPER_BOB, BIRD_KEEPER, BOB, Bird_keeperBobSeenText, Bird_keeperBobBeatenText, 0, Bird_keeperBobScript
Bird_keeperBobScript:
talkaftercancel
@@ -91,5 +91,5 @@ Route18_MapEventHeader:
.PersonEvents:
db 2
- person_event SPRITE_YOUNGSTER, 12, 9, $a, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperBoris, -1
- person_event SPRITE_YOUNGSTER, 6, 13, $6, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperBob, -1
+ person_event SPRITE_YOUNGSTER, 12, 9, SPRITEMOVEDATA_0A, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperBoris, -1
+ person_event SPRITE_YOUNGSTER, 6, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, 2, 3, TrainerBird_keeperBob, -1