Miscellaneous tweaks (#72)

5 files changed, 11 insertions, 17 deletions

diff --git a/constants/event_flags.asm b/constants/event_flags.asm
index c1588e0f..f522c5e4 100644
--- a/constants/event_flags.asm
+++ b/constants/event_flags.asm
@@ -916,7 +916,7 @@
 	const EVENT_BEAT_SAILOR_HUEY2
 	const EVENT_BEAT_SAILOR_HUEY3
 ; Super Nerd
-	const EVENT_BEAT_SUPER_NERD_STAN
+	const EVENT_BEAT_SUPER_NERD_ERIC_UNUSED
 	const EVENT_BEAT_SUPER_NERD_ERIC
 	const EVENT_BEAT_SUPER_NERD_GREGG
 	const EVENT_BEAT_SUPER_NERD_JAY
diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm
index 682708b4..a302b006 100644
--- a/constants/trainer_constants.asm
+++ b/constants/trainer_constants.asm
@@ -139,12 +139,6 @@ NUM_NONTRAINER_PHONECONTACTS EQU const_value - 1
 	const ALAN3
 	const CHAD2
 	const CHAD3
-	const JACK4 ; unused
-	const JACK5 ; unused
-	const ALAN4 ; unused
-	const ALAN5 ; unused
-	const CHAD4 ; unused
-	const CHAD5 ; unused
 
 	trainerclass BIRD_KEEPER ; 18
 	const ROD
@@ -320,7 +314,7 @@ NUM_NONTRAINER_PHONECONTACTS EQU const_value - 1
 	const ROB
 	const ED
 	const WADE1
-	const BUG_CATCHER_BENNY
+	const BENNY
 	const AL
 	const JOSH
 	const ARNIE1
@@ -414,7 +408,7 @@ NUM_NONTRAINER_PHONECONTACTS EQU const_value - 1
 	const HUEY3
 
 	trainerclass SUPER_NERD ; 29
-	const STAN
+	const ERIC_UNUSED
 	const ERIC
 	const GREGG ; unused
 	const JAY ; unused
diff --git a/data/events/bug_contest_winners.asm b/data/events/bug_contest_winners.asm
index 525283af..da2be381 100644
--- a/data/events/bug_contest_winners.asm
+++ b/data/events/bug_contest_winners.asm
@@ -44,7 +44,7 @@ BugContestant_PokefanMWilliam:
 	dbw VENONAT,    321
 
 BugContestant_BugCatcherBenny:
-	db BUG_CATCHER, BUG_CATCHER_BENNY
+	db BUG_CATCHER, BENNY
 	dbw BUTTERFREE, 318
 	dbw WEEDLE,     295
 	dbw CATERPIE,   285
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."