Use dname macro to automatically pad names with "@" characters (#1198)

data/battle_tower/classes.asm

@@ -1,79 +1,83 @@
+MACRO bt_trainer
+	dname \2 ; name
+	db \1 ; class
+ENDM
+
 BattleTowerTrainers:
 ; The trainer class is not used in Crystal 1.0 due to a bug.
 ; Instead, the sixth character in the trainer's name is used.
 ; See BattleTowerText in engine/events/battle_tower/trainer_text.asm.
 	table_width (NAME_LENGTH - 1) + 1
-	; name, class
-	db "HANSON@@@@", FISHER
-	db "SAWYER@@@@", POKEMANIAC
-	db "MASUDA@@@@", GUITARIST
-	db "NICKEL@@@@", SCIENTIST
-	db "OLSON@@@@@", POKEFANM
-	db "ZABOROWSKI", LASS
-	db "WRIGHT@@@@", YOUNGSTER
-	db "ALEXANDER@", HIKER
-	db "KAWAKAMI@@", TEACHER
-	db "BICKETT@@@", POKEFANM
-	db "SAITO@@@@@", KIMONO_GIRL
-	db "CRAWFORD@@", BOARDER
-	db "DIAZ@@@@@@", PICNICKER
-	db "ERICKSON@@", BIKER
-	db "FAIRFIELD@", JUGGLER
-	db "HUNTER@@@@", POKEFANF
-	db "HILL@@@@@@", FIREBREATHER
-	db "JAVIER@@@@", SWIMMERF
-	db "KAUFMAN@@@", SWIMMERM
-	db "LANCASTER@", SKIER
-	db "McMAHILL@@", CAMPER
+	bt_trainer FISHER,       "HANSON"
+	bt_trainer POKEMANIAC,   "SAWYER"
+	bt_trainer GUITARIST,    "MASUDA"
+	bt_trainer SCIENTIST,    "NICKEL"
+	bt_trainer POKEFANM,     "OLSON"
+	bt_trainer LASS,         "ZABOROWSKI"
+	bt_trainer YOUNGSTER,    "WRIGHT"
+	bt_trainer HIKER,        "ALEXANDER"
+	bt_trainer TEACHER,      "KAWAKAMI"
+	bt_trainer POKEFANM,     "BICKETT"
+	bt_trainer KIMONO_GIRL,  "SAITO"
+	bt_trainer BOARDER,      "CRAWFORD"
+	bt_trainer PICNICKER,    "DIAZ"
+	bt_trainer BIKER,        "ERICKSON"
+	bt_trainer JUGGLER,      "FAIRFIELD"
+	bt_trainer POKEFANF,     "HUNTER"
+	bt_trainer FIREBREATHER, "HILL"
+	bt_trainer SWIMMERF,     "JAVIER"
+	bt_trainer SWIMMERM,     "KAUFMAN"
+	bt_trainer SKIER,        "LANCASTER"
+	bt_trainer CAMPER,       "McMAHILL"
 	assert_table_length BATTLETOWER_NUM_UNIQUE_MON
 ; The following can only be sampled in Crystal 1.1.
-	db "OBRIEN@@@@", GENTLEMAN
-	db "FROST@@@@@", BEAUTY
-	db "MORSE@@@@@", SUPER_NERD
-	db "YUFUNE@@@@", BLACKBELT_T
-	db "RAJAN@@@@@", COOLTRAINERF
-	db "RODRIGUEZ@", OFFICER
-	db "SANTIAGO@@", PSYCHIC_T
-	db "STOCK@@@@@", POKEFANM
-	db "THURMAN@@@", SCIENTIST
-	db "VALENTINO@", BEAUTY
-	db "WAGNER@@@@", CAMPER
-	db "YATES@@@@@", BIRD_KEEPER
-	db "ANDREWS@@@", PICNICKER
-	db "BAHN@@@@@@", POKEMANIAC
-	db "MORI@@@@@@", SCIENTIST
-	db "BUCKMAN@@@", SAGE
-	db "COBB@@@@@@", SCHOOLBOY
-	db "HUGHES@@@@", FISHER
-	db "ARITA@@@@@", KIMONO_GIRL
-	db "EASTON@@@@", PSYCHIC_T
-	db "FREEMAN@@@", CAMPER
-	db "GIESE@@@@@", LASS
-	db "HATCHER@@@", GENTLEMAN
-	db "JACKSON@@@", POKEFANF
-	db "KAHN@@@@@@", POKEMANIAC
-	db "LEONG@@@@@", YOUNGSTER
-	db "MARINO@@@@", TEACHER
-	db "NEWMAN@@@@", SAILOR
-	db "NGUYEN@@@@", BLACKBELT_T
-	db "OGDEN@@@@@", SUPER_NERD
-	db "PARK@@@@@@", COOLTRAINERF
-	db "RAINE@@@@@", SWIMMERM
-	db "SELLS@@@@@", BIRD_KEEPER
-	db "ROCKWELL@@", BOARDER
-	db "THORNTON@@", LASS
-	db "TURNER@@@@", OFFICER
-	db "VAN DYKE@@", SKIER
-	db "WALKER@@@@", SCHOOLBOY
-	db "MEYER@@@@@", SWIMMERF
-	db "JOHNSON@@@", YOUNGSTER
-	db "ADAMS@@@@@", GUITARIST
-	db "SMITH@@@@@", BUG_CATCHER
-	db "TAJIRI@@@@", BUG_CATCHER
-	db "BAKER@@@@@", POKEMANIAC
-	db "COLLINS@@@", SCIENTIST
-	db "SMART@@@@@", SUPER_NERD
-	db "DYKSTRA@@@", SWIMMERF
-	db "EATON@@@@@", BIKER
-	db "WONG@@@@@@", FIREBREATHER
+	bt_trainer GENTLEMAN,    "OBRIEN"
+	bt_trainer BEAUTY,       "FROST"
+	bt_trainer SUPER_NERD,   "MORSE"
+	bt_trainer BLACKBELT_T,  "YUFUNE"
+	bt_trainer COOLTRAINERF, "RAJAN"
+	bt_trainer OFFICER,      "RODRIGUEZ"
+	bt_trainer PSYCHIC_T,    "SANTIAGO"
+	bt_trainer POKEFANM,     "STOCK"
+	bt_trainer SCIENTIST,    "THURMAN"
+	bt_trainer BEAUTY,       "VALENTINO"
+	bt_trainer CAMPER,       "WAGNER"
+	bt_trainer BIRD_KEEPER,  "YATES"
+	bt_trainer PICNICKER,    "ANDREWS"
+	bt_trainer POKEMANIAC,   "BAHN"
+	bt_trainer SCIENTIST,    "MORI"
+	bt_trainer SAGE,         "BUCKMAN"
+	bt_trainer SCHOOLBOY,    "COBB"
+	bt_trainer FISHER,       "HUGHES"
+	bt_trainer KIMONO_GIRL,  "ARITA"
+	bt_trainer PSYCHIC_T,    "EASTON"
+	bt_trainer CAMPER,       "FREEMAN"
+	bt_trainer LASS,         "GIESE"
+	bt_trainer GENTLEMAN,    "HATCHER"
+	bt_trainer POKEFANF,     "JACKSON"
+	bt_trainer POKEMANIAC,   "KAHN"
+	bt_trainer YOUNGSTER,    "LEONG"
+	bt_trainer TEACHER,      "MARINO"
+	bt_trainer SAILOR,       "NEWMAN"
+	bt_trainer BLACKBELT_T,  "NGUYEN"
+	bt_trainer SUPER_NERD,   "OGDEN"
+	bt_trainer COOLTRAINERF, "PARK"
+	bt_trainer SWIMMERM,     "RAINE"
+	bt_trainer BIRD_KEEPER,  "SELLS"
+	bt_trainer BOARDER,      "ROCKWELL"
+	bt_trainer LASS,         "THORNTON"
+	bt_trainer OFFICER,      "TURNER"
+	bt_trainer SKIER,        "VAN DYKE"
+	bt_trainer SCHOOLBOY,    "WALKER"
+	bt_trainer SWIMMERF,     "MEYER"
+	bt_trainer YOUNGSTER,    "JOHNSON"
+	bt_trainer GUITARIST,    "ADAMS"
+	bt_trainer BUG_CATCHER,  "SMITH"
+	bt_trainer BUG_CATCHER,  "TAJIRI"
+	bt_trainer POKEMANIAC,   "BAKER"
+	bt_trainer SCIENTIST,    "COLLINS"
+	bt_trainer SUPER_NERD,   "SMART"
+	bt_trainer SWIMMERF,     "DYKSTRA"
+	bt_trainer BIKER,        "EATON"
+	bt_trainer FIREBREATHER, "WONG"
 	assert_table_length BATTLETOWER_NUM_UNIQUE_TRAINERS