Merge branch 'master' of https://github.com/pret/pokered

5 files changed, 56 insertions, 50 deletions

diff --git a/data/moves/animations.asm b/data/moves/animations.asm
index fd7ad88b..a7e1f0be 100644
--- a/data/moves/animations.asm
+++ b/data/moves/animations.asm
@@ -192,7 +192,7 @@ AttackAnimationPointers:
 	dw SleepEnemyAnim
 	dw ConfusedPlayerAnim
 	dw ConfusedEnemyAnim
-	dw FaintAnim
+	dw SlideDownAnim
 	dw BallTossAnim
 	dw BallShakeAnim
 	dw BallPoofAnim
@@ -1258,7 +1258,7 @@ BallBlockAnim:
 	battle_anim NO_MOVE, SUBANIM_0_BALL_BLOCK, 0, 3
 	db -1 ; end
 
-FaintAnim:
+SlideDownAnim:
 	battle_anim DIG, SE_SLIDE_MON_DOWN
 	db -1 ; end
 
diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm
index ae243768..0f8b6d96 100644
--- a/data/pokemon/dex_entries.asm
+++ b/data/pokemon/dex_entries.asm
@@ -194,7 +194,7 @@ PokedexEntryPointers:
 
 ; string: species name
 ; height in feet, inches
-; weight in pounds
+; weight in tenths of a pound
 ; text entry
 
 BulbasaurDexEntry:
diff --git a/data/trainers/name_pointers.asm b/data/trainers/name_pointers.asm
index 6317f54a..914fe9d4 100644
--- a/data/trainers/name_pointers.asm
+++ b/data/trainers/name_pointers.asm
@@ -2,6 +2,7 @@ TrainerNamePointers:
 ; These are only used for trainers' defeat speeches.
 ; They were originally shortened variants of the trainer class names
 ; in the Japanese versions, but are now redundant with TrainerNames.
+	table_width 2, TrainerNamePointers
 	dw .YoungsterName
 	dw .BugCatcherName
 	dw .LassName
@@ -49,6 +50,7 @@ TrainerNamePointers:
 	dw wTrainerName
 	dw wTrainerName
 	dw wTrainerName
+	assert_table_length NUM_TRAINERS
 
 .YoungsterName:     db "YOUNGSTER@"
 .BugCatcherName:    db "BUG CATCHER@"
diff --git a/data/trainers/names.asm b/data/trainers/names.asm
index d8e1f550..dc6ded77 100644
--- a/data/trainers/names.asm
+++ b/data/trainers/names.asm
@@ -1,48 +1,50 @@
 TrainerNames::
-	db "YOUNGSTER@"
-	db "BUG CATCHER@"
-	db "LASS@"
-	db "SAILOR@"
-	db "JR.TRAINER♂@"
-	db "JR.TRAINER♀@"
-	db "POKéMANIAC@"
-	db "SUPER NERD@"
-	db "HIKER@"
-	db "BIKER@"
-	db "BURGLAR@"
-	db "ENGINEER@"
-	db "JUGGLER@"
-	db "FISHERMAN@"
-	db "SWIMMER@"
-	db "CUE BALL@"
-	db "GAMBLER@"
-	db "BEAUTY@"
-	db "PSYCHIC@"
-	db "ROCKER@"
-	db "JUGGLER@"
-	db "TAMER@"
-	db "BIRD KEEPER@"
-	db "BLACKBELT@"
-	db "RIVAL1@"
-	db "PROF.OAK@"
-	db "CHIEF@"
-	db "SCIENTIST@"
-	db "GIOVANNI@"
-	db "ROCKET@"
-	db "COOLTRAINER♂@"
-	db "COOLTRAINER♀@"
-	db "BRUNO@"
-	db "BROCK@"
-	db "MISTY@"
-	db "LT.SURGE@"
-	db "ERIKA@"
-	db "KOGA@"
-	db "BLAINE@"
-	db "SABRINA@"
-	db "GENTLEMAN@"
-	db "RIVAL2@"
-	db "RIVAL3@"
-	db "LORELEI@"
-	db "CHANNELER@"
-	db "AGATHA@"
-	db "LANCE@"
+	list_start TrainerNames
+	li "YOUNGSTER"
+	li "BUG CATCHER"
+	li "LASS"
+	li "SAILOR"
+	li "JR.TRAINER♂"
+	li "JR.TRAINER♀"
+	li "POKéMANIAC"
+	li "SUPER NERD"
+	li "HIKER"
+	li "BIKER"
+	li "BURGLAR"
+	li "ENGINEER"
+	li "JUGGLER"
+	li "FISHERMAN"
+	li "SWIMMER"
+	li "CUE BALL"
+	li "GAMBLER"
+	li "BEAUTY"
+	li "PSYCHIC"
+	li "ROCKER"
+	li "JUGGLER"
+	li "TAMER"
+	li "BIRD KEEPER"
+	li "BLACKBELT"
+	li "RIVAL1"
+	li "PROF.OAK"
+	li "CHIEF"
+	li "SCIENTIST"
+	li "GIOVANNI"
+	li "ROCKET"
+	li "COOLTRAINER♂"
+	li "COOLTRAINER♀"
+	li "BRUNO"
+	li "BROCK"
+	li "MISTY"
+	li "LT.SURGE"
+	li "ERIKA"
+	li "KOGA"
+	li "BLAINE"
+	li "SABRINA"
+	li "GENTLEMAN"
+	li "RIVAL2"
+	li "RIVAL3"
+	li "LORELEI"
+	li "CHANNELER"
+	li "AGATHA"
+	li "LANCE"
+	assert_list_length NUM_TRAINERS
diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
index b8c795ef..e4ff648a 100644
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@@ -1,4 +1,5 @@
 TrainerDataPointers:
+	table_width 2, TrainerDataPointers
 	dw YoungsterData
 	dw BugCatcherData
 	dw LassData
@@ -46,6 +47,7 @@ TrainerDataPointers:
 	dw ChannelerData
 	dw AgathaData
 	dw LanceData
+	assert_table_length NUM_TRAINERS
 
 ; if first byte != $FF, then
 	; first byte is level (of all pokemon on this team)