1 files changed, 261 insertions, 256 deletions
diff --git a/data/items/names.asm b/data/items/names.asm
index f44100ab3..93b83d9c5 100644
--- a/data/items/names.asm
+++ b/data/items/names.asm
@@ -1,257 +1,262 @@
 ItemNames::
-	db "MASTER BALL@"
-	db "ULTRA BALL@"
-	db "BRIGHTPOWDER@"
-	db "GREAT BALL@"
-	db "# BALL@"
-	db "TERU-SAMA@"
-	db "BICYCLE@"
-	db "MOON STONE@"
-	db "ANTIDOTE@"
-	db "BURN HEAL@"
-	db "ICE HEAL@"
-	db "AWAKENING@"
-	db "PARLYZ HEAL@"
-	db "FULL RESTORE@"
-	db "MAX POTION@"
-	db "HYPER POTION@"
-	db "SUPER POTION@"
-	db "POTION@"
-	db "ESCAPE ROPE@"
-	db "REPEL@"
-	db "MAX ELIXER@"
-	db "FIRE STONE@"
-	db "THUNDERSTONE@"
-	db "WATER STONE@"
-	db "TERU-SAMA@"
-	db "HP UP@"
-	db "PROTEIN@"
-	db "IRON@"
-	db "CARBOS@"
-	db "LUCKY PUNCH@"
-	db "CALCIUM@"
-	db "RARE CANDY@"
-	db "X ACCURACY@"
-	db "LEAF STONE@"
-	db "METAL POWDER@"
-	db "NUGGET@"
-	db "# DOLL@"
-	db "FULL HEAL@"
-	db "REVIVE@"
-	db "MAX REVIVE@"
-	db "GUARD SPEC.@"
-	db "SUPER REPEL@"
-	db "MAX REPEL@"
-	db "DIRE HIT@"
-	db "TERU-SAMA@"
-	db "FRESH WATER@"
-	db "SODA POP@"
-	db "LEMONADE@"
-	db "X ATTACK@"
-	db "TERU-SAMA@"
-	db "X DEFEND@"
-	db "X SPEED@"
-	db "X SPECIAL@"
-	db "COIN CASE@"
-	db "ITEMFINDER@"
-	db "TERU-SAMA@"
-	db "EXP.SHARE@"
-	db "OLD ROD@"
-	db "GOOD ROD@"
-	db "SILVER LEAF@"
-	db "SUPER ROD@"
-	db "PP UP@"
-	db "ETHER@"
-	db "MAX ETHER@"
-	db "ELIXER@"
-	db "RED SCALE@"
-	db "SECRETPOTION@"
-	db "S.S.TICKET@"
-	db "MYSTERY EGG@"
-	db "CLEAR BELL@"
-	db "SILVER WING@"
-	db "MOOMOO MILK@"
-	db "QUICK CLAW@"
-	db "PSNCUREBERRY@"
-	db "GOLD LEAF@"
-	db "SOFT SAND@"
-	db "SHARP BEAK@"
-	db "PRZCUREBERRY@"
-	db "BURNT BERRY@"
-	db "ICE BERRY@"
-	db "POISON BARB@"
-	db "KING'S ROCK@"
-	db "BITTER BERRY@"
-	db "MINT BERRY@"
-	db "RED APRICORN@"
-	db "TINYMUSHROOM@"
-	db "BIG MUSHROOM@"
-	db "SILVERPOWDER@"
-	db "BLU APRICORN@"
-	db "TERU-SAMA@"
-	db "AMULET COIN@"
-	db "YLW APRICORN@"
-	db "GRN APRICORN@"
-	db "CLEANSE TAG@"
-	db "MYSTIC WATER@"
-	db "TWISTEDSPOON@"
-	db "WHT APRICORN@"
-	db "BLACKBELT@"
-	db "BLK APRICORN@"
-	db "TERU-SAMA@"
-	db "PNK APRICORN@"
-	db "BLACKGLASSES@"
-	db "SLOWPOKETAIL@"
-	db "PINK BOW@"
-	db "STICK@"
-	db "SMOKE BALL@"
-	db "NEVERMELTICE@"
-	db "MAGNET@"
-	db "MIRACLEBERRY@"
-	db "PEARL@"
-	db "BIG PEARL@"
-	db "EVERSTONE@"
-	db "SPELL TAG@"
-	db "RAGECANDYBAR@"
-	db "GS BALL@"
-	db "BLUE CARD@"
-	db "MIRACLE SEED@"
-	db "THICK CLUB@"
-	db "FOCUS BAND@"
-	db "TERU-SAMA@"
-	db "ENERGYPOWDER@"
-	db "ENERGY ROOT@"
-	db "HEAL POWDER@"
-	db "REVIVAL HERB@"
-	db "HARD STONE@"
-	db "LUCKY EGG@"
-	db "CARD KEY@"
-	db "MACHINE PART@"
-	db "EGG TICKET@"
-	db "LOST ITEM@"
-	db "STARDUST@"
-	db "STAR PIECE@"
-	db "BASEMENT KEY@"
-	db "PASS@"
-	db "TERU-SAMA@"
-	db "TERU-SAMA@"
-	db "TERU-SAMA@"
-	db "CHARCOAL@"
-	db "BERRY JUICE@"
-	db "SCOPE LENS@"
-	db "TERU-SAMA@"
-	db "TERU-SAMA@"
-	db "METAL COAT@"
-	db "DRAGON FANG@"
-	db "TERU-SAMA@"
-	db "LEFTOVERS@"
-	db "TERU-SAMA@"
-	db "TERU-SAMA@"
-	db "TERU-SAMA@"
-	db "MYSTERYBERRY@"
-	db "DRAGON SCALE@"
-	db "BERSERK GENE@"
-	db "TERU-SAMA@"
-	db "TERU-SAMA@"
-	db "TERU-SAMA@"
-	db "SACRED ASH@"
-	db "HEAVY BALL@"
-	db "FLOWER MAIL@"
-	db "LEVEL BALL@"
-	db "LURE BALL@"
-	db "FAST BALL@"
-	db "TERU-SAMA@"
-	db "LIGHT BALL@"
-	db "FRIEND BALL@"
-	db "MOON BALL@"
-	db "LOVE BALL@"
-	db "NORMAL BOX@"
-	db "GORGEOUS BOX@"
-	db "SUN STONE@"
-	db "POLKADOT BOW@"
-	db "TERU-SAMA@"
-	db "UP-GRADE@"
-	db "BERRY@"
-	db "GOLD BERRY@"
-	db "SQUIRTBOTTLE@"
-	db "TERU-SAMA@"
-	db "PARK BALL@"
-	db "RAINBOW WING@"
-	db "TERU-SAMA@"
-	db "BRICK PIECE@"
-	db "SURF MAIL@"
-	db "LITEBLUEMAIL@"
-	db "PORTRAITMAIL@"
-	db "LOVELY MAIL@"
-	db "EON MAIL@"
-	db "MORPH MAIL@"
-	db "BLUESKY MAIL@"
-	db "MUSIC MAIL@"
-	db "MIRAGE MAIL@"
-	db "TERU-SAMA@"
-	db "TM01@"
-	db "TM02@"
-	db "TM03@"
-	db "TM04@"
-	db "TERU-SAMA@"
-	db "TM05@"
-	db "TM06@"
-	db "TM07@"
-	db "TM08@"
-	db "TM09@"
-	db "TM10@"
-	db "TM11@"
-	db "TM12@"
-	db "TM13@"
-	db "TM14@"
-	db "TM15@"
-	db "TM16@"
-	db "TM17@"
-	db "TM18@"
-	db "TM19@"
-	db "TM20@"
-	db "TM21@"
-	db "TM22@"
-	db "TM23@"
-	db "TM24@"
-	db "TM25@"
-	db "TM26@"
-	db "TM27@"
-	db "TM28@"
-	db "TERU-SAMA@"
-	db "TM29@"
-	db "TM30@"
-	db "TM31@"
-	db "TM32@"
-	db "TM33@"
-	db "TM34@"
-	db "TM35@"
-	db "TM36@"
-	db "TM37@"
-	db "TM38@"
-	db "TM39@"
-	db "TM40@"
-	db "TM41@"
-	db "TM42@"
-	db "TM43@"
-	db "TM44@"
-	db "TM45@"
-	db "TM46@"
-	db "TM47@"
-	db "TM48@"
-	db "TM49@"
-	db "TM50@"
-	db "HM01@"
-	db "HM02@"
-	db "HM03@"
-	db "HM04@"
-	db "HM05@"
-	db "HM06@"
-	db "HM07@"
-	db "TERU-SAMA@"
-	db "TERU-SAMA@"
-	db "TERU-SAMA@"
-	db "TERU-SAMA@"
-	db "TERU-SAMA@"
-	db "TERU-SAMA@"
-	db "?@"
+	list_start ItemNames
+	li "MASTER BALL"
+	li "ULTRA BALL"
+	li "BRIGHTPOWDER"
+	li "GREAT BALL"
+	li "# BALL"
+	li "TERU-SAMA"
+	li "BICYCLE"
+	li "MOON STONE"
+	li "ANTIDOTE"
+	li "BURN HEAL"
+	li "ICE HEAL"
+	li "AWAKENING"
+	li "PARLYZ HEAL"
+	li "FULL RESTORE"
+	li "MAX POTION"
+	li "HYPER POTION"
+	li "SUPER POTION"
+	li "POTION"
+	li "ESCAPE ROPE"
+	li "REPEL"
+	li "MAX ELIXER"
+	li "FIRE STONE"
+	li "THUNDERSTONE"
+	li "WATER STONE"
+	li "TERU-SAMA"
+	li "HP UP"
+	li "PROTEIN"
+	li "IRON"
+	li "CARBOS"
+	li "LUCKY PUNCH"
+	li "CALCIUM"
+	li "RARE CANDY"
+	li "X ACCURACY"
+	li "LEAF STONE"
+	li "METAL POWDER"
+	li "NUGGET"
+	li "# DOLL"
+	li "FULL HEAL"
+	li "REVIVE"
+	li "MAX REVIVE"
+	li "GUARD SPEC."
+	li "SUPER REPEL"
+	li "MAX REPEL"
+	li "DIRE HIT"
+	li "TERU-SAMA"
+	li "FRESH WATER"
+	li "SODA POP"
+	li "LEMONADE"
+	li "X ATTACK"
+	li "TERU-SAMA"
+	li "X DEFEND"
+	li "X SPEED"
+	li "X SPECIAL"
+	li "COIN CASE"
+	li "ITEMFINDER"
+	li "TERU-SAMA"
+	li "EXP.SHARE"
+	li "OLD ROD"
+	li "GOOD ROD"
+	li "SILVER LEAF"
+	li "SUPER ROD"
+	li "PP UP"
+	li "ETHER"
+	li "MAX ETHER"
+	li "ELIXER"
+	li "RED SCALE"
+	li "SECRETPOTION"
+	li "S.S.TICKET"
+	li "MYSTERY EGG"
+	li "CLEAR BELL"
+	li "SILVER WING"
+	li "MOOMOO MILK"
+	li "QUICK CLAW"
+	li "PSNCUREBERRY"
+	li "GOLD LEAF"
+	li "SOFT SAND"
+	li "SHARP BEAK"
+	li "PRZCUREBERRY"
+	li "BURNT BERRY"
+	li "ICE BERRY"
+	li "POISON BARB"
+	li "KING'S ROCK"
+	li "BITTER BERRY"
+	li "MINT BERRY"
+	li "RED APRICORN"
+	li "TINYMUSHROOM"
+	li "BIG MUSHROOM"
+	li "SILVERPOWDER"
+	li "BLU APRICORN"
+	li "TERU-SAMA"
+	li "AMULET COIN"
+	li "YLW APRICORN"
+	li "GRN APRICORN"
+	li "CLEANSE TAG"
+	li "MYSTIC WATER"
+	li "TWISTEDSPOON"
+	li "WHT APRICORN"
+	li "BLACKBELT"
+	li "BLK APRICORN"
+	li "TERU-SAMA"
+	li "PNK APRICORN"
+	li "BLACKGLASSES"
+	li "SLOWPOKETAIL"
+	li "PINK BOW"
+	li "STICK"
+	li "SMOKE BALL"
+	li "NEVERMELTICE"
+	li "MAGNET"
+	li "MIRACLEBERRY"
+	li "PEARL"
+	li "BIG PEARL"
+	li "EVERSTONE"
+	li "SPELL TAG"
+	li "RAGECANDYBAR"
+	li "GS BALL"
+	li "BLUE CARD"
+	li "MIRACLE SEED"
+	li "THICK CLUB"
+	li "FOCUS BAND"
+	li "TERU-SAMA"
+	li "ENERGYPOWDER"
+	li "ENERGY ROOT"
+	li "HEAL POWDER"
+	li "REVIVAL HERB"
+	li "HARD STONE"
+	li "LUCKY EGG"
+	li "CARD KEY"
+	li "MACHINE PART"
+	li "EGG TICKET"
+	li "LOST ITEM"
+	li "STARDUST"
+	li "STAR PIECE"
+	li "BASEMENT KEY"
+	li "PASS"
+	li "TERU-SAMA"
+	li "TERU-SAMA"
+	li "TERU-SAMA"
+	li "CHARCOAL"
+	li "BERRY JUICE"
+	li "SCOPE LENS"
+	li "TERU-SAMA"
+	li "TERU-SAMA"
+	li "METAL COAT"
+	li "DRAGON FANG"
+	li "TERU-SAMA"
+	li "LEFTOVERS"
+	li "TERU-SAMA"
+	li "TERU-SAMA"
+	li "TERU-SAMA"
+	li "MYSTERYBERRY"
+	li "DRAGON SCALE"
+	li "BERSERK GENE"
+	li "TERU-SAMA"
+	li "TERU-SAMA"
+	li "TERU-SAMA"
+	li "SACRED ASH"
+	li "HEAVY BALL"
+	li "FLOWER MAIL"
+	li "LEVEL BALL"
+	li "LURE BALL"
+	li "FAST BALL"
+	li "TERU-SAMA"
+	li "LIGHT BALL"
+	li "FRIEND BALL"
+	li "MOON BALL"
+	li "LOVE BALL"
+	li "NORMAL BOX"
+	li "GORGEOUS BOX"
+	li "SUN STONE"
+	li "POLKADOT BOW"
+	li "TERU-SAMA"
+	li "UP-GRADE"
+	li "BERRY"
+	li "GOLD BERRY"
+	li "SQUIRTBOTTLE"
+	li "TERU-SAMA"
+	li "PARK BALL"
+	li "RAINBOW WING"
+	li "TERU-SAMA"
+	li "BRICK PIECE"
+	li "SURF MAIL"
+	li "LITEBLUEMAIL"
+	li "PORTRAITMAIL"
+	li "LOVELY MAIL"
+	li "EON MAIL"
+	li "MORPH MAIL"
+	li "BLUESKY MAIL"
+	li "MUSIC MAIL"
+	li "MIRAGE MAIL"
+	li "TERU-SAMA"
+	assert_list_length NUM_ITEMS
+	li "TM01"
+	li "TM02"
+	li "TM03"
+	li "TM04"
+	li "TERU-SAMA"
+	li "TM05"
+	li "TM06"
+	li "TM07"
+	li "TM08"
+	li "TM09"
+	li "TM10"
+	li "TM11"
+	li "TM12"
+	li "TM13"
+	li "TM14"
+	li "TM15"
+	li "TM16"
+	li "TM17"
+	li "TM18"
+	li "TM19"
+	li "TM20"
+	li "TM21"
+	li "TM22"
+	li "TM23"
+	li "TM24"
+	li "TM25"
+	li "TM26"
+	li "TM27"
+	li "TM28"
+	li "TERU-SAMA"
+	li "TM29"
+	li "TM30"
+	li "TM31"
+	li "TM32"
+	li "TM33"
+	li "TM34"
+	li "TM35"
+	li "TM36"
+	li "TM37"
+	li "TM38"
+	li "TM39"
+	li "TM40"
+	li "TM41"
+	li "TM42"
+	li "TM43"
+	li "TM44"
+	li "TM45"
+	li "TM46"
+	li "TM47"
+	li "TM48"
+	li "TM49"
+	li "TM50"
+	assert_list_length NUM_ITEMS + NUM_TMS + 2 ; count ITEM_C3 and ITEM_DC
+	li "HM01"
+	li "HM02"
+	li "HM03"
+	li "HM04"
+	li "HM05"
+	li "HM06"
+	li "HM07"
+	assert_list_length NUM_ITEMS + NUM_TMS + 2 + NUM_HMS ; count ITEM_C3 and ITEM_DC
+	li "TERU-SAMA"
+	li "TERU-SAMA"
+	li "TERU-SAMA"
+	li "TERU-SAMA"
+	li "TERU-SAMA"
+	li "TERU-SAMA"
+	li "?"
+	assert_list_length $100