diff options
Diffstat (limited to 'maps/Route32.asm')
| -rw-r--r-- | maps/Route32.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route32.asm b/maps/Route32.asm index 660f972f3..43df9f0a3 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -440,13 +440,13 @@ TrainerYoungsterGordon: closetext end -TrainerBird_keeperPeter: - trainer EVENT_BEAT_BIRD_KEEPER_PETER, BIRD_KEEPER, PETER, Bird_keeperPeterSeenText, Bird_keeperPeterBeatenText, 0, .Script +TrainerBirdKeeperPeter: + trainer EVENT_BEAT_BIRD_KEEPER_PETER, BIRD_KEEPER, PETER, BirdKeeperPeterSeenText, BirdKeeperPeterBeatenText, 0, .Script .Script: end_if_just_battled opentext - writetext Bird_keeperPeterAfterText + writetext BirdKeeperPeterAfterText waitbutton closetext end @@ -821,19 +821,19 @@ PicnickerLiz1AfterText: line "nice chat too." done -Bird_keeperPeterSeenText: +BirdKeeperPeterSeenText: text "That BADGE! It's" line "from VIOLET CITY!" para "You beat FALKNER?" done -Bird_keeperPeterBeatenText: +BirdKeeperPeterBeatenText: text "I know what my" line "weaknesses are." done -Bird_keeperPeterAfterText: +BirdKeeperPeterAfterText: text "I should train" line "again at the GYM" cont "in VIOLET CITY." @@ -965,7 +965,7 @@ Route32_MapEventHeader: object_event SPRITE_YOUNGSTER, 45, 3, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 3, TrainerCamperRoland, -1 object_event SPRITE_LASS, 30, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 1, TrainerPicnickerLiz1, -1 object_event SPRITE_COOLTRAINER_M, 8, 19, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32CooltrainerMScript, -1 - object_event SPRITE_YOUNGSTER, 82, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperPeter, -1 + object_event SPRITE_YOUNGSTER, 82, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperPeter, -1 object_event SPRITE_FISHER, 70, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SlowpokeTailSalesmanScript, EVENT_SLOWPOKE_WELL_ROCKETS object_event SPRITE_POKE_BALL, 53, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route32GreatBall, EVENT_ROUTE_32_GREAT_BALL object_event SPRITE_FISHER, 13, 15, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Route32RoarTMGuyScript, -1 |