summaryrefslogtreecommitdiff
path: root/maps
diff options
context:
space:
mode:
authorFrenchOrange <64930003+FrenchOrange@users.noreply.github.com>2022-03-08 02:48:59 +0100
committerGitHub <noreply@github.com>2022-03-07 20:48:59 -0500
commit7d17d3ce8fc4b20901fec96417d91b9eb996df04 (patch)
tree0fc7b6f678bf58598d2c9886ed34487968d31f53 /maps
parente90799266323b5df3eacfbe37a59c433309202ec (diff)
Miscellaneous tweaks (#72)
Diffstat (limited to 'maps')
-rw-r--r--maps/AzaleaGym.asm2
-rw-r--r--maps/RuinsOfAlphOutside.asm12
2 files changed, 7 insertions, 7 deletions
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm
index 0e25aeec..df84a45e 100644
--- a/maps/AzaleaGym.asm
+++ b/maps/AzaleaGym.asm
@@ -90,7 +90,7 @@ TrainerTwinsAmyandmay2:
end
TrainerBugCatcherBenny:
- trainer BUG_CATCHER, BUG_CATCHER_BENNY, EVENT_BEAT_BUG_CATCHER_BENNY, BugCatcherBennySeenText, BugCatcherBennyBeatenText, 0, .AfterScript
+ trainer BUG_CATCHER, BENNY, EVENT_BEAT_BUG_CATCHER_BENNY, BugCatcherBennySeenText, BugCatcherBennyBeatenText, 0, .AfterScript
.AfterScript:
endifjustbattled
diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm
index cf26ca46..795933bd 100644
--- a/maps/RuinsOfAlphOutside.asm
+++ b/maps/RuinsOfAlphOutside.asm
@@ -79,13 +79,13 @@ TrainerPsychicNathan:
closetext
end
-TrainerSuperNerdStan: ; unreferenced
- trainer SUPER_NERD, STAN, EVENT_BEAT_SUPER_NERD_STAN, SuperNerdStanSeenText, SuperNerdStanBeatenText, 0, .Script
+TrainerSuperNerdEricUnused: ; unreferenced
+ trainer SUPER_NERD, ERIC_UNUSED, EVENT_BEAT_SUPER_NERD_ERIC_UNUSED, SuperNerdEricUnusedSeenText, SuperNerdEricUnusedBeatenText, 0, .Script
.Script:
endifjustbattled
opentext
- writetext SuperNerdStanAfterBattleText
+ writetext SuperNerdEricUnusedAfterBattleText
waitbutton
closetext
end
@@ -145,13 +145,13 @@ RuinsOfAlphOutsideScientistText:
cont "DEX. Follow me."
done
-SuperNerdStanSeenText:
+SuperNerdEricUnusedSeenText:
text "What do you want?"
line "I'm studying--"
cont "don't disturb me!"
done
-SuperNerdStanBeatenText:
+SuperNerdEricUnusedBeatenText:
text "Sorry…"
line "I'm frustrated by"
@@ -159,7 +159,7 @@ SuperNerdStanBeatenText:
line "understanding…"
done
-SuperNerdStanAfterBattleText:
+SuperNerdEricUnusedAfterBattleText:
text "The RUINS are from"
line "about 1500 years"
cont "ago."