Use dname macro to automatically pad names with "@" characters (#1198)
This commit is contained in:
Rangi
GitHub
@@ -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
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,18 +1,21 @@
|
||||
MACRO npctrade
|
||||
; dialog set, requested mon, offered mon, nickname, dvs, item, OT ID, OT name, gender requested
|
||||
db \1, \2, \3, \4, \5, \6, \7
|
||||
db \1, \2, \3
|
||||
dname \4, NAME_LENGTH
|
||||
db \5, \6, \7
|
||||
dw \8
|
||||
db \9, \<10>, 0
|
||||
dname \9, NAME_LENGTH
|
||||
db \<10>, 0
|
||||
ENDM
|
||||
|
||||
NPCTrades:
|
||||
; entries correspond to NPCTRADE_* constants
|
||||
table_width NPCTRADE_STRUCT_LENGTH
|
||||
npctrade TRADE_DIALOGSET_COLLECTOR, ABRA, MACHOP, "MUSCLE@@@@@", $37, $66, GOLD_BERRY, 37460, "MIKE@@@@@@@", TRADE_GENDER_EITHER
|
||||
npctrade TRADE_DIALOGSET_COLLECTOR, BELLSPROUT, ONIX, "ROCKY@@@@@@", $96, $66, BITTER_BERRY, 48926, "KYLE@@@@@@@", TRADE_GENDER_EITHER
|
||||
npctrade TRADE_DIALOGSET_HAPPY, KRABBY, VOLTORB, "VOLTY@@@@@@", $98, $88, PRZCUREBERRY, 29189, "TIM@@@@@@@@", TRADE_GENDER_EITHER
|
||||
npctrade TRADE_DIALOGSET_GIRL, DRAGONAIR, DODRIO, "DORIS@@@@@@", $77, $66, SMOKE_BALL, 00283, "EMY@@@@@@@@", TRADE_GENDER_FEMALE
|
||||
npctrade TRADE_DIALOGSET_NEWBIE, HAUNTER, XATU, "PAUL@@@@@@@", $96, $86, MYSTERYBERRY, 15616, "CHRIS@@@@@@", TRADE_GENDER_EITHER
|
||||
npctrade TRADE_DIALOGSET_GIRL, CHANSEY, AERODACTYL, "AEROY@@@@@@", $96, $66, GOLD_BERRY, 26491, "KIM@@@@@@@@", TRADE_GENDER_EITHER
|
||||
npctrade TRADE_DIALOGSET_COLLECTOR, DUGTRIO, MAGNETON, "MAGGIE@@@@@", $96, $66, METAL_COAT, 50082, "FOREST@@@@@", TRADE_GENDER_EITHER
|
||||
npctrade TRADE_DIALOGSET_COLLECTOR, ABRA, MACHOP, "MUSCLE", $37, $66, GOLD_BERRY, 37460, "MIKE", TRADE_GENDER_EITHER
|
||||
npctrade TRADE_DIALOGSET_COLLECTOR, BELLSPROUT, ONIX, "ROCKY", $96, $66, BITTER_BERRY, 48926, "KYLE", TRADE_GENDER_EITHER
|
||||
npctrade TRADE_DIALOGSET_HAPPY, KRABBY, VOLTORB, "VOLTY", $98, $88, PRZCUREBERRY, 29189, "TIM", TRADE_GENDER_EITHER
|
||||
npctrade TRADE_DIALOGSET_GIRL, DRAGONAIR, DODRIO, "DORIS", $77, $66, SMOKE_BALL, 00283, "EMY", TRADE_GENDER_FEMALE
|
||||
npctrade TRADE_DIALOGSET_NEWBIE, HAUNTER, XATU, "PAUL", $96, $86, MYSTERYBERRY, 15616, "CHRIS", TRADE_GENDER_EITHER
|
||||
npctrade TRADE_DIALOGSET_GIRL, CHANSEY, AERODACTYL, "AEROY", $96, $66, GOLD_BERRY, 26491, "KIM", TRADE_GENDER_EITHER
|
||||
npctrade TRADE_DIALOGSET_COLLECTOR, DUGTRIO, MAGNETON, "MAGGIE", $96, $66, METAL_COAT, 50082, "FOREST", TRADE_GENDER_EITHER
|
||||
assert_table_length NUM_NPC_TRADES
|
||||
|
||||
@@ -60,7 +60,7 @@ OddEggs:
|
||||
bigdw 11 ; Spd
|
||||
bigdw 8 ; SAtk
|
||||
bigdw 8 ; SDef
|
||||
db "EGG@@@@@@@@"
|
||||
dname "EGG", MON_NAME_LENGTH
|
||||
|
||||
db PICHU
|
||||
db NO_ITEM
|
||||
@@ -86,7 +86,7 @@ OddEggs:
|
||||
bigdw 12 ; Spd
|
||||
bigdw 9 ; SAtk
|
||||
bigdw 9 ; SDef
|
||||
db "EGG@@@@@@@@"
|
||||
dname "EGG", MON_NAME_LENGTH
|
||||
|
||||
db CLEFFA
|
||||
db NO_ITEM
|
||||
@@ -112,7 +112,7 @@ OddEggs:
|
||||
bigdw 6 ; Spd
|
||||
bigdw 9 ; SAtk
|
||||
bigdw 10 ; SDef
|
||||
db "EGG@@@@@@@@"
|
||||
dname "EGG", MON_NAME_LENGTH
|
||||
|
||||
db CLEFFA
|
||||
db NO_ITEM
|
||||
@@ -138,7 +138,7 @@ OddEggs:
|
||||
bigdw 7 ; Spd
|
||||
bigdw 10 ; SAtk
|
||||
bigdw 11 ; SDef
|
||||
db "EGG@@@@@@@@"
|
||||
dname "EGG", MON_NAME_LENGTH
|
||||
|
||||
db IGGLYBUFF
|
||||
db NO_ITEM
|
||||
@@ -164,7 +164,7 @@ OddEggs:
|
||||
bigdw 6 ; Spd
|
||||
bigdw 9 ; SAtk
|
||||
bigdw 7 ; SDef
|
||||
db "EGG@@@@@@@@"
|
||||
dname "EGG", MON_NAME_LENGTH
|
||||
|
||||
db IGGLYBUFF
|
||||
db NO_ITEM
|
||||
@@ -190,7 +190,7 @@ OddEggs:
|
||||
bigdw 7 ; Spd
|
||||
bigdw 10 ; SAtk
|
||||
bigdw 8 ; SDef
|
||||
db "EGG@@@@@@@@"
|
||||
dname "EGG", MON_NAME_LENGTH
|
||||
|
||||
db SMOOCHUM
|
||||
db NO_ITEM
|
||||
@@ -216,7 +216,7 @@ OddEggs:
|
||||
bigdw 11 ; Spd
|
||||
bigdw 13 ; SAtk
|
||||
bigdw 11 ; SDef
|
||||
db "EGG@@@@@@@@"
|
||||
dname "EGG", MON_NAME_LENGTH
|
||||
|
||||
db SMOOCHUM
|
||||
db NO_ITEM
|
||||
@@ -242,7 +242,7 @@ OddEggs:
|
||||
bigdw 12 ; Spd
|
||||
bigdw 14 ; SAtk
|
||||
bigdw 12 ; SDef
|
||||
db "EGG@@@@@@@@"
|
||||
dname "EGG", MON_NAME_LENGTH
|
||||
|
||||
db MAGBY
|
||||
db NO_ITEM
|
||||
@@ -268,7 +268,7 @@ OddEggs:
|
||||
bigdw 13 ; Spd
|
||||
bigdw 12 ; SAtk
|
||||
bigdw 10 ; SDef
|
||||
db "EGG@@@@@@@@"
|
||||
dname "EGG", MON_NAME_LENGTH
|
||||
|
||||
db MAGBY
|
||||
db NO_ITEM
|
||||
@@ -294,7 +294,7 @@ OddEggs:
|
||||
bigdw 14 ; Spd
|
||||
bigdw 13 ; SAtk
|
||||
bigdw 11 ; SDef
|
||||
db "EGG@@@@@@@@"
|
||||
dname "EGG", MON_NAME_LENGTH
|
||||
|
||||
db ELEKID
|
||||
db NO_ITEM
|
||||
@@ -320,7 +320,7 @@ OddEggs:
|
||||
bigdw 14 ; Spd
|
||||
bigdw 11 ; SAtk
|
||||
bigdw 10 ; SDef
|
||||
db "EGG@@@@@@@@"
|
||||
dname "EGG", MON_NAME_LENGTH
|
||||
|
||||
db ELEKID
|
||||
db NO_ITEM
|
||||
@@ -346,7 +346,7 @@ OddEggs:
|
||||
bigdw 15 ; Spd
|
||||
bigdw 12 ; SAtk
|
||||
bigdw 11 ; SDef
|
||||
db "EGG@@@@@@@@"
|
||||
dname "EGG", MON_NAME_LENGTH
|
||||
|
||||
db TYROGUE
|
||||
db NO_ITEM
|
||||
@@ -372,7 +372,7 @@ OddEggs:
|
||||
bigdw 8 ; Spd
|
||||
bigdw 8 ; SAtk
|
||||
bigdw 8 ; SDef
|
||||
db "EGG@@@@@@@@"
|
||||
dname "EGG", MON_NAME_LENGTH
|
||||
|
||||
db TYROGUE
|
||||
db NO_ITEM
|
||||
@@ -398,6 +398,6 @@ OddEggs:
|
||||
bigdw 9 ; Spd
|
||||
bigdw 9 ; SAtk
|
||||
bigdw 9 ; SDef
|
||||
db "EGG@@@@@@@@"
|
||||
dname "EGG", MON_NAME_LENGTH
|
||||
|
||||
assert_table_length NUM_ODD_EGGS
|
||||
|
||||
@@ -1,261 +1,261 @@
|
||||
PokemonNames::
|
||||
table_width NAME_LENGTH - 1
|
||||
db "BULBASAUR@"
|
||||
db "IVYSAUR@@@"
|
||||
db "VENUSAUR@@"
|
||||
db "CHARMANDER"
|
||||
db "CHARMELEON"
|
||||
db "CHARIZARD@"
|
||||
db "SQUIRTLE@@"
|
||||
db "WARTORTLE@"
|
||||
db "BLASTOISE@"
|
||||
db "CATERPIE@@"
|
||||
db "METAPOD@@@"
|
||||
db "BUTTERFREE"
|
||||
db "WEEDLE@@@@"
|
||||
db "KAKUNA@@@@"
|
||||
db "BEEDRILL@@"
|
||||
db "PIDGEY@@@@"
|
||||
db "PIDGEOTTO@"
|
||||
db "PIDGEOT@@@"
|
||||
db "RATTATA@@@"
|
||||
db "RATICATE@@"
|
||||
db "SPEAROW@@@"
|
||||
db "FEAROW@@@@"
|
||||
db "EKANS@@@@@"
|
||||
db "ARBOK@@@@@"
|
||||
db "PIKACHU@@@"
|
||||
db "RAICHU@@@@"
|
||||
db "SANDSHREW@"
|
||||
db "SANDSLASH@"
|
||||
db "NIDORAN♀@@"
|
||||
db "NIDORINA@@"
|
||||
db "NIDOQUEEN@"
|
||||
db "NIDORAN♂@@"
|
||||
db "NIDORINO@@"
|
||||
db "NIDOKING@@"
|
||||
db "CLEFAIRY@@"
|
||||
db "CLEFABLE@@"
|
||||
db "VULPIX@@@@"
|
||||
db "NINETALES@"
|
||||
db "JIGGLYPUFF"
|
||||
db "WIGGLYTUFF"
|
||||
db "ZUBAT@@@@@"
|
||||
db "GOLBAT@@@@"
|
||||
db "ODDISH@@@@"
|
||||
db "GLOOM@@@@@"
|
||||
db "VILEPLUME@"
|
||||
db "PARAS@@@@@"
|
||||
db "PARASECT@@"
|
||||
db "VENONAT@@@"
|
||||
db "VENOMOTH@@"
|
||||
db "DIGLETT@@@"
|
||||
db "DUGTRIO@@@"
|
||||
db "MEOWTH@@@@"
|
||||
db "PERSIAN@@@"
|
||||
db "PSYDUCK@@@"
|
||||
db "GOLDUCK@@@"
|
||||
db "MANKEY@@@@"
|
||||
db "PRIMEAPE@@"
|
||||
db "GROWLITHE@"
|
||||
db "ARCANINE@@"
|
||||
db "POLIWAG@@@"
|
||||
db "POLIWHIRL@"
|
||||
db "POLIWRATH@"
|
||||
db "ABRA@@@@@@"
|
||||
db "KADABRA@@@"
|
||||
db "ALAKAZAM@@"
|
||||
db "MACHOP@@@@"
|
||||
db "MACHOKE@@@"
|
||||
db "MACHAMP@@@"
|
||||
db "BELLSPROUT"
|
||||
db "WEEPINBELL"
|
||||
db "VICTREEBEL"
|
||||
db "TENTACOOL@"
|
||||
db "TENTACRUEL"
|
||||
db "GEODUDE@@@"
|
||||
db "GRAVELER@@"
|
||||
db "GOLEM@@@@@"
|
||||
db "PONYTA@@@@"
|
||||
db "RAPIDASH@@"
|
||||
db "SLOWPOKE@@"
|
||||
db "SLOWBRO@@@"
|
||||
db "MAGNEMITE@"
|
||||
db "MAGNETON@@"
|
||||
db "FARFETCH'D"
|
||||
db "DODUO@@@@@"
|
||||
db "DODRIO@@@@"
|
||||
db "SEEL@@@@@@"
|
||||
db "DEWGONG@@@"
|
||||
db "GRIMER@@@@"
|
||||
db "MUK@@@@@@@"
|
||||
db "SHELLDER@@"
|
||||
db "CLOYSTER@@"
|
||||
db "GASTLY@@@@"
|
||||
db "HAUNTER@@@"
|
||||
db "GENGAR@@@@"
|
||||
db "ONIX@@@@@@"
|
||||
db "DROWZEE@@@"
|
||||
db "HYPNO@@@@@"
|
||||
db "KRABBY@@@@"
|
||||
db "KINGLER@@@"
|
||||
db "VOLTORB@@@"
|
||||
db "ELECTRODE@"
|
||||
db "EXEGGCUTE@"
|
||||
db "EXEGGUTOR@"
|
||||
db "CUBONE@@@@"
|
||||
db "MAROWAK@@@"
|
||||
db "HITMONLEE@"
|
||||
db "HITMONCHAN"
|
||||
db "LICKITUNG@"
|
||||
db "KOFFING@@@"
|
||||
db "WEEZING@@@"
|
||||
db "RHYHORN@@@"
|
||||
db "RHYDON@@@@"
|
||||
db "CHANSEY@@@"
|
||||
db "TANGELA@@@"
|
||||
db "KANGASKHAN"
|
||||
db "HORSEA@@@@"
|
||||
db "SEADRA@@@@"
|
||||
db "GOLDEEN@@@"
|
||||
db "SEAKING@@@"
|
||||
db "STARYU@@@@"
|
||||
db "STARMIE@@@"
|
||||
db "MR.MIME@@@"
|
||||
db "SCYTHER@@@"
|
||||
db "JYNX@@@@@@"
|
||||
db "ELECTABUZZ"
|
||||
db "MAGMAR@@@@"
|
||||
db "PINSIR@@@@"
|
||||
db "TAUROS@@@@"
|
||||
db "MAGIKARP@@"
|
||||
db "GYARADOS@@"
|
||||
db "LAPRAS@@@@"
|
||||
db "DITTO@@@@@"
|
||||
db "EEVEE@@@@@"
|
||||
db "VAPOREON@@"
|
||||
db "JOLTEON@@@"
|
||||
db "FLAREON@@@"
|
||||
db "PORYGON@@@"
|
||||
db "OMANYTE@@@"
|
||||
db "OMASTAR@@@"
|
||||
db "KABUTO@@@@"
|
||||
db "KABUTOPS@@"
|
||||
db "AERODACTYL"
|
||||
db "SNORLAX@@@"
|
||||
db "ARTICUNO@@"
|
||||
db "ZAPDOS@@@@"
|
||||
db "MOLTRES@@@"
|
||||
db "DRATINI@@@"
|
||||
db "DRAGONAIR@"
|
||||
db "DRAGONITE@"
|
||||
db "MEWTWO@@@@"
|
||||
db "MEW@@@@@@@"
|
||||
db "CHIKORITA@"
|
||||
db "BAYLEEF@@@"
|
||||
db "MEGANIUM@@"
|
||||
db "CYNDAQUIL@"
|
||||
db "QUILAVA@@@"
|
||||
db "TYPHLOSION"
|
||||
db "TOTODILE@@"
|
||||
db "CROCONAW@@"
|
||||
db "FERALIGATR"
|
||||
db "SENTRET@@@"
|
||||
db "FURRET@@@@"
|
||||
db "HOOTHOOT@@"
|
||||
db "NOCTOWL@@@"
|
||||
db "LEDYBA@@@@"
|
||||
db "LEDIAN@@@@"
|
||||
db "SPINARAK@@"
|
||||
db "ARIADOS@@@"
|
||||
db "CROBAT@@@@"
|
||||
db "CHINCHOU@@"
|
||||
db "LANTURN@@@"
|
||||
db "PICHU@@@@@"
|
||||
db "CLEFFA@@@@"
|
||||
db "IGGLYBUFF@"
|
||||
db "TOGEPI@@@@"
|
||||
db "TOGETIC@@@"
|
||||
db "NATU@@@@@@"
|
||||
db "XATU@@@@@@"
|
||||
db "MAREEP@@@@"
|
||||
db "FLAAFFY@@@"
|
||||
db "AMPHAROS@@"
|
||||
db "BELLOSSOM@"
|
||||
db "MARILL@@@@"
|
||||
db "AZUMARILL@"
|
||||
db "SUDOWOODO@"
|
||||
db "POLITOED@@"
|
||||
db "HOPPIP@@@@"
|
||||
db "SKIPLOOM@@"
|
||||
db "JUMPLUFF@@"
|
||||
db "AIPOM@@@@@"
|
||||
db "SUNKERN@@@"
|
||||
db "SUNFLORA@@"
|
||||
db "YANMA@@@@@"
|
||||
db "WOOPER@@@@"
|
||||
db "QUAGSIRE@@"
|
||||
db "ESPEON@@@@"
|
||||
db "UMBREON@@@"
|
||||
db "MURKROW@@@"
|
||||
db "SLOWKING@@"
|
||||
db "MISDREAVUS"
|
||||
db "UNOWN@@@@@"
|
||||
db "WOBBUFFET@"
|
||||
db "GIRAFARIG@"
|
||||
db "PINECO@@@@"
|
||||
db "FORRETRESS"
|
||||
db "DUNSPARCE@"
|
||||
db "GLIGAR@@@@"
|
||||
db "STEELIX@@@"
|
||||
db "SNUBBULL@@"
|
||||
db "GRANBULL@@"
|
||||
db "QWILFISH@@"
|
||||
db "SCIZOR@@@@"
|
||||
db "SHUCKLE@@@"
|
||||
db "HERACROSS@"
|
||||
db "SNEASEL@@@"
|
||||
db "TEDDIURSA@"
|
||||
db "URSARING@@"
|
||||
db "SLUGMA@@@@"
|
||||
db "MAGCARGO@@"
|
||||
db "SWINUB@@@@"
|
||||
db "PILOSWINE@"
|
||||
db "CORSOLA@@@"
|
||||
db "REMORAID@@"
|
||||
db "OCTILLERY@"
|
||||
db "DELIBIRD@@"
|
||||
db "MANTINE@@@"
|
||||
db "SKARMORY@@"
|
||||
db "HOUNDOUR@@"
|
||||
db "HOUNDOOM@@"
|
||||
db "KINGDRA@@@"
|
||||
db "PHANPY@@@@"
|
||||
db "DONPHAN@@@"
|
||||
db "PORYGON2@@"
|
||||
db "STANTLER@@"
|
||||
db "SMEARGLE@@"
|
||||
db "TYROGUE@@@"
|
||||
db "HITMONTOP@"
|
||||
db "SMOOCHUM@@"
|
||||
db "ELEKID@@@@"
|
||||
db "MAGBY@@@@@"
|
||||
db "MILTANK@@@"
|
||||
db "BLISSEY@@@"
|
||||
db "RAIKOU@@@@"
|
||||
db "ENTEI@@@@@"
|
||||
db "SUICUNE@@@"
|
||||
db "LARVITAR@@"
|
||||
db "PUPITAR@@@"
|
||||
db "TYRANITAR@"
|
||||
db "LUGIA@@@@@"
|
||||
db "HO-OH@@@@@"
|
||||
db "CELEBI@@@@"
|
||||
dname "BULBASAUR"
|
||||
dname "IVYSAUR"
|
||||
dname "VENUSAUR"
|
||||
dname "CHARMANDER"
|
||||
dname "CHARMELEON"
|
||||
dname "CHARIZARD"
|
||||
dname "SQUIRTLE"
|
||||
dname "WARTORTLE"
|
||||
dname "BLASTOISE"
|
||||
dname "CATERPIE"
|
||||
dname "METAPOD"
|
||||
dname "BUTTERFREE"
|
||||
dname "WEEDLE"
|
||||
dname "KAKUNA"
|
||||
dname "BEEDRILL"
|
||||
dname "PIDGEY"
|
||||
dname "PIDGEOTTO"
|
||||
dname "PIDGEOT"
|
||||
dname "RATTATA"
|
||||
dname "RATICATE"
|
||||
dname "SPEAROW"
|
||||
dname "FEAROW"
|
||||
dname "EKANS"
|
||||
dname "ARBOK"
|
||||
dname "PIKACHU"
|
||||
dname "RAICHU"
|
||||
dname "SANDSHREW"
|
||||
dname "SANDSLASH"
|
||||
dname "NIDORAN♀"
|
||||
dname "NIDORINA"
|
||||
dname "NIDOQUEEN"
|
||||
dname "NIDORAN♂"
|
||||
dname "NIDORINO"
|
||||
dname "NIDOKING"
|
||||
dname "CLEFAIRY"
|
||||
dname "CLEFABLE"
|
||||
dname "VULPIX"
|
||||
dname "NINETALES"
|
||||
dname "JIGGLYPUFF"
|
||||
dname "WIGGLYTUFF"
|
||||
dname "ZUBAT"
|
||||
dname "GOLBAT"
|
||||
dname "ODDISH"
|
||||
dname "GLOOM"
|
||||
dname "VILEPLUME"
|
||||
dname "PARAS"
|
||||
dname "PARASECT"
|
||||
dname "VENONAT"
|
||||
dname "VENOMOTH"
|
||||
dname "DIGLETT"
|
||||
dname "DUGTRIO"
|
||||
dname "MEOWTH"
|
||||
dname "PERSIAN"
|
||||
dname "PSYDUCK"
|
||||
dname "GOLDUCK"
|
||||
dname "MANKEY"
|
||||
dname "PRIMEAPE"
|
||||
dname "GROWLITHE"
|
||||
dname "ARCANINE"
|
||||
dname "POLIWAG"
|
||||
dname "POLIWHIRL"
|
||||
dname "POLIWRATH"
|
||||
dname "ABRA"
|
||||
dname "KADABRA"
|
||||
dname "ALAKAZAM"
|
||||
dname "MACHOP"
|
||||
dname "MACHOKE"
|
||||
dname "MACHAMP"
|
||||
dname "BELLSPROUT"
|
||||
dname "WEEPINBELL"
|
||||
dname "VICTREEBEL"
|
||||
dname "TENTACOOL"
|
||||
dname "TENTACRUEL"
|
||||
dname "GEODUDE"
|
||||
dname "GRAVELER"
|
||||
dname "GOLEM"
|
||||
dname "PONYTA"
|
||||
dname "RAPIDASH"
|
||||
dname "SLOWPOKE"
|
||||
dname "SLOWBRO"
|
||||
dname "MAGNEMITE"
|
||||
dname "MAGNETON"
|
||||
dname "FARFETCH'D"
|
||||
dname "DODUO"
|
||||
dname "DODRIO"
|
||||
dname "SEEL"
|
||||
dname "DEWGONG"
|
||||
dname "GRIMER"
|
||||
dname "MUK"
|
||||
dname "SHELLDER"
|
||||
dname "CLOYSTER"
|
||||
dname "GASTLY"
|
||||
dname "HAUNTER"
|
||||
dname "GENGAR"
|
||||
dname "ONIX"
|
||||
dname "DROWZEE"
|
||||
dname "HYPNO"
|
||||
dname "KRABBY"
|
||||
dname "KINGLER"
|
||||
dname "VOLTORB"
|
||||
dname "ELECTRODE"
|
||||
dname "EXEGGCUTE"
|
||||
dname "EXEGGUTOR"
|
||||
dname "CUBONE"
|
||||
dname "MAROWAK"
|
||||
dname "HITMONLEE"
|
||||
dname "HITMONCHAN"
|
||||
dname "LICKITUNG"
|
||||
dname "KOFFING"
|
||||
dname "WEEZING"
|
||||
dname "RHYHORN"
|
||||
dname "RHYDON"
|
||||
dname "CHANSEY"
|
||||
dname "TANGELA"
|
||||
dname "KANGASKHAN"
|
||||
dname "HORSEA"
|
||||
dname "SEADRA"
|
||||
dname "GOLDEEN"
|
||||
dname "SEAKING"
|
||||
dname "STARYU"
|
||||
dname "STARMIE"
|
||||
dname "MR.MIME"
|
||||
dname "SCYTHER"
|
||||
dname "JYNX"
|
||||
dname "ELECTABUZZ"
|
||||
dname "MAGMAR"
|
||||
dname "PINSIR"
|
||||
dname "TAUROS"
|
||||
dname "MAGIKARP"
|
||||
dname "GYARADOS"
|
||||
dname "LAPRAS"
|
||||
dname "DITTO"
|
||||
dname "EEVEE"
|
||||
dname "VAPOREON"
|
||||
dname "JOLTEON"
|
||||
dname "FLAREON"
|
||||
dname "PORYGON"
|
||||
dname "OMANYTE"
|
||||
dname "OMASTAR"
|
||||
dname "KABUTO"
|
||||
dname "KABUTOPS"
|
||||
dname "AERODACTYL"
|
||||
dname "SNORLAX"
|
||||
dname "ARTICUNO"
|
||||
dname "ZAPDOS"
|
||||
dname "MOLTRES"
|
||||
dname "DRATINI"
|
||||
dname "DRAGONAIR"
|
||||
dname "DRAGONITE"
|
||||
dname "MEWTWO"
|
||||
dname "MEW"
|
||||
dname "CHIKORITA"
|
||||
dname "BAYLEEF"
|
||||
dname "MEGANIUM"
|
||||
dname "CYNDAQUIL"
|
||||
dname "QUILAVA"
|
||||
dname "TYPHLOSION"
|
||||
dname "TOTODILE"
|
||||
dname "CROCONAW"
|
||||
dname "FERALIGATR"
|
||||
dname "SENTRET"
|
||||
dname "FURRET"
|
||||
dname "HOOTHOOT"
|
||||
dname "NOCTOWL"
|
||||
dname "LEDYBA"
|
||||
dname "LEDIAN"
|
||||
dname "SPINARAK"
|
||||
dname "ARIADOS"
|
||||
dname "CROBAT"
|
||||
dname "CHINCHOU"
|
||||
dname "LANTURN"
|
||||
dname "PICHU"
|
||||
dname "CLEFFA"
|
||||
dname "IGGLYBUFF"
|
||||
dname "TOGEPI"
|
||||
dname "TOGETIC"
|
||||
dname "NATU"
|
||||
dname "XATU"
|
||||
dname "MAREEP"
|
||||
dname "FLAAFFY"
|
||||
dname "AMPHAROS"
|
||||
dname "BELLOSSOM"
|
||||
dname "MARILL"
|
||||
dname "AZUMARILL"
|
||||
dname "SUDOWOODO"
|
||||
dname "POLITOED"
|
||||
dname "HOPPIP"
|
||||
dname "SKIPLOOM"
|
||||
dname "JUMPLUFF"
|
||||
dname "AIPOM"
|
||||
dname "SUNKERN"
|
||||
dname "SUNFLORA"
|
||||
dname "YANMA"
|
||||
dname "WOOPER"
|
||||
dname "QUAGSIRE"
|
||||
dname "ESPEON"
|
||||
dname "UMBREON"
|
||||
dname "MURKROW"
|
||||
dname "SLOWKING"
|
||||
dname "MISDREAVUS"
|
||||
dname "UNOWN"
|
||||
dname "WOBBUFFET"
|
||||
dname "GIRAFARIG"
|
||||
dname "PINECO"
|
||||
dname "FORRETRESS"
|
||||
dname "DUNSPARCE"
|
||||
dname "GLIGAR"
|
||||
dname "STEELIX"
|
||||
dname "SNUBBULL"
|
||||
dname "GRANBULL"
|
||||
dname "QWILFISH"
|
||||
dname "SCIZOR"
|
||||
dname "SHUCKLE"
|
||||
dname "HERACROSS"
|
||||
dname "SNEASEL"
|
||||
dname "TEDDIURSA"
|
||||
dname "URSARING"
|
||||
dname "SLUGMA"
|
||||
dname "MAGCARGO"
|
||||
dname "SWINUB"
|
||||
dname "PILOSWINE"
|
||||
dname "CORSOLA"
|
||||
dname "REMORAID"
|
||||
dname "OCTILLERY"
|
||||
dname "DELIBIRD"
|
||||
dname "MANTINE"
|
||||
dname "SKARMORY"
|
||||
dname "HOUNDOUR"
|
||||
dname "HOUNDOOM"
|
||||
dname "KINGDRA"
|
||||
dname "PHANPY"
|
||||
dname "DONPHAN"
|
||||
dname "PORYGON2"
|
||||
dname "STANTLER"
|
||||
dname "SMEARGLE"
|
||||
dname "TYROGUE"
|
||||
dname "HITMONTOP"
|
||||
dname "SMOOCHUM"
|
||||
dname "ELEKID"
|
||||
dname "MAGBY"
|
||||
dname "MILTANK"
|
||||
dname "BLISSEY"
|
||||
dname "RAIKOU"
|
||||
dname "ENTEI"
|
||||
dname "SUICUNE"
|
||||
dname "LARVITAR"
|
||||
dname "PUPITAR"
|
||||
dname "TYRANITAR"
|
||||
dname "LUGIA"
|
||||
dname "HO-OH"
|
||||
dname "CELEBI"
|
||||
assert_table_length NUM_POKEMON
|
||||
db "?????@@@@@"
|
||||
db "EGG@@@@@@@"
|
||||
dname "?????"
|
||||
dname "EGG"
|
||||
assert_table_length EGG
|
||||
db "?????@@@@@"
|
||||
db "?????@@@@@"
|
||||
db "?????@@@@@"
|
||||
dname "?????"
|
||||
dname "?????"
|
||||
dname "?????"
|
||||
assert_table_length $100
|
||||
|
||||
@@ -1307,7 +1307,7 @@ endr
|
||||
ret
|
||||
|
||||
String_MysteryJP:
|
||||
db "なぞナゾ@@" ; MYSTERY
|
||||
dname "なぞナゾ", NAME_LENGTH_JAPANESE ; "MYSTERY"
|
||||
|
||||
BattleTowerAction_0F:
|
||||
ldh a, [rWBK]
|
||||
|
||||
@@ -91,6 +91,6 @@ _GiveOddEgg:
|
||||
ret
|
||||
|
||||
.Odd:
|
||||
db "ODD@@@@@@@@@"
|
||||
dname "ODD", MON_NAME_LENGTH + 1
|
||||
|
||||
INCLUDE "data/events/odd_eggs.asm"
|
||||
|
||||
@@ -780,9 +780,9 @@ NamePlayer:
|
||||
ret
|
||||
|
||||
.Chris:
|
||||
db "CHRIS@@@@@@"
|
||||
dname "CHRIS", NAME_LENGTH
|
||||
.Kris:
|
||||
db "KRIS@@@@@@@"
|
||||
dname "KRIS", NAME_LENGTH
|
||||
|
||||
GSShowPlayerNamingChoices: ; unreferenced
|
||||
call LoadMenuHeader
|
||||
|
||||
@@ -1430,13 +1430,14 @@ DebugTrade: ; unreferenced
|
||||
|
||||
MACRO debugtrade
|
||||
; species, ot name, ot id
|
||||
db \1, \2
|
||||
db \1
|
||||
dname \2, NAME_LENGTH_JAPANESE
|
||||
dw \3
|
||||
ENDM
|
||||
|
||||
.DebugTradeData:
|
||||
debugtrade VENUSAUR, "ゲーフり@@", $0123 ; GAME FREAK
|
||||
debugtrade CHARIZARD, "クりーチャ@", $0456 ; Creatures Inc.
|
||||
debugtrade VENUSAUR, "ゲーフり", $0123 ; GAME FREAK
|
||||
debugtrade CHARIZARD, "クりーチャ", $0456 ; Creatures Inc.
|
||||
|
||||
TradeGameBoyTilemap: INCBIN "gfx/trade/game_boy.tilemap" ; 6x8
|
||||
TradeLinkTubeTilemap: INCBIN "gfx/trade/link_cable.tilemap" ; 12x3
|
||||
|
||||
@@ -203,7 +203,7 @@ CorrectPartyErrors: ; unreferenced
|
||||
ret
|
||||
|
||||
.TAMAGO:
|
||||
db "タマゴ@@@"
|
||||
dname "タマゴ", NAME_LENGTH_JAPANESE ; "EGG"
|
||||
|
||||
.GetLengthOfStringWith6CharCap:
|
||||
push de
|
||||
|
||||
@@ -108,6 +108,18 @@ MACRO dba_pics ; front, back
|
||||
endc
|
||||
ENDM
|
||||
|
||||
MACRO dname
|
||||
if _NARG == 2
|
||||
def n = \2
|
||||
else
|
||||
def n = NAME_LENGTH - 1
|
||||
endc
|
||||
assert STRFIND(\1, "@") == -1, "String terminator \"@\" in name: \1"
|
||||
assert CHARLEN(\1) <= n, "Name longer than {d:n} characters: \1"
|
||||
db \1
|
||||
ds n - CHARLEN(\1), "@"
|
||||
ENDM
|
||||
|
||||
MACRO bcd
|
||||
rept _NARG
|
||||
dn ((\1) % 100) / 10, (\1) % 10
|
||||
|
||||
@@ -1704,13 +1704,13 @@ DebugMobileTrade: ; unreferenced
|
||||
|
||||
.DebugTradeData:
|
||||
db VENUSAUR
|
||||
db "ゲーフり@@"
|
||||
dname "ゲーフり", NAME_LENGTH_JAPANESE ; "GEEFURI" (Game Freak)
|
||||
dw $0123
|
||||
db "かびーん@@"
|
||||
dname "かびーん", NAME_LENGTH_JAPANESE ; "KABIIN"
|
||||
db CHARIZARD
|
||||
db "クりーチャ@"
|
||||
dname "クりーチャ", NAME_LENGTH_JAPANESE ; "CREATURE"
|
||||
dw $0456
|
||||
db "マツミヤ@@"
|
||||
dname "マツミヤ", NAME_LENGTH_JAPANESE ; "MATSUMIYA"
|
||||
|
||||
LoadMobileAdapterPalette:
|
||||
ld a, [wc74e]
|
||||
|
||||
@@ -330,7 +330,7 @@ Mobile_CopyDefaultOTName:
|
||||
ret
|
||||
|
||||
Mobile5F_PlayersName:
|
||||
db "クりス@@"
|
||||
dname "クりス", NAME_LENGTH_JAPANESE - 1
|
||||
|
||||
Mobile_CopyDefaultNickname:
|
||||
ld hl, .DefaultNickname
|
||||
@@ -340,7 +340,7 @@ Mobile_CopyDefaultNickname:
|
||||
ret
|
||||
|
||||
.DefaultNickname:
|
||||
db "？？？？？"
|
||||
dname "？？？？？", NAME_LENGTH_JAPANESE - 1
|
||||
|
||||
Mobile_CopyDefaultMail:
|
||||
ld a, "@"
|
||||
|
||||
Reference in New Issue
Block a user