diff options
Diffstat (limited to 'maps/Route18.asm')
| -rw-r--r-- | maps/Route18.asm | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/maps/Route18.asm b/maps/Route18.asm index 6c28da07e..aaa2ce6cf 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -3,30 +3,30 @@ const_value set 2 const ROUTE18_YOUNGSTER2 Route18_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerBird_keeperBoris: - trainer EVENT_BEAT_BIRD_KEEPER_BORIS, BIRD_KEEPER, BORIS, Bird_keeperBorisSeenText, Bird_keeperBorisBeatenText, 0, Bird_keeperBorisScript + trainer EVENT_BEAT_BIRD_KEEPER_BORIS, BIRD_KEEPER, BORIS, Bird_keeperBorisSeenText, Bird_keeperBorisBeatenText, 0, .Script -Bird_keeperBorisScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1acfa5 + writetext Bird_keeperBorisAfterBattleText waitbutton closetext end TrainerBird_keeperBob: - trainer EVENT_BEAT_BIRD_KEEPER_BOB, BIRD_KEEPER, BOB, Bird_keeperBobSeenText, Bird_keeperBobBeatenText, 0, Bird_keeperBobScript + trainer EVENT_BEAT_BIRD_KEEPER_BOB, BIRD_KEEPER, BOB, Bird_keeperBobSeenText, Bird_keeperBobBeatenText, 0, .Script -Bird_keeperBobScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ad00d + writetext Bird_keeperBobAfterBattleText waitbutton closetext end @@ -46,7 +46,7 @@ Bird_keeperBorisBeatenText: text "Ayieee!" done -UnknownText_0x1acfa5: +Bird_keeperBorisAfterBattleText: text "Since you're so" line "strong, it must be" cont "fun to battle." @@ -62,7 +62,7 @@ Bird_keeperBobBeatenText: text "…Whew!" done -UnknownText_0x1ad00d: +Bird_keeperBobAfterBattleText: text "If you don't have" line "a BICYCLE, you're" @@ -86,14 +86,14 @@ Route18_MapEventHeader: warp_def $6, $2, 3, ROUTE_17_18_GATE warp_def $7, $2, 4, ROUTE_17_18_GATE -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 5, 9, SIGNPOST_READ, Route18Sign + bg_event 5, 9, BGEVENT_READ, Route18Sign -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_YOUNGSTER, 12, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperBoris, -1 - person_event SPRITE_YOUNGSTER, 6, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBird_keeperBob, -1 + object_event SPRITE_YOUNGSTER, 12, 9, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperBoris, -1 + object_event SPRITE_YOUNGSTER, 6, 13, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperBob, -1 |