aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/Route8.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2025-01-30 21:40:19 -0600
committerdannye <33dannye@gmail.com>2025-01-30 21:40:19 -0600
commit6cb885a9f68b9f445d7fa45279731336fe0247d4 (patch)
tree39736ab1dd8ebcc57f8e981db6103285743d5530 /scripts/Route8.asm
parentIdentify unnamed functions in map_sprites.asm (#126) (diff)
parentFix some label typos, and add some constants instead of raw numbers (#492) (diff)
downloadpokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.tar.gz
pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.tar.xz
pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts/Route8.asm')
-rw-r--r--scripts/Route8.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/Route8.asm b/scripts/Route8.asm
index 657d5c83..7b5476c9 100644
--- a/scripts/Route8.asm
+++ b/scripts/Route8.asm
@@ -35,7 +35,7 @@ Route8TrainerHeader1:
Route8TrainerHeader2:
trainer EVENT_BEAT_ROUTE_8_TRAINER_2, 4, Route8SuperNerd2BattleText, Route8SuperNerd2EndBattleText, Route8SuperNerd2AfterBattleText
Route8TrainerHeader3:
- trainer EVENT_BEAT_ROUTE_8_TRAINER_3, 2, Route8CooltrainerF1BattleText, Route8CooltrainerF21EndBattleText, Route8CooltrainerF1AfterBattleText
+ trainer EVENT_BEAT_ROUTE_8_TRAINER_3, 2, Route8CooltrainerF1BattleText, Route8CooltrainerF1EndBattleText, Route8CooltrainerF1AfterBattleText
Route8TrainerHeader4:
trainer EVENT_BEAT_ROUTE_8_TRAINER_4, 3, Route8SuperNerd3BattleText, Route8SuperNerd3EndBattleText, Route8SuperNerd3AfterBattleText
Route8TrainerHeader5:
@@ -112,8 +112,8 @@ Route8CooltrainerF1BattleText:
text_far _Route8CooltrainerF1BattleText
text_end
-Route8CooltrainerF21EndBattleText:
- text_far _Route8CooltrainerF21EndBattleText
+Route8CooltrainerF1EndBattleText:
+ text_far _Route8CooltrainerF1EndBattleText
text_end
Route8CooltrainerF1AfterBattleText: