From bcbb4252003b48fc7e4b29c3634a640388dc786c Mon Sep 17 00:00:00 2001 From: Skeli Date: Thu, 14 Oct 2021 17:12:53 -0400 Subject: [PATCH 01/11] Update M-Lucario, M-Medicham, & Swellow Sprites --- .../backspr/gBackShinySprite305Swellow.png | Bin 550 -> 550 bytes .../gBackShinySprite897MedichamMega.png | Bin 731 -> 1624 bytes .../backspr/gBackShinySprite914LucarioMega.png | Bin 868 -> 955 bytes graphics/frontspr/gFrontSprite305Swellow.png | Bin 932 -> 934 bytes .../frontspr/gFrontSprite897MedichamMega.png | Bin 838 -> 1606 bytes .../frontspr/gFrontSprite914LucarioMega.png | Bin 861 -> 939 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/graphics/backspr/gBackShinySprite305Swellow.png b/graphics/backspr/gBackShinySprite305Swellow.png index e411722cf60d8089c6819ad6b06c7de93bc2b77f..5711061e8f2d58c6b4d51a489492ff41d25573e4 100644 GIT binary patch delta 473 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 bISuw7V!t92@)HPE00000NkvXXu0mjf!f~6% diff --git a/graphics/frontspr/gFrontSprite897MedichamMega.png b/graphics/frontspr/gFrontSprite897MedichamMega.png index c7c1ff716075d98233f774ff0a6eca1103503366..10add5b562e29fcbf7281a86aa93096fcf3d9eba 100644 GIT binary patch delta 1601 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 LNkvXXu0mjf?IDRc From 2b516245634820fed54d7ecc761fdb8421fd6560 Mon Sep 17 00:00:00 2001 From: Skeli Date: Thu, 14 Oct 2021 17:13:57 -0400 Subject: [PATCH 02/11] Add Missing Arceus Tutors + Remove Ice Punch from Darmanitan-U Arceus is supposed to learn Blast Burn and Hydro Cannon --- src/tutor_compatibility/2 - Ice Punch.txt | 1 - src/tutor_compatibility/63 - Blast Burn.txt | 18 ++++++++++++++++++ src/tutor_compatibility/64 - Hydro Cannon.txt | 18 ++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/src/tutor_compatibility/2 - Ice Punch.txt b/src/tutor_compatibility/2 - Ice Punch.txt index 5bf0cf8..209cb59 100644 --- a/src/tutor_compatibility/2 - Ice Punch.txt +++ b/src/tutor_compatibility/2 - Ice Punch.txt @@ -149,7 +149,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 From 1adda998c7ab3f549aa3838b68e2f5ed807812b7 Mon Sep 17 00:00:00 2001 From: Skeli Date: Thu, 14 Oct 2021 17:14:18 -0400 Subject: [PATCH 03/11] Fix Tyrunt Pokedex String --- strings/Pokedex_Data.string | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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. From 31e75f6a2606bea45b636f83b9d0590795bc74d6 Mon Sep 17 00:00:00 2001 From: Skeli Date: Thu, 14 Oct 2021 17:14:28 -0400 Subject: [PATCH 04/11] Decap Unown Form Names --- strings/Pokemon_Name_Table.string | 54 +++++++++++++++---------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/strings/Pokemon_Name_Table.string b/strings/Pokemon_Name_Table.string index 9236836..fe94984 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 From b38179f647b308b9304c2e85b62599a3171f2ced Mon Sep 17 00:00:00 2001 From: Skeli Date: Thu, 14 Oct 2021 17:15:29 -0400 Subject: [PATCH 05/11] Add Different A-Raichu Method -Using a Thunder Stone while standing on the shore evolves it -Not supported by the public CFRU as of this commit --- include/evolution.h | 5 ++++- src/Evolution Table.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/evolution.h b/include/evolution.h index a707a03..daedc5c 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,5 +62,7 @@ enum MegaEvoVariants MEGA_VARIANT_ULTRA_BURST, //Necrozma }; +#define MB_SHALLOW_WATER 0x17 //For Alolan Raichu + #define MAPSEC_POWER_PLANT 0x8E #define MAPSEC_ICEFALL_CAVE 0xB1 diff --git a/src/Evolution Table.c b/src/Evolution Table.c index ed3c824..3bfceef 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}}, From 23f4ffa633c833910088d23964c174d73a77a1f7 Mon Sep 17 00:00:00 2001 From: Skeli Date: Thu, 14 Oct 2021 17:21:48 -0400 Subject: [PATCH 06/11] Fix Incorrect Constants --- scripts/tm_tutor.py | 2 +- special_inserts.asm | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/tm_tutor.py b/scripts/tm_tutor.py index 5876e67..6ef7b5c 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 = 128 -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 From 94e1e298293e8405147dc4c59d7623007dc93120 Mon Sep 17 00:00:00 2001 From: Skeli Date: Thu, 14 Oct 2021 17:23:06 -0400 Subject: [PATCH 07/11] Add Gen 8 Egg Moves --- src/Egg_Moves.c | 367 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 333 insertions(+), 34 deletions(-) diff --git a/src/Egg_Moves.c b/src/Egg_Moves.c index ad31766..f2e1872 100644 --- a/src/Egg_Moves.c +++ b/src/Egg_Moves.c @@ -4573,23 +4573,38 @@ const u16 gEggMoves[] = MOVE_ENDURE, MOVE_CHIPAWAY, MOVE_CURSE), - + egg_moves(KOFFING_G, - MOVE_CURSE, - MOVE_GRUDGE, - MOVE_PAINSPLIT, + MOVE_SCREECH, + MOVE_PSYWAVE, MOVE_PSYBEAM, + MOVE_DESTINYBOND, + MOVE_PAINSPLIT, + MOVE_GRUDGE, MOVE_SPITE, + MOVE_CURSE, MOVE_STOCKPILE, MOVE_SWALLOW, - MOVE_SPITUP), + MOVE_SPITUP, + MOVE_TOXICSPIKES, + MOVE_VENOMDRENCH), egg_moves(MIME_JR_G, - MOVE_CONFUSERAY, - MOVE_FAKEOUT, + MOVE_FUTURESIGHT, MOVE_HYPNOSIS, + MOVE_MIMIC, + MOVE_FAKEOUT, + MOVE_TRICK, + MOVE_CONFUSERAY, + MOVE_WAKEUPSLAP, + MOVE_TEETERDANCE, + MOVE_HEALINGWISH, + MOVE_CHARM, + MOVE_NASTYPLOT, MOVE_POWERSPLIT, - MOVE_TICKLE), + MOVE_MAGICROOM, + MOVE_ICYWIND, + MOVE_PSYCHICTERRAIN), egg_moves(MR_MIME_G, MOVE_CONFUSERAY, @@ -4651,6 +4666,287 @@ const u16 gEggMoves[] = MOVE_TAILWIND, MOVE_SAFEGUARD, MOVE_CAPTIVATE), + + 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 }; u32 __attribute__((long_call)) GetMonData(void*, s32, const void *data); @@ -4697,34 +4993,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 && gEvolutionTable[j][k].targetSpecies == species) - { - species = j; - found = TRUE; - break; - } - } + for (i = 0; i < 3; ++i) + { + found = FALSE; - if (found) - break; - } + 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; + } - if (j == NUM_SPECIES) - break; - } + if (gEvolutionTable[j][k].method == EVO_NONE) //Most likely end of entries + break; //Break now to save time + } - return species; + if (found) + break; + } + + if (j == NUM_SPECIES) + break; + } + + return species; } - From 390cc66554faf3a5083eb3ad22134e544f4d14ad Mon Sep 17 00:00:00 2001 From: Skeli Date: Thu, 14 Oct 2021 17:23:26 -0400 Subject: [PATCH 08/11] Give Gigantamax Forms Pokedex Ids --- src/Species_To_Pokdex_Table.c | 37 +++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/src/Species_To_Pokdex_Table.c b/src/Species_To_Pokdex_Table.c index 1d2763d..5f7e4e9 100644 --- a/src/Species_To_Pokdex_Table.c +++ b/src/Species_To_Pokdex_Table.c @@ -1220,6 +1220,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, @@ -1229,9 +1230,45 @@ 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, [SPECIES_YAMASK_G - 1] = NATIONAL_DEX_YAMASK, [SPECIES_STUNFISK_G - 1] = NATIONAL_DEX_STUNFISK, + + [SPECIES_VENUSAUR_GIGA - 1] = NATIONAL_DEX_VENUSAUR, + [SPECIES_CHARIZARD_GIGA - 1] = NATIONAL_DEX_CHARIZARD, + [SPECIES_BLASTOISE_GIGA - 1] = NATIONAL_DEX_BLASTOISE, + [SPECIES_BUTTERFREE_GIGA - 1] = NATIONAL_DEX_BUTTERFREE, + [SPECIES_PIKACHU_GIGA - 1] = NATIONAL_DEX_PIKACHU, + [SPECIES_MEOWTH_GIGA - 1] = NATIONAL_DEX_MEOWTH, + [SPECIES_MACHAMP_GIGA - 1] = NATIONAL_DEX_MACHAMP, + [SPECIES_GENGAR_GIGA - 1] = NATIONAL_DEX_GENGAR, + [SPECIES_KINGLER_GIGA - 1] = NATIONAL_DEX_KINGLER, + [SPECIES_LAPRAS_GIGA - 1] = NATIONAL_DEX_LAPRAS, + [SPECIES_EEVEE_GIGA - 1] = NATIONAL_DEX_EEVEE, + [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, }; From 1ce0cd6370760ba9ade7fd66ecac60142d6c651c Mon Sep 17 00:00:00 2001 From: Skeli Date: Thu, 14 Oct 2021 17:23:55 -0400 Subject: [PATCH 09/11] Fix an Icon Palette Issue --- bytereplacement | 1 + 1 file changed, 1 insertion(+) 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 From e32392747113113aa74c993502fc3044c4b1ca83 Mon Sep 17 00:00:00 2001 From: Skeli Date: Thu, 14 Oct 2021 17:24:21 -0400 Subject: [PATCH 10/11] Allow Unicode Strings to Work --- scripts/string.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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] != "": From b664ad721b7cfc4e959e2a853cfa9467f05be260 Mon Sep 17 00:00:00 2001 From: Skeli Date: Thu, 14 Oct 2021 17:24:31 -0400 Subject: [PATCH 11/11] Fix Habitat Table Issues --- src/Back_Pic_Coords_Table.c | 2 +- src/Front_Pic_Coords_Table.c | 2 +- src/Habitat_Table.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Back_Pic_Coords_Table.c b/src/Back_Pic_Coords_Table.c index 44ebbc3..1a7faae 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/Front_Pic_Coords_Table.c b/src/Front_Pic_Coords_Table.c index 63fbd63..cffad82 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 9a7321a..2440285 100644 --- a/src/Habitat_Table.c +++ b/src/Habitat_Table.c @@ -692,7 +692,7 @@ const u16 gForestPage32[] = SPECIES_COMBEE, SPECIES_VESPIQUEN, SPECIES_CHERUBI, - SPECIES_CHERRIM_SUN, + SPECIES_CHERRIM, }; const u16 gForestPage33[] = @@ -1634,7 +1634,6 @@ const u16 gMountainPage6[] = { SPECIES_CUBONE, SPECIES_MAROWAK, - SPECIES_CUBONE_A, SPECIES_MAROWAK_A, }; @@ -1871,6 +1870,7 @@ const u16 gMountainPage40[]= SPECIES_MINIOR_YELLOW, SPECIES_MINIOR_INDIGO, SPECIES_MINIOR_GREEN, + SPECIES_MINIOR_VIOLET, }; const u16 gMountainPage41[] =