diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-23 17:14:09 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-12-23 17:14:09 -0500 |
| commit | c51968f0de6b8420c141dde27339e82a42837c5b (patch) | |
| tree | 782f2b25f21adacb48fd516694b8a82864fe0b99 /maps/Route1.asm | |
| parent | c883ab4d34ecb4890010e808d6b6d533f5d8ad56 (diff) | |
| parent | 878092004956418bfd77bfdb9fc9dd7f640f80d2 (diff) | |
Merge remote-tracking branch 'origin/master' into master
Diffstat (limited to 'maps/Route1.asm')
| -rw-r--r-- | maps/Route1.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/maps/Route1.asm b/maps/Route1.asm index 3bda2934f..d083b2708 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -11,9 +11,9 @@ Route1_MapScriptHeader: db 0 TrainerSchoolboyDanny: - trainer EVENT_BEAT_SCHOOLBOY_DANNY, SCHOOLBOY, DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, 0, SchoolboyDannyScript + trainer EVENT_BEAT_SCHOOLBOY_DANNY, SCHOOLBOY, DANNY, SchoolboyDannySeenText, SchoolboyDannyBeatenText, 0, .Script -SchoolboyDannyScript: +.Script: end_if_just_battled opentext writetext SchoolboyDannyAfterBattleText @@ -22,9 +22,9 @@ SchoolboyDannyScript: end TrainerCooltrainerfQuinn: - trainer EVENT_BEAT_COOLTRAINERF_QUINN, COOLTRAINERF, QUINN, CooltrainerfQuinnSeenText, CooltrainerfQuinnBeatenText, 0, CooltrainerfQuinnScript + trainer EVENT_BEAT_COOLTRAINERF_QUINN, COOLTRAINERF, QUINN, CooltrainerfQuinnSeenText, CooltrainerfQuinnBeatenText, 0, .Script -CooltrainerfQuinnScript: +.Script: end_if_just_battled opentext writetext CooltrainerfQuinnAfterBattleText |