From c9b01f2c64af1dac4c235623fb73874590e3d9b3 Mon Sep 17 00:00:00 2001 From: MementoMartha Date: Wed, 29 Mar 2023 11:35:41 +0100 Subject: [PATCH] A few minor changes Reworks the Pokedex to accommodate for the regional forms, changes a title screen graphic, and cleans up a few base stat files (will do the rest later). Also revised a few dex entries (special thanks to my girlfriend for Gyopin's!) --- constants/pokedex_constants.asm | 455 +++++++++++++------------ constants/pokemon_constants.asm | 48 +-- data/pokemon/base_stats.asm | 55 ++- data/pokemon/base_stats/arcanineh.asm | 9 +- data/pokemon/base_stats/melmetal.asm | 14 +- data/pokemon/base_stats/meltan.asm | 7 +- data/pokemon/base_stats/screamtail.asm | 2 +- data/pokemon/base_stats/taurosp.asm | 10 +- data/pokemon/base_stats/taurospa.asm | 17 +- data/pokemon/base_stats/taurospb.asm | 8 +- data/pokemon/menu_icons.asm | 55 ++- data/pokemon/new_dex_text.asm | 82 ++--- data/pokemon/palettes.asm | 55 ++- gfx/title/kep_version.png | Bin 441 -> 456 bytes 14 files changed, 439 insertions(+), 378 deletions(-) diff --git a/constants/pokedex_constants.asm b/constants/pokedex_constants.asm index 9c81205e..4521e7ef 100644 --- a/constants/pokedex_constants.asm +++ b/constants/pokedex_constants.asm @@ -14,228 +14,247 @@ const DEX_SQUIRTLE ; 7 (007) const DEX_WARTORTLE ; 8 (008) const DEX_TOTARTLE ; (009) - const DEX_RATTATA ; 19 (010) - const DEX_RATICATE ; 20 (011) - const DEX_PIDGEY ; 16 (012) - const DEX_PIDGEOTTO ; 17 (013) - const DEX_PIDGEOT ; 18 (014) - const DEX_CATERPIE ; 10 (015) - const DEX_METAPOD ; 11 (016) - const DEX_BUTTERFREE ; 12 (017) - const DEX_WEEDLE ; 13 (018) - const DEX_KAKUNA ; 14 (019) - const DEX_BEEDRILL ; 15 (020) - const DEX_KONYA ; (021) - const DEX_MEOWTH ; 52 (022) - const DEX_PERSIAN ; 53 (023) - const DEX_PERRSERKER ; (024) - const DEX_PIKACHU ; 25 (025) - const DEX_RAICHU ; 26 (026) - const DEX_GOROCHU ; (027) - const DEX_SPEAROW ; 21 (028) - const DEX_FEAROW ; 22 (029) - const DEX_EKANS ; 23 (030) - const DEX_ARBOK ; 24 (031) - const DEX_SANDSHREW ; 27 (032) - const DEX_SANDSLASH ; 28 (033) - const DEX_NIDORAN_F ; 29 (034) - const DEX_NIDORINA ; 30 (035) - const DEX_NIDOQUEEN ; 31 (036) - const DEX_NIDORAN_M ; 32 (037) - const DEX_NIDORINO ; 33 (038) - const DEX_NIDOKING ; 34 (039) - const DEX_NIDOREIGN ; (040) - const DEX_BITTYBAT ; (041) - const DEX_ZUBAT ; 41 (042) - const DEX_GOLBAT ; 42 (043) - const DEX_CROBAT ; (044) - const DEX_GEODUDE ; 74 (045) - const DEX_GRAVELER ; 75 (046) - const DEX_GOLEM ; 76 (047) - const DEX_PARA ; (048) - const DEX_PARAS ; 46 (049) - const DEX_PARASECT ; 47 (050) - const DEX_CLEFAIRY ; 35 (051) - const DEX_CLEFABLE ; 36 (052) - const DEX_JIGGLYPUFF ; 39 (053) - const DEX_WIGGLYTUFF ; 40 (054) - const DEX_MIKON ; (055) - const DEX_VULPIX ; 37 (056) - const DEX_NINETALES ; 38 (057) - const DEX_PUDI ; (058) - const DEX_GROWLITHE ; 58 (059) - const DEX_ARCANINE ; 59 (060) - const DEX_MANKEY ; 56 (061) - const DEX_PRIMEAPE ; 57 (062) - const DEX_ANNIHILAPE ; (063) - const DEX_ODDISH ; 43 (064) - const DEX_GLOOM ; 44 (065) - const DEX_VILEPLUME ; 45 (066) - const DEX_BELLOSSOM ; (067) - const DEX_BELLSPROUT ; 69 (068) - const DEX_WEEPINBELL ; 70 (069) - const DEX_VICTREEBEL ; 71 (070) - const DEX_TSUBOMITTO ; (071) - const DEX_MAGIKARP ; 129 (072) - const DEX_GYARADOS ; 130 (073) - const DEX_GYOPIN ; (074) - const DEX_GOLDEEN ; 118 (075) - const DEX_SEAKING ; 119 (076) - const DEX_VENONAT ; 48 (077) - const DEX_VENOMOTH ; 49 (078) - const DEX_CHEEP ; (079) - const DEX_JABETTA ; (080) - const DEX_PSYDUCK ; 54 (081) - const DEX_WEIRDUCK ; (082) - const DEX_GOLDUCK ; 55 (083) - const DEX_ABRA ; 63 (084) - const DEX_KADABRA ; 64 (085) - const DEX_ALAKAZAM ; 65 (086) - const DEX_POLIWAG ; 60 (087) - const DEX_POLIWHIRL ; 61 (088) - const DEX_POLIWRATH ; 62 (089) - const DEX_POLITOED ; (090) - const DEX_DIGLETT ; 50 (091) - const DEX_DUGTRIO ; 51 (092) - const DEX_WIGLETT ; (093) - const DEX_WUGTRIO ; (094) - const DEX_DROWZEE ; 96 (095) - const DEX_HYPNO ; 97 (096) - const DEX_KOTORA ; (097) - const DEX_GAOTORA ; (098) - const DEX_GOROTORA ; (099) - const DEX_VOLTORB ; 100 (100) - const DEX_ELECTRODE ; 101 (101) - const DEX_TENTACOOL ; 72 (102) - const DEX_TENTACRUEL ; 73 (103) - const DEX_TOEDSCOOL ; (104) - const DEX_TOEDSCRUEL ; (105) + const DEX_PIKACHU ; 25 (010) + const DEX_RAICHU ; 26 (011) + ; const DEX_RAICHU_A ; (012) + const DEX_GOROCHU ; (013) + const DEX_EEVEE ; 133 (014) + const DEX_VAPOREON ; 134 (015) + const DEX_JOLTEON ; 135 (016) + const DEX_FLAREON ; 136 (017) + const DEX_ESPEON ; (018) + const DEX_UMBREON ; (019) + const DEX_LEAFEON ; (020) + const DEX_GLACEON ; (021) + const DEX_SYLVEON ; (022) + const DEX_RATTATA ; 19 (023) + const DEX_RATICATE ; 20 (024) + ; const DEX_RATICATE_A ; (025) + const DEX_PIDGEY ; 16 (026) + const DEX_PIDGEOTTO ; 17 (027) + const DEX_PIDGEOT ; 18 (028) + const DEX_CATERPIE ; 10 (029) + const DEX_METAPOD ; 11 (030) + const DEX_BUTTERFREE ; 12 (031) + const DEX_WEEDLE ; 13 (032) + const DEX_KAKUNA ; 14 (033) + const DEX_BEEDRILL ; 15 (034) + const DEX_KONYA ; (035) + const DEX_MEOWTH ; 52 (036) + const DEX_PERSIAN ; 53 (037) + const DEX_PERRSERKER ; (038) + const DEX_SPEAROW ; 21 (039) + const DEX_FEAROW ; 22 (040) + const DEX_EKANS ; 23 (041) + const DEX_ARBOK ; 24 (042) + const DEX_SANDSHREW ; 27 (043) + const DEX_SANDSLASH ; 28 (044) + ; const DEX_SANDSLASH_A ; (045) + const DEX_NIDORAN_F ; 29 (046) + const DEX_NIDORINA ; 30 (047) + const DEX_NIDOQUEEN ; 31 (048) + const DEX_NIDORAN_M ; 32 (049) + const DEX_NIDORINO ; 33 (050) + const DEX_NIDOKING ; 34 (051) + const DEX_NIDOREIGN ; (052) + const DEX_BITTYBAT ; (053) + const DEX_ZUBAT ; 41 (054) + const DEX_GOLBAT ; 42 (055) + const DEX_CROBAT ; (056) + const DEX_GEODUDE ; 74 (057) + const DEX_GRAVELER ; 75 (058) + const DEX_GOLEM ; 76 (059) + ; const DEX_GOLEM_A ; (060) + const DEX_PARA ; (061) + const DEX_PARAS ; 46 (062) + const DEX_PARASECT ; 47 (063) + const DEX_CLEFAIRY ; 35 (064) + const DEX_CLEFABLE ; 36 (065) + const DEX_JIGGLYPUFF ; 39 (066) + const DEX_WIGGLYTUFF ; 40 (067) + const DEX_MIKON ; (068) + const DEX_VULPIX ; 37 (069) + const DEX_NINETALES ; 38 (070) + ; const DEX_NINETALES_A ; (071) + const DEX_PUDI ; (072) + const DEX_GROWLITHE ; 58 (073) + const DEX_ARCANINE ; 59 (074) + ; const DEX_ARCANINE_A ; (075) + const DEX_MANKEY ; 56 (076) + const DEX_PRIMEAPE ; 57 (077) + const DEX_ANNIHILAPE ; (078) + const DEX_ODDISH ; 43 (079) + const DEX_GLOOM ; 44 (080) + const DEX_VILEPLUME ; 45 (081) + const DEX_BELLOSSOM ; (082) + const DEX_BELLSPROUT ; 69 (083) + const DEX_WEEPINBELL ; 70 (084) + const DEX_VICTREEBEL ; 71 (085) + const DEX_TSUBOMITTO ; (086) + const DEX_MAGIKARP ; 129 (087) + const DEX_GYARADOS ; 130 (088) + const DEX_GYOPIN ; (089) + const DEX_GOLDEEN ; 118 (090) + const DEX_SEAKING ; 119 (091) + const DEX_VENONAT ; 48 (092) + const DEX_VENOMOTH ; 49 (093) + const DEX_CHEEP ; (094) + const DEX_JABETTA ; (095) + const DEX_PSYDUCK ; 54 (096) + const DEX_WEIRDUCK ; (097) + const DEX_GOLDUCK ; 55 (098) + const DEX_ABRA ; 63 (099) + const DEX_KADABRA ; 64 (100) + const DEX_ALAKAZAM ; 65 (101) + const DEX_POLIWAG ; 60 (102) + const DEX_POLIWHIRL ; 61 (103) + const DEX_POLIWRATH ; 62 (104) + const DEX_POLITOED ; (105) const DEX_RIBBITO ; (106) const DEX_CROAKOZUNA ; (107) - const DEX_LICKITUNG ; 108 (108) + const DEX_LICKITUNG ; 108 (108) ; There's a reason we're keeping Lickitung's number. const DEX_LICKILICKY ; (109) const DEX_ONIX ; 95 (110) const DEX_STEELIX ; (111) - const DEX_MAGNEMITE ; 81 (112) - const DEX_MAGNETITE ; (113) - const DEX_MAGNETON ; 82 (114) - const DEX_MAGNEZONE ; (115) - const DEX_MACHOP ; 66 (116) - const DEX_MACHOKE ; 67 (117) - const DEX_MACHAMP ; 68 (118) - const DEX_CROCKY ; (119) - const DEX_FARFETCHD ; 83 (120) - const DEX_MADAAMU ; (121) - const DEX_SIRFETCHD ; (122) - const DEX_KRABBY ; 98 (123) - const DEX_KINGLER ; 99 (124) - const DEX_SLOWPOKE ; 79 (125) - const DEX_SLOWBRO ; 80 (126) - const DEX_SLOWKING ; (127) - const DEX_PUCHIKOON ; (128) - const DEX_PONYTA ; 77 (129) - const DEX_RAPIDASH ; 78 (130) - const DEX_MONJA ; (131) - const DEX_TANGELA ; 114 (132) - const DEX_TANGROWTH ; (133) - const DEX_HINAAZU ; (134) - const DEX_DODUO ; 84 (135) - const DEX_DODRIO ; 85 (136) - const DEX_BARUNDA ; (137) - const DEX_GASTLY ; 92 (138) - const DEX_HAUNTER ; 93 (139) - const DEX_GENGAR ; 94 (140) - const DEX_CUBONE ; 104 (141) - const DEX_MAROWAK ; 105 (142) - const DEX_GUARDIA ; (143) - const DEX_BETOBEBII ; (144) - const DEX_GRIMER ; 88 (145) - const DEX_MUK ; 89 (146) - const DEX_KOFFING ; 109 (147) - const DEX_WEEZING ; 110 (148) - const DEX_BLASTYKE ; (149) - const DEX_BLASTOISE ; 9 (150) - const DEX_DITTO ; 132 (151) - const DEX_ANIMON ; (152) - const DEX_DEER ; (153) - const DEX_HITMONLEE ; 106 (154) - const DEX_HITMONCHAN ; 107 (155) - const DEX_HITMONTOP ; (156) - const DEX_CACTUS ; (157) - const DEX_SHELLDER ; 90 (158) - const DEX_CLOYSTER ; 91 (159) - const DEX_BLOTTLE ; (160) - const DEX_PENDRAKEN ; (161) - const DEX_STARYU ; 120 (162) - const DEX_STARMIE ; 121 (163) - const DEX_SEEL ; 86 (164) - const DEX_DEWGONG ; 87 (165) - const DEX_HORSEA ; 116 (166) - const DEX_SEADRA ; 117 (167) - const DEX_KINGDRA ; (168) - const DEX_JAGG ; (169) - const DEX_EXEGGCUTE ; 102 (170) - const DEX_EXEGGUTOR ; 103 (171) - const DEX_RHYHORN ; 111 (172) - const DEX_RHYDON ; 112 (173) - const DEX_RHYPERIOR ; (174) - const DEX_SCYTHER ; 123 (175) - const DEX_SCIZOR ; (176) - const DEX_KLEAVOR ; (177) - const DEX_PINSIR ; 127 (178) - const DEX_PURAKKUSU ; (179) - const DEX_KANGASKHAN ; 115 (180) - const DEX_TRAMPEL ; (181) - const DEX_TAUROS ; 128 (182) - const DEX_CHANSEY ; 113 (183) - const DEX_BLISSEY ; (184) - const DEX_SKIMPER ; (185) - const DEX_BAWLIGUA ; (186) - const DEX_CRYITHAN ; (187) - const DEX_MR_MIME ; 122 (188) - const DEX_MR_RIME ; (189) - const DEX_JYNX ; 124 (190) - const DEX_BUU ; (191) - const DEX_ELECTABUZZ ; 125 (192) - const DEX_ELECTIVIRE ; (193) - const DEX_MAGMAR ; 126 (194) - const DEX_MAGMORTAR ; (195) - const DEX_LAPRAS ; 131 (196) - const DEX_EEVEE ; 133 (197) - const DEX_VAPOREON ; 134 (198) - const DEX_JOLTEON ; 135 (199) - const DEX_FLAREON ; 136 (200) - const DEX_ESPEON ; (201) - const DEX_UMBREON ; (202) - const DEX_LEAFEON ; (203) - const DEX_GLACEON ; (204) - const DEX_SYLVEON ; (205) - const DEX_PORYGON ; 137 (206) - const DEX_PORYGON2 ; (207) - const DEX_PORYGONZ ; (208) - const DEX_OMANYTE ; 138 (209) - const DEX_OMASTAR ; 139 (210) - const DEX_KABUTO ; 140 (211) - const DEX_KABUTOPS ; 141 (212) - const DEX_AERODACTYL ; 142 (213) - const DEX_DECILLA ; (214) - const DEX_GYAOON ; (215) - const DEX_OMEGA ; (216) - const DEX_SNORLAX ; 143 (217) - const DEX_SCREAM_TAIL ; (218) - const DEX_SANDY_SHOCKS ; (219) - const DEX_DRATINI ; 147 (220) - const DEX_DRAGONAIR ; 148 (221) - const DEX_DRAGONITE ; 149 (222) - const DEX_ARTICUNO ; 144 (223) - const DEX_ARTICUNO_G ; (224) - const DEX_ZAPDOS ; 145 (225) - const DEX_ZAPDOS_G ; (226) - const DEX_MOLTRES ; 146 (227) - const DEX_MOLTRES_G ; (228) - const DEX_MEWTWO ; 150 (229) - const DEX_MEW ; 151 (230) - ; const DEX_MELTAN ; (231) - ; const DEX_MELMETAL ; (232) + const DEX_DIGLETT ; 50 (112) + const DEX_DUGTRIO ; 51 (113) + ; const DEX_DUGTRIO_A ; (114) + const DEX_WIGLETT ; (115) + const DEX_WUGTRIO ; (116) + const DEX_DROWZEE ; 96 (117) + const DEX_HYPNO ; 97 (118) + const DEX_KOTORA ; (119) + const DEX_GAOTORA ; (120) + const DEX_GOROTORA ; (121) + const DEX_VOLTORB ; 100 (122) + const DEX_ELECTRODE ; 101 (123) + ; const DEX_ELECTRODE_H ; (124) + const DEX_TENTACOOL ; 72 (125) + const DEX_TENTACRUEL ; 73 (126) + const DEX_TOEDSCOOL ; (127) + const DEX_TOEDSCRUEL ; (128) + const DEX_MAGNEMITE ; 81 (129) + const DEX_MAGNETITE ; (130) + const DEX_MAGNETON ; 82 (131) + const DEX_MAGNEZONE ; (132) + const DEX_MACHOP ; 66 (133) + const DEX_MACHOKE ; 67 (134) + const DEX_MACHAMP ; 68 (135) + const DEX_CROCKY ; (136) + const DEX_FARFETCHD ; 83 (137) + const DEX_MADAAMU ; (138) + const DEX_SIRFETCHD ; (139) + const DEX_KRABBY ; 98 (140) + const DEX_KINGLER ; 99 (141) + const DEX_SLOWPOKE ; 79 (142) + const DEX_SLOWBRO ; 80 (143) + ; const DEX_SLOWBRO_G ; (144) + const DEX_SLOWKING ; (145) + ; const DEX_SLOWKING_G ; (146) + const DEX_PUCHIKOON ; (147) + const DEX_PONYTA ; 77 (148) + const DEX_RAPIDASH ; 78 (149) + ; const DEX_RAPIDASH_G ; (150) + const DEX_MONJA ; (151) + const DEX_TANGELA ; 114 (152) + const DEX_TANGROWTH ; (153) + const DEX_HINAAZU ; (154) + const DEX_DODUO ; 84 (155) + const DEX_DODRIO ; 85 (156) + const DEX_BARUNDA ; (157) + const DEX_GASTLY ; 92 (158) + const DEX_HAUNTER ; 93 (159) + const DEX_GENGAR ; 94 (160) + const DEX_CUBONE ; 104 (161) + const DEX_MAROWAK ; 105 (162) + ; const DEX_MAROWAK_A ; (163) + const DEX_GUARDIA ; (164) + const DEX_BETOBEBII ; (165) + const DEX_GRIMER ; 88 (166) + const DEX_MUK ; 89 (167) + ; const DEX_MUK_A ; (168) + const DEX_KOFFING ; 109 (169) + const DEX_WEEZING ; 110 (170) + ; const DEX_WEEZING_G ; (171) + const DEX_BLASTYKE ; (172) + const DEX_BLASTOISE ; 9 (173) + const DEX_DITTO ; 132 (174) + const DEX_ANIMON ; (175) + const DEX_DEER ; (176) + const DEX_HITMONLEE ; 106 (177) + const DEX_HITMONCHAN ; 107 (178) + const DEX_HITMONTOP ; (179) + const DEX_CACTUS ; (180) + const DEX_SHELLDER ; 90 (181) + const DEX_CLOYSTER ; 91 (182) + const DEX_BLOTTLE ; (183) + const DEX_PENDRAKEN ; (184) + const DEX_STARYU ; 120 (185) + const DEX_STARMIE ; 121 (186) + const DEX_SEEL ; 86 (187) + const DEX_DEWGONG ; 87 (188) + const DEX_HORSEA ; 116 (189) + const DEX_SEADRA ; 117 (190) + const DEX_KINGDRA ; (191) + const DEX_JAGG ; (192) + const DEX_EXEGGCUTE ; 102 (193) + const DEX_EXEGGUTOR ; 103 (194) + ; const DEX_EXEGGUTOR_A ; (195) + const DEX_RHYHORN ; 111 (196) + const DEX_RHYDON ; 112 (197) + const DEX_RHYPERIOR ; (198) + const DEX_SCYTHER ; 123 (199) + const DEX_SCIZOR ; (200) + const DEX_KLEAVOR ; (201) + const DEX_PINSIR ; 127 (202) + const DEX_PURAKKUSU ; (203) + const DEX_KANGASKHAN ; 115 (204) + const DEX_TRAMPEL ; (205) + const DEX_TAUROS ; 128 (206) + ; const DEX_TAUROS_P ; (207) + ; const DEX_TAUROS_PA ; (208) + ; const DEX_TAUROS_PB ; (209) + const DEX_CHANSEY ; 113 (210) + const DEX_BLISSEY ; (211) + const DEX_SKIMPER ; (212) + const DEX_BAWLIGUA ; (213) + const DEX_CRYITHAN ; (214) + const DEX_MR_MIME ; 122 (215) + ; const DEX_MR_MIME_G ; (216) + const DEX_MR_RIME ; (217) + const DEX_JYNX ; 124 (218) + const DEX_BUU ; (219) + const DEX_ELECTABUZZ ; 125 (220) + const DEX_ELECTIVIRE ; (221) + const DEX_MAGMAR ; 126 (222) + const DEX_MAGMORTAR ; (223) + const DEX_LAPRAS ; 131 (224) + const DEX_PORYGON ; 137 (225) + const DEX_PORYGON2 ; (226) + const DEX_PORYGONZ ; (227) + const DEX_OMANYTE ; 138 (228) + const DEX_OMASTAR ; 139 (229) + const DEX_KABUTO ; 140 (230) + const DEX_KABUTOPS ; 141 (231) + const DEX_AERODACTYL ; 142 (232) + const DEX_DECILLA ; (233) + const DEX_GYAOON ; (234) + const DEX_OMEGA ; (235) + const DEX_SNORLAX ; 143 (236) + const DEX_SCREAM_TAIL ; (237) + const DEX_SANDY_SHOCKS ; (238) + const DEX_DRATINI ; 147 (239) + const DEX_DRAGONAIR ; 148 (240) + const DEX_DRAGONITE ; 149 (241) + const DEX_ARTICUNO ; 144 (242) + const DEX_ARTICUNO_G ; (243) + const DEX_ZAPDOS ; 145 (244) + const DEX_ZAPDOS_G ; (245) + const DEX_MOLTRES ; 146 (246) + const DEX_MOLTRES_G ; (247) + const DEX_MEWTWO ; 150 (248) + const DEX_MEW ; 151 (249) + ; const DEX_MELTAN ; (250) + ; const DEX_MELMETAL ; (251) DEF NUM_POKEMON EQU const_value diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 1ef1cc0f..0ca46255 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -15,10 +15,8 @@ const VOLTORB ; $06 const NIDOKING ; $07 const SLOWBRO ; $08 - ; const SLOWBRO-G const IVYSAUR ; $09 const EXEGGUTOR ; $0A - ; const EXEGGUTOR-A const LICKITUNG ; $0B const EXEGGCUTE ; $0C const GRIMER ; $0D @@ -29,7 +27,6 @@ const RHYHORN ; $12 const LAPRAS ; $13 const ARCANINE ; $14 - ; const ARCANINE-H const MEW ; $15 const GYARADOS ; $16 const SHELLDER ; $17 @@ -52,7 +49,6 @@ const CHANSEY ; $28 const MACHOKE ; $29 const MR_MIME ; $2A - ; const MR_MIME-G const HITMONLEE ; $2B const HITMONCHAN ; $2C const ARBOK ; $2D @@ -71,9 +67,6 @@ const SEEL ; $3A const DIGLETT ; $3B const TAUROS ; $3C - ; const TAUROS-P - ; const TAUROS-PB - ; const TAUROS-PA const TRAMPEL ; $3D (new) const CROCKY ; $3E (new) const BLOTTLE ; $3F (new) @@ -97,10 +90,8 @@ const MIKON ; $51 (new) const VULPIX ; $52 const NINETALES ; $53 - ; const NINETALES-A const PIKACHU ; $54 const RAICHU ; $55 - ; const RAICHU-A const RIBBITO ; $56 (new) const CROAKOZUNA ; $57 (new) const DRATINI ; $58 @@ -113,7 +104,6 @@ const CRYITHAN ; $5F (new) const SANDSHREW ; $60 const SANDSLASH ; $61 - ; const SANDSLASH-A const OMANYTE ; $62 const OMASTAR ; $63 const JIGGLYPUFF ; $64 @@ -135,7 +125,6 @@ const DODRIO ; $74 const PRIMEAPE ; $75 const DUGTRIO ; $76 - ; const DUGTRIO-A const VENOMOTH ; $77 const DEWGONG ; $78 const PURAKKUSU ; $79 (new) @@ -154,19 +143,15 @@ const KONYA ; $86 (new) const OMEGA ; $87 (new) const MUK ; $88 - ; const MUK-A const DECILLA ; $89 (new) const KINGLER ; $8A const CLOYSTER ; $8B const MAGNETITE ; $8C (new) const ELECTRODE ; $8D - ; const ELECTRODE-H const CLEFABLE ; $8E const WEEZING ; $8F const PERSIAN ; $90 - ; const PERSIAN-A const MAROWAK ; $91 - ; const MAROWAK-A const GUARDIA ; $92 (new) const HAUNTER ; $93 const ABRA ; $94 @@ -186,10 +171,8 @@ const PUCHIKOON ; $A2 (new) const PONYTA ; $A3 const RAPIDASH ; $A4 - ; const RAPIDASH-G const RATTATA ; $A5 const RATICATE ; $A6 - ; const RATICATE-A const NIDORINO ; $A7 const NIDORINA ; $A8 const GEODUDE ; $A9 @@ -254,12 +237,31 @@ const PERRSERKER ; $E4 const SIRFETCHD ; $E5 const MR_RIME ; $E6 - const ARTICUNO_G ; $E7 - const ZAPDOS_G ; $E8 - const MOLTRES_G ; $E9 - ; const MELTAN ; $EA - ; const MELMETAL ; $EB - const MISSINGNO ; $EC + ; const MELTAN ; $E7 + ; const MELMETAL ; $E8 + ; const ARCANINE_H ; $E9 + ; const ELECTRODE_H ; $EA + ; const RATICATE_A ; $EB + ; const SANDSLASH_A ; $EC + ; const NINETALES_A ; $ED + ; const DUGTRIO_A ; $EE + ; const PERSIAN_A ; $EF + ; const GOLEM_A ; $F0 + ; const RAPIDASH_G ; $F1 + ; const SLOWBRO_G ; $F2 + ; const SLOWKING_G ; $F3 + ; const MUK_A ; $F4 + ; const EXEGGUTOR_A ; $F5 + ; const MAROWAK_A ; $F6 + ; const WEEZING_G ; $F7 + ; const MR_MIME_G ; $F8 + ; const TAUROS_P ; $F9 + ; const TAUROS_PA ; $FA + ; const TAUROS_PB ; $FB + const ARTICUNO_G ; $FC + const ZAPDOS_G ; $FD + const MOLTRES_G ; $FE + const MISSINGNO ; $FF (need to make sure we can still put something here) DEF NUM_POKEMON_INDEXES EQU const_value - 1 diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 1fa8dd51..1388da1b 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -9,8 +9,22 @@ INCLUDE "data/pokemon/base_stats/charizard.asm" INCLUDE "data/pokemon/base_stats/squirtle.asm" INCLUDE "data/pokemon/base_stats/wartortle.asm" INCLUDE "data/pokemon/base_stats/totartle.asm" +INCLUDE "data/pokemon/base_stats/pikachu.asm" +INCLUDE "data/pokemon/base_stats/raichu.asm" +; INCLUDE "data/pokemon/base_stats/raichua.asm" +INCLUDE "data/pokemon/base_stats/gorochu.asm" +INCLUDE "data/pokemon/base_stats/eevee.asm" +INCLUDE "data/pokemon/base_stats/vaporeon.asm" +INCLUDE "data/pokemon/base_stats/jolteon.asm" +INCLUDE "data/pokemon/base_stats/flareon.asm" +INCLUDE "data/pokemon/base_stats/espeon.asm" +INCLUDE "data/pokemon/base_stats/umbreon.asm" +INCLUDE "data/pokemon/base_stats/leafeon.asm" +INCLUDE "data/pokemon/base_stats/glaceon.asm" +INCLUDE "data/pokemon/base_stats/sylveon.asm" INCLUDE "data/pokemon/base_stats/rattata.asm" INCLUDE "data/pokemon/base_stats/raticate.asm" +; INCLUDE "data/pokemon/base_stats/raticatea.asm" INCLUDE "data/pokemon/base_stats/pidgey.asm" INCLUDE "data/pokemon/base_stats/pidgeotto.asm" INCLUDE "data/pokemon/base_stats/pidgeot.asm" @@ -24,15 +38,13 @@ INCLUDE "data/pokemon/base_stats/konya.asm" INCLUDE "data/pokemon/base_stats/meowth.asm" INCLUDE "data/pokemon/base_stats/persian.asm" INCLUDE "data/pokemon/base_stats/perrserker.asm" -INCLUDE "data/pokemon/base_stats/pikachu.asm" -INCLUDE "data/pokemon/base_stats/raichu.asm" -INCLUDE "data/pokemon/base_stats/gorochu.asm" INCLUDE "data/pokemon/base_stats/spearow.asm" INCLUDE "data/pokemon/base_stats/fearow.asm" INCLUDE "data/pokemon/base_stats/ekans.asm" INCLUDE "data/pokemon/base_stats/arbok.asm" INCLUDE "data/pokemon/base_stats/sandshrew.asm" INCLUDE "data/pokemon/base_stats/sandslash.asm" +; INCLUDE "data/pokemon/base_stats/sandslasha.asm" INCLUDE "data/pokemon/base_stats/nidoranf.asm" INCLUDE "data/pokemon/base_stats/nidorina.asm" INCLUDE "data/pokemon/base_stats/nidoqueen.asm" @@ -47,6 +59,7 @@ INCLUDE "data/pokemon/base_stats/crobat.asm" INCLUDE "data/pokemon/base_stats/geodude.asm" INCLUDE "data/pokemon/base_stats/graveler.asm" INCLUDE "data/pokemon/base_stats/golem.asm" +; INCLUDE "data/pokemon/base_stats/golema.asm" INCLUDE "data/pokemon/base_stats/para.asm" INCLUDE "data/pokemon/base_stats/paras.asm" INCLUDE "data/pokemon/base_stats/parasect.asm" @@ -57,9 +70,11 @@ INCLUDE "data/pokemon/base_stats/wigglytuff.asm" INCLUDE "data/pokemon/base_stats/mikon.asm" INCLUDE "data/pokemon/base_stats/vulpix.asm" INCLUDE "data/pokemon/base_stats/ninetales.asm" +; INCLUDE "data/pokemon/base_stats/ninetalesa.asm" INCLUDE "data/pokemon/base_stats/pudi.asm" INCLUDE "data/pokemon/base_stats/growlithe.asm" INCLUDE "data/pokemon/base_stats/arcanine.asm" +; INCLUDE "data/pokemon/base_stats/arcanineh.asm" INCLUDE "data/pokemon/base_stats/mankey.asm" INCLUDE "data/pokemon/base_stats/primeape.asm" INCLUDE "data/pokemon/base_stats/annihilape.asm" @@ -90,8 +105,15 @@ INCLUDE "data/pokemon/base_stats/poliwag.asm" INCLUDE "data/pokemon/base_stats/poliwhirl.asm" INCLUDE "data/pokemon/base_stats/poliwrath.asm" INCLUDE "data/pokemon/base_stats/politoed.asm" +INCLUDE "data/pokemon/base_stats/ribbito.asm" +INCLUDE "data/pokemon/base_stats/croakozuna.asm" +INCLUDE "data/pokemon/base_stats/lickitung.asm" +INCLUDE "data/pokemon/base_stats/lickilicky.asm" +INCLUDE "data/pokemon/base_stats/onix.asm" +INCLUDE "data/pokemon/base_stats/steelix.asm" INCLUDE "data/pokemon/base_stats/diglett.asm" INCLUDE "data/pokemon/base_stats/dugtrio.asm" +; INCLUDE "data/pokemon/base_stats/dugtrioa.asm" INCLUDE "data/pokemon/base_stats/wiglett.asm" INCLUDE "data/pokemon/base_stats/wugtrio.asm" INCLUDE "data/pokemon/base_stats/drowzee.asm" @@ -101,16 +123,11 @@ INCLUDE "data/pokemon/base_stats/gaotora.asm" INCLUDE "data/pokemon/base_stats/gorotora.asm" INCLUDE "data/pokemon/base_stats/voltorb.asm" INCLUDE "data/pokemon/base_stats/electrode.asm" +; INCLUDE "data/pokemon/base_stats/electrodeh.asm" INCLUDE "data/pokemon/base_stats/tentacool.asm" INCLUDE "data/pokemon/base_stats/tentacruel.asm" INCLUDE "data/pokemon/base_stats/toedscool.asm" INCLUDE "data/pokemon/base_stats/toedscruel.asm" -INCLUDE "data/pokemon/base_stats/ribbito.asm" -INCLUDE "data/pokemon/base_stats/croakozuna.asm" -INCLUDE "data/pokemon/base_stats/lickitung.asm" -INCLUDE "data/pokemon/base_stats/lickilicky.asm" -INCLUDE "data/pokemon/base_stats/onix.asm" -INCLUDE "data/pokemon/base_stats/steelix.asm" INCLUDE "data/pokemon/base_stats/magnemite.asm" INCLUDE "data/pokemon/base_stats/magnetite.asm" INCLUDE "data/pokemon/base_stats/magneton.asm" @@ -126,10 +143,13 @@ INCLUDE "data/pokemon/base_stats/krabby.asm" INCLUDE "data/pokemon/base_stats/kingler.asm" INCLUDE "data/pokemon/base_stats/slowpoke.asm" INCLUDE "data/pokemon/base_stats/slowbro.asm" +; INCLUDE "data/pokemon/base_stats/slowbrog.asm" INCLUDE "data/pokemon/base_stats/slowking.asm" +; INCLUDE "data/pokemon/base_stats/slowkingg.asm" INCLUDE "data/pokemon/base_stats/puchikoon.asm" INCLUDE "data/pokemon/base_stats/ponyta.asm" INCLUDE "data/pokemon/base_stats/rapidash.asm" +; INCLUDE "data/pokemon/base_stats/rapidashg.asm" INCLUDE "data/pokemon/base_stats/monja.asm" INCLUDE "data/pokemon/base_stats/tangela.asm" INCLUDE "data/pokemon/base_stats/tangrowth.asm" @@ -142,12 +162,15 @@ INCLUDE "data/pokemon/base_stats/haunter.asm" INCLUDE "data/pokemon/base_stats/gengar.asm" INCLUDE "data/pokemon/base_stats/cubone.asm" INCLUDE "data/pokemon/base_stats/marowak.asm" +; INCLUDE "data/pokemon/base_stats/marowaka.asm" INCLUDE "data/pokemon/base_stats/guardia.asm" INCLUDE "data/pokemon/base_stats/betobebii.asm" INCLUDE "data/pokemon/base_stats/grimer.asm" INCLUDE "data/pokemon/base_stats/muk.asm" +; INCLUDE "data/pokemon/base_stats/muka.asm" INCLUDE "data/pokemon/base_stats/koffing.asm" INCLUDE "data/pokemon/base_stats/weezing.asm" +; INCLUDE "data/pokemon/base_stats/weezingg.asm" INCLUDE "data/pokemon/base_stats/blastyke.asm" INCLUDE "data/pokemon/base_stats/blastoise.asm" INCLUDE "data/pokemon/base_stats/ditto.asm" @@ -171,6 +194,7 @@ INCLUDE "data/pokemon/base_stats/kingdra.asm" INCLUDE "data/pokemon/base_stats/jagg.asm" INCLUDE "data/pokemon/base_stats/exeggcute.asm" INCLUDE "data/pokemon/base_stats/exeggutor.asm" +; INCLUDE "data/pokemon/base_stats/exeggutora.asm" INCLUDE "data/pokemon/base_stats/rhyhorn.asm" INCLUDE "data/pokemon/base_stats/rhydon.asm" INCLUDE "data/pokemon/base_stats/rhyperior.asm" @@ -182,12 +206,16 @@ INCLUDE "data/pokemon/base_stats/purakkusu.asm" INCLUDE "data/pokemon/base_stats/kangaskhan.asm" INCLUDE "data/pokemon/base_stats/trampel.asm" INCLUDE "data/pokemon/base_stats/tauros.asm" +; INCLUDE "data/pokemon/base_stats/taurosp.asm" +; INCLUDE "data/pokemon/base_stats/taurospa.asm" +; INCLUDE "data/pokemon/base_stats/taurospb.asm" INCLUDE "data/pokemon/base_stats/chansey.asm" INCLUDE "data/pokemon/base_stats/blissey.asm" INCLUDE "data/pokemon/base_stats/skimper.asm" INCLUDE "data/pokemon/base_stats/bawligua.asm" INCLUDE "data/pokemon/base_stats/cryithan.asm" INCLUDE "data/pokemon/base_stats/mrmime.asm" +; INCLUDE "data/pokemon/base_stats/mrmimeg.asm" INCLUDE "data/pokemon/base_stats/mrrime.asm" INCLUDE "data/pokemon/base_stats/jynx.asm" INCLUDE "data/pokemon/base_stats/buu.asm" @@ -196,15 +224,6 @@ INCLUDE "data/pokemon/base_stats/electivire.asm" INCLUDE "data/pokemon/base_stats/magmar.asm" INCLUDE "data/pokemon/base_stats/magmortar.asm" INCLUDE "data/pokemon/base_stats/lapras.asm" -INCLUDE "data/pokemon/base_stats/eevee.asm" -INCLUDE "data/pokemon/base_stats/vaporeon.asm" -INCLUDE "data/pokemon/base_stats/jolteon.asm" -INCLUDE "data/pokemon/base_stats/flareon.asm" -INCLUDE "data/pokemon/base_stats/espeon.asm" -INCLUDE "data/pokemon/base_stats/umbreon.asm" -INCLUDE "data/pokemon/base_stats/leafeon.asm" -INCLUDE "data/pokemon/base_stats/glaceon.asm" -INCLUDE "data/pokemon/base_stats/sylveon.asm" INCLUDE "data/pokemon/base_stats/porygon.asm" INCLUDE "data/pokemon/base_stats/porygon2.asm" INCLUDE "data/pokemon/base_stats/porygonz.asm" diff --git a/data/pokemon/base_stats/arcanineh.asm b/data/pokemon/base_stats/arcanineh.asm index 3096f0c7..29fe9733 100644 --- a/data/pokemon/base_stats/arcanineh.asm +++ b/data/pokemon/base_stats/arcanineh.asm @@ -1,6 +1,6 @@ db DEX_ARCANINE_H ; pokedex id - db 95, 115, 80, 90, 80 + db 95, 115, 80, 90, 80 ; hp atk def spd spc db FIRE, ROCK ; type @@ -14,9 +14,10 @@ db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, BODY_SLAM, DOUBLE_EDGE, RAGE, DRAGON_RAGE, \ - DIG, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \ - FIRE_BLAST, SWIFT, SKULL_BASH, REST, SUBSTITUTE + tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ + RAGE, DRAGON_RAGE, DIG, MIMIC, DOUBLE_TEAM, \ + REFLECT, BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, \ + REST, ROCK_SLIDE, SUBSTITUTE ; end db BANK(ArcanineHPicFront) diff --git a/data/pokemon/base_stats/melmetal.asm b/data/pokemon/base_stats/melmetal.asm index 9431baa0..f009148b 100644 --- a/data/pokemon/base_stats/melmetal.asm +++ b/data/pokemon/base_stats/melmetal.asm @@ -1,11 +1,11 @@ db DEX_MELMETAL ; pokedex id - db 135, 143, 143, 34, 65 + db 135, 143, 143, 34, 65 ; hp atk def spd spc db STEEL, STEEL ; type - db 75 ; catch rate - db 213 ; base exp + db 3 ; catch rate + db 243 ; base exp INCBIN "gfx/pokemon/front/melmetal.pic", 0, 1 ; sprite dimensions dw MelmetalPicFront, MelmetalPicBack @@ -14,10 +14,10 @@ db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, RAGE, MIMIC, DOUBLE_TEAM, BIDE, REST, SUBSTITUTE, THUNDER_WAVE, \ - MEGA_PUNCH, SUBMISSION, HYPER_BEAM, MEGA_KICK, BODY_SLAM, ICE_BEAM, \ - SOLAR_BEAM, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, ROCK_SLIDE, \ - SUBSTITUTE + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, ICE_BEAM, \ + HYPER_BEAM, SUBMISSION, RAGE, SOLARBEAM, THUNDERBOLT, \ + THUNDER, EARTHQUAKE, FISSURE, MIMIC, DOUBLE_TEAM, \ + BIDE, REST, THUNDER_WAVE, ROCK_SLIDE, SUBSTITUTE ; end db BANK(MelmetalPicFront) diff --git a/data/pokemon/base_stats/meltan.asm b/data/pokemon/base_stats/meltan.asm index f790a40b..c68d67db 100644 --- a/data/pokemon/base_stats/meltan.asm +++ b/data/pokemon/base_stats/meltan.asm @@ -4,8 +4,8 @@ ; hp atk def spd spc db STEEL, STEEL ; type - db 75 ; catch rate - db 213 ; base exp + db 3 ; catch rate + db 131 ; base exp INCBIN "gfx/pokemon/front/meltan.pic", 0, 1 ; sprite dimensions dw MeltanPicFront, MeltanPicBack @@ -14,7 +14,8 @@ db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm TOXIC, RAGE, MIMIC, DOUBLE_TEAM, BIDE, REST, SUBSTITUTE, THUNDER_WAVE + tmhm TOXIC, RAGE, MIMIC, DOUBLE_TEAM, BIDE, \ + REST, THUNDER_WAVE, SUBSTITUTE ; end db BANK(MeltanPicFront) diff --git a/data/pokemon/base_stats/screamtail.asm b/data/pokemon/base_stats/screamtail.asm index 24d4c9eb..6613f0a1 100644 --- a/data/pokemon/base_stats/screamtail.asm +++ b/data/pokemon/base_stats/screamtail.asm @@ -1,6 +1,6 @@ db DEX_SCREAM_TAIL ; pokedex id - db 115, 65, 99, 111, 65 + db 115, 65, 99, 111, 115 ; hp atk def spd spc db FAIRY, PSYCHIC_TYPE ; type diff --git a/data/pokemon/base_stats/taurosp.asm b/data/pokemon/base_stats/taurosp.asm index 20b74dd3..e67c2780 100644 --- a/data/pokemon/base_stats/taurosp.asm +++ b/data/pokemon/base_stats/taurosp.asm @@ -1,6 +1,6 @@ db DEX_TAUROS_P ; pokedex id - db 75, 110, 105, 100, 70 + db 75, 110, 105, 100, 70 ; hp atk def spd spc db FIGHTING, FIGHTING ; type @@ -15,10 +15,10 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, THUNDERBOLT, \ - THUNDER, EARTHQUAKE, FISSURE, MIMIC, DOUBLE_TEAM, \ - BIDE, FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, \ - STRENGTH, SUBMISSION, COUNTER + ICE_BEAM, BLIZZARD, HYPER_BEAM, SUBMISSION, COUNTER, \ + RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, \ + MIMIC, DOUBLE_TEAM, BIDE, FIRE_BLAST, SKULL_BASH, \ + REST, SUBSTITUTE, STRENGTH ; end db BANK(TaurosPPicFront) diff --git a/data/pokemon/base_stats/taurospa.asm b/data/pokemon/base_stats/taurospa.asm index 0a1c3b25..35f88e9b 100644 --- a/data/pokemon/base_stats/taurospa.asm +++ b/data/pokemon/base_stats/taurospa.asm @@ -7,19 +7,20 @@ db 45 ; catch rate db 211 ; base exp - INCBIN "gfx/pokemon/front/taurospw.pic", 0, 1 ; sprite dimensions - dw TaurosPWPicFront, TaurosPWPicBack + INCBIN "gfx/pokemon/front/taurospa.pic", 0, 1 ; sprite dimensions + dw TaurosPAPicFront, TaurosPAPicBack db DOUBLE_KICK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, THUNDERBOLT, \ - THUNDER, EARTHQUAKE, FISSURE, MIMIC, DOUBLE_TEAM, \ - BIDE, FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, \ - STRENGTH, SUBMISSION, COUNTER, BUBBLE_BEAM, WATER_GUN, SURF + BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ + SUBMISSION, COUNTER, RAGE, THUNDERBOLT, THUNDER, \ + EARTHQUAKE, FISSURE, MIMIC, DOUBLE_TEAM, BIDE, \ + FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, SURF, \ + STRENGTH ; end - db BANK(TaurosPWPicFront) - assert BANK(TaurosPWPicFront) == BANK(TaurosPWPicBack) + db BANK(TaurosPAPicFront) + assert BANK(TaurosPAPicFront) == BANK(TaurosPAPicBack) diff --git a/data/pokemon/base_stats/taurospb.asm b/data/pokemon/base_stats/taurospb.asm index beda5ea3..7d516b71 100644 --- a/data/pokemon/base_stats/taurospb.asm +++ b/data/pokemon/base_stats/taurospb.asm @@ -15,10 +15,10 @@ ; tm/hm learnset tmhm TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, THUNDERBOLT, \ - THUNDER, EARTHQUAKE, FISSURE, MIMIC, DOUBLE_TEAM, \ - BIDE, FIRE_BLAST, SKULL_BASH, REST, SUBSTITUTE, \ - STRENGTH, SUBMISSION, COUNTER + ICE_BEAM, BLIZZARD, HYPER_BEAM, SUBMISSION, COUNTER, \ + RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, \ + MIMIC, DOUBLE_TEAM, BIDE, FIRE_BLAST, SKULL_BASH, \ + REST, SUBSTITUTE, STRENGTH ; end db BANK(TaurosPBPicFront) diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 1de5b57f..2205d9ff 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -9,8 +9,22 @@ MonPartyData: nybble ICON_WATER ; Squirtle nybble ICON_WATER ; Wartortle nybble ICON_WATER ; Totartle + nybble ICON_FAIRY ; Pikachu + nybble ICON_FAIRY ; Raichu + ; nybble ICON_FAIRY ; Raichu-A + nybble ICON_FAIRY ; Gorochu + nybble ICON_QUADRUPED ; Eevee + nybble ICON_QUADRUPED ; Vaporeon + nybble ICON_QUADRUPED ; Jolteon + nybble ICON_QUADRUPED ; Flareon + nybble ICON_QUADRUPED ; Espeon + nybble ICON_QUADRUPED ; Umbreon + nybble ICON_QUADRUPED ; Leafeon + nybble ICON_QUADRUPED ; Glaceon + nybble ICON_QUADRUPED ; Sylveon nybble ICON_QUADRUPED ; Rattata nybble ICON_QUADRUPED ; Raticate + ; nybble ICON_QUADRUPED ; Raticate-A nybble ICON_BIRD ; Pidgey nybble ICON_BIRD ; Pidgeotto nybble ICON_BIRD ; Pidgeot @@ -24,15 +38,13 @@ MonPartyData: nybble ICON_MON ; Meowth nybble ICON_MON ; Persian nybble ICON_MON ; Perrserker - nybble ICON_FAIRY ; Pikachu - nybble ICON_FAIRY ; Raichu - nybble ICON_FAIRY ; Gorochu nybble ICON_BIRD ; Spearow nybble ICON_BIRD ; Fearow nybble ICON_SNAKE ; Ekans nybble ICON_SNAKE ; Arbok nybble ICON_MON ; Sandshrew nybble ICON_MON ; Sandslash + ; nybble ICON_MON ; Sandslash-A nybble ICON_MON ; NidoranF nybble ICON_MON ; Nidorina nybble ICON_MON ; Nidoqueen @@ -47,6 +59,7 @@ MonPartyData: nybble ICON_MON ; Geodude nybble ICON_MON ; Graveler nybble ICON_MON ; Golem + ; nybble ICON_MON ; Golem-A nybble ICON_BUG ; Para nybble ICON_BUG ; Paras nybble ICON_BUG ; Parasect @@ -57,9 +70,11 @@ MonPartyData: nybble ICON_QUADRUPED ; Mikon nybble ICON_QUADRUPED ; Vulpix nybble ICON_QUADRUPED ; Ninetales + ; nybble ICON_QUADRUPED ; Ninetales-A nybble ICON_QUADRUPED ; Pudi nybble ICON_QUADRUPED ; Growlithe nybble ICON_QUADRUPED ; Arcanine + ; nybble ICON_QUADRUPED ; Arcanine-A nybble ICON_MON ; Mankey nybble ICON_MON ; Primeape nybble ICON_MON ; Annihilape @@ -90,8 +105,15 @@ MonPartyData: nybble ICON_MON ; Poliwhirl nybble ICON_MON ; Poliwrath nybble ICON_MON ; Politoed + nybble ICON_MON ; Ribbito + nybble ICON_MON ; Croakozuna + nybble ICON_MON ; Lickitung + nybble ICON_MON ; Lickilicky + nybble ICON_SNAKE ; Onix + nybble ICON_SNAKE ; Steelix nybble ICON_MON ; Diglett nybble ICON_MON ; Dugtrio + ; nybble ICON_MON ; Dugtrio-A nybble ICON_WATER ; Wiglett nybble ICON_WATER ; Wugtrio nybble ICON_MON ; Drowzee @@ -101,16 +123,11 @@ MonPartyData: nybble ICON_QUADRUPED ; Gorotora nybble ICON_BALL ; Voltorb nybble ICON_BALL ; Electrode + ; nybble ICON_BALL ; Electrode-A nybble ICON_WATER ; Tentacool nybble ICON_WATER ; Tentacruel nybble ICON_GRASS ; Toedscool nybble ICON_GRASS ; Toedscruel - nybble ICON_MON ; Ribbito - nybble ICON_MON ; Croakozuna - nybble ICON_MON ; Lickitung - nybble ICON_MON ; Lickilicky - nybble ICON_SNAKE ; Onix - nybble ICON_SNAKE ; Steelix nybble ICON_BALL ; Magnemite nybble ICON_BALL ; Magnetite nybble ICON_BALL ; Magneton @@ -126,10 +143,13 @@ MonPartyData: nybble ICON_WATER ; Kingler nybble ICON_QUADRUPED ; Slowpoke nybble ICON_MON ; Slowbro + ; nybble ICON_MON ; Slowbro-G nybble ICON_MON ; Slowking + ; nybble ICON_MON ; Slowking-G nybble ICON_QUADRUPED ; Puchikoon nybble ICON_QUADRUPED ; Ponyta nybble ICON_QUADRUPED ; Rapidash + ; nybble ICON_QUADRUPED ; Rapidash-G nybble ICON_GRASS ; Monja nybble ICON_GRASS ; Tangela nybble ICON_GRASS ; Tangrowth @@ -142,12 +162,15 @@ MonPartyData: nybble ICON_MON ; Gengar nybble ICON_MON ; Cubone nybble ICON_MON ; Marowak + ; nybble ICON_MON ; Marowak-A nybble ICON_MON ; Guardia nybble ICON_MON ; Betobebii nybble ICON_MON ; Grimer nybble ICON_MON ; Muk + ; nybble ICON_MON ; Muk-A nybble ICON_MON ; Koffing nybble ICON_MON ; Weezing + ; nybble ICON_MON ; Weezing-G nybble ICON_WATER ; Blastyke nybble ICON_WATER ; Blastoise nybble ICON_MON ; Ditto @@ -171,6 +194,7 @@ MonPartyData: nybble ICON_WATER ; Jagg nybble ICON_GRASS ; Exeggcute nybble ICON_GRASS ; Exeggutor + ; nybble ICON_GRASS ; Exeggutor-A nybble ICON_QUADRUPED ; Rhyhorn nybble ICON_MON ; Rhydon nybble ICON_MON ; Rhyperior @@ -182,12 +206,16 @@ MonPartyData: nybble ICON_MON ; Kangaskhan nybble ICON_MON ; Trampel nybble ICON_QUADRUPED ; Tauros + ; nybble ICON_QUADRUPED ; Tauros-P + ; nybble ICON_QUADRUPED ; Tauros-PA + ; nybble ICON_QUADRUPED ; Tauros-PB nybble ICON_FAIRY ; Chansey nybble ICON_FAIRY ; Blissey nybble ICON_MON ; Skimper nybble ICON_MON ; Bawligua nybble ICON_MON ; Cryithan nybble ICON_MON ; Mr.Mime + ; nybble ICON_MON ; Mr.Mime-G nybble ICON_MON ; Mr.Rime nybble ICON_MON ; Jynx nybble ICON_MON ; Buu @@ -196,15 +224,6 @@ MonPartyData: nybble ICON_MON ; Magmar nybble ICON_MON ; Magmortar nybble ICON_WATER ; Lapras - nybble ICON_QUADRUPED ; Eevee - nybble ICON_QUADRUPED ; Vaporeon - nybble ICON_QUADRUPED ; Jolteon - nybble ICON_QUADRUPED ; Flareon - nybble ICON_QUADRUPED ; Espeon - nybble ICON_QUADRUPED ; Umbreon - nybble ICON_QUADRUPED ; Leafeon - nybble ICON_QUADRUPED ; Glaceon - nybble ICON_QUADRUPED ; Sylveon nybble ICON_BALL ; Porygon nybble ICON_BALL ; Porygon2 nybble ICON_BALL ; Porygon-Z diff --git a/data/pokemon/new_dex_text.asm b/data/pokemon/new_dex_text.asm index ffaae905..f7104594 100644 --- a/data/pokemon/new_dex_text.asm +++ b/data/pokemon/new_dex_text.asm @@ -198,14 +198,14 @@ _PuchikoonDexEntry:: next "is very hot" dex -_GyopinDexEntry:: ; may rework, I just reused PokeThon's version - text "It was once scarce" - next "and rarely seen," - next "but thanks to a" +_GyopinDexEntry:: ; reworked, thank you Ness :3 ~M + text "Its tiny fins make" + next "it an unskilled" + next "swimmer. It fends" - page "dedicated breeder," - next "it has since" - next "flourished" + page "off bigger #MON" + next "by attacking" + next "with its horn" dex _GorochuDexEntry:: @@ -739,12 +739,12 @@ _MeltanDexEntry:: dex _MelmetalDexEntry:: - text "A #MON revered" - next "as a deity over" + text "A myth from over" next "3,000 years ago" + next "depicted it as a" - page "for its ability" - next "to create pure" + page "giant with the" + next "ability to create" next "iron from nothing" dex @@ -808,26 +808,6 @@ _MoltresGDexEntry:: next "wanders too close" dex -;_MeltanDexEntry:: -; text "It feeds on metal." -; next "The strongest one" -; next "in a group will" - -; page "absorb the rest" -; next "to evolve into" -; next "a MELMETAL" -; dex - -;_MelmetalDexEntry:: -; text "This #MON came" -; next "back to life" -; next "after 3,000" - -; page "years. Myths" -; next "describe it" -; next "becoming a giant" -; dex ; consider revising - include longevity and it becoming a cyclopian giant - ;_ArcanineHDexEntry:: ; text "Its body has a" ; next "rock-like feel." @@ -869,12 +849,12 @@ _MoltresGDexEntry:: ; dex ;_NinetalesADexEntry:: -; text "It was once said" -; next "to be a deity." -; next "Disliking human" ; may not quite be accurate - interpretation of ultra sun entry. consider revising. +; text "Once thought to" +; next "be a deity, it" +; next "appears to lost" -; page "presence, it" -; next "guides them away" +; page "mountain climbers" +; next "to guide them away" ; next "from its home" ; dex @@ -935,7 +915,7 @@ _MoltresGDexEntry:: ; page "Mumbling eerie" ; next "spells, it makes" -; next "strange POTIONS" +; next "strange POTIONs" ; dex ;_MukADexEntry:: @@ -949,13 +929,13 @@ _MoltresGDexEntry:: ; dex ;_ExeggutorADexEntry:: -; text "While strong" -; next "sunlight has" -; next "allowed EXEGGUTOR" +; text "Strong sunlight" +; next "awoke its hidden" +; next "draconic powers." -; page "to attain its true" -; next "form, its PSI" -; next "power has faded" +; page "However, as a" +; next "result, its PSI" +; next "has weakened" ; dex ; consider revising ;_MarowakADexEntry:: @@ -979,13 +959,13 @@ _MoltresGDexEntry:: ; dex ;_MrMimeGDexEntry:: -; text "Instead of using" -; next "PSI energy to" -; next "make invisible," +; text "Although it no" +; next "longer creates" +; next "invisible walls," -; page "walls, this MR." -; next "MIME makes them" -; next "using ice." +; page "This MR.MIME can" +; next "use PSI to make" +; next "barriers of ice" ; dex ;_TaurosPDexEntry:: @@ -995,7 +975,7 @@ _MoltresGDexEntry:: ; page "its thick muscles" ; next "to overwhelm its" -; next "opponents." +; next "opponents" ; dex ;_TaurosPBDexEntry:: @@ -1015,7 +995,7 @@ _MoltresGDexEntry:: ; page "shoot water at" ; next "high pressure from" -; next "its horns." +; next "its horns" ; dex _MissingNoDexEntry:: diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 06af4fa6..cd8c9d84 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -10,8 +10,22 @@ MonsterPalettes: db PAL_CYANMON ; SQUIRTLE db PAL_CYANMON ; WARTORTLE db PAL_CYANMON ; TOTARTLE + db PAL_YELLOWMON ; PIKACHU + db PAL_YELLOWMON ; RAICHU + ; db PAL_YELLOWMON ; RAICHU_A + db PAL_YELLOWMON ; GOROCHU + db PAL_BROWNMON ; EEVEE + db PAL_CYANMON ; VAPOREON + db PAL_YELLOWMON ; JOLTEON + db PAL_REDMON ; FLAREON + db PAL_YELLOWMON ; ESPEON + db PAL_PURPLEMON ; UMBREON + db PAL_GREENMON ; LEAFEON + db PAL_CYANMON ; GLACEON + db PAL_MEWMON ; SYLVEON db PAL_PURPLEMON ; RATTATA db PAL_BROWNMON ; RATICATE + ; db PAL_GREYMON ; RATICATE_A db PAL_BROWNMON ; PIDGEY db PAL_BROWNMON ; PIDGEOTTO db PAL_BROWNMON ; PIDGEOT @@ -25,15 +39,13 @@ MonsterPalettes: db PAL_YELLOWMON ; MEOWTH db PAL_YELLOWMON ; PERSIAN db PAL_GREYMON ; PERRSEKRER - db PAL_YELLOWMON ; PIKACHU - db PAL_YELLOWMON ; RAICHU - db PAL_YELLOWMON ; GOROCHU db PAL_BROWNMON ; SPEAROW db PAL_BROWNMON ; FEAROW db PAL_PURPLEMON ; EKANS db PAL_PURPLEMON ; ARBOK db PAL_BROWNMON ; SANDSHREW db PAL_BROWNMON ; SANDSLASH + ; db PAL_CYANMON ; SANDSLASH_A db PAL_BLUEMON ; NIDORAN_F db PAL_BLUEMON ; NIDORINA db PAL_BLUEMON ; NIDOQUEEN @@ -48,6 +60,7 @@ MonsterPalettes: db PAL_GREYMON ; GEODUDE db PAL_GREYMON ; GRAVELER db PAL_GREYMON ; GOLEM + ; db PAL_GREYMON ; GOLEM_A db PAL_REDMON ; PARA db PAL_REDMON ; PARAS db PAL_REDMON ; PARASECT @@ -58,9 +71,11 @@ MonsterPalettes: db PAL_REDMON ; MIKON db PAL_REDMON ; VULPIX db PAL_YELLOWMON ; NINETALES + ; db PAL_CYANMON ; NINETALES_A db PAL_REDMON ; PUDI db PAL_REDMON ; GROWLITHE db PAL_REDMON ; ARCANINE + ; db PAL_REDMON ; ARCANINE_A db PAL_BROWNMON ; MANKEY db PAL_BROWNMON ; PRIMEAPE db PAL_GREYMON ; ANNIHILAPE @@ -91,8 +106,15 @@ MonsterPalettes: db PAL_BLUEMON ; POLIWHIRL db PAL_BLUEMON ; POLIWRATH db PAL_GREENMON ; POLITOED + db PAL_GREENMON ; RIBBITO + db PAL_GREENMON ; CROAKOZUNA + db PAL_PINKMON ; LICKITUNG + db PAL_PINKMON ; LICKILICKY + db PAL_GREYMON ; ONIX + db PAL_GREYMON ; STEELIX db PAL_BROWNMON ; DIGLETT db PAL_BROWNMON ; DUGTRIO + ; db PAL_BROWNMON ; DUGTRIO_A db PAL_PINKMON ; WIGLETT db PAL_PINKMON ; WUGTRIO db PAL_YELLOWMON ; DROWZEE @@ -102,16 +124,11 @@ MonsterPalettes: db PAL_YELLOWMON ; GOROTORA db PAL_REDMON ; VOLTORB db PAL_REDMON ; ELECTRODE + ; db PAL_REDMON ; ELECTRODE_H db PAL_CYANMON ; TENTACOOL db PAL_CYANMON ; TENTACRUEL db PAL_BROWNMON ; TOEDSCOOL db PAL_YELLOWMON ; TOEDSCRUEL - Yellow doesn't really look right... - db PAL_GREENMON ; RIBBITO - db PAL_GREENMON ; CROAKOZUNA - db PAL_PINKMON ; LICKITUNG - db PAL_PINKMON ; LICKILICKY - db PAL_GREYMON ; ONIX - db PAL_GREYMON ; STEELIX db PAL_GREYMON ; MAGNEMITE db PAL_GREYMON ; MAGNETITE db PAL_GREYMON ; MAGNETON @@ -127,10 +144,13 @@ MonsterPalettes: db PAL_REDMON ; KINGLER db PAL_PINKMON ; SLOWPOKE db PAL_PINKMON ; SLOWBRO + ; db PAL_PURPLEMON ; SLOWBRO_G db PAL_PINKMON ; SLOWKING + ; db PAL_PURPLEMON ; SLOWKING_G db PAL_REDMON ; PUCHIKOON db PAL_REDMON ; PONYTA db PAL_REDMON ; RAPIDASH + ; db PAL_PURPLEMON ; RAPIDASH_G db PAL_BLUEMON ; MONJA db PAL_BLUEMON ; TANGELA db PAL_CYANMON ; TANGROWTH @@ -143,12 +163,15 @@ MonsterPalettes: db PAL_PURPLEMON ; GENGAR db PAL_BROWNMON ; CUBONE db PAL_BROWNMON ; MAROWAK + ; db PAL_PURPLEMON ; MAROWAK_A db PAL_BROWNMON ; GUARDIA db PAL_PURPLEMON ; BETOBEBII db PAL_PURPLEMON ; GRIMER db PAL_PURPLEMON ; MUK + ; db PAL_GREENMON ; MUK_A db PAL_PURPLEMON ; KOFFING db PAL_PURPLEMON ; WEEZING + ; db PAL_GREYMON ; WEEZING_G db PAL_CYANMON ; BLASTYKE db PAL_CYANMON ; BLASTOISE db PAL_PURPLEMON ; DITTO @@ -172,6 +195,7 @@ MonsterPalettes: db PAL_BLUEMON ; JAGG db PAL_PINKMON ; EXEGGCUTE db PAL_GREENMON ; EXEGGUTOR + ; db PAL_GREENMON ; EXEGGUTOR_A db PAL_GREYMON ; RHYHORN db PAL_GREYMON ; RHYDON db PAL_BROWNMON ; RHYPERIOR @@ -183,12 +207,16 @@ MonsterPalettes: db PAL_BROWNMON ; KANGASKHAN db PAL_GREYMON ; TRAMPEL db PAL_BROWNMON ; TAUROS + ; db PAL_GREYMON ; TAUROS_P + ; db PAL_BLUEMON ; TAUROS_PA + ; db PAL_REDMON ; TAUROS_PB db PAL_PINKMON ; CHANSEY db PAL_PINKMON ; BLISSEY db PAL_CYANMON ; SKIMPER db PAL_CYANMON ; BAWLIGUA db PAL_CYANMON ; CRYITHAN db PAL_PINKMON ; MR_MIME + ; db PAL_CYANMON ; MR_MIME_G db PAL_CYANMON ; MR_RIME db PAL_REDBAR ; JYNX db PAL_BLUEMON ; BUU @@ -197,15 +225,6 @@ MonsterPalettes: db PAL_REDMON ; MAGMAR db PAL_REDMON ; MAGMORTAR db PAL_CYANMON ; LAPRAS - db PAL_BROWNMON ; EEVEE - db PAL_CYANMON ; VAPOREON - db PAL_YELLOWMON ; JOLTEON - db PAL_REDMON ; FLAREON - db PAL_YELLOWMON ; ESPEON - db PAL_PURPLEMON ; UMBREON - db PAL_GREENMON ; LEAFEON - db PAL_CYANMON ; GLACEON - db PAL_MEWMON ; SYLVEON db PAL_MEWMON ; PORYGON db PAL_MEWMON ; PORYGON2 db PAL_MEWMON ; PORYGONZ diff --git a/gfx/title/kep_version.png b/gfx/title/kep_version.png index cf51a58a9f025dc76838f6306a7da11998ed808b..059a39191caab78e295c978dace9b35c698ae52f 100644 GIT binary patch delta 175 zcmdnVe1dsGC)aakNq$z#7Oorm6DO-k8S5Gt>l&Gc7@Arcm|B^dX&V?=85oqlTeNlJ zMR6RmESse`Co?f-#(H?VIEHXsPyWHr%F{FL%+~+X``@RoxF4JSyZ-*`yF6d7XD2uI zyyZFberEB1^Lw#;A}jU(?*IQFXThvrr+)ta{+9LCs`ac!-xwJT6E!!j(A5-Y00K`} KKbLh*2~7YU>O~R& delta 160 zcmX@XypwrCC)YDhNp^h;;hFn%Cr(z8GSW4$)HN~F}E@`)iyA&GB8MYF_4>h zQ5=V?m}JMI$xMuyewLmtjv*Y^lYj8D^33R&Ec5l)|NmG2r(5J?=Ia#v*l2UOu&-+I u13UlP1t