From 6f72bfece1352fc7f4aefc9bb98ef42d8bf182c3 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sun, 22 Oct 2017 01:52:57 -0400 Subject: [PATCH] condense japanese pokemon sort --- misc/fixed_words.asm | 131 +++++++++++++++---------------------------- 1 file changed, 44 insertions(+), 87 deletions(-) diff --git a/misc/fixed_words.asm b/misc/fixed_words.asm index b471ff013..8d1f73c28 100755 --- a/misc/fixed_words.asm +++ b/misc/fixed_words.asm @@ -3341,93 +3341,50 @@ SortedPokemon: dw .wa dw .end -.a: db EKANS, ARBOK, SEAKING, ARIADOS, CROCONAW, UNOWN - db -1 -.i: db EEVEE, GEODUDE, SPINARAK, PILOSWINE, ONIX - db -1 -.u: db ARCANINE, SUDOWOODO, WEEPINBELL, VICTREEBEL, WOOPER, SWINUB - db -1 -.e: db SKARMORY, AIPOM, ESPEON, HITMONCHAN, ELEKID, ELECTABUZZ, ENTEI - db -1 -.o: db FERALIGATR, FURRET, OCTILLERY, PRIMEAPE, SENTRET, STANTLER, SPEAROW, FEAROW, OMASTAR, OMANYTE - db -1 -.ka_ga db GROWLITHE, MACHAMP, DRAGONITE, PINSIR, SNORLAX, KABUTO, KABUTOPS, HITMONTOP, WARTORTLE, BLASTOISE, FARFETCH_D, CUBONE, MAROWAK, KANGASKHAN - db -1 -.ki_gi db SUNFLORA, CATERPIE, GYARADOS, RAPIDASH, NINETALES, GIRAFARIG, BELLOSSOM, KINGDRA, KINGLER - db -1 -.ku_gu db GLOOM, PINECO, GLIGAR, KRABBY, GRANBULL, CROBAT - db -1 -.ke_ge db ABRA, GENGAR, TAUROS - db -1 -.ko_go db MAGIKARP, MAGNEMITE, GASTLY, HAUNTER, MACHOKE, KAKUNA, PSYDUCK, PHANPY, RATTATA, GOLDUCK, GOLBAT, GOLEM, GRAVELER, VENONAT - db -1 -.sa_za db RHYHORN, PUPITAR, CORSOLA, HITMONLEE, ZAPDOS, JOLTEON, SANDSHREW, SANDSLASH ; RHYDON should lead this list - db -1 -.shi_ji db SEADRA, SHELLDER, VAPOREON, DEWGONG - db -1 -.su_zu db SUICUNE, STARMIE, SCYTHER, ZUBAT, BEEDRILL, HYPNO, DROWZEE - db -1 -.se_ze db SQUIRTLE, CELEBI - db -1 -.so_zo db WOBBUFFET - db -1 -.ta_da db DUGTRIO, HORSEA, EXEGGCUTE - db -1 -.chi_dhi db CHIKORITA, CHINCHOU - db -1 -.tsu_du db SHUCKLE - db -1 -.te_de db DIGLETT, REMORAID, DELIBIRD, HOUNDOUR, AMPHAROS - db -1 -.to_do db DODUO, DODRIO, SMEARGLE, KOFFING, TENTACRUEL, TOGETIC, TOGEPI, GOLDEEN, METAPOD, DONPHAN - db -1 -.na db ODDISH, EXEGGUTOR - db -1 -.ni db NIDOKING, NIDOQUEEN, NIDORAN_M, NIDORAN_F, NIDORINA, NIDORINO, MEOWTH, SNEASEL, POLIWHIRL, POLITOED, POLIWRATH, POLIWAG - db -1 -.nu db QUAGSIRE - db -1 -.ne db NATU, XATU - db -1 -.no db DUNSPARCE - db -1 -.ha_ba_pa db SEEL, STEELIX, TYPHLOSION, DRAGONAIR, BUTTERFREE, SCIZOR, HOPPIP, BLISSEY, PARAS, PARASECT, QWILFISH, MR__MIME, TYROGUE, CLOYSTER, TYRANITAR - db -1 -.hi_bi_pi db CLEFFA, WEEDLE, PIKACHU, CLEFABLE, PIDGEOT, PIDGEOTTO, PICHU, CLEFAIRY, CHARMANDER, STARYU, CYNDAQUIL, SUNKERN, TEDDIURSA, VOLTORB - db -1 -.fu_bu_pu db MOLTRES, FLAREON, ALAKAZAM, MAGMAR, FORRETRESS, WIGGLYTUFF, IVYSAUR, BULBASAUR, VENUSAUR, AERODACTYL, MAGBY, IGGLYBUFF, UMBREON, ARTICUNO, JIGGLYPUFF, SNUBBULL - db -1 -.he_be_pe db BAYLEEF, GRIMER, MUK, HERACROSS, HOUNDOOM, PERSIAN, LICKITUNG - db -1 -.ho_bo_po db HO_OH, HOOTHOOT, PIDGEY, PONYTA, SKIPLOOM, PORYGON, PORYGON2 - db -1 -.ma db MAGCARGO, SLUGMA, QUILAVA, BELLSPROUT, WEEZING, MARILL, AZUMARILL, ELECTRODE, MANKEY, MANTINE - db -1 -.mi db DRATINI, MEW, MEWTWO, MILTANK - db -1 -.mu db MISDREAVUS, SMOOCHUM - db -1 -.me db MEGANIUM, DITTO, TENTACOOL, MAREEP - db -1 -.mo db FLAAFFY, VENOMOTH, TANGELA - db -1 -.ya db SLOWKING, SLOWBRO, SLOWPOKE, MURKROW, YANMA - db -1 -.yu db KADABRA - db -1 -.yo db LARVITAR, NOCTOWL - db -1 -.ra db RAIKOU, RAICHU, CHANSEY, RATICATE, LAPRAS, VILEPLUME, LANTURN - db -1 -.ri db CHARMELEON, CHARIZARD, URSARING - db -1 -.ru db JYNX, LUGIA - db -1 -.re db MAGNETON, LEDIAN, LEDYBA - db -1 -.ro db VULPIX - db -1 -.wa db JUMPLUFF, TOTODILE, MACHOP +.a: db EKANS, ARBOK, SEAKING, ARIADOS, CROCONAW, UNOWN, -1 +.i: db EEVEE, GEODUDE, SPINARAK, PILOSWINE, ONIX, -1 +.u: db ARCANINE, SUDOWOODO, WEEPINBELL, VICTREEBEL, WOOPER, SWINUB, -1 +.e: db SKARMORY, AIPOM, ESPEON, HITMONCHAN, ELEKID, ELECTABUZZ, ENTEI, -1 +.o: db FERALIGATR, FURRET, OCTILLERY, PRIMEAPE, SENTRET, STANTLER, SPEAROW, FEAROW, OMASTAR, OMANYTE, -1 +.ka_ga db GROWLITHE, MACHAMP, DRAGONITE, PINSIR, SNORLAX, KABUTO, KABUTOPS, HITMONTOP, WARTORTLE, BLASTOISE, FARFETCH_D, CUBONE, MAROWAK, KANGASKHAN, -1 +.ki_gi db SUNFLORA, CATERPIE, GYARADOS, RAPIDASH, NINETALES, GIRAFARIG, BELLOSSOM, KINGDRA, KINGLER, -1 +.ku_gu db GLOOM, PINECO, GLIGAR, KRABBY, GRANBULL, CROBAT, -1 +.ke_ge db ABRA, GENGAR, TAUROS, -1 +.ko_go db MAGIKARP, MAGNEMITE, GASTLY, HAUNTER, MACHOKE, KAKUNA, PSYDUCK, PHANPY, RATTATA, GOLDUCK, GOLBAT, GOLEM, GRAVELER, VENONAT, -1 +.sa_za db RHYHORN, PUPITAR, CORSOLA, HITMONLEE, ZAPDOS, JOLTEON, SANDSHREW, SANDSLASH, -1 ; RHYDON should lead this list +.shi_ji db SEADRA, SHELLDER, VAPOREON, DEWGONG, -1 +.su_zu db SUICUNE, STARMIE, SCYTHER, ZUBAT, BEEDRILL, HYPNO, DROWZEE, -1 +.se_ze db SQUIRTLE, CELEBI, -1 +.so_zo db WOBBUFFET, -1 +.ta_da db DUGTRIO, HORSEA, EXEGGCUTE, -1 +.chi_dhi db CHIKORITA, CHINCHOU, -1 +.tsu_du db SHUCKLE, -1 +.te_de db DIGLETT, REMORAID, DELIBIRD, HOUNDOUR, AMPHAROS, -1 +.to_do db DODUO, DODRIO, SMEARGLE, KOFFING, TENTACRUEL, TOGETIC, TOGEPI, GOLDEEN, METAPOD, DONPHAN, -1 +.na db ODDISH, EXEGGUTOR, -1 +.ni db NIDOKING, NIDOQUEEN, NIDORAN_M, NIDORAN_F, NIDORINA, NIDORINO, MEOWTH, SNEASEL, POLIWHIRL, POLITOED, POLIWRATH, POLIWAG, -1 +.nu db QUAGSIRE, -1 +.ne db NATU, XATU, -1 +.no db DUNSPARCE, -1 +.ha_ba_pa db SEEL, STEELIX, TYPHLOSION, DRAGONAIR, BUTTERFREE, SCIZOR, HOPPIP, BLISSEY, PARAS, PARASECT, QWILFISH, MR__MIME, TYROGUE, CLOYSTER, TYRANITAR, -1 +.hi_bi_pi db CLEFFA, WEEDLE, PIKACHU, CLEFABLE, PIDGEOT, PIDGEOTTO, PICHU, CLEFAIRY, CHARMANDER, STARYU, CYNDAQUIL, SUNKERN, TEDDIURSA, VOLTORB, -1 +.fu_bu_pu db MOLTRES, FLAREON, ALAKAZAM, MAGMAR, FORRETRESS, WIGGLYTUFF, IVYSAUR, BULBASAUR, VENUSAUR, AERODACTYL, MAGBY, IGGLYBUFF, UMBREON, ARTICUNO, JIGGLYPUFF, SNUBBULL, -1 +.he_be_pe db BAYLEEF, GRIMER, MUK, HERACROSS, HOUNDOOM, PERSIAN, LICKITUNG, -1 +.ho_bo_po db HO_OH, HOOTHOOT, PIDGEY, PONYTA, SKIPLOOM, PORYGON, PORYGON2, -1 +.ma db MAGCARGO, SLUGMA, QUILAVA, BELLSPROUT, WEEZING, MARILL, AZUMARILL, ELECTRODE, MANKEY, MANTINE, -1 +.mi db DRATINI, MEW, MEWTWO, MILTANK, -1 +.mu db MISDREAVUS, SMOOCHUM, -1 +.me db MEGANIUM, DITTO, TENTACOOL, MAREEP, -1 +.mo db FLAAFFY, VENOMOTH, TANGELA, -1 +.ya db SLOWKING, SLOWBRO, SLOWPOKE, MURKROW, YANMA, -1 +.yu db KADABRA, -1 +.yo db LARVITAR, NOCTOWL, -1 +.ra db RAIKOU, RAICHU, CHANSEY, RATICATE, LAPRAS, VILEPLUME, LANTURN, -1 +.ri db CHARMELEON, CHARIZARD, URSARING, -1 +.ru db JYNX, LUGIA, -1 +.re db MAGNETON, LEDIAN, LEDYBA, -1 +.ro db VULPIX, -1 +.wa db JUMPLUFF, TOTODILE, MACHOP;, -1 .end db -1 ; 11d67e