Sync with pokered

1 files changed, 2 insertions, 93 deletions

diff --git a/engine/battle/save_trainer_name.asm b/engine/battle/save_trainer_name.asm
index 49d0429f..4d40fd82 100644
--- a/engine/battle/save_trainer_name.asm
+++ b/engine/battle/save_trainer_name.asm
@@ -1,4 +1,4 @@
-SaveTrainerName:
+SaveTrainerName::
 	ld hl, TrainerNamePointers
 	ld a, [wTrainerClass]
 	dec a
@@ -18,95 +18,4 @@ SaveTrainerName:
 	jr nz, .CopyCharacter
 	ret
 
-TrainerNamePointers:
-; what is the point of these?
-	dw YoungsterName
-	dw BugCatcherName
-	dw LassName
-	dw wTrainerName
-	dw JrTrainerMName
-	dw JrTrainerFName
-	dw PokemaniacName
-	dw SuperNerdName
-	dw wTrainerName
-	dw wTrainerName
-	dw BurglarName
-	dw EngineerName
-	dw JugglerXName
-	dw wTrainerName
-	dw SwimmerName
-	dw wTrainerName
-	dw wTrainerName
-	dw BeautyName
-	dw wTrainerName
-	dw RockerName
-	dw JugglerName
-	dw wTrainerName
-	dw wTrainerName
-	dw BlackbeltName
-	dw wTrainerName
-	dw ProfOakName
-	dw ChiefName
-	dw ScientistName
-	dw wTrainerName
-	dw RocketName
-	dw CooltrainerMName
-	dw CooltrainerFName
-	dw wTrainerName
-	dw wTrainerName
-	dw wTrainerName
-	dw wTrainerName
-	dw wTrainerName
-	dw wTrainerName
-	dw wTrainerName
-	dw wTrainerName
-	dw wTrainerName
-	dw wTrainerName
-	dw wTrainerName
-	dw wTrainerName
-	dw wTrainerName
-	dw wTrainerName
-	dw wTrainerName
-
-YoungsterName:
-	db "YOUNGSTER@"
-BugCatcherName:
-	db "BUG CATCHER@"
-LassName:
-	db "LASS@"
-JrTrainerMName:
-	db "JR.TRAINER♂@"
-JrTrainerFName:
-	db "JR.TRAINER♀@"
-PokemaniacName:
-	db "POKéMANIAC@"
-SuperNerdName:
-	db "SUPER NERD@"
-BurglarName:
-	db "BURGLAR@"
-EngineerName:
-	db "ENGINEER@"
-JugglerXName:
-	db "JUGGLER@"
-SwimmerName:
-	db "SWIMMER@"
-BeautyName:
-	db "BEAUTY@"
-RockerName:
-	db "ROCKER@"
-JugglerName:
-	db "JUGGLER@"
-BlackbeltName:
-	db "BLACKBELT@"
-ProfOakName:
-	db "PROF.OAK@"
-ChiefName:
-	db "CHIEF@"
-ScientistName:
-	db "SCIENTIST@"
-RocketName:
-	db "ROCKET@"
-CooltrainerMName:
-	db "COOLTRAINER♂@"
-CooltrainerFName:
-	db "COOLTRAINER♀@"
+INCLUDE "data/trainers/name_pointers.asm"