diff --git a/bytereplacement b/bytereplacement index d363318..de2ebeb 100644 --- a/bytereplacement +++ b/bytereplacement @@ -21,6 +21,7 @@ 080970A6 C0 46 C0 46 C0 46 C0 46 C0 46 0809713E C0 46 C0 46 C0 46 C0 46 C0 46 080971DA C0 46 +08097206 C0 46 #Deoxys Stat & Icon Fixes 08044696 C0 46 diff --git a/graphics/backspr/gBackShinySprite305Swellow.png b/graphics/backspr/gBackShinySprite305Swellow.png index e411722..5711061 100644 Binary files a/graphics/backspr/gBackShinySprite305Swellow.png and b/graphics/backspr/gBackShinySprite305Swellow.png differ diff --git a/graphics/backspr/gBackShinySprite897MedichamMega.png b/graphics/backspr/gBackShinySprite897MedichamMega.png index 8430499..472d331 100644 Binary files a/graphics/backspr/gBackShinySprite897MedichamMega.png and b/graphics/backspr/gBackShinySprite897MedichamMega.png differ diff --git a/graphics/backspr/gBackShinySprite914LucarioMega.png b/graphics/backspr/gBackShinySprite914LucarioMega.png index a5030c1..b537dda 100644 Binary files a/graphics/backspr/gBackShinySprite914LucarioMega.png and b/graphics/backspr/gBackShinySprite914LucarioMega.png differ diff --git a/graphics/frontspr/gFrontSprite305Swellow.png b/graphics/frontspr/gFrontSprite305Swellow.png index 5f3b0ce..934e7da 100644 Binary files a/graphics/frontspr/gFrontSprite305Swellow.png and b/graphics/frontspr/gFrontSprite305Swellow.png differ diff --git a/graphics/frontspr/gFrontSprite897MedichamMega.png b/graphics/frontspr/gFrontSprite897MedichamMega.png index c7c1ff7..10add5b 100644 Binary files a/graphics/frontspr/gFrontSprite897MedichamMega.png and b/graphics/frontspr/gFrontSprite897MedichamMega.png differ diff --git a/graphics/frontspr/gFrontSprite914LucarioMega.png b/graphics/frontspr/gFrontSprite914LucarioMega.png index bfca71f..8703635 100644 Binary files a/graphics/frontspr/gFrontSprite914LucarioMega.png and b/graphics/frontspr/gFrontSprite914LucarioMega.png differ diff --git a/include/evolution.h b/include/evolution.h index 24608c2..bbf536f 100644 --- a/include/evolution.h +++ b/include/evolution.h @@ -47,7 +47,8 @@ enum EvolutionMethods EVO_CRITICAL_HIT, // successfully land 3 critical hits in one battle EVO_NATURE_HIGH, // evolution based on high key nature at a certain level EVO_NATURE_LOW, // evolution based on low key nature at a certain level - EVO_DAMAGE_LOCATION // recieve 49+ damage in battle without fainting, walk to specific tile + EVO_DAMAGE_LOCATION, // recieve 49+ damage in battle without fainting, walk to specific tile + EVO_ITEM_LOCATION, // Stand on a tile with a certain behaviour and use an item on a Pokemon }; #define EVO_GIGANTAMAX 0xFD @@ -61,6 +62,8 @@ enum MegaEvoVariants MEGA_VARIANT_ULTRA_BURST, //Necrozma }; +#define MB_SHALLOW_WATER 0x17 //For Alolan Raichu + #define MAPSEC_FROST_MOUNTAIN 0x82 #define MAPSEC_ROUTE_8 0x6C #define MAPSEC_BLIZZARD_CITY 0x5C diff --git a/scripts/string.py b/scripts/string.py index 15ef6b6..8bf724f 100644 --- a/scripts/string.py +++ b/scripts/string.py @@ -73,7 +73,7 @@ SpecialBuffers = { def StringFileConverter(fileName: str): stringToWrite = ".thumb\n.text\n.align 2\n\n" - with open(fileName, 'r', encoding="ISO-8859-1") as file: + with open(fileName, 'r', encoding="utf-8") as file: maxLength = 0 fillFF = False readingState = 0 @@ -203,7 +203,7 @@ def ProcessString(string: str, lineNum: int, maxLength=0, fillWithFF=False) -> s def PokeByteTableMaker(): dictionary = {} - with open(CharMap, 'r', encoding="ISO-8859-1") as file: + with open(CharMap, 'r', encoding="utf-8") as file: for line in file: if line.strip() != "/FF" and line.strip() != "": if line[2] == '=' and line[3] != "": diff --git a/scripts/tm_tutor.py b/scripts/tm_tutor.py index 311e679..b400234 100644 --- a/scripts/tm_tutor.py +++ b/scripts/tm_tutor.py @@ -5,7 +5,7 @@ from glob import glob # Data TM_HM_COUNT = 128 TUTOR_COUNT = 146 -SPECIES_COUNT = 0x4EC + 1 +SPECIES_COUNT = 0x4F3 + 1 TM_OUTPUT = "assembly/generated/tm_compatibility.s" TUTOR_OUTPUT = "assembly/generated/tutor_compatibility.s" diff --git a/special_inserts.asm b/special_inserts.asm index 3da3fa2..48aa06c 100644 --- a/special_inserts.asm +++ b/special_inserts.asm @@ -2,7 +2,6 @@ .align 2 .thumb -.equ NUM_SPECIES, 1266 .equ EVOS_PER_MON, 16 .equ FINAL_DEX_ENTRY, 898 diff --git a/src/Back_Pic_Coords_Table.c b/src/Back_Pic_Coords_Table.c index fb25cdb..127b6d6 100644 --- a/src/Back_Pic_Coords_Table.c +++ b/src/Back_Pic_Coords_Table.c @@ -4576,7 +4576,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES] = [SPECIES_LUCARIO_MEGA] = { .size = 0x0, - .y_offset = 0x0, + .y_offset = 0x1, }, [SPECIES_ABOMASNOW_MEGA] = { diff --git a/src/Egg_Moves.c b/src/Egg_Moves.c index fa4c257..c25e255 100644 --- a/src/Egg_Moves.c +++ b/src/Egg_Moves.c @@ -589,7 +589,8 @@ const u16 gEggMoves[] = MOVE_DETECT, MOVE_ENDURE, MOVE_CHIPAWAY, - MOVE_CURSE), + MOVE_CURSE, + MOVE_THRASH), egg_moves(LICKITUNG, MOVE_MAGNITUDE, @@ -619,6 +620,20 @@ const u16 gEggMoves[] = MOVE_TOXICSPIKES, MOVE_VENOMDRENCH), + egg_moves(KOFFING_G, + MOVE_SCREECH, + MOVE_PSYWAVE, + MOVE_PSYBEAM, + MOVE_PAINSPLIT, + MOVE_GRUDGE, + MOVE_SPITE, + MOVE_CURSE, + MOVE_STOCKPILE, + MOVE_SWALLOW, + MOVE_SPITUP, + MOVE_TOXICSPIKES, + MOVE_VENOMDRENCH), + egg_moves(RHYHORN, MOVE_CRUNCH, MOVE_REVERSAL, @@ -914,7 +929,8 @@ const u16 gEggMoves[] = MOVE_NIGHTSHADE, MOVE_DEFOG, MOVE_MEANLOOK, - MOVE_HURRICANE), + MOVE_ZENHEADBUTT, + MOVE_SYNCHRONOISE), egg_moves(LEDYBA, MOVE_PSYBEAM, @@ -1120,8 +1136,7 @@ const u16 gEggMoves[] = MOVE_ENDURE, MOVE_BIDE, MOVE_MORNINGSUN, - MOVE_GRASSYTERRAIN, - MOVE_SEEDFLARE), + MOVE_GRASSYTERRAIN), egg_moves(YANMA, MOVE_WHIRLWIND, @@ -1223,7 +1238,8 @@ const u16 gEggMoves[] = MOVE_SLEEPTALK, MOVE_HEX, MOVE_AQUATAIL, - MOVE_LASTRESORT), + MOVE_LASTRESORT, + MOVE_NORETREAT), egg_moves(GLIGAR, MOVE_METALCLAW, @@ -1561,7 +1577,6 @@ const u16 gEggMoves[] = egg_moves(TORCHIC, MOVE_COUNTER, - MOVE_ENDURE, MOVE_SMELLINGSALTS, MOVE_CRUSHCLAW, MOVE_BATONPASS, @@ -1879,7 +1894,7 @@ const u16 gEggMoves[] = MOVE_FEINT, MOVE_FOCUSPUNCH, MOVE_CHIPAWAY, - MOVE_VITALTHROW, + MOVE_WAKEUPSLAP, MOVE_STORMTHROW), egg_moves(ELECTRIKE, @@ -1987,7 +2002,8 @@ const u16 gEggMoves[] = MOVE_LUCKYCHANT, MOVE_ENDURE, MOVE_SIMPLEBEAM, - MOVE_RECOVER), + MOVE_RECOVER, + MOVE_PAYBACK), egg_moves(PLUSLE, MOVE_WISH, @@ -2161,7 +2177,8 @@ const u16 gEggMoves[] = MOVE_PURSUIT, MOVE_CONFUSERAY, MOVE_OMINOUSWIND, - MOVE_GUNKSHOT), + MOVE_GUNKSHOT, + MOVE_COTTONGUARD), egg_moves(SEVIPER, MOVE_STOCKPILE, @@ -2294,7 +2311,6 @@ const u16 gEggMoves[] = MOVE_FIREFANG, MOVE_DRAGONRUSH, MOVE_DRAGONPULSE, - MOVE_ENDURE, MOVE_DEFENSECURL), egg_moves(CHIMECHO, @@ -2609,6 +2625,20 @@ const u16 gEggMoves[] = MOVE_ICYWIND, MOVE_PSYCHICTERRAIN), + egg_moves(MIME_JR_G, + MOVE_FUTURESIGHT, + MOVE_HYPNOSIS, + MOVE_FAKEOUT, + MOVE_CONFUSERAY, + MOVE_WAKEUPSLAP, + MOVE_HEALINGWISH, + MOVE_CHARM, + MOVE_NASTYPLOT, + MOVE_POWERSPLIT, + MOVE_MAGICROOM, + MOVE_ICYWIND, + MOVE_PSYCHICTERRAIN), + egg_moves(HAPPINY, MOVE_PRESENT, MOVE_METRONOME, @@ -2731,6 +2761,7 @@ const u16 gEggMoves[] = egg_moves(CARNIVINE, MOVE_SLEEPPOWDER, MOVE_STUNSPORE, + MOVE_RAZORLEAF, MOVE_SLAM, MOVE_SYNTHESIS, MOVE_MAGICALLEAF, @@ -2739,7 +2770,8 @@ const u16 gEggMoves[] = MOVE_GIGADRAIN, MOVE_RAGEPOWDER, MOVE_GRASSWHISTLE, - MOVE_ACIDSPRAY), + MOVE_ACIDSPRAY, + MOVE_BIND), egg_moves(FINNEON, MOVE_SWEETKISS, @@ -3233,7 +3265,8 @@ const u16 gEggMoves[] = MOVE_DARKPULSE, MOVE_HEALPULSE, MOVE_TORMENT, - MOVE_FAKEOUT), + MOVE_FAKEOUT, + MOVE_MAGICPOWDER), egg_moves(SOLOSIS, MOVE_NIGHTSHADE, @@ -3243,7 +3276,6 @@ const u16 gEggMoves[] = MOVE_TRICK, MOVE_IMPRISON, MOVE_SECRETPOWER, - MOVE_ASTONISH, MOVE_HELPINGHAND), egg_moves(DUCKLETT, @@ -3387,7 +3419,6 @@ const u16 gEggMoves[] = MOVE_COUNTER, MOVE_FOCUSENERGY, MOVE_REVERSAL, - MOVE_ENDURE, MOVE_RAZORWIND, MOVE_NIGHTSLASH, MOVE_ENDEAVOR, @@ -3527,7 +3558,8 @@ const u16 gEggMoves[] = MOVE_SCREECH, MOVE_HEADSMASH, MOVE_DARKPULSE, - MOVE_BELCH), + MOVE_BELCH, + MOVE_SLAM), egg_moves(LARVESTA, MOVE_HARDEN, @@ -3647,7 +3679,8 @@ const u16 gEggMoves[] = MOVE_YAWN, MOVE_SNATCH, MOVE_FIRESPIN, - MOVE_FLAREBLITZ), + MOVE_FLAREBLITZ, + MOVE_EXTREMESPEED), egg_moves(FLABEBE, MOVE_COPYCAT, @@ -4046,7 +4079,8 @@ const u16 gEggMoves[] = MOVE_FEINT, MOVE_COUNTER, MOVE_KNOCKOFF, - MOVE_BESTOW), + MOVE_BESTOW, + MOVE_COURTCHANGE), egg_moves(WIMPOD, MOVE_SPIKES, @@ -4251,7 +4285,8 @@ const u16 gEggMoves[] = MOVE_DETECT, MOVE_ENDURE, MOVE_CHIPAWAY, - MOVE_CURSE), + MOVE_CURSE, + MOVE_THRASH), egg_moves(ORICORIO_Y, MOVE_PLUCK, @@ -4268,6 +4303,285 @@ const u16 gEggMoves[] = MOVE_TAILWIND, MOVE_SAFEGUARD), + egg_moves(GROOKEY, + MOVE_GROWTH, + MOVE_HAMMERARM, + MOVE_FAKEOUT, + MOVE_STRENGTH, + MOVE_NATUREPOWER, + MOVE_WORRYSEED, + MOVE_LEECHSEED), + + egg_moves(SCORBUNNY, + MOVE_HIGHJUMPKICK, + MOVE_SANDATTACK, + MOVE_SUCKERPUNCH, + MOVE_SUPERFANG), + + egg_moves(SOBBLE, + MOVE_AQUAJET, + MOVE_DOUBLETEAM, + MOVE_AQUARING, + MOVE_MIST, + MOVE_HAZE, + MOVE_ICESHARD, + MOVE_FELLSTINGER), + + egg_moves(SKWOVET, + MOVE_ROLLOUT, + MOVE_DEFENSECURL, + MOVE_LASTRESORT, + MOVE_BELLYDRUM), + + egg_moves(ROOKIDEE, + MOVE_SKYATTACK, + MOVE_SANDATTACK, + MOVE_TAILWIND, + MOVE_DEFOG, + MOVE_ROCKSMASH, + MOVE_SPITE, + MOVE_ROOST), + + egg_moves(BLIPBUG, + MOVE_INFESTATION, + MOVE_SUPERSONIC, + MOVE_STICKYWEB, + MOVE_RECOVER), + + egg_moves(NICKIT, + MOVE_QUICKGUARD, + MOVE_KNOCKOFF, + MOVE_HOWL, + MOVE_TORMENT), + + egg_moves(GOSSIFLEUR, + MOVE_GROWTH, + MOVE_LEECHSEED, + MOVE_WORRYSEED, + MOVE_POISONPOWDER, + MOVE_STUNSPORE, + MOVE_SLEEPPOWDER), + + egg_moves(WOOLOO, + MOVE_STOMP, + MOVE_SWAGGER, + MOVE_COUNTER), + + egg_moves(CHEWTLE, + MOVE_SKULLBASH, + MOVE_GASTROACID, + MOVE_DRAGONTAIL), + + egg_moves(YAMPER, + MOVE_DOUBLEEDGE, + MOVE_SANDATTACK, + MOVE_FLAMECHARGE, + MOVE_DISCHARGE, + MOVE_HOWL), + + egg_moves(ROLYCOLY, + MOVE_EXPLOSION, + MOVE_MUDSLAP, + MOVE_BLOCK), + + egg_moves(APPLIN, + MOVE_SUCKERPUNCH, + MOVE_ROLLOUT, + MOVE_DEFENSECURL, + MOVE_RECYCLE), + + egg_moves(SILICOBRA, + MOVE_DRAGONRUSH, + MOVE_MUDSLAP, + MOVE_LASTRESORT, + MOVE_BELCH, + MOVE_POISONTAIL), + + egg_moves(CRAMORANT, + MOVE_DEFOG, + MOVE_AERIALACE, + MOVE_FEATHERDANCE, + MOVE_AQUARING, + MOVE_ROOST), + + egg_moves(ARROKUDA, + MOVE_THRASH, + MOVE_ACUPRESSURE, + MOVE_SLASH, + MOVE_NIGHTSLASH), + + egg_moves(TOXEL, + MOVE_ENDEAVOR, + MOVE_METALSOUND, + MOVE_POWERUPPUNCH), + + egg_moves(SIZZLIPEDE, + MOVE_KNOCKOFF, + MOVE_STRUGGLEBUG, + MOVE_ROLLOUT, + MOVE_DEFENSECURL), + + egg_moves(CLOBBOPUS, + MOVE_PAINSPLIT, + MOVE_SOAK, + MOVE_SUCKERPUNCH, + MOVE_CIRCLETHROW, + MOVE_SEISMICTOSS, + MOVE_POWERUPPUNCH), + + egg_moves(HATENNA, + MOVE_AROMATICMIST, + MOVE_NUZZLE, + MOVE_AFTERYOU, + MOVE_QUASH), + + egg_moves(MILCERY, + MOVE_BABYDOLLEYES, + MOVE_LASTRESORT), + + egg_moves(PINCURCHIN, + MOVE_MEMENTO, + MOVE_SUCKERPUNCH), + + egg_moves(SNOM, + MOVE_FAIRYWIND, + MOVE_MIRRORCOAT, + MOVE_BUGBITE), + + egg_moves(STONJOURNER, + MOVE_CURSE, + MOVE_ANCIENTPOWER), + + egg_moves(EISCUE, + MOVE_SOAK, + MOVE_AQUARING, + MOVE_BELLYDRUM, + MOVE_DOUBLEEDGE, + MOVE_ICICLECRASH, + MOVE_HEADSMASH), + + egg_moves(INDEEDEE, + MOVE_PSYCHUP, + MOVE_FAKEOUT, + MOVE_EXTRASENSORY), + + egg_moves(INDEEDEE_FEMALE, + MOVE_PSYCHUP, + MOVE_FAKEOUT, + MOVE_PSYCHOSHIFT, + MOVE_HEALPULSE), + + egg_moves(MORPEKO, + MOVE_SWAGGER, + MOVE_SUPERFANG, + MOVE_CHARGE, + MOVE_TICKLE, + MOVE_RAPIDSPIN, + MOVE_QUASH, + MOVE_PARTINGSHOT, + MOVE_FAKEOUT), + + egg_moves(CUFANT, + MOVE_DOUBLEEDGE, + MOVE_BELCH, + MOVE_CURSE, + MOVE_SLAM, + MOVE_FISSURE, + MOVE_SWAGGER, + MOVE_WHIRLWIND, + MOVE_DEFENSECURL), + + egg_moves(DURALUDON, + MOVE_SLASH, + MOVE_NIGHTSLASH, + MOVE_MIRRORCOAT), + + egg_moves(DREEPY, + MOVE_CURSE, + MOVE_GRUDGE, + MOVE_CONFUSERAY, + MOVE_DOUBLETEAM, + MOVE_DISABLE, + MOVE_DRAGONTAIL, + MOVE_SUCKERPUNCH), + + egg_moves(MEOWTH_G, + MOVE_SPITE, + MOVE_DOUBLEEDGE, + MOVE_CURSE, + MOVE_FLAIL, + MOVE_NIGHTSLASH, + MOVE_COVET), + + egg_moves(PONYTA_G, + MOVE_THRASH, + MOVE_DOUBLEKICK, + MOVE_HYPNOSIS, + MOVE_DOUBLEEDGE, + MOVE_HORNDRILL, + MOVE_MORNINGSUN), + + egg_moves(SLOWPOKE_G, + MOVE_BELCH, + MOVE_BELLYDRUM, + MOVE_BLOCK, + MOVE_STOMP), + + egg_moves(FARFETCHD_G, + MOVE_COUNTER, + MOVE_QUICKATTACK, + MOVE_FLAIL, + MOVE_QUICKGUARD, + MOVE_CURSE, + MOVE_COVET, + MOVE_NIGHTSLASH, + MOVE_SIMPLEBEAM, + MOVE_DOUBLEEDGE, + MOVE_FEINT, + MOVE_SKYATTACK), + + egg_moves(MR_MIME_G, + MOVE_FAKEOUT, + MOVE_CONFUSERAY, + MOVE_POWERSPLIT, + MOVE_TICKLE), + + egg_moves(CORSOLA_G, + MOVE_HAZE, + MOVE_CONFUSERAY, + MOVE_NATUREPOWER, + MOVE_DESTINYBOND, + MOVE_WATERPULSE, + MOVE_HEADSMASH), + + egg_moves(ZIGZAGOON_G, + MOVE_PARTINGSHOT, + MOVE_QUICKGUARD, + MOVE_KNOCKOFF), + + egg_moves(DARUMAKA_G, + MOVE_FOCUSPUNCH, + MOVE_HAMMERARM, + MOVE_TAKEDOWN, + MOVE_FLAMEWHEEL, + MOVE_YAWN, + MOVE_FREEZEDRY, + MOVE_INCINERATE, + MOVE_POWERUPPUNCH), + + egg_moves(YAMASK_G, + MOVE_MEMENTO), + + egg_moves(STUNFISK_G, + MOVE_BIND, + MOVE_YAWN, + MOVE_ASTONISH, + MOVE_CURSE, + MOVE_SPITE, + MOVE_COUNTER, + MOVE_PAINSPLIT, + MOVE_REFLECTTYPE), + EGG_MOVES_TERMINATOR }; @@ -4315,35 +4629,37 @@ extern const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON]; // given species. u16 GetEggSpecies(u16 species) { - int i, j, k; - bool8 found; + int i, j, k; + bool8 found; - // Working backwards up to 5 times seems arbitrary, since the maximum number - // of times would only be 3 for 3-stage evolutions. - for (i = 0; i < EVOS_PER_MON; i++) - { - found = FALSE; - for (j = 1; j < NUM_SPECIES; j++) - { - for (k = 0; k < EVOS_PER_MON; k++) - { - if (gEvolutionTable[j][k].method != EVO_MEGA + for (i = 0; i < 3; ++i) + { + found = FALSE; + + for (j = 1; j < NUM_SPECIES; ++j) + { + for (k = 0; k < EVOS_PER_MON; ++k) + { + if (gEvolutionTable[j][k].method != EVO_MEGA && gEvolutionTable[j][k].method != EVO_GIGANTAMAX && gEvolutionTable[j][k].targetSpecies == species) - { - species = j; - found = TRUE; - break; - } - } + { + species = j; + found = TRUE; + break; + } - if (found) - break; - } + if (gEvolutionTable[j][k].method == EVO_NONE) //Most likely end of entries + break; //Break now to save time + } - if (j == NUM_SPECIES) - break; - } + if (found) + break; + } - return species; + if (j == NUM_SPECIES) + break; + } + + return species; } diff --git a/src/Evolution Table.c b/src/Evolution Table.c index e27b499..592a4b0 100644 --- a/src/Evolution Table.c +++ b/src/Evolution Table.c @@ -33,8 +33,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_RATTATA] = {{EVO_LEVEL, 20, SPECIES_RATICATE, 0}}, [SPECIES_SPEAROW] = {{EVO_LEVEL, 20, SPECIES_FEAROW, 0}}, [SPECIES_EKANS] = {{EVO_LEVEL, 22, SPECIES_ARBOK, 0}}, - [SPECIES_PIKACHU] = {{EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_RAICHU, 0}, - {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_RAICHU_A, 0}, + [SPECIES_PIKACHU] = {{EVO_ITEM_LOCATION, ITEM_THUNDER_STONE, SPECIES_RAICHU_A, MB_SHALLOW_WATER}, + {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_RAICHU, 0}, {EVO_GIGANTAMAX, TRUE, SPECIES_PIKACHU_GIGA, 0}}, [SPECIES_PIKACHU_SURFING] = {{EVO_GIGANTAMAX, TRUE, SPECIES_PIKACHU_GIGA, 0}}, [SPECIES_PIKACHU_FLYING] = {{EVO_GIGANTAMAX, TRUE, SPECIES_PIKACHU_GIGA, 0}}, diff --git a/src/Front_Pic_Coords_Table.c b/src/Front_Pic_Coords_Table.c index 4fdf0aa..8797764 100644 --- a/src/Front_Pic_Coords_Table.c +++ b/src/Front_Pic_Coords_Table.c @@ -4576,7 +4576,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES] = [SPECIES_LUCARIO_MEGA] = { .size = 0x0, - .y_offset = 0x2, + .y_offset = 0x0, }, [SPECIES_ABOMASNOW_MEGA] = { diff --git a/src/Habitat_Table.c b/src/Habitat_Table.c index 8e471f8..c561225 100644 --- a/src/Habitat_Table.c +++ b/src/Habitat_Table.c @@ -648,7 +648,7 @@ const u16 gForestPage32[] = SPECIES_COMBEE, SPECIES_VESPIQUEN, SPECIES_CHERUBI, - SPECIES_CHERRIM_SUN, + SPECIES_CHERRIM, }; const u16 gForestPage33[] = @@ -1488,7 +1488,6 @@ const u16 gMountainPage6[] = { SPECIES_CUBONE, SPECIES_MAROWAK, - SPECIES_CUBONE_A, SPECIES_MAROWAK_A, }; @@ -1712,6 +1711,7 @@ const u16 gMountainPage38[]= SPECIES_MINIOR_YELLOW, SPECIES_MINIOR_INDIGO, SPECIES_MINIOR_GREEN, + SPECIES_MINIOR_VIOLET, }; const u16 gMountainPage39[] = diff --git a/src/Species_To_Pokdex_Table.c b/src/Species_To_Pokdex_Table.c index 2b0365d..99f3298 100644 --- a/src/Species_To_Pokdex_Table.c +++ b/src/Species_To_Pokdex_Table.c @@ -1219,6 +1219,7 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_SLOWPOKE_G - 1] = NATIONAL_DEX_SLOWPOKE, [SPECIES_SLOWBRO_G - 1] = NATIONAL_DEX_SLOWBRO, [SPECIES_FARFETCHD_G - 1] = NATIONAL_DEX_FARFETCHD, + [SPECIES_KOFFING_G - 1] = NATIONAL_DEX_KOFFING, [SPECIES_WEEZING_G - 1] = NATIONAL_DEX_WEEZING, [SPECIES_MR_MIME_G - 1] = NATIONAL_DEX_MR_MIME, [SPECIES_ARTICUNO_G - 1] = NATIONAL_DEX_ARTICUNO, @@ -1228,6 +1229,7 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_CORSOLA_G - 1] = NATIONAL_DEX_CORSOLA, [SPECIES_ZIGZAGOON_G - 1] = NATIONAL_DEX_ZIGZAGOON, [SPECIES_LINOONE_G - 1] = NATIONAL_DEX_LINOONE, + [SPECIES_MIME_JR_G - 1] = NATIONAL_DEX_MIME_JR, [SPECIES_DARUMAKA_G - 1] = NATIONAL_DEX_DARUMAKA, [SPECIES_DARMANITAN_G - 1] = NATIONAL_DEX_DARMANITAN, [SPECIES_DARMANITAN_G_ZEN - 1] = NATIONAL_DEX_DARMANITAN, @@ -1248,4 +1250,24 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_SNORLAX_GIGA - 1] = NATIONAL_DEX_SNORLAX, [SPECIES_GARBODOR_GIGA - 1] = NATIONAL_DEX_GARBODOR, [SPECIES_MELMETAL_GIGA - 1] = NATIONAL_DEX_MELMETAL, + [SPECIES_RILLABOOM_GIGA - 1] = NATIONAL_DEX_RILLABOOM, + [SPECIES_CINDERACE_GIGA - 1] = NATIONAL_DEX_CINDERACE, + [SPECIES_INTELEON_GIGA - 1] = NATIONAL_DEX_INTELEON, + [SPECIES_CORVIKNIGHT_GIGA - 1] = NATIONAL_DEX_CORVIKNIGHT, + [SPECIES_ORBEETLE_GIGA - 1] = NATIONAL_DEX_ORBEETLE, + [SPECIES_DREDNAW_GIGA - 1] = NATIONAL_DEX_DREDNAW, + [SPECIES_COALOSSAL_GIGA - 1] = NATIONAL_DEX_COALOSSAL, + [SPECIES_FLAPPLE_GIGA - 1] = NATIONAL_DEX_FLAPPLE, + [SPECIES_APPLETUN_GIGA - 1] = NATIONAL_DEX_APPLETUN, + [SPECIES_SANDACONDA_GIGA - 1] = NATIONAL_DEX_SANDACONDA, + [SPECIES_TOXTRICITY_GIGA - 1] = NATIONAL_DEX_TOXTRICITY, + [SPECIES_TOXTRICITY_LOW_KEY_GIGA - 1] = NATIONAL_DEX_TOXTRICITY, + [SPECIES_CENTISKORCH_GIGA - 1] = NATIONAL_DEX_CENTISKORCH, + [SPECIES_HATTERENE_GIGA - 1] = NATIONAL_DEX_HATTERENE, + [SPECIES_GRIMMSNARL_GIGA - 1] = NATIONAL_DEX_GRIMMSNARL, + [SPECIES_ALCREMIE_GIGA - 1] = NATIONAL_DEX_ALCREMIE, + [SPECIES_COPPERAJAH_GIGA - 1] = NATIONAL_DEX_COPPERAJAH, + [SPECIES_DURALUDON_GIGA - 1] = NATIONAL_DEX_DURALUDON, + [SPECIES_URSHIFU_SINGLE_GIGA - 1] = NATIONAL_DEX_URSHIFU, + [SPECIES_URSHIFU_RAPID_GIGA - 1] = NATIONAL_DEX_URSHIFU, }; diff --git a/src/tutor_compatibility/2 - Ice Punch.txt b/src/tutor_compatibility/2 - Ice Punch.txt index 9131714..4592620 100644 --- a/src/tutor_compatibility/2 - Ice Punch.txt +++ b/src/tutor_compatibility/2 - Ice Punch.txt @@ -155,7 +155,6 @@ THROH SAWK DARUMAKA_G DARMANITAN_G -DARMANITAN SCRAGGY SCRAFTY REUNICLUS diff --git a/src/tutor_compatibility/63 - Blast Burn.txt b/src/tutor_compatibility/63 - Blast Burn.txt index 0e40fd8..9315011 100644 --- a/src/tutor_compatibility/63 - Blast Burn.txt +++ b/src/tutor_compatibility/63 - Blast Burn.txt @@ -9,3 +9,21 @@ INCINEROAR SCORBUNNY RABOOT CINDERACE +ARCEUS +ARCEUS_FIGHT +ARCEUS_FLYING +ARCEUS_POISON +ARCEUS_GROUND +ARCEUS_ROCK +ARCEUS_BUG +ARCEUS_GHOST +ARCEUS_STEEL +ARCEUS_FIRE +ARCEUS_WATER +ARCEUS_GRASS +ARCEUS_ELECTRIC +ARCEUS_PSYCHIC +ARCEUS_ICE +ARCEUS_DRAGON +ARCEUS_DARK +ARCEUS_FAIRY diff --git a/src/tutor_compatibility/64 - Hydro Cannon.txt b/src/tutor_compatibility/64 - Hydro Cannon.txt index e4b3945..50e14c2 100644 --- a/src/tutor_compatibility/64 - Hydro Cannon.txt +++ b/src/tutor_compatibility/64 - Hydro Cannon.txt @@ -10,3 +10,21 @@ PRIMARINA SOBBLE DRIZZILE INTELEON +ARCEUS +ARCEUS_FIGHT +ARCEUS_FLYING +ARCEUS_POISON +ARCEUS_GROUND +ARCEUS_ROCK +ARCEUS_BUG +ARCEUS_GHOST +ARCEUS_STEEL +ARCEUS_FIRE +ARCEUS_WATER +ARCEUS_GRASS +ARCEUS_ELECTRIC +ARCEUS_PSYCHIC +ARCEUS_ICE +ARCEUS_DRAGON +ARCEUS_DARK +ARCEUS_FAIRY diff --git a/strings/Pokedex_Data.string b/strings/Pokedex_Data.string index 52da866..63fac6a 100644 --- a/strings/Pokedex_Data.string +++ b/strings/Pokedex_Data.string @@ -926,7 +926,7 @@ The frills on either side of its head\nhave cells that generate electricity\nwhe It flares its frill and generates\nenergy. It can generate sufficient\nelectricity to power a skyscraper. #org @DEX_ENTRY_TYRUNT -Its immense jaws have enough\ndestructive force to chew up an\nautomobile. It lived 100 million years ago. +Its immense jaws have enough destructive\nforce to chew up an automobile. It lived\n100 million years ago. #org @DEX_ENTRY_TYRANTRUM Nothing could stop this Pok\emon 100\nmillion years ago, so it behaved like a\nking. diff --git a/strings/Pokemon_Name_Table.string b/strings/Pokemon_Name_Table.string index db74f72..f11e256 100644 --- a/strings/Pokemon_Name_Table.string +++ b/strings/Pokemon_Name_Table.string @@ -1242,85 +1242,85 @@ Chimecho Bad Egg #org @NAME_UNOWNB -UNOWNB +Unown B #org @NAME_UNOWNC -UNOWNC +Unown C #org @NAME_UNOWND -UNOWND +Unown D #org @NAME_UNOWNE -UNOWNE +Unown E #org @NAME_UNOWNF -UNOWNF +Unown F #org @NAME_UNOWNG -UNOWNG +Unown G #org @NAME_UNOWNH -UNOWNH +Unown H #org @NAME_UNOWNI -UNOWNI +Unown I #org @NAME_UNOWNJ -UNOWNJ +Unown J #org @NAME_UNOWNK -UNOWNK +Unown K #org @NAME_UNOWNL -UNOWNL +Unown L #org @NAME_UNOWNM -UNOWNM +Unown M #org @NAME_UNOWNN -UNOWNN +Unown N #org @NAME_UNOWNO -UNOWNO +Unown O #org @NAME_UNOWNP -UNOWNP +Unown P #org @NAME_UNOWNQ -UNOWNQ +Unown Q #org @NAME_UNOWNR -UNOWNR +Unown R #org @NAME_UNOWNS -UNOWNS +Unown S #org @NAME_UNOWNT -UNOWNT +Unown T #org @NAME_UNOWNU -UNOWNU +Unown U #org @NAME_UNOWNV -UNOWNV +Unown V #org @NAME_UNOWNW -UNOWNW +Unown W #org @NAME_UNOWNX -UNOWNX +Unown X #org @NAME_UNOWNY -UNOWNY +Unown Y #org @NAME_UNOWNZ -UNOWNZ +Unown Z #org @NAME_UNOWN_QUESTION -UNOWN! +Unown ! #org @NAME_UNOWN_EXCLAMATION -UNOWN? +Unown ? #org @NAME_TURTWIG Turtwig