diff options
Diffstat (limited to 'maps/Route4.asm')
| -rw-r--r-- | maps/Route4.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route4.asm b/maps/Route4.asm index cb1b18d69..e4797656e 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -11,13 +11,13 @@ Route4_MapScriptHeader: .MapCallbacks: db 0 -TrainerBird_keeperHank: - trainer EVENT_BEAT_BIRD_KEEPER_HANK, BIRD_KEEPER, HANK, Bird_keeperHankSeenText, Bird_keeperHankBeatenText, 0, .Script +TrainerBirdKeeperHank: + trainer EVENT_BEAT_BIRD_KEEPER_HANK, BIRD_KEEPER, HANK, BirdKeeperHankSeenText, BirdKeeperHankBeatenText, 0, .Script .Script: end_if_just_battled opentext - writetext Bird_keeperHankAfterBattleText + writetext BirdKeeperHankAfterBattleText waitbutton closetext end @@ -54,18 +54,18 @@ Route4HiddenUltraBall: dwb EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL -Bird_keeperHankSeenText: +BirdKeeperHankSeenText: text "I'm raising my" line "#MON. Want to" cont "battle with me?" done -Bird_keeperHankBeatenText: +BirdKeeperHankBeatenText: text "Ack! I lost that" line "one…" done -Bird_keeperHankAfterBattleText: +BirdKeeperHankAfterBattleText: text "If you have a" line "specific #MON" @@ -139,7 +139,7 @@ Route4_MapEventHeader: .ObjectEvents: db 4 - object_event SPRITE_YOUNGSTER, 9, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperHank, -1 + object_event SPRITE_YOUNGSTER, 9, 17, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperHank, -1 object_event SPRITE_LASS, 8, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerHope, -1 object_event SPRITE_LASS, 6, 21, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerPicnickerSharon, -1 object_event SPRITE_POKE_BALL, 3, 26, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, Route4HPUp, EVENT_ROUTE_4_HP_UP |