diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-28 01:30:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-28 01:30:36 -0500 |
| commit | da28d1a84b0499bead314e17ae2ff0d13eb03196 (patch) | |
| tree | c212adfc53d1996c06f2e4be1d6e480e687a2ad8 /maps/Route14.asm | |
| parent | bad9e33530af8cdc29ce5629df682fc7915bfff0 (diff) | |
| parent | 2c4777f3363cd64d05fb00084fd83dff8ac31674 (diff) | |
Merge pull request #437 from roukaour/master
Reorganize battle/; rename most "header" misnomers; gfx/pics → gfx/pokemon
Diffstat (limited to 'maps/Route14.asm')
| -rw-r--r-- | maps/Route14.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route14.asm b/maps/Route14.asm index ba9a510af..411f5029a 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -30,13 +30,13 @@ TrainerPokefanmCarter: closetext end -TrainerBird_keeperRoy: - trainer EVENT_BEAT_BIRD_KEEPER_ROY, BIRD_KEEPER, ROY, Bird_keeperRoySeenText, Bird_keeperRoyBeatenText, 0, .Script +TrainerBirdKeeperRoy: + trainer EVENT_BEAT_BIRD_KEEPER_ROY, BIRD_KEEPER, ROY, BirdKeeperRoySeenText, BirdKeeperRoyBeatenText, 0, .Script .Script: end_if_just_battled opentext - writetext Bird_keeperRoyAfterBattleText + writetext BirdKeeperRoyAfterBattleText waitbutton closetext end @@ -72,18 +72,18 @@ PokefanmCarterAfterBattleText: line "well-balanced mix." done -Bird_keeperRoySeenText: +BirdKeeperRoySeenText: text "My dream is to fly" line "with my beloved" cont "bird #MON." done -Bird_keeperRoyBeatenText: +BirdKeeperRoyBeatenText: text "I can dream, but I" line "can't ever fly…" done -Bird_keeperRoyAfterBattleText: +BirdKeeperRoyAfterBattleText: text "You have #MON" line "that know the HM" @@ -131,6 +131,6 @@ Route14_MapEventHeader: .ObjectEvents: db 4 object_event SPRITE_POKEFAN_M, 15, 11, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmCarter, -1 - object_event SPRITE_YOUNGSTER, 27, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBird_keeperRoy, -1 + object_event SPRITE_YOUNGSTER, 27, 11, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBirdKeeperRoy, -1 object_event SPRITE_POKEFAN_M, 11, 6, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerPokefanmTrevor, -1 object_event SPRITE_TEACHER, 5, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 4, Kim, -1 |