From b0d2409c831855da38833a912efa8117a84d8140 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 2 Jan 2018 23:21:07 -0500 Subject: [PATCH] =?UTF-8?q?Move=20EZChat=20Pok=C3=A9mon=20order=20to=20dat?= =?UTF-8?q?a/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- constants/pokemon_constants.asm | 1 + data/pokemon/ezchat_order.asm | 96 ++++++++++++++++++++++++++++++ mobile/fixed_words.asm | 102 ++------------------------------ 3 files changed, 101 insertions(+), 98 deletions(-) create mode 100644 data/pokemon/ezchat_order.asm diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index d52086b08..54be7c1e5 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -10,6 +10,7 @@ ; - PokemonPalettes (see data/pokemon/palettes.asm) ; - PokedexDataPointerTable (see data/pokemon/dex_entry_pointers.asm) ; - AlphabeticalPokedexOrder (see data/pokemon/dex_order_alpha.asm) +; - EZChat_SortedPokemon (see data/pokemon/ezchat_order.asm) ; - NewPokedexOrder (see data/pokemon/dex_order_new.asm) ; - Pokered_MonIndices (see data/time_capsule/mon_order.asm) ; - AnimationPointers (see gfx/pokemon/anim_pointers.asm) diff --git a/data/pokemon/ezchat_order.asm b/data/pokemon/ezchat_order.asm new file mode 100644 index 000000000..8cb860028 --- /dev/null +++ b/data/pokemon/ezchat_order.asm @@ -0,0 +1,96 @@ +; Every Pokémon sorted by their Japanese names in gojūon order. +; Notably, Rhydon is missing (it should be before Rhyhorn). + +EZChat_SortedPokemon: + dw .a + dw .i + dw .u + dw .e + dw .o + dw .ka_ga + dw .ki_gi + dw .ku_gu + dw .ke_ge + dw .ko_go + dw .sa_za + dw .shi_ji + dw .su_zu + dw .se_ze + dw .so_zo + dw .ta_da + dw .chi_dhi + dw .tsu_du + dw .te_de + dw .to_do + dw .na + dw .ni + dw .nu + dw .ne + dw .no + dw .ha_ba_pa + dw .hi_bi_pi + dw .fu_bu_pu + dw .he_be_pe + dw .ho_bo_po + dw .ma + dw .mi + dw .mu + dw .me + dw .mo + dw .ya + dw .yu + dw .yo + dw .ra + dw .ri + dw .ru + dw .re + dw .ro + dw .wa + dw .end + +.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 diff --git a/mobile/fixed_words.asm b/mobile/fixed_words.asm index a071beaa2..71e8abe96 100755 --- a/mobile/fixed_words.asm +++ b/mobile/fixed_words.asm @@ -3022,9 +3022,9 @@ EZChat_GetSeenPokemonByKana: ; 11d3ba ld [wcd2e], a ld [hl], a - ld a, LOW(SortedPokemon) + ld a, LOW(EZChat_SortedPokemon) ld [wcd2f], a - ld a, HIGH(SortedPokemon) + ld a, HIGH(EZChat_SortedPokemon) ld [wcd30], a ld a, LOW($c6a8) @@ -3093,7 +3093,7 @@ EZChat_GetSeenPokemonByKana: ; 11d3ba or b jr nz, .loop1 -; recover the pointer from wcd2f (default: SortedPokemon) +; recover the pointer from wcd2f (default: EZChat_SortedPokemon) ld a, [wcd2f] ld l, a ld a, [wcd30] @@ -3292,101 +3292,7 @@ EZChat_GetCategoryWordsByKana: ; 11d4aa ret ; 11d4fe -SortedPokemon: -; Pokemon sorted by kana. -; Notably, Rhydon is missing. - dw .a - dw .i - dw .u - dw .e - dw .o - dw .ka_ga - dw .ki_gi - dw .ku_gu - dw .ke_ge - dw .ko_go - dw .sa_za - dw .shi_ji - dw .su_zu - dw .se_ze - dw .so_zo - dw .ta_da - dw .chi_dhi - dw .tsu_du - dw .te_de - dw .to_do - dw .na - dw .ni - dw .nu - dw .ne - dw .no - dw .ha_ba_pa - dw .hi_bi_pi - dw .fu_bu_pu - dw .he_be_pe - dw .ho_bo_po - dw .ma - dw .mi - dw .mu - dw .me - dw .mo - dw .ya - dw .yu - dw .yo - dw .ra - dw .ri - dw .ru - dw .re - dw .ro - dw .wa - dw .end - -.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 +INCLUDE "data/pokemon/ezchat_order.asm" GFX_11d67e: INCBIN "gfx/pokedex/select_start.2bpp"