diff options
Diffstat (limited to 'maps/Route17.asm')
| -rw-r--r-- | maps/Route17.asm | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/maps/Route17.asm b/maps/Route17.asm index b01ce1ddc..03cfd3e4b 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -10,12 +10,9 @@ Route17_MapScriptHeader: .MapCallbacks: db 1 + dbw MAPCALLBACK_NEWMAP, .AlwaysOnBike - ; callbacks - - dbw MAPCALLBACK_NEWMAP, UnknownScript_0x1ad0ab - -UnknownScript_0x1ad0ab: +.AlwaysOnBike: setflag ENGINE_ALWAYS_ON_BIKE setflag ENGINE_DOWNHILL return @@ -26,7 +23,7 @@ TrainerBikerCharles: BikerCharlesScript: end_if_just_battled opentext - writetext UnknownText_0x1ad293 + writetext BikerCharlesAfterBattleText waitbutton closetext end @@ -37,7 +34,7 @@ TrainerBikerRiley: BikerRileyScript: end_if_just_battled opentext - writetext UnknownText_0x1ad13b + writetext BikerRileyAfterBattleText waitbutton closetext end @@ -48,7 +45,7 @@ TrainerBikerJoel: BikerJoelScript: end_if_just_battled opentext - writetext UnknownText_0x1ad196 + writetext BikerJoelAfterBattleText waitbutton closetext end @@ -59,7 +56,7 @@ TrainerBikerGlenn: BikerGlennScript: end_if_just_battled opentext - writetext UnknownText_0x1ad225 + writetext BikerGlennAfterBattleText waitbutton closetext end @@ -81,7 +78,7 @@ BikerRileyBeatenText: text "Whoa, you kick!" done -UnknownText_0x1ad13b: +BikerRileyAfterBattleText: text "Don't get cocky," line "you JOHTO punk!" done @@ -96,7 +93,7 @@ BikerJoelBeatenText: line "look cool…" done -UnknownText_0x1ad196: +BikerJoelAfterBattleText: text "I look cool, but" line "I'm weak, so I'm" cont "not really cool." @@ -115,7 +112,7 @@ BikerGlennBeatenText: line "awesome torque!" done -UnknownText_0x1ad225: +BikerGlennAfterBattleText: text "Hands-free riding" line "is considered cool" cont "on CYCLING ROAD." @@ -131,7 +128,7 @@ BikerCharlesBeatenText: line "burn!" done -UnknownText_0x1ad293: +BikerCharlesAfterBattleText: text "Reckless driving" line "causes accidents!" cont "Take it easy!" @@ -156,7 +153,7 @@ Route17_MapEventHeader: .PersonEvents: db 4 - person_event SPRITE_BIKER, 17, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 4, TrainerBikerRiley, -1 - person_event SPRITE_BIKER, 68, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 1, TrainerBikerJoel, -1 - person_event SPRITE_BIKER, 53, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBikerGlenn, -1 - person_event SPRITE_BIKER, 80, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 4, TrainerBikerCharles, -1 + person_event SPRITE_BIKER, 17, 4, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 4, TrainerBikerRiley, -1 + person_event SPRITE_BIKER, 68, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 1, TrainerBikerJoel, -1 + person_event SPRITE_BIKER, 53, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 3, TrainerBikerGlenn, -1 + person_event SPRITE_BIKER, 80, 6, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, PERSONTYPE_TRAINER, 4, TrainerBikerCharles, -1 |