diff --git a/linker.ld b/linker.ld index 90e5d64..9d04850 100644 --- a/linker.ld +++ b/linker.ld @@ -1,7 +1,7 @@ OUTPUT_ARCH(arm) MEMORY { - rom : ORIGIN = (0x08000000 + 0x1717a60), LENGTH = 32M + rom : ORIGIN = (0x08000000 + 0x17174e0), LENGTH = 32M ewram : ORIGIN = 0x02000000, LENGTH = 4M - 4k } diff --git a/scripts/insert.py b/scripts/insert.py index c943497..6ab4ae9 100644 --- a/scripts/insert.py +++ b/scripts/insert.py @@ -7,7 +7,7 @@ import sys from datetime import datetime import _io -OFFSET_TO_PUT = 0x1717a60 +OFFSET_TO_PUT = 0x17174e0 SOURCE_ROM = "Pokemon Unbound.gba" ROM_NAME = "test.gba" diff --git a/scripts/make.py b/scripts/make.py index 23e9aab..bd2ba26 100644 --- a/scripts/make.py +++ b/scripts/make.py @@ -9,7 +9,7 @@ import sys ############ ROM_NAME = "Pokemon Unbound.gba" # The name of your rom -OFFSET_TO_PUT = 0x1717a60 +OFFSET_TO_PUT = 0x17174e0 SEARCH_FREE_SPACE = False # Set to True if you want the script to search for free space # Set to False if you don't want to search for free space as you update the engine diff --git a/src/Pokedex_Orders.c b/src/Pokedex_Orders.c index 7fc3f5c..9fac1df 100644 --- a/src/Pokedex_Orders.c +++ b/src/Pokedex_Orders.c @@ -3,157 +3,281 @@ const u16 gPokedexOrder_Regional[] = { - NATIONAL_DEX_BULBASAUR, - NATIONAL_DEX_IVYSAUR, - NATIONAL_DEX_VENUSAUR, - NATIONAL_DEX_CHARMANDER, - NATIONAL_DEX_CHARMELEON, - NATIONAL_DEX_CHARIZARD, - NATIONAL_DEX_SQUIRTLE, - NATIONAL_DEX_WARTORTLE, - NATIONAL_DEX_BLASTOISE, + NATIONAL_DEX_SNORUNT, + NATIONAL_DEX_GLALIE, + NATIONAL_DEX_FROSLASS, + NATIONAL_DEX_VANILLITE, + NATIONAL_DEX_VANILLISH, + NATIONAL_DEX_VANILLUXE, + NATIONAL_DEX_DELIBIRD, + NATIONAL_DEX_MINIOR, + NATIONAL_DEX_SNEASEL, + NATIONAL_DEX_WEAVILE, + NATIONAL_DEX_ZUBAT, + NATIONAL_DEX_GOLBAT, + NATIONAL_DEX_CROBAT, + NATIONAL_DEX_MAKUHITA, + NATIONAL_DEX_HARIYAMA, + NATIONAL_DEX_SPHEAL, + NATIONAL_DEX_SEALEO, + NATIONAL_DEX_WALREIN, + NATIONAL_DEX_SMOOCHUM, + NATIONAL_DEX_JYNX, + NATIONAL_DEX_ROGGENROLA, + NATIONAL_DEX_BOLDORE, + NATIONAL_DEX_GIGALITH, + NATIONAL_DEX_SWINUB, + NATIONAL_DEX_PILOSWINE, + NATIONAL_DEX_MAMOSWINE, + NATIONAL_DEX_BERGMITE, + NATIONAL_DEX_AVALUGG, + NATIONAL_DEX_DRILBUR, + NATIONAL_DEX_EXCADRILL, + NATIONAL_DEX_MAWILE, + NATIONAL_DEX_SANDSHREW, + NATIONAL_DEX_SANDSLASH, + NATIONAL_DEX_STARLY, + NATIONAL_DEX_STARAVIA, + NATIONAL_DEX_STARAPTOR, + NATIONAL_DEX_HOOTHOOT, + NATIONAL_DEX_NOCTOWL, + NATIONAL_DEX_PATRAT, + NATIONAL_DEX_WATCHOG, + NATIONAL_DEX_RATTATA, + NATIONAL_DEX_RATICATE, + NATIONAL_DEX_BUDEW, + NATIONAL_DEX_ROSELIA, + NATIONAL_DEX_ROSERADE, + NATIONAL_DEX_SWABLU, + NATIONAL_DEX_ALTARIA, + NATIONAL_DEX_ELECTRIKE, + NATIONAL_DEX_MANECTRIC, + NATIONAL_DEX_AZURILL, + NATIONAL_DEX_MARILL, + NATIONAL_DEX_AZUMARILL, + NATIONAL_DEX_STUFFUL, + NATIONAL_DEX_BEWEAR, + NATIONAL_DEX_SCRAGGY, + NATIONAL_DEX_SCRAFTY, + NATIONAL_DEX_RIOLU, + NATIONAL_DEX_LUCARIO, + NATIONAL_DEX_POOCHYENA, + NATIONAL_DEX_MIGHTYENA, + NATIONAL_DEX_WINGULL, + NATIONAL_DEX_PELIPPER, + NATIONAL_DEX_SENTRET, + NATIONAL_DEX_FURRET, + NATIONAL_DEX_BIDOOF, + NATIONAL_DEX_BIBAREL, + NATIONAL_DEX_BUIZEL, + NATIONAL_DEX_FLOATZEL, + NATIONAL_DEX_SHELLOS, + NATIONAL_DEX_GASTRODON, + NATIONAL_DEX_DEWPIDER, + NATIONAL_DEX_ARAQUANID, + NATIONAL_DEX_SURSKIT, + NATIONAL_DEX_MASQUERAIN, + NATIONAL_DEX_KRABBY, + NATIONAL_DEX_KINGLER, + NATIONAL_DEX_BURMY, + NATIONAL_DEX_WORMADAM, + NATIONAL_DEX_MOTHIM, + NATIONAL_DEX_FLABEBE, + NATIONAL_DEX_FLOETTE, + NATIONAL_DEX_FLORGES, + NATIONAL_DEX_CUTIEFLY, + NATIONAL_DEX_RIBOMBEE, + NATIONAL_DEX_ORICORIO, + NATIONAL_DEX_PANSAGE, + NATIONAL_DEX_SIMISAGE, + NATIONAL_DEX_PANSEAR, + NATIONAL_DEX_SIMISEAR, + NATIONAL_DEX_PANPOUR, + NATIONAL_DEX_SIMIPOUR, + NATIONAL_DEX_COMBEE, + NATIONAL_DEX_VESPIQUEN, + NATIONAL_DEX_COMFEY, + NATIONAL_DEX_CHERUBI, + NATIONAL_DEX_CHERRIM, NATIONAL_DEX_CATERPIE, NATIONAL_DEX_METAPOD, NATIONAL_DEX_BUTTERFREE, NATIONAL_DEX_WEEDLE, NATIONAL_DEX_KAKUNA, NATIONAL_DEX_BEEDRILL, - NATIONAL_DEX_PIDGEY, - NATIONAL_DEX_PIDGEOTTO, - NATIONAL_DEX_PIDGEOT, - NATIONAL_DEX_RATTATA, - NATIONAL_DEX_RATICATE, - NATIONAL_DEX_SPEAROW, - NATIONAL_DEX_FEAROW, - NATIONAL_DEX_EKANS, - NATIONAL_DEX_ARBOK, - NATIONAL_DEX_PIKACHU, - NATIONAL_DEX_RAICHU, - NATIONAL_DEX_SANDSHREW, - NATIONAL_DEX_SANDSLASH, - NATIONAL_DEX_NIDORAN_F, - NATIONAL_DEX_NIDORINA, - NATIONAL_DEX_NIDOQUEEN, - NATIONAL_DEX_NIDORAN_M, - NATIONAL_DEX_NIDORINO, - NATIONAL_DEX_NIDOKING, - NATIONAL_DEX_CLEFAIRY, - NATIONAL_DEX_CLEFABLE, - NATIONAL_DEX_VULPIX, - NATIONAL_DEX_NINETALES, - NATIONAL_DEX_JIGGLYPUFF, - NATIONAL_DEX_WIGGLYTUFF, - NATIONAL_DEX_ZUBAT, - NATIONAL_DEX_GOLBAT, - NATIONAL_DEX_ODDISH, - NATIONAL_DEX_GLOOM, - NATIONAL_DEX_VILEPLUME, - NATIONAL_DEX_PARAS, - NATIONAL_DEX_PARASECT, - NATIONAL_DEX_VENONAT, - NATIONAL_DEX_VENOMOTH, - NATIONAL_DEX_DIGLETT, - NATIONAL_DEX_DUGTRIO, - NATIONAL_DEX_MEOWTH, - NATIONAL_DEX_PERSIAN, - NATIONAL_DEX_PSYDUCK, - NATIONAL_DEX_GOLDUCK, - NATIONAL_DEX_MANKEY, - NATIONAL_DEX_PRIMEAPE, - NATIONAL_DEX_GROWLITHE, - NATIONAL_DEX_ARCANINE, - NATIONAL_DEX_POLIWAG, - NATIONAL_DEX_POLIWHIRL, - NATIONAL_DEX_POLIWRATH, - NATIONAL_DEX_ABRA, - NATIONAL_DEX_KADABRA, - NATIONAL_DEX_ALAKAZAM, - NATIONAL_DEX_MACHOP, - NATIONAL_DEX_MACHOKE, - NATIONAL_DEX_MACHAMP, - NATIONAL_DEX_BELLSPROUT, - NATIONAL_DEX_WEEPINBELL, - NATIONAL_DEX_VICTREEBEL, - NATIONAL_DEX_TENTACOOL, - NATIONAL_DEX_TENTACRUEL, - NATIONAL_DEX_GEODUDE, - NATIONAL_DEX_GRAVELER, - NATIONAL_DEX_GOLEM, - NATIONAL_DEX_PONYTA, - NATIONAL_DEX_RAPIDASH, - NATIONAL_DEX_SLOWPOKE, - NATIONAL_DEX_SLOWBRO, - NATIONAL_DEX_MAGNEMITE, - NATIONAL_DEX_MAGNETON, - NATIONAL_DEX_FARFETCHD, - NATIONAL_DEX_DODUO, - NATIONAL_DEX_DODRIO, - NATIONAL_DEX_SEEL, - NATIONAL_DEX_DEWGONG, - NATIONAL_DEX_GRIMER, - NATIONAL_DEX_MUK, - NATIONAL_DEX_SHELLDER, - NATIONAL_DEX_CLOYSTER, + NATIONAL_DEX_SEEDOT, + NATIONAL_DEX_NUZLEAF, + NATIONAL_DEX_SHIFTRY, + NATIONAL_DEX_PUMPKABOO, + NATIONAL_DEX_GOURGEIST, NATIONAL_DEX_GASTLY, NATIONAL_DEX_HAUNTER, NATIONAL_DEX_GENGAR, - NATIONAL_DEX_ONIX, + NATIONAL_DEX_SHUPPET, + NATIONAL_DEX_BANETTE, + NATIONAL_DEX_DUSKULL, + NATIONAL_DEX_DUSCLOPS, + NATIONAL_DEX_DUSKNOIR, + NATIONAL_DEX_PHANTUMP, + NATIONAL_DEX_TREVENANT, + NATIONAL_DEX_NINCADA, + NATIONAL_DEX_NINJASK, + NATIONAL_DEX_SHEDINJA, + NATIONAL_DEX_PIKIPEK, + NATIONAL_DEX_TRUMBEAK, + NATIONAL_DEX_TOUCANNON, + NATIONAL_DEX_LILLIPUP, + NATIONAL_DEX_HERDIER, + NATIONAL_DEX_STOUTLAND, + NATIONAL_DEX_EKANS, + NATIONAL_DEX_ARBOK, + NATIONAL_DEX_NUMEL, + NATIONAL_DEX_CAMERUPT, + NATIONAL_DEX_MANKEY, + NATIONAL_DEX_PRIMEAPE, + NATIONAL_DEX_RALTS, + NATIONAL_DEX_KIRLIA, + NATIONAL_DEX_GARDEVOIR, + NATIONAL_DEX_GALLADE, + NATIONAL_DEX_LITLEO, + NATIONAL_DEX_PYROAR, + NATIONAL_DEX_WOOBAT, + NATIONAL_DEX_SWOOBAT, + NATIONAL_DEX_SLUGMA, + NATIONAL_DEX_MAGCARGO, + NATIONAL_DEX_SALANDIT, + NATIONAL_DEX_SALAZZLE, + NATIONAL_DEX_GEODUDE, + NATIONAL_DEX_GRAVELER, + NATIONAL_DEX_GOLEM, + NATIONAL_DEX_TORKOAL, + NATIONAL_DEX_MAGBY, + NATIONAL_DEX_MAGMAR, + NATIONAL_DEX_MAGMORTAR, + NATIONAL_DEX_VULPIX, + NATIONAL_DEX_NINETALES, + NATIONAL_DEX_TAILLOW, + NATIONAL_DEX_SWELLOW, + NATIONAL_DEX_MURKROW, + NATIONAL_DEX_HONCHKROW, + NATIONAL_DEX_BUNNELBY, + NATIONAL_DEX_DIGGERSBY, + NATIONAL_DEX_NIDORAN_M, + NATIONAL_DEX_NIDORINO, + NATIONAL_DEX_NIDOKING, + NATIONAL_DEX_NIDORAN_F, + NATIONAL_DEX_NIDORINA, + NATIONAL_DEX_NIDOQUEEN, + NATIONAL_DEX_GROWLITHE, + NATIONAL_DEX_ARCANINE, + NATIONAL_DEX_HOUNDOUR, + NATIONAL_DEX_HOUNDOOM, + NATIONAL_DEX_DEDENNE, + NATIONAL_DEX_PURRLOIN, + NATIONAL_DEX_LIEPARD, + NATIONAL_DEX_ARON, + NATIONAL_DEX_LAIRON, + NATIONAL_DEX_AGGRON, + NATIONAL_DEX_NOSEPASS, + NATIONAL_DEX_PROBOPASS, + NATIONAL_DEX_NOIBAT, + NATIONAL_DEX_NOIVERN, + NATIONAL_DEX_PHANPY, + NATIONAL_DEX_DONPHAN, + NATIONAL_DEX_GLIGAR, + NATIONAL_DEX_GLISCOR, + NATIONAL_DEX_DUNSPARCE, + NATIONAL_DEX_ZIGZAGOON, + NATIONAL_DEX_LINOONE, + NATIONAL_DEX_LEDYBA, + NATIONAL_DEX_LEDIAN, + NATIONAL_DEX_SPINARAK, + NATIONAL_DEX_ARIADOS, + NATIONAL_DEX_SHINX, + NATIONAL_DEX_LUXIO, + NATIONAL_DEX_LUXRAY, + NATIONAL_DEX_DEERLING, + NATIONAL_DEX_SAWSBUCK, + NATIONAL_DEX_SUNKERN, + NATIONAL_DEX_SUNFLORA, + NATIONAL_DEX_KRICKETOT, + NATIONAL_DEX_KRICKETUNE, + NATIONAL_DEX_SMEARGLE, + NATIONAL_DEX_YUNGOOS, + NATIONAL_DEX_GUMSHOOS, + NATIONAL_DEX_DODUO, + NATIONAL_DEX_DODRIO, + NATIONAL_DEX_BUNEARY, + NATIONAL_DEX_LOPUNNY, + NATIONAL_DEX_ABRA, + NATIONAL_DEX_KADABRA, + NATIONAL_DEX_ALAKAZAM, + NATIONAL_DEX_MAREEP, + NATIONAL_DEX_FLAAFFY, + NATIONAL_DEX_AMPHAROS, + NATIONAL_DEX_ESPURR, + NATIONAL_DEX_MEOWSTIC, NATIONAL_DEX_DROWZEE, NATIONAL_DEX_HYPNO, - NATIONAL_DEX_KRABBY, - NATIONAL_DEX_KINGLER, - NATIONAL_DEX_VOLTORB, - NATIONAL_DEX_ELECTRODE, - NATIONAL_DEX_EXEGGCUTE, - NATIONAL_DEX_EXEGGUTOR, - NATIONAL_DEX_CUBONE, - NATIONAL_DEX_MAROWAK, - NATIONAL_DEX_HITMONLEE, - NATIONAL_DEX_HITMONCHAN, - NATIONAL_DEX_LICKITUNG, - NATIONAL_DEX_KOFFING, - NATIONAL_DEX_WEEZING, - NATIONAL_DEX_RHYHORN, - NATIONAL_DEX_RHYDON, - NATIONAL_DEX_CHANSEY, - NATIONAL_DEX_TANGELA, - NATIONAL_DEX_KANGASKHAN, - NATIONAL_DEX_HORSEA, - NATIONAL_DEX_SEADRA, - NATIONAL_DEX_GOLDEEN, - NATIONAL_DEX_SEAKING, - NATIONAL_DEX_STARYU, - NATIONAL_DEX_STARMIE, + NATIONAL_DEX_MIME_JR, NATIONAL_DEX_MR_MIME, - NATIONAL_DEX_SCYTHER, - NATIONAL_DEX_JYNX, - NATIONAL_DEX_ELECTABUZZ, - NATIONAL_DEX_MAGMAR, - NATIONAL_DEX_PINSIR, - NATIONAL_DEX_TAUROS, NATIONAL_DEX_MAGIKARP, NATIONAL_DEX_GYARADOS, - NATIONAL_DEX_LAPRAS, - NATIONAL_DEX_DITTO, - NATIONAL_DEX_EEVEE, - NATIONAL_DEX_VAPOREON, - NATIONAL_DEX_JOLTEON, - NATIONAL_DEX_FLAREON, - NATIONAL_DEX_PORYGON, - NATIONAL_DEX_OMANYTE, - NATIONAL_DEX_OMASTAR, - NATIONAL_DEX_KABUTO, - NATIONAL_DEX_KABUTOPS, - NATIONAL_DEX_AERODACTYL, - NATIONAL_DEX_SNORLAX, - NATIONAL_DEX_ARTICUNO, - NATIONAL_DEX_ZAPDOS, - NATIONAL_DEX_MOLTRES, - NATIONAL_DEX_DRATINI, - NATIONAL_DEX_DRAGONAIR, - NATIONAL_DEX_DRAGONITE, - NATIONAL_DEX_MEWTWO, - NATIONAL_DEX_MEW, + NATIONAL_DEX_BRONZOR, + NATIONAL_DEX_BRONZONG, + NATIONAL_DEX_ONIX, + NATIONAL_DEX_STEELIX, + NATIONAL_DEX_CRYOGONAL, + NATIONAL_DEX_CARBINK, + NATIONAL_DEX_SNOVER, + NATIONAL_DEX_ABOMASNOW, + NATIONAL_DEX_CUBCHOO, + NATIONAL_DEX_BEARTIC, + NATIONAL_DEX_STANTLER, + NATIONAL_DEX_CRABRAWLER, + NATIONAL_DEX_CRABOMINABLE, + NATIONAL_DEX_SPEAROW, + NATIONAL_DEX_FEAROW, + NATIONAL_DEX_GRUBBIN, + NATIONAL_DEX_CHARJABUG, + NATIONAL_DEX_VIKAVOLT, + NATIONAL_DEX_SHROOMISH, + NATIONAL_DEX_BRELOOM, + NATIONAL_DEX_SKORUPI, + NATIONAL_DEX_DRAPION, + NATIONAL_DEX_HAPPINY, + NATIONAL_DEX_CHANSEY, + NATIONAL_DEX_BLISSEY, + NATIONAL_DEX_KARRABLAST, + NATIONAL_DEX_ESCAVALIER, + NATIONAL_DEX_LOTAD, + NATIONAL_DEX_LOMBRE, + NATIONAL_DEX_LUDICOLO, + NATIONAL_DEX_TYMPOLE, + NATIONAL_DEX_PALPITOAD, + NATIONAL_DEX_SEISMITOAD, + NATIONAL_DEX_MILTANK, + NATIONAL_DEX_LICKITUNG, + NATIONAL_DEX_GOOMY, + NATIONAL_DEX_SLIGGOO, + NATIONAL_DEX_GOODRA, + NATIONAL_DEX_SHELMET, + NATIONAL_DEX_ACCELGOR, + NATIONAL_DEX_EXEGGCUTE, + NATIONAL_DEX_EXEGGUTOR, + NATIONAL_DEX_MEOWTH, + NATIONAL_DEX_PERSIAN, + NATIONAL_DEX_YANMA, + NATIONAL_DEX_YANMEGA, + NATIONAL_DEX_VENONAT, + NATIONAL_DEX_VENOMOTH, + NATIONAL_DEX_SPOINK, + NATIONAL_DEX_GRUMPIG, + NATIONAL_DEX_MEDITITE, + NATIONAL_DEX_MEDICHAM, + NATIONAL_DEX_ABSOL, + NATIONAL_DEX_GLAMEOW, + NATIONAL_DEX_PURUGLY, }; const u16 gRegionalDexCount = ARRAY_COUNT(gPokedexOrder_Regional);