From d70bab6a4ab250ed231cade0c4852765937d7906 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 16 Sep 2017 12:11:11 -0700 Subject: Use macro for dex species names --- macros/pokedex.asm | 19 ++ text/pokedex_species.asm | 488 ++++++++++------------------------------------- 2 files changed, 116 insertions(+), 391 deletions(-) diff --git a/macros/pokedex.asm b/macros/pokedex.asm index 66ce1c3..365a8ba 100755 --- a/macros/pokedex.asm +++ b/macros/pokedex.asm @@ -68,3 +68,22 @@ x = \1 * 10 db (\2 % 10) + $30 db $00, $FC ENDM + +dex_species: MACRO + REPT _NARG + dex_species_char \1 + SHIFT + ENDR + REPT 11 - _NARG + dex_species_char " " + ENDR + db $00 + ENDM + +dex_species_char: MACRO + IF \1 == " " + db $81, $40 + ELSE + db $82, \1 + $1F + ENDC + ENDM diff --git a/text/pokedex_species.asm b/text/pokedex_species.asm index 1cb96da..87225f4 100644 --- a/text/pokedex_species.asm +++ b/text/pokedex_species.asm @@ -1,392 +1,98 @@ -; THESE ARE NOT POINTERS. THEY ARE VARIABLE-WIDTH-FONT CHARACTERS. -; VARIABLE-WIDTH-FONT STILL NEEDS DOCUMENTATION. -; SEE LoadDexVWFCharacter. - MonSpeciesNames: ; 0x29fa6 - ; SEED - dw $7282, $6482, $6482, $6382, $4081, $4081, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; LIZARD - dw $6B82, $6882, $7982, $6082, $7182, $6382, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; FLAME - dw $6582, $6B82, $6082, $6C82, $6482, $4081, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; TINYTURTLE - dw $7382, $6882, $6D82, $7882, $7382, $7482, $7182, $7382, $6B82, $6482, $4081 - db $00 - - ; TURTLE - dw $7382, $7482, $7182, $7382, $6B82, $6482, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; SHELLFISH - dw $7282, $6782, $6482, $6B82, $6B82, $6582, $6882, $7282, $6782, $4081, $4081 - db $00 - - ; WORM - dw $7682, $6E82, $7182, $6C82, $4081, $4081, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; COCOON - dw $6282, $6E82, $6282, $6E82, $6E82, $6D82, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; BUTTERFLY - dw $6182, $7482, $7382, $7382, $6482, $7182, $6582, $6B82, $7882, $4081, $4081 - db $00 - - ; HAIRY_BUG - dw $6782, $6082, $6882, $7182, $7882, $4081, $6182, $7482, $6682, $4081, $4081 - db $00 - - ; POISON_BEE - dw $6F82, $6E82, $6882, $7282, $6E82, $6D82, $4081, $6182, $6482, $6482, $4081 - db $00 - - ; TINY_BIRD - dw $7382, $6882, $6D82, $7882, $4081, $6182, $6882, $7182, $6382, $4081, $4081 - db $00 - - ; BIRD - dw $6182, $6882, $7182, $6382, $4081, $4081, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; MOUSE - dw $6C82, $6E82, $7482, $7282, $6482, $4081, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; BEAK - dw $6182, $6482, $6082, $6A82, $4081, $4081, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; SNAKE - dw $7282, $6D82, $6082, $6A82, $6482, $4081, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; COBRA - dw $6282, $6E82, $6182, $7182, $6082, $4081, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; POISON_PIN - dw $6F82, $6E82, $6882, $7282, $6E82, $6D82, $4081, $6F82, $6882, $6D82, $4081 - db $00 - - ; DRILL - dw $6382, $7182, $6882, $6B82, $6B82, $4081, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; FAIRY - dw $6582, $6082, $6882, $7182, $7882, $4081, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; FOX - dw $6582, $6E82, $7782, $4081, $4081, $4081, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; BALLOON - dw $6182, $6082, $6B82, $6B82, $6E82, $6E82, $6D82, $4081, $4081, $4081, $4081 - db $00 - - ; BAT - dw $6182, $6082, $7382, $4081, $4081, $4081, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; WEED - dw $7682, $6482, $6482, $6382, $4081, $4081, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; FLOWER - dw $6582, $6B82, $6E82, $7682, $6482, $7182, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; MUSHROOM - dw $6C82, $7482, $7282, $6782, $7182, $6E82, $6E82, $6C82, $4081, $4081, $4081 - db $00 - - ; INSECT - dw $6882, $6D82, $7282, $6482, $6282, $7382, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; POISONMOTH - dw $6F82, $6E82, $6882, $7282, $6E82, $6D82, $6C82, $6E82, $7382, $6782, $4081 - db $00 - - ; MOLE - dw $6C82, $6E82, $6B82, $6482, $4081, $4081, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; SCRATCHCAT - dw $7282, $6282, $7182, $6082, $7382, $6282, $6782, $6282, $6082, $7382, $4081 - db $00 - - ; CLASSY_CAT - dw $6282, $6B82, $6082, $7282, $7282, $7882, $4081, $6282, $6082, $7382, $4081 - db $00 - - ; DUCK - dw $6382, $7482, $6282, $6A82, $4081, $4081, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; PIG_MONKEY - dw $6F82, $6882, $6682, $4081, $6C82, $6E82, $6D82, $6A82, $6482, $7882, $4081 - db $00 - - ; PUPPY - dw $6F82, $7482, $6F82, $6F82, $7882, $4081, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; LEGENDARY - dw $6B82, $6482, $6682, $6482, $6D82, $6382, $6082, $7182, $7882, $4081, $4081 - db $00 - - ; TADPOLE - dw $7382, $6082, $6382, $6F82, $6E82, $6B82, $6482, $4081, $4081, $4081, $4081 - db $00 - - ; PSI - dw $6F82, $7282, $6882, $4081, $4081, $4081, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; SUPERPOWER - dw $7282, $7482, $6F82, $6482, $7182, $6F82, $6E82, $7682, $6482, $7182, $4081 - db $00 - - ; FLYCATCHER - dw $6582, $6B82, $7882, $6282, $6082, $7382, $6282, $6782, $6482, $7182, $4081 - db $00 - - ; JELLYFISH - dw $6982, $6482, $6B82, $6B82, $7882, $6582, $6882, $7282, $6782, $4081, $4081 - db $00 - - ; ROCK - dw $7182, $6E82, $6282, $6A82, $4081, $4081, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; MEGATON - dw $6C82, $6482, $6682, $6082, $7382, $6E82, $6D82, $4081, $4081, $4081, $4081 - db $00 - - ; FIRE_HORSE - dw $6582, $6882, $7182, $6482, $4081, $6782, $6E82, $7182, $7282, $6482, $4081 - db $00 - - ; DOPEY - dw $6382, $6E82, $6F82, $6482, $7882, $4081, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; HERMITCRAB - dw $6782, $6482, $7182, $6C82, $6882, $7382, $6282, $7182, $6082, $6182, $4081 - db $00 - - ; MAGNET - dw $6C82, $6082, $6682, $6D82, $6482, $7382, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; WILD_DUCK - dw $7682, $6882, $6B82, $6382, $4081, $6382, $7482, $6282, $6A82, $4081, $4081 - db $00 - - ; TWIN_BIRD - dw $7382, $7682, $6882, $6D82, $4081, $6182, $6882, $7182, $6382, $4081, $4081 - db $00 - - ; TRIPLEBIRD - dw $7382, $7182, $6882, $6F82, $6B82, $6482, $6182, $6882, $7182, $6382, $4081 - db $00 - - ; SEA_LION - dw $7282, $6482, $6082, $4081, $6B82, $6882, $6E82, $6D82, $4081, $4081, $4081 - db $00 - - ; SLUDGE - dw $7282, $6B82, $7482, $6382, $6682, $6482, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; BIVALVE - dw $6182, $6882, $7582, $6082, $6B82, $7582, $6482, $4081, $4081, $4081, $4081 - db $00 - - ; GAS - dw $6682, $6082, $7282, $4081, $4081, $4081, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; SHADOW - dw $7282, $6782, $6082, $6382, $6E82, $7682, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; ROCK_SNAKE - dw $7182, $6E82, $6282, $6A82, $4081, $7282, $6D82, $6082, $6A82, $6482, $4081 - db $00 - - ; HYPNOSIS - dw $6782, $7882, $6F82, $6D82, $6E82, $7282, $6882, $7282, $4081, $4081, $4081 - db $00 - - ; RIVER_CRAB - dw $7182, $6882, $7582, $6482, $7182, $4081, $6282, $7182, $6082, $6182, $4081 - db $00 - - ; PINCER - dw $6F82, $6882, $6D82, $6282, $6482, $7182, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; BALL - dw $6182, $6082, $6B82, $6B82, $4081, $4081, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; EGG - dw $6482, $6682, $6682, $4081, $4081, $4081, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; COCONUT - dw $6282, $6E82, $6282, $6E82, $6D82, $7482, $7382, $4081, $4081, $4081, $4081 - db $00 - - ; LONELY - dw $6B82, $6E82, $6D82, $6482, $6B82, $7882, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; BONEKEEPER - dw $6182, $6E82, $6D82, $6482, $6A82, $6482, $6482, $6F82, $6482, $7182, $4081 - db $00 - - ; KICKING - dw $6A82, $6882, $6282, $6A82, $6882, $6D82, $6682, $4081, $4081, $4081, $4081 - db $00 - - ; PUNCHING - dw $6F82, $7482, $6D82, $6282, $6782, $6882, $6D82, $6682, $4081, $4081, $4081 - db $00 - - ; LICKING - dw $6B82, $6882, $6282, $6A82, $6882, $6D82, $6682, $4081, $4081, $4081, $4081 - db $00 - - ; POISON_GAS - dw $6F82, $6E82, $6882, $7282, $6E82, $6D82, $4081, $6682, $6082, $7282, $4081 - db $00 - - ; SPIKES - dw $7282, $6F82, $6882, $6A82, $6482, $7282, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; VINE - dw $7582, $6882, $6D82, $6482, $4081, $4081, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; PARENT - dw $6F82, $6082, $7182, $6482, $6D82, $7382, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; DRAGON - dw $6382, $7182, $6082, $6682, $6E82, $6D82, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; GOLDFISH - dw $6682, $6E82, $6B82, $6382, $6582, $6882, $7282, $6782, $4081, $4081, $4081 - db $00 - - ; STARSHAPE - dw $7282, $7382, $6082, $7182, $7282, $6782, $6082, $6F82, $6482, $4081, $4081 - db $00 - - ; MYSTERIOUS - dw $6C82, $7882, $7282, $7382, $6482, $7182, $6882, $6E82, $7482, $7282, $4081 - db $00 - - ; BARRIER - dw $6182, $6082, $7182, $7182, $6882, $6482, $7182, $4081, $4081, $4081, $4081 - db $00 - - ; MANTIS - dw $6C82, $6082, $6D82, $7382, $6882, $7282, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; HUMANSHAPE - dw $6782, $7482, $6C82, $6082, $6D82, $7282, $6782, $6082, $6F82, $6482, $4081 - db $00 - - ; ELECTRIC - dw $6482, $6B82, $6482, $6282, $7382, $7182, $6882, $6282, $4081, $4081, $4081 - db $00 - - ; SPITFIRE - dw $7282, $6F82, $6882, $7382, $6582, $6882, $7182, $6482, $4081, $4081, $4081 - db $00 - - ; STAGBEETLE - dw $7282, $7382, $6082, $6682, $6182, $6482, $6482, $7382, $6B82, $6482, $4081 - db $00 - - ; WILD_BULL - dw $7682, $6882, $6B82, $6382, $4081, $6182, $7482, $6B82, $6B82, $4081, $4081 - db $00 - - ; FISH - dw $6582, $6882, $7282, $6782, $4081, $4081, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; ATROCIOUS - dw $6082, $7382, $7182, $6E82, $6282, $6882, $6E82, $7482, $7282, $4081, $4081 - db $00 - - ; TRANSPORT - dw $7382, $7182, $6082, $6D82, $7282, $6F82, $6E82, $7182, $7382, $4081, $4081 - db $00 - - ; TRANSFORM - dw $7382, $7182, $6082, $6D82, $7282, $6582, $6E82, $7182, $6C82, $4081, $4081 - db $00 - - ; EVOLUTION - dw $6482, $7582, $6E82, $6B82, $7482, $7382, $6882, $6E82, $6D82, $4081, $4081 - db $00 - - ; BUBBLE_JET - dw $6182, $7482, $6182, $6182, $6B82, $6482, $4081, $6982, $6482, $7382, $4081 - db $00 - - ; LIGHTNING - dw $6B82, $6882, $6682, $6782, $7382, $6D82, $6882, $6D82, $6682, $4081, $4081 - db $00 - - ; FLAME_2 - dw $6582, $6B82, $6082, $6C82, $6482, $4081, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; VIRTUAL - dw $7582, $6882, $7182, $7382, $7482, $6082, $6B82, $4081, $4081, $4081, $4081 - db $00 - - ; SPIRAL - dw $7282, $6F82, $6882, $7182, $6082, $6B82, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; FOSSIL - dw $6582, $6E82, $7282, $7282, $6882, $6B82, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; SLEEPING - dw $7282, $6B82, $6482, $6482, $6F82, $6882, $6D82, $6682, $4081, $4081, $4081 - db $00 - - ; FREEZE - dw $6582, $7182, $6482, $6482, $7982, $6482, $4081, $4081, $4081, $4081, $4081 - db $00 - - ; GENETIC - dw $6682, $6482, $6D82, $6482, $7382, $6882, $6282, $4081, $4081, $4081, $4081 - db $00 - - ; NEW_SPECIE - dw $6D82, $6482, $7682, $4081, $7282, $6F82, $6482, $6282, $6882, $6482, $4081 - db $00 - - ; RAT - dw $7182, $6082, $7382, $4081, $4081, $4081, $4081, $4081, $4081, $4081, $4081 - db $00 + dex_species "S","E","E","D" ; SPECIES_SEED + dex_species "L","I","Z","A","R","D" ; SPECIES_LIZARD + dex_species "F","L","A","M","E" ; SPECIES_FLAME + dex_species "T","I","N","Y","T","U","R","T","L","E" ; SPECIES_TINYTURTLE + dex_species "T","U","R","T","L","E" ; SPECIES_TURTLE + dex_species "S","H","E","L","L","F","I","S","H" ; SPECIES_SHELLFISH + dex_species "W","O","R","M" ; SPECIES_WORM + dex_species "C","O","C","O","O","N" ; SPECIES_COCOON + dex_species "B","U","T","T","E","R","F","L","Y" ; SPECIES_BUTTERFLY + dex_species "H","A","I","R","Y"," ","B","U","G" ; SPECIES_HAIRY_BUG + dex_species "P","O","I","S","O","N"," ","B","E","E" ; SPECIES_POISON_BEE + dex_species "T","I","N","Y"," ","B","I","R","D" ; SPECIES_TINY_BIRD + dex_species "B","I","R","D" ; SPECIES_BIRD + dex_species "M","O","U","S","E" ; SPECIES_MOUSE + dex_species "B","E","A","K" ; SPECIES_BEAK + dex_species "S","N","A","K","E" ; SPECIES_SNAKE + dex_species "C","O","B","R","A" ; SPECIES_COBRA + dex_species "P","O","I","S","O","N"," ","P","I","N" ; SPECIES_POISON_PIN + dex_species "D","R","I","L","L" ; SPECIES_DRILL + dex_species "F","A","I","R","Y" ; SPECIES_FAIRY + dex_species "F","O","X" ; SPECIES_FOX + dex_species "B","A","L","L","O","O","N" ; SPECIES_BALLOON + dex_species "B","A","T" ; SPECIES_BAT + dex_species "W","E","E","D" ; SPECIES_WEED + dex_species "F","L","O","W","E","R" ; SPECIES_FLOWER + dex_species "M","U","S","H","R","O","O","M" ; SPECIES_MUSHROOM + dex_species "I","N","S","E","C","T" ; SPECIES_INSECT + dex_species "P","O","I","S","O","N","M","O","T","H" ; SPECIES_POISONMOTH + dex_species "M","O","L","E" ; SPECIES_MOLE + dex_species "S","C","R","A","T","C","H","C","A","T" ; SPECIES_SCRATCHCAT + dex_species "C","L","A","S","S","Y"," ","C","A","T" ; SPECIES_CLASSY_CAT + dex_species "D","U","C","K" ; SPECIES_DUCK + dex_species "P","I","G"," ","M","O","N","K","E","Y" ; SPECIES_PIG_MONKEY + dex_species "P","U","P","P","Y" ; SPECIES_PUPPY + dex_species "L","E","G","E","N","D","A","R","Y" ; SPECIES_LEGENDARY + dex_species "T","A","D","P","O","L","E" ; SPECIES_TADPOLE + dex_species "P","S","I" ; SPECIES_PSI + dex_species "S","U","P","E","R","P","O","W","E","R" ; SPECIES_SUPERPOWER + dex_species "F","L","Y","C","A","T","C","H","E","R" ; SPECIES_FLYCATCHER + dex_species "J","E","L","L","Y","F","I","S","H" ; SPECIES_JELLYFISH + dex_species "R","O","C","K" ; SPECIES_ROCK + dex_species "M","E","G","A","T","O","N" ; SPECIES_MEGATON + dex_species "F","I","R","E"," ","H","O","R","S","E" ; SPECIES_FIRE_HORSE + dex_species "D","O","P","E","Y" ; SPECIES_DOPEY + dex_species "H","E","R","M","I","T","C","R","A","B" ; SPECIES_HERMITCRAB + dex_species "M","A","G","N","E","T" ; SPECIES_MAGNET + dex_species "W","I","L","D"," ","D","U","C","K" ; SPECIES_WILD_DUCK + dex_species "T","W","I","N"," ","B","I","R","D" ; SPECIES_TWIN_BIRD + dex_species "T","R","I","P","L","E","B","I","R","D" ; SPECIES_TRIPLEBIRD + dex_species "S","E","A"," ","L","I","O","N" ; SPECIES_SEA_LION + dex_species "S","L","U","D","G","E" ; SPECIES_SLUDGE + dex_species "B","I","V","A","L","V","E" ; SPECIES_BIVALVE + dex_species "G","A","S" ; SPECIES_GAS + dex_species "S","H","A","D","O","W" ; SPECIES_SHADOW + dex_species "R","O","C","K"," ","S","N","A","K","E" ; SPECIES_ROCK_SNAKE + dex_species "H","Y","P","N","O","S","I","S" ; SPECIES_HYPNOSIS + dex_species "R","I","V","E","R"," ","C","R","A","B" ; SPECIES_RIVER_CRAB + dex_species "P","I","N","C","E","R" ; SPECIES_PINCER + dex_species "B","A","L","L" ; SPECIES_BALL + dex_species "E","G","G" ; SPECIES_EGG + dex_species "C","O","C","O","N","U","T" ; SPECIES_COCONUT + dex_species "L","O","N","E","L","Y" ; SPECIES_LONELY + dex_species "B","O","N","E","K","E","E","P","E","R" ; SPECIES_BONEKEEPER + dex_species "K","I","C","K","I","N","G" ; SPECIES_KICKING + dex_species "P","U","N","C","H","I","N","G" ; SPECIES_PUNCHING + dex_species "L","I","C","K","I","N","G" ; SPECIES_LICKING + dex_species "P","O","I","S","O","N"," ","G","A","S" ; SPECIES_POISON_GAS + dex_species "S","P","I","K","E","S" ; SPECIES_SPIKES + dex_species "V","I","N","E" ; SPECIES_VINE + dex_species "P","A","R","E","N","T" ; SPECIES_PARENT + dex_species "D","R","A","G","O","N" ; SPECIES_DRAGON + dex_species "G","O","L","D","F","I","S","H" ; SPECIES_GOLDFISH + dex_species "S","T","A","R","S","H","A","P","E" ; SPECIES_STARSHAPE + dex_species "M","Y","S","T","E","R","I","O","U","S" ; SPECIES_MYSTERIOUS + dex_species "B","A","R","R","I","E","R" ; SPECIES_BARRIER + dex_species "M","A","N","T","I","S" ; SPECIES_MANTIS + dex_species "H","U","M","A","N","S","H","A","P","E" ; SPECIES_HUMANSHAPE + dex_species "E","L","E","C","T","R","I","C" ; SPECIES_ELECTRIC + dex_species "S","P","I","T","F","I","R","E" ; SPECIES_SPITFIRE + dex_species "S","T","A","G","B","E","E","T","L","E" ; SPECIES_STAGBEETLE + dex_species "W","I","L","D"," ","B","U","L","L" ; SPECIES_WILD_BULL + dex_species "F","I","S","H" ; SPECIES_FISH + dex_species "A","T","R","O","C","I","O","U","S" ; SPECIES_ATROCIOUS + dex_species "T","R","A","N","S","P","O","R","T" ; SPECIES_TRANSPORT + dex_species "T","R","A","N","S","F","O","R","M" ; SPECIES_TRANSFORM + dex_species "E","V","O","L","U","T","I","O","N" ; SPECIES_EVOLUTION + dex_species "B","U","B","B","L","E"," ","J","E","T" ; SPECIES_BUBBLE_JET + dex_species "L","I","G","H","T","N","I","N","G" ; SPECIES_LIGHTNING + dex_species "F","L","A","M","E" ; SPECIES_FLAME_2 + dex_species "V","I","R","T","U","A","L" ; SPECIES_VIRTUAL + dex_species "S","P","I","R","A","L" ; SPECIES_SPIRAL + dex_species "F","O","S","S","I","L" ; SPECIES_FOSSIL + dex_species "S","L","E","E","P","I","N","G" ; SPECIES_SLEEPING + dex_species "F","R","E","E","Z","E" ; SPECIES_FREEZE + dex_species "G","E","N","E","T","I","C" ; SPECIES_GENETIC + dex_species "N","E","W"," ","S","P","E","C","I","E" ; SPECIES_NEW_SPECIE + dex_species "R","A","T" ; SPECIES_RAT -- cgit v1.2.3