mirror of
https://github.com/kwsch/PKHeX
synced 2024-09-22 15:21:55 +00:00
Merge pull request #1572 from kwsch/usum
Fix save resigning for USUM, add resources for new pokemon
This commit is contained in:
Kurt
GitHub
commit
f825377e83
93 changed files with 2646 additions and 1720 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -210,6 +210,7 @@ $RECYCLE.BIN/
|
|||
#############
|
||||
|
||||
*.resources
|
||||
pingme.txt
|
||||
|
||||
|
||||
#############
|
||||
|
|
|
|||
|
|
@ -12,10 +12,10 @@ namespace PKHeX.Core
|
|||
internal const int MaxBallID_7 = 0x1A; // 26
|
||||
internal const int MaxGameID_7 = 41; // Crystal (VC?)
|
||||
|
||||
internal const int MaxSpeciesID_7_USUM = 802; // 807 todo
|
||||
internal const int MaxMoveID_7_USUM = 720; // 728 todo
|
||||
internal const int MaxItemID_7_USUM = 920; // 959 todo
|
||||
internal const int MaxAbilityID_7_USUM = 232; // 233 todo
|
||||
internal const int MaxSpeciesID_7_USUM = 807; // 807 todo
|
||||
internal const int MaxMoveID_7_USUM = 728; // 728 todo
|
||||
internal const int MaxItemID_7_USUM = 959; // 959 todo
|
||||
internal const int MaxAbilityID_7_USUM = 233; // 233 todo
|
||||
|
||||
#region Met Locations
|
||||
|
||||
|
|
|
|||
|
|
@ -387,6 +387,7 @@ namespace PKHeX.Core
|
|||
{
|
||||
forms[745], // Midday
|
||||
forms[1024], // Midnight
|
||||
forms[1064], // Dusk
|
||||
};
|
||||
|
||||
case 746: // Wishiwashi
|
||||
|
|
@ -425,6 +426,15 @@ namespace PKHeX.Core
|
|||
forms[1058], // Busted
|
||||
};
|
||||
|
||||
case 800:
|
||||
return new[]
|
||||
{
|
||||
types[000], // Normal
|
||||
forms[1065], // Dusk Mane
|
||||
forms[1066], // Dawn Wings
|
||||
forms[1067], // Ultra Necrozma
|
||||
};
|
||||
|
||||
case 801: // Magearna
|
||||
return new[]
|
||||
{
|
||||
|
|
@ -497,6 +507,7 @@ namespace PKHeX.Core
|
|||
forms[816], // Unova
|
||||
forms[817], // Kalos
|
||||
forms[818], // Alola
|
||||
forms[1063] // Partner
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ namespace PKHeX.Core
|
|||
/// <summary>
|
||||
/// Personal Table used in <see cref="GameVersion.USUM"/>.
|
||||
/// </summary>
|
||||
public static readonly PersonalTable USUM = GetTable("sm", GameVersion.USUM);
|
||||
public static readonly PersonalTable USUM = GetTable("uu", GameVersion.USUM);
|
||||
/// <summary>
|
||||
/// Personal Table used in <see cref="GameVersion.SM"/>.
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -230,4 +230,5 @@ Nebel-Erzeuger
|
|||
Gras-Erzeuger
|
||||
Metallprotektor
|
||||
Phantomschutz
|
||||
Prismarüstung
|
||||
Prismarüstung
|
||||
Zerebralmacht
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Keiner
|
||||
Kein Item
|
||||
Meisterball
|
||||
Hyperball
|
||||
Superball
|
||||
|
|
@ -918,4 +918,43 @@ Psycho-Disc
|
|||
Eis-Disc
|
||||
Drachen-Disc
|
||||
Unlicht-Disc
|
||||
Feen-Disc
|
||||
Feen-Disc
|
||||
Solgalium Z
|
||||
Lunalium Z
|
||||
Ultranecronium Z
|
||||
Mimigmium Z
|
||||
Wolwerockium Z
|
||||
Grandirasium Z
|
||||
Solgalium Z
|
||||
Lunalium Z
|
||||
Ultranecronium Z
|
||||
Mimigmium Z
|
||||
Wolwerockium Z
|
||||
Grandirasium Z
|
||||
Z-Kraftring
|
||||
Rosa Blatt
|
||||
Oranges Blatt
|
||||
Blaues Blatt
|
||||
Rotes Blatt
|
||||
Grünes Blatt
|
||||
Gelbes Blatt
|
||||
Violettes Blatt
|
||||
Regenbogenblüte
|
||||
Gewitterorden
|
||||
Necrosol
|
||||
Necrolun
|
||||
Necrosol
|
||||
Necrolun
|
||||
Elimas Normium Z
|
||||
Nachlassball
|
||||
Brutbon
|
||||
Schnäppchenbon
|
||||
Preisgeldbon
|
||||
EP-Bon
|
||||
Freundschaftsbon
|
||||
Lockbon
|
||||
Schutzbon
|
||||
KP-Bon
|
||||
AP-Bon
|
||||
Statuswertebon
|
||||
Fangbon
|
||||
|
|
|
|||
|
|
@ -717,4 +717,13 @@ Tränendrüse
|
|||
Elektropikser
|
||||
Naturzorn
|
||||
Multi-Angriff
|
||||
Tausendfacher Donnerblitz
|
||||
Tausendfacher Donnerblitz
|
||||
Knallkopf
|
||||
Plasmafäuste
|
||||
Photonen-Geysir
|
||||
Licht des Erlöschens
|
||||
Schmetternde Sonnenwalze
|
||||
Geballter Mondlaser
|
||||
Herzliche Knuddelkloppe
|
||||
Fataler Steinregen
|
||||
Rasselnder Seelentanz
|
||||
|
|
|
|||
|
|
@ -27,10 +27,10 @@ Pikachu
|
|||
Raichu
|
||||
Sandan
|
||||
Sandamer
|
||||
Nidoran♀
|
||||
Nidoran
|
||||
Nidorina
|
||||
Nidoqueen
|
||||
Nidoran♂
|
||||
Nidoran
|
||||
Nidorino
|
||||
Nidoking
|
||||
Piepi
|
||||
|
|
@ -800,4 +800,9 @@ Katagami
|
|||
Schlingking
|
||||
Necrozma
|
||||
Magearna
|
||||
Marshadow
|
||||
Marshadow
|
||||
Venicro
|
||||
Agoyon
|
||||
Muramura
|
||||
Kopplosio
|
||||
Zeraora
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ Route 10
|
|||
|
||||
Route 11
|
||||
|
||||
Küste von Ula-Ula
|
||||
Strand von Ula-Ula
|
||||
|
||||
Route 13
|
||||
|
||||
|
|
@ -188,7 +188,46 @@ Kampfbaum
|
|||
|
||||
Æther-Paradies
|
||||
|
||||
Ultradimension
|
||||
Ultratiefsee
|
||||
|
||||
Malihe City
|
||||
Kap am Stadtrand
|
||||
Kap am Stadtrand
|
||||
Mele-Mele
|
||||
Akala
|
||||
Ula-Ula
|
||||
Poni
|
||||
Big Wave Beach
|
||||
|
||||
Strandhöhle
|
||||
|
||||
Kantai-Strand
|
||||
|
||||
Strand von Poni
|
||||
|
||||
Ultrametropolis
|
||||
|
||||
Metropo Tower
|
||||
|
||||
Ultrakraftwerk
|
||||
|
||||
Ultratal
|
||||
|
||||
Ultrawüste
|
||||
|
||||
Ultrawald
|
||||
|
||||
Ultradschungel
|
||||
|
||||
Ultrawolkenkratzer
|
||||
|
||||
Ultradimension Zero
|
||||
|
||||
Rocket-Schloss
|
||||
|
||||
Tunnel in der Ebene
|
||||
|
||||
Pikachu-Tal
|
||||
|
||||
Route 1
|
||||
Trainerschule
|
||||
Spaltberg-Tunnel
|
||||
|
|
|
|||
|
|
@ -13,4 +13,5 @@ Pokémon GO
|
|||
Kanto-Region
|
||||
Hoenn-Region
|
||||
Alola-Region
|
||||
Pokémon-Resort
|
||||
Pokémon-Resort
|
||||
Johto-Region
|
||||
|
|
|
|||
|
|
@ -85,4 +85,4 @@ Pokémon GO
|
|||
Pokémon Bank
|
||||
Pokémon-Geschäft
|
||||
Demo-Version
|
||||
Pokémon Trainer Club
|
||||
Pokémon Trainer Club
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Ferne Person
|
||||
Hortleiterinnen
|
||||
Schatzsucher
|
||||
Dame der Heißen Quellen
|
||||
Dame der Heißen Quellen
|
||||
|
|
|
|||
|
|
@ -230,4 +230,5 @@ Misty Surge
|
|||
Grassy Surge
|
||||
Full Metal Body
|
||||
Shadow Shield
|
||||
Prism Armor
|
||||
Prism Armor
|
||||
Neuroforce
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -30,8 +30,8 @@ Omega Ruby
|
|||
|
||||
Sun
|
||||
Moon
|
||||
|
||||
|
||||
Ultra Sun
|
||||
Ultra Moon
|
||||
GO
|
||||
Red
|
||||
Blue [INT]/Green [JP]
|
||||
|
|
|
|||
|
|
@ -918,4 +918,43 @@ Psychic Memory
|
|||
Ice Memory
|
||||
Dragon Memory
|
||||
Dark Memory
|
||||
Fairy Memory
|
||||
Fairy Memory
|
||||
Solganium Z
|
||||
Lunalium Z
|
||||
Ultranecrozium Z
|
||||
Mimikium Z
|
||||
Lycanium Z
|
||||
Kommonium Z
|
||||
Solganium Z
|
||||
Lunalium Z
|
||||
Ultranecrozium Z
|
||||
Mimikium Z
|
||||
Lycanium Z
|
||||
Kommonium Z
|
||||
Z-Power Ring
|
||||
Pink Petal
|
||||
Orange Petal
|
||||
Blue Petal
|
||||
Red Petal
|
||||
Green Petal
|
||||
Yellow Petal
|
||||
Purple Petal
|
||||
Rainbow Flower
|
||||
Surge Badge
|
||||
N-Solarizer
|
||||
N-Lunarizer
|
||||
N-Solarizer
|
||||
N-Lunarizer
|
||||
Ilima’s Normalium Z
|
||||
Left Poké Ball
|
||||
Roto Hatch
|
||||
Roto Bargain
|
||||
Roto Prize Money
|
||||
Roto Exp. Points
|
||||
Roto Friendship
|
||||
Roto Encounter
|
||||
Roto Stealth
|
||||
Roto HP Restore
|
||||
Roto PP Restore
|
||||
Roto Boost
|
||||
Roto Catch
|
||||
|
|
|
|||
|
|
@ -717,4 +717,13 @@ Tearful Look
|
|||
Zing Zap
|
||||
Nature’s Madness
|
||||
Multi-Attack
|
||||
10,000,000 Volt Thunderbolt
|
||||
10,000,000 Volt Thunderbolt
|
||||
Mind Blown
|
||||
Plasma Fists
|
||||
Photon Geyser
|
||||
Light That Burns the Sky
|
||||
Searing Sunraze Smash
|
||||
Menacing Moonraze Maelstrom
|
||||
Let’s Snuggle Forever
|
||||
Splintered Stormshards
|
||||
Clangorous Soulblaze
|
||||
|
|
|
|||
|
|
@ -27,10 +27,10 @@ Pikachu
|
|||
Raichu
|
||||
Sandshrew
|
||||
Sandslash
|
||||
Nidoran♀
|
||||
Nidoran
|
||||
Nidorina
|
||||
Nidoqueen
|
||||
Nidoran♂
|
||||
Nidoran
|
||||
Nidorino
|
||||
Nidoking
|
||||
Clefairy
|
||||
|
|
@ -800,4 +800,9 @@ Kartana
|
|||
Guzzlord
|
||||
Necrozma
|
||||
Magearna
|
||||
Marshadow
|
||||
Marshadow
|
||||
Poipole
|
||||
Naganadel
|
||||
Stakataka
|
||||
Blacephalon
|
||||
Zeraora
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ Route 10
|
|||
|
||||
Route 11
|
||||
|
||||
Secluded Shore
|
||||
Ula’ula Beach
|
||||
|
||||
Route 13
|
||||
|
||||
|
|
@ -188,7 +188,46 @@ Battle Tree
|
|||
|
||||
Aether Paradise
|
||||
|
||||
Ultra Space
|
||||
Ultra Deep Sea
|
||||
|
||||
Malie City
|
||||
Outer Cape
|
||||
Outer Cape
|
||||
Melemele
|
||||
Akala
|
||||
Ula’ula
|
||||
Poni
|
||||
Big Wave Beach
|
||||
|
||||
Sandy Cave
|
||||
|
||||
Heahea Beach
|
||||
|
||||
Poni Beach
|
||||
|
||||
Ultra Megalopolis
|
||||
|
||||
Megalo Tower
|
||||
|
||||
Ultra Plant
|
||||
|
||||
Ultra Crater
|
||||
|
||||
Ultra Desert
|
||||
|
||||
Ultra Forest
|
||||
|
||||
Ultra Jungle
|
||||
|
||||
Ultra Ruin
|
||||
|
||||
Ultra Space Wilds
|
||||
|
||||
Team Rocket’s Castle
|
||||
|
||||
Plains Grotto
|
||||
|
||||
Pikachu Valley
|
||||
|
||||
Route 1
|
||||
Trainers’ School
|
||||
Dividing Peak Tunnel
|
||||
|
|
|
|||
|
|
@ -13,4 +13,5 @@ Pokémon GO
|
|||
the Kanto region
|
||||
the Hoenn region
|
||||
the Alola region
|
||||
Poké Pelago
|
||||
Poké Pelago
|
||||
the Johto region
|
||||
|
|
|
|||
|
|
@ -85,4 +85,4 @@ Pokémon GO
|
|||
Pokémon Bank
|
||||
a Pokémon shop
|
||||
a demo version
|
||||
the Pokémon Trainer Club
|
||||
the Pokémon Trainer Club
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
a stranger
|
||||
Nursery helpers
|
||||
a treasure hunter
|
||||
an old hot-springs visitor
|
||||
an old hot-springs visitor
|
||||
|
|
|
|||
|
|
@ -230,4 +230,5 @@ Nebulogénesis
|
|||
Herbogénesis
|
||||
Guardia Metálica
|
||||
Guardia Espectro
|
||||
Armadura Prisma
|
||||
Armadura Prisma
|
||||
Fuerza Cerebral
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,4 +1,4 @@
|
|||
Ninguno
|
||||
Ningún objeto
|
||||
Master Ball
|
||||
Ultra Ball
|
||||
Super Ball
|
||||
|
|
@ -918,4 +918,43 @@ Disco Psíquico
|
|||
Disco Hielo
|
||||
Disco Dragón
|
||||
Disco Siniestro
|
||||
Disco Hada
|
||||
Disco Hada
|
||||
Solgaleostal Z
|
||||
Lunalastal Z
|
||||
Ultranecrostal Z
|
||||
Mimikyustal Z
|
||||
Lycanrostal Z
|
||||
Kommostal Z
|
||||
Solgaleostal Z
|
||||
Lunalastal Z
|
||||
Ultranecrostal Z
|
||||
Mimikyustal Z
|
||||
Lycanrostal Z
|
||||
Kommostal Z
|
||||
Superpulsera Z
|
||||
Pétalo Rosa
|
||||
Pétalo Naranja
|
||||
Pétalo Azul
|
||||
Pétalo Rojo
|
||||
Pétalo Verde
|
||||
Pétalo Amarillo
|
||||
Pétalo Violeta
|
||||
Flor Irisada
|
||||
Medalla Fulgor
|
||||
Necrosol
|
||||
Necroluna
|
||||
Necrosol
|
||||
Necroluna
|
||||
Cristal Z (Liam)
|
||||
Poké Ball Ajena
|
||||
Cupón Eclosión
|
||||
Cupón Rebaja
|
||||
Cupón Botín
|
||||
Cupón Exp
|
||||
Cupón Amistad
|
||||
Cupón Reclamo
|
||||
Cupón Sigilo
|
||||
Cupón PS
|
||||
Cupón PP
|
||||
Cupón Refuerzo
|
||||
Cupón Captura
|
||||
|
|
|
|||
|
|
@ -717,4 +717,13 @@ Ojos Llorosos
|
|||
Electropunzada
|
||||
Furia Natural
|
||||
Multiataque
|
||||
Gigarrayo Fulminante
|
||||
Gigarrayo Fulminante
|
||||
Cabeza Sorpresa
|
||||
Puños Plasma
|
||||
Géiser Fotónico
|
||||
Fotodestrucción Apocalíptica
|
||||
Embestida Solar
|
||||
Deflagración Lunar
|
||||
Somanta Amistosa
|
||||
Tempestad Rocosa
|
||||
Estruendo Implacable
|
||||
|
|
|
|||
|
|
@ -27,10 +27,10 @@ Pikachu
|
|||
Raichu
|
||||
Sandshrew
|
||||
Sandslash
|
||||
Nidoran♀
|
||||
Nidoran
|
||||
Nidorina
|
||||
Nidoqueen
|
||||
Nidoran♂
|
||||
Nidoran
|
||||
Nidorino
|
||||
Nidoking
|
||||
Clefairy
|
||||
|
|
@ -800,4 +800,9 @@ Kartana
|
|||
Guzzlord
|
||||
Necrozma
|
||||
Magearna
|
||||
Marshadow
|
||||
Marshadow
|
||||
Poipole
|
||||
Naganadel
|
||||
Stakataka
|
||||
Blacephalon
|
||||
Zeraora
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ Ruta 10
|
|||
|
||||
Ruta 11
|
||||
|
||||
Playa Menor
|
||||
Playa de Ula-Ula
|
||||
|
||||
Ruta 13
|
||||
|
||||
|
|
@ -188,7 +188,46 @@ Isla Exeggutor
|
|||
|
||||
Paraíso Æther
|
||||
|
||||
Ultraespacio
|
||||
Ultraabismo
|
||||
|
||||
Ciudad Malíe
|
||||
Cabo de las Afueras
|
||||
Cabo de las Afueras
|
||||
Melemele
|
||||
Akala
|
||||
Ula-Ula
|
||||
Poni
|
||||
Playa Big Wave
|
||||
|
||||
Cueva Costera
|
||||
|
||||
Playa de Kantai
|
||||
|
||||
Playa de Poni
|
||||
|
||||
Ultrópolis
|
||||
|
||||
Torre Ultrópolis
|
||||
|
||||
Ultragenerador
|
||||
|
||||
Ultravalle
|
||||
|
||||
Ultradesierto
|
||||
|
||||
Ultrabosque
|
||||
|
||||
Ultrajungla
|
||||
|
||||
Ultraurbe
|
||||
|
||||
Ultraespacio Cero
|
||||
|
||||
Castillo Team Rocket
|
||||
|
||||
Gruta de la Llanura
|
||||
|
||||
Valle de los Pikachu
|
||||
|
||||
Ruta 1
|
||||
Escuela Entrenadores
|
||||
Túnel del Volcán
|
||||
|
|
|
|||
|
|
@ -13,4 +13,5 @@ Pokémon GO
|
|||
Kanto
|
||||
Hoenn
|
||||
Alola
|
||||
Poké Resort
|
||||
Poké Resort
|
||||
Johto
|
||||
|
|
|
|||
|
|
@ -85,4 +85,4 @@ Pokémon GO
|
|||
Banco de Pokémon
|
||||
Establecimiento Pokémon
|
||||
versión de prueba
|
||||
Club de Entrenadores Pokémon
|
||||
Club de Entrenadores Pokémon
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Persona lejana
|
||||
Cuidados Pokémon
|
||||
Buscatesoros
|
||||
Anciana del Balneario
|
||||
Anciana del Balneario
|
||||
|
|
|
|||
|
|
@ -230,4 +230,5 @@ Créa-Brume
|
|||
Créa-Herbe
|
||||
Métallo-Garde
|
||||
Spectro-Bouclier
|
||||
Prisme-Armure
|
||||
Prisme-Armure
|
||||
Cérébro-Force
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,4 +1,4 @@
|
|||
Aucun
|
||||
Aucun objet
|
||||
Master Ball
|
||||
Hyper Ball
|
||||
Super Ball
|
||||
|
|
@ -918,4 +918,43 @@ ROM Psy
|
|||
ROM Glace
|
||||
ROM Dragon
|
||||
ROM Ténèbres
|
||||
ROM Fée
|
||||
ROM Fée
|
||||
Solgazélite
|
||||
Lunazélite
|
||||
Ultranécrozélite
|
||||
Mimiquizélite
|
||||
Lougarozélite
|
||||
Ékaïzélite
|
||||
Solgazélite
|
||||
Lunazélite
|
||||
Ultranécrozélite
|
||||
Mimiquizélite
|
||||
Lougarozélite
|
||||
Ékaïzélite
|
||||
Super Bracelet Z
|
||||
Pétale Rose
|
||||
Pétale Orange
|
||||
Pétale Bleu
|
||||
Pétale Rouge
|
||||
Pétale Vert
|
||||
Pétale Jaune
|
||||
Pétale Violet
|
||||
Fleur 7 Couleurs
|
||||
Fulguro-Badge
|
||||
Necrosol
|
||||
Necroluna
|
||||
Necrosol
|
||||
Necroluna
|
||||
Cristal Z Althéo
|
||||
Poké Ball donnée
|
||||
Moti-Couveuse
|
||||
Moti-Promo
|
||||
Moti-Magot
|
||||
Moti-Exp
|
||||
Moti-Cœur
|
||||
Moti-Appât
|
||||
Moti-Camouflage
|
||||
Moti-Récup’ PV
|
||||
Moti-Récup’ PP
|
||||
Moti-Soutien
|
||||
Moti-Capture
|
||||
|
|
|
|||
|
|
@ -717,4 +717,13 @@ Larme à l’Œil
|
|||
Électrikipik
|
||||
Ire de la Nature
|
||||
Coup Varia-Type
|
||||
Giga-Tonnerre
|
||||
Giga-Tonnerre
|
||||
Caboche-Kaboum
|
||||
Plasma Punch
|
||||
Photo-Geyser
|
||||
Apocalypsis Luminis
|
||||
Hélio-Choc Dévastateur
|
||||
Rayons Séléno-Explosifs
|
||||
Patati-Patattrape
|
||||
Hurlement des Roches-Lames
|
||||
Dracacophonie Flamboyante
|
||||
|
|
|
|||
|
|
@ -27,10 +27,10 @@ Pikachu
|
|||
Raichu
|
||||
Sabelette
|
||||
Sablaireau
|
||||
Nidoran♀
|
||||
Nidoran
|
||||
Nidorina
|
||||
Nidoqueen
|
||||
Nidoran♂
|
||||
Nidoran
|
||||
Nidorino
|
||||
Nidoking
|
||||
Mélofée
|
||||
|
|
@ -800,4 +800,9 @@ Katagami
|
|||
Engloutyran
|
||||
Necrozma
|
||||
Magearna
|
||||
Marshadow
|
||||
Marshadow
|
||||
Vémini
|
||||
Mandrillon
|
||||
Ama-Ama
|
||||
Pierroteknik
|
||||
Zeraora
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ Route 10
|
|||
|
||||
Route 11
|
||||
|
||||
Côte Sauvage
|
||||
Plage d’Ula-Ula
|
||||
|
||||
Route 13
|
||||
|
||||
|
|
@ -188,7 +188,46 @@ Arbre de Combat
|
|||
|
||||
Paradis Æther
|
||||
|
||||
Ultra-Dimension
|
||||
Ultra-Abysses
|
||||
|
||||
Malié
|
||||
Cap Passiloin
|
||||
Cap Passiloin
|
||||
Mele-Mele
|
||||
Akala
|
||||
Ula-Ula
|
||||
Poni
|
||||
Plage Big Wave
|
||||
|
||||
Grotte de la Plage
|
||||
|
||||
Plage d’Ho’ohale
|
||||
|
||||
Plage de Poni
|
||||
|
||||
Ultra-Mégalopole
|
||||
|
||||
Tour Mégalopole
|
||||
|
||||
Ultra-Centrale
|
||||
|
||||
Ultra-Vallée
|
||||
|
||||
Ultra-Désert
|
||||
|
||||
Ultra-Forêt
|
||||
|
||||
Ultra-Jungle
|
||||
|
||||
Ultra-Gratte-Ciel
|
||||
|
||||
Ultra-Dimension Zéro
|
||||
|
||||
Château Rocket
|
||||
|
||||
Grotte de la Plaine
|
||||
|
||||
Plaine des Pikachu
|
||||
|
||||
Route 1
|
||||
École de Dresseurs
|
||||
Tunnel Perce-Mont
|
||||
|
|
|
|||
|
|
@ -13,4 +13,5 @@ Pokémon GO
|
|||
Kanto
|
||||
Hoenn
|
||||
Alola
|
||||
Poké Loisir
|
||||
Poké Loisir
|
||||
Johto
|
||||
|
|
|
|||
|
|
@ -85,4 +85,4 @@ Pokémon GO
|
|||
Banque Pokémon
|
||||
Boutique Pokémon
|
||||
Démo
|
||||
Club des Dresseurs Pokémon
|
||||
Club des Dresseurs Pokémon
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Personne lointaine
|
||||
Responsable de la Garderie
|
||||
Chercheur de Trésors
|
||||
Dame des Eaux Thermales
|
||||
Dame des Eaux Thermales
|
||||
|
|
|
|||
|
|
@ -230,4 +230,5 @@ Nebbiogenesi
|
|||
Erbogenesi
|
||||
Metalprotezione
|
||||
Spettroguardia
|
||||
Scudoprisma
|
||||
Scudoprisma
|
||||
Cerebroforza
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -918,4 +918,43 @@ ROM Psico
|
|||
ROM Ghiaccio
|
||||
ROM Drago
|
||||
ROM Buio
|
||||
ROM Folletto
|
||||
ROM Folletto
|
||||
Solgaleium Z
|
||||
Lunalium Z
|
||||
Ultranecrozium Z
|
||||
Mimikyum Z
|
||||
Lycanrochium Z
|
||||
Kommonium Z
|
||||
Solgaleium Z
|
||||
Lunalium Z
|
||||
Ultranecrozium Z
|
||||
Mimikyum Z
|
||||
Lycanrochium Z
|
||||
Kommonium Z
|
||||
Supercerchio Z
|
||||
Petalo rosa
|
||||
Petalo arancione
|
||||
Petalo azzurro
|
||||
Petalo rosso
|
||||
Petalo verde
|
||||
Petalo giallo
|
||||
Petalo violetto
|
||||
Fiore arcobaleno
|
||||
Medaglia Tonante
|
||||
Necrosolix
|
||||
Necrolunix
|
||||
Necrosolix
|
||||
Necrolunix
|
||||
Normium Z Liam
|
||||
Poké Ball altrui
|
||||
Cova’n’roll
|
||||
Sconto’n’roll
|
||||
Soldi’n’roll
|
||||
Esp’n’roll
|
||||
Affetto’n’roll
|
||||
Incontra’n’roll
|
||||
Repelle’n’roll
|
||||
PS’n’roll
|
||||
PP’n’roll
|
||||
Stat’n’roll
|
||||
Acchiappa’n’roll
|
||||
|
|
|
|||
|
|
@ -717,4 +717,13 @@ Occhionilucidi
|
|||
Elettropizzico
|
||||
Ira della Natura
|
||||
Multiattacco
|
||||
Iperfulmine
|
||||
Iperfulmine
|
||||
Sbalorditesta
|
||||
Pugni Plasma
|
||||
Geyser Fotonico
|
||||
Fotodistruzione Apocalittica
|
||||
Supercollisione Solare
|
||||
Deflagrazione Lunare
|
||||
Dolcesacco di Botte
|
||||
Litotempesta Radiale
|
||||
Dracofonia Divampante
|
||||
|
|
|
|||
|
|
@ -27,10 +27,10 @@ Pikachu
|
|||
Raichu
|
||||
Sandshrew
|
||||
Sandslash
|
||||
Nidoran♀
|
||||
Nidoran
|
||||
Nidorina
|
||||
Nidoqueen
|
||||
Nidoran♂
|
||||
Nidoran
|
||||
Nidorino
|
||||
Nidoking
|
||||
Clefairy
|
||||
|
|
@ -800,4 +800,9 @@ Kartana
|
|||
Guzzlord
|
||||
Necrozma
|
||||
Magearna
|
||||
Marshadow
|
||||
Marshadow
|
||||
Poipole
|
||||
Naganadel
|
||||
Stakataka
|
||||
Blacephalon
|
||||
Zeraora
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ Percorso 10
|
|||
|
||||
Percorso 11
|
||||
|
||||
Lido di Ula Ula
|
||||
Spiaggia di Ula Ula
|
||||
|
||||
Percorso 13
|
||||
|
||||
|
|
@ -188,7 +188,46 @@ Albero della Lotta
|
|||
|
||||
Æther Paradise
|
||||
|
||||
Ultramondo
|
||||
Ultrabisso
|
||||
|
||||
Malie
|
||||
Promontorio di Malie
|
||||
Promontorio di Malie
|
||||
Mele Mele
|
||||
Akala
|
||||
Ula Ula
|
||||
Poni
|
||||
Spiaggia Big Wave
|
||||
|
||||
Caverna Costiera
|
||||
|
||||
Spiaggia di Kantai
|
||||
|
||||
Spiaggia di Poni
|
||||
|
||||
Ultramegalopoli
|
||||
|
||||
Torre Megalopoli
|
||||
|
||||
Ultracentrale
|
||||
|
||||
Ultravalle
|
||||
|
||||
Ultradeserto
|
||||
|
||||
Ultraforesta
|
||||
|
||||
Ultragiungla
|
||||
|
||||
Ultragglomerato
|
||||
|
||||
Ultramondo Ignoto
|
||||
|
||||
Castello Team Rocket
|
||||
|
||||
Grotta Prateria
|
||||
|
||||
Valle dei Pikachu
|
||||
|
||||
Percorso 1
|
||||
Scuola Allenatori
|
||||
Tunnel del Vulcano
|
||||
|
|
|
|||
|
|
@ -13,4 +13,5 @@ Pokémon GO
|
|||
Kanto
|
||||
Hoenn
|
||||
Alola
|
||||
Poké Resort
|
||||
Poké Resort
|
||||
Johto
|
||||
|
|
|
|||
|
|
@ -85,4 +85,4 @@ Pokémon GO
|
|||
Banca Pokémon
|
||||
Negozio Pokémon
|
||||
Demo
|
||||
Club Allenatori di Pokémon
|
||||
Club Allenatori di Pokémon
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Persona lontana
|
||||
Ostello Pokémon
|
||||
Cercatesori
|
||||
Vecchina delle terme
|
||||
Vecchina delle terme
|
||||
|
|
|
|||
|
|
@ -230,4 +230,5 @@
|
|||
グラスメイカー
|
||||
メタルプロテクト
|
||||
ファントムガード
|
||||
プリズムアーマー
|
||||
プリズムアーマー
|
||||
ブレインフォース
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -918,4 +918,43 @@
|
|||
アイスメモリ
|
||||
ドラゴンメモリ
|
||||
ダークメモリ
|
||||
フェアリーメモリ
|
||||
フェアリーメモリ
|
||||
ソルガレオＺ
|
||||
ルナアーラＺ
|
||||
ウルトラネクロＺ
|
||||
ミミッキュＺ
|
||||
ルガルガンＺ
|
||||
ジャラランガＺ
|
||||
ソルガレオＺ
|
||||
ルナアーラＺ
|
||||
ウルトラネクロＺ
|
||||
ミミッキュＺ
|
||||
ルガルガンＺ
|
||||
ジャラランガＺ
|
||||
Ｚパワーリング
|
||||
ももいろはなびら
|
||||
だいだいはなびら
|
||||
あおのはなびら
|
||||
あかのはなびら
|
||||
みどりのはなびら
|
||||
きいろのはなびら
|
||||
むらさきはなびら
|
||||
にじいろのはな
|
||||
だいだいバッジ
|
||||
ネクロプラスソル
|
||||
ネクロプラスルナ
|
||||
ネクロプラスソル
|
||||
ネクロプラスルナ
|
||||
イリマのノーマルＺ
|
||||
のこされたボール
|
||||
タマゴふかポン
|
||||
やすうりポン
|
||||
おこづかいポン
|
||||
けいけんポン
|
||||
なつきポン
|
||||
みっけポン
|
||||
かくれポン
|
||||
ＨＰかいふくポン
|
||||
ＰＰかいふくポン
|
||||
おうえんポン
|
||||
つかまえポン
|
||||
|
|
|
|||
|
|
@ -717,4 +717,13 @@
|
|||
びりびりちくちく
|
||||
しぜんのいかり
|
||||
マルチアタック
|
||||
１０００まんボルト
|
||||
１０００まんボルト
|
||||
ビックリヘッド
|
||||
プラズマフィスト
|
||||
フォトンゲイザー
|
||||
てんこがすめつぼうのひかり
|
||||
サンシャインスマッシャー
|
||||
ムーンライトブラスター
|
||||
ぽかぼかフレンドタイム
|
||||
ラジアルエッジストーム
|
||||
ブレイジングソウルビート
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
タマゴ
|
||||
タマゴ
|
||||
フシギダネ
|
||||
フシギソウ
|
||||
フシギバナ
|
||||
|
|
@ -800,4 +800,9 @@
|
|||
アクジキング
|
||||
ネクロズマ
|
||||
マギアナ
|
||||
マーシャドー
|
||||
マーシャドー
|
||||
ベベノム
|
||||
アーゴヨン
|
||||
ツンデツンデ
|
||||
ズガドーン
|
||||
ゼラオラ
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@
|
|||
|
||||
１１ばんどうろ
|
||||
|
||||
ウラウラうらかいがん
|
||||
ウラウラビーチ
|
||||
|
||||
１３ばんどうろ
|
||||
|
||||
|
|
@ -188,7 +188,46 @@
|
|||
|
||||
エーテルパラダイス
|
||||
|
||||
ウルトラスペース
|
||||
ウルトラディープシー
|
||||
|
||||
マリエシティ
|
||||
はずれのみさき
|
||||
はずれのみさき
|
||||
メレメレ
|
||||
アーカラ
|
||||
ウラウラ
|
||||
ポニ
|
||||
ビッグウェーブビーチ
|
||||
|
||||
はまべのほらあな
|
||||
|
||||
カンタイビーチ
|
||||
|
||||
ポニのビーチ
|
||||
|
||||
ウルトラメガロポリス
|
||||
|
||||
メガロタワー
|
||||
|
||||
ウルトラプラント
|
||||
|
||||
ウルトラバレー
|
||||
|
||||
ウルトラデザート
|
||||
|
||||
ウルトラフォレスト
|
||||
|
||||
ウルトラジャングル
|
||||
|
||||
ウルトラビルディング
|
||||
|
||||
ウルトラスペースゼロ
|
||||
|
||||
ロケットだんのしろ
|
||||
|
||||
こうやのよこあな
|
||||
|
||||
ピカチュウのたに
|
||||
|
||||
１ばんどうろ
|
||||
トレーナーズスクール
|
||||
ワカツダケトンネル
|
||||
|
|
|
|||
|
|
@ -13,4 +13,5 @@ Pokémon GO
|
|||
カントーちほう
|
||||
ホウエンちほう
|
||||
アローラちほう
|
||||
ポケリゾート
|
||||
ポケリゾート
|
||||
ジョウトちほう
|
||||
|
|
|
|||
|
|
@ -85,4 +85,4 @@ Pokémon GO
|
|||
ポケモンバンク
|
||||
ポケモンのショップ
|
||||
たいけんばん
|
||||
the Pokémon Trainer Club
|
||||
the Pokémon Trainer Club
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
とおくにいるひと
|
||||
あずかりやさん
|
||||
トレジャーハンター
|
||||
おんせんばあさん
|
||||
おんせんばあさん
|
||||
|
|
|
|||
|
|
@ -230,4 +230,5 @@ AR시스템
|
|||
그래스메이커
|
||||
메탈프로텍트
|
||||
스펙터가드
|
||||
프리즘아머
|
||||
프리즘아머
|
||||
브레인포스
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -918,4 +918,43 @@ Z링
|
|||
아이스메모리
|
||||
드래곤메모리
|
||||
다크메모리
|
||||
페어리메모리
|
||||
페어리메모리
|
||||
솔가레오Z
|
||||
루나아라Z
|
||||
울트라네크로Z
|
||||
따라큐Z
|
||||
루가루암Z
|
||||
짜랑고우거Z
|
||||
솔가레오Z
|
||||
루나아라Z
|
||||
울트라네크로Z
|
||||
따라큐Z
|
||||
루가루암Z
|
||||
짜랑고우거Z
|
||||
Z파워링
|
||||
담홍꽃잎
|
||||
주황꽃잎
|
||||
파랑꽃잎
|
||||
빨강꽃잎
|
||||
초록꽃잎
|
||||
노랑꽃잎
|
||||
보라꽃잎
|
||||
무지개꽃
|
||||
주황배지
|
||||
네크로플러스솔
|
||||
네크로플러스루나
|
||||
네크로플러스솔
|
||||
네크로플러스루나
|
||||
일리마의 노말Z
|
||||
남겨진 볼
|
||||
알부화캡슐토이
|
||||
할인캡슐토이
|
||||
용돈캡슐토이
|
||||
경험캡슐토이
|
||||
친밀도캡슐토이
|
||||
발견캡슐토이
|
||||
숨기캡슐토이
|
||||
HP회복캡슐토이
|
||||
PP회복캡슐토이
|
||||
응원캡슐토이
|
||||
잡기캡슐토이
|
||||
|
|
|
|||
|
|
@ -717,4 +717,13 @@ DD래리어트
|
|||
찌리리따끔따끔
|
||||
자연의분노
|
||||
멀티어택
|
||||
1000만볼트
|
||||
1000만볼트
|
||||
깜짝헤드
|
||||
플라스마피스트
|
||||
포톤가이저
|
||||
하늘을태우는멸망의빛
|
||||
선샤인스매셔
|
||||
문라이트블래스터
|
||||
투닥투닥프렌드타임
|
||||
레이디얼에지스톰
|
||||
브레이징소울비트
|
||||
|
|
|
|||
|
|
@ -27,10 +27,10 @@
|
|||
라이츄
|
||||
모래두지
|
||||
고지
|
||||
니드런♀
|
||||
니드런
|
||||
니드리나
|
||||
니드퀸
|
||||
니드런♂
|
||||
니드런
|
||||
니드리노
|
||||
니드킹
|
||||
삐삐
|
||||
|
|
@ -800,4 +800,9 @@
|
|||
악식킹
|
||||
네크로즈마
|
||||
마기아나
|
||||
마샤도
|
||||
마샤도
|
||||
베베놈
|
||||
아고용
|
||||
차곡차곡
|
||||
두파팡
|
||||
제라오라
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@
|
|||
|
||||
11번도로
|
||||
|
||||
울라울라 뒤쪽 해안
|
||||
울라울라비치
|
||||
|
||||
13번도로
|
||||
|
||||
|
|
@ -188,7 +188,46 @@
|
|||
|
||||
에테르파라다이스
|
||||
|
||||
울트라스페이스
|
||||
울트라딥시
|
||||
|
||||
말리에시티
|
||||
외곽해안가
|
||||
외곽해안가
|
||||
멜레멜레
|
||||
아칼라
|
||||
울라울라
|
||||
포니
|
||||
빅웨이브비치
|
||||
|
||||
해변 동굴
|
||||
|
||||
환대비치
|
||||
|
||||
포니비치
|
||||
|
||||
울트라메가로폴리스
|
||||
|
||||
메가로타워
|
||||
|
||||
울트라플랜트
|
||||
|
||||
울트라밸리
|
||||
|
||||
울트라데저트
|
||||
|
||||
울트라포레스트
|
||||
|
||||
울트라정글
|
||||
|
||||
울트라빌딩
|
||||
|
||||
울트라스페이스제로
|
||||
|
||||
로켓단의 성
|
||||
|
||||
황야 옆굴
|
||||
|
||||
피카츄 골짜기
|
||||
|
||||
1번도로
|
||||
트레이너스쿨
|
||||
경계터널
|
||||
|
|
|
|||
|
|
@ -13,4 +13,5 @@ Pokémon GO
|
|||
관동지방
|
||||
호연지방
|
||||
알로라지방
|
||||
포켓리조트
|
||||
포켓리조트
|
||||
성도지방
|
||||
|
|
|
|||
|
|
@ -85,4 +85,4 @@ Pokémon GO
|
|||
포켓몬 뱅크
|
||||
a Pokémon shop
|
||||
체험판
|
||||
the Pokémon Trainer Club
|
||||
the Pokémon Trainer Club
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
멀리 있는 사람
|
||||
맡기미집
|
||||
트레져헌터
|
||||
온천할머니
|
||||
온천할머니
|
||||
|
|
|
|||
|
|
@ -230,4 +230,5 @@
|
|||
青草制造者
|
||||
金属防护
|
||||
幻影防守
|
||||
棱镜装甲
|
||||
棱镜装甲
|
||||
脑核之力
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -918,4 +918,43 @@
|
|||
冰雪存储碟
|
||||
龙存储碟
|
||||
黑暗存储碟
|
||||
妖精存储碟
|
||||
妖精存储碟
|
||||
索尔迦雷欧Ｚ
|
||||
露奈雅拉Ｚ
|
||||
究极奈克洛Ｚ
|
||||
谜拟ＱＺ
|
||||
鬃岩狼人Ｚ
|
||||
杖尾鳞甲龙Ｚ
|
||||
索尔迦雷欧Ｚ
|
||||
露奈雅拉Ｚ
|
||||
究极奈克洛Ｚ
|
||||
谜拟ＱＺ
|
||||
鬃岩狼人Ｚ
|
||||
杖尾鳞甲龙Ｚ
|
||||
Ｚ强力手环
|
||||
粉红花瓣
|
||||
橙色花瓣
|
||||
蓝色花瓣
|
||||
红色花瓣
|
||||
绿色花瓣
|
||||
黄色花瓣
|
||||
紫色花瓣
|
||||
虹色之花
|
||||
桔色徽章
|
||||
奈克洛索尔合体器
|
||||
奈克洛露奈合体器
|
||||
奈克洛索尔合体器
|
||||
奈克洛露奈合体器
|
||||
伊利马的一般Ｚ
|
||||
留下的精灵球
|
||||
孵蛋碰碰
|
||||
优惠碰碰
|
||||
零花钱碰碰
|
||||
经验碰碰
|
||||
亲密碰碰
|
||||
相遇碰碰
|
||||
隐身碰碰
|
||||
ＨＰ回复碰碰
|
||||
ＰＰ回复碰碰
|
||||
加油碰碰
|
||||
捕捉碰碰
|
||||
|
|
|
|||
|
|
@ -717,4 +717,13 @@
|
|||
麻麻刺刺
|
||||
自然之怒
|
||||
多属性攻击
|
||||
千万伏特
|
||||
千万伏特
|
||||
惊爆大头
|
||||
等离子闪电拳
|
||||
光子喷涌
|
||||
焚天灭世炽光爆
|
||||
日光回旋下苍穹
|
||||
月华飞溅落灵霄
|
||||
亲密无间大乱揍
|
||||
狼啸石牙飓风暴
|
||||
炽魂热舞烈音爆
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -108,7 +108,7 @@
|
|||
|
||||
１１号道路
|
||||
|
||||
乌拉乌拉后海岸
|
||||
乌拉乌拉海滩
|
||||
|
||||
１３号道路
|
||||
|
||||
|
|
@ -188,7 +188,46 @@
|
|||
|
||||
以太乐园
|
||||
|
||||
究极空间
|
||||
究极深海
|
||||
|
||||
马利埃静市
|
||||
市郊海角
|
||||
市郊海角
|
||||
美乐美乐
|
||||
阿卡拉
|
||||
乌拉乌拉
|
||||
波尼
|
||||
大浪海滩
|
||||
|
||||
海滩洞穴
|
||||
|
||||
慷待海滩
|
||||
|
||||
波尼海滩
|
||||
|
||||
究极大都会
|
||||
|
||||
究极大都会塔
|
||||
|
||||
究极发电厂
|
||||
|
||||
究极峡谷
|
||||
|
||||
究极沙漠
|
||||
|
||||
究极森林
|
||||
|
||||
究极丛林
|
||||
|
||||
究极大厦
|
||||
|
||||
究极空间零地带
|
||||
|
||||
火箭队城堡
|
||||
|
||||
旷野洞窟
|
||||
|
||||
皮卡丘山谷
|
||||
|
||||
１号道路
|
||||
训练家学校
|
||||
分隔岭隧道
|
||||
|
|
|
|||
|
|
@ -13,4 +13,5 @@ Pokémon GO
|
|||
关都地区
|
||||
丰缘地区
|
||||
阿罗拉地区
|
||||
宝可度假地
|
||||
宝可度假地
|
||||
城都地区
|
||||
|
|
|
|||
|
|
@ -85,4 +85,4 @@ Pokémon GO
|
|||
宝可梦虚拟银行
|
||||
宝可梦的店
|
||||
体验版
|
||||
the Pokémon Trainer Club
|
||||
the Pokémon Trainer Club
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
远处的人
|
||||
寄放屋
|
||||
寻宝猎人
|
||||
温泉婆婆
|
||||
温泉婆婆
|
||||
|
|
|
|||
|
|
@ -147,9 +147,10 @@ namespace PKHeX.Core
|
|||
return null;
|
||||
|
||||
// Save Chunks are 0x200 bytes each; Memecrypto signature is 0x100 bytes into the 2nd to last chunk.
|
||||
int ChecksumTableOffset = sav7.Length - 0x200;
|
||||
int MemeCryptoOffset = ChecksumTableOffset - 0x100;
|
||||
const int ChecksumSignatureLength = 0x140;
|
||||
var isUSUM = sav7.Length == SaveUtil.SIZE_G7USUM;
|
||||
var ChecksumTableOffset = sav7.Length - 0x200;
|
||||
var MemeCryptoOffset = isUSUM ? 0x6C100 : 0x6BB00;
|
||||
var ChecksumSignatureLength = isUSUM ? 0x150 : 0x140;
|
||||
const int MemeCryptoSignatureLength = 0x80;
|
||||
|
||||
var outSav = (byte[])sav7.Clone();
|
||||
|
|
|
|||
|
|
@ -114,6 +114,7 @@ namespace PKHeX.Core
|
|||
// clear memecrypto sig
|
||||
if (Blocks.Length > MemeCryptoBlock)
|
||||
new byte[0x80].CopyTo(Data, Blocks[MemeCryptoBlock].Offset + 0x100);
|
||||
|
||||
}
|
||||
|
||||
private const int MemeCryptoBlock = 36; // todo
|
||||
|
|
@ -973,6 +974,9 @@ namespace PKHeX.Core
|
|||
if (pkm.IsEgg) // do not add
|
||||
return;
|
||||
|
||||
if (USUM) // TODO: IMPLEMENT POKEDEX EDITING FOR USUM
|
||||
return;
|
||||
|
||||
int bit = pkm.Species - 1;
|
||||
int bd = bit >> 3; // div8
|
||||
int bm = bit & 7; // mod8
|
||||
|
|
|
|||
|
|
@ -734,6 +734,17 @@
|
|||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="icon.ico" />
|
||||
<None Include="Resources\img\Pokemon Sprites\25-7.png" />
|
||||
<None Include="Resources\img\Pokemon Sprites\744-1.png" />
|
||||
<None Include="Resources\img\Pokemon Sprites\745-2.png" />
|
||||
<None Include="Resources\img\Pokemon Sprites\800-1.png" />
|
||||
<None Include="Resources\img\Pokemon Sprites\800-2.png" />
|
||||
<None Include="Resources\img\Pokemon Sprites\800-3.png" />
|
||||
<Content Include="Resources\img\Pokemon Sprites\803.png" />
|
||||
<Content Include="Resources\img\Pokemon Sprites\804.png" />
|
||||
<Content Include="Resources\img\Pokemon Sprites\805.png" />
|
||||
<Content Include="Resources\img\Pokemon Sprites\806.png" />
|
||||
<Content Include="Resources\img\Pokemon Sprites\807.png" />
|
||||
<None Include="Resources\img\Pokemon Sprites\490-e.png" />
|
||||
<None Include="Resources\img\misc\leaf.png" />
|
||||
<None Include="Resources\img\misc\crown.png" />
|
||||
|
|
|
|||
126
PKHeX.WinForms/Properties/Resources.Designer.cs
generated
126
PKHeX.WinForms/Properties/Resources.Designer.cs
generated
|
|
@ -2330,6 +2330,16 @@ namespace PKHeX.WinForms.Properties {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap _25_7 {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("_25_7", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
|
|
@ -9300,6 +9310,16 @@ namespace PKHeX.WinForms.Properties {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap _744_1 {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("_744_1", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
|
|
@ -9320,6 +9340,16 @@ namespace PKHeX.WinForms.Properties {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap _745_2 {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("_745_2", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
|
|
@ -10110,6 +10140,36 @@ namespace PKHeX.WinForms.Properties {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap _800_1 {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("_800_1", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap _800_2 {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("_800_2", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap _800_3 {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("_800_3", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
|
|
@ -10140,6 +10200,56 @@ namespace PKHeX.WinForms.Properties {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap _803 {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("_803", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap _804 {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("_804", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap _805 {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("_805", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap _806 {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("_806", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
internal static System.Drawing.Bitmap _807 {
|
||||
get {
|
||||
object obj = ResourceManager.GetObject("_807", resourceCulture);
|
||||
return ((System.Drawing.Bitmap)(obj));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||
/// </summary>
|
||||
|
|
@ -12334,15 +12444,13 @@ namespace PKHeX.WinForms.Properties {
|
|||
/// Looks up a localized string similar to PKHeX - By Kaphotics
|
||||
///http://projectpokemon.org/pkhex
|
||||
///
|
||||
///17/05/30 - New Update:
|
||||
/// - Program Internals:
|
||||
/// - - PKHeX now uses C# 7 language features.
|
||||
/// - - PKHeX.Core is now a .NET Standard class library.
|
||||
///17/10/17 - New Update:
|
||||
/// - Legality:
|
||||
/// - - Changed: Refactored internals to better handle matching of encounters and future plans.
|
||||
/// - - Added: PIDIV method detection. For now, the only legality flagging present is for Cosseum/XD starters.
|
||||
/// - - Added: More legality check flagging. Thanks javierhimura & wwwwwwzx!
|
||||
/// - Main Window:
/// [rest of string was truncated]";.
|
||||
/// - - Fixed: Gen4 Cute Charm PIDIV detection for species that change gender ratios upon evolution (Combee etc).
|
||||
/// - - Fixed: Gen6/7 Traded eggs change the origin version to the hatcher's version when hatched. Updated affected logic.
|
||||
/// - - Changed: Gen2->Gen7 and Gen2->Gen1->Gen7 transfer detection & checking improved.
|
||||
/// - - Changed: Another round of legality check updates. Thanks (so many different users)!
|
||||
/// - Adde [rest of string was truncated]";.
|
||||
/// </summary>
|
||||
internal static string changelog {
|
||||
get {
|
||||
|
|
@ -17381,7 +17489,7 @@ namespace PKHeX.WinForms.Properties {
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to 20170530.
|
||||
/// Looks up a localized string similar to 20171017.
|
||||
/// </summary>
|
||||
internal static string ProgramVersion {
|
||||
get {
|
||||
|
|
|
|||
|
|
@ -5956,4 +5956,37 @@
|
|||
<data name="_490_e" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\img\Pokemon Sprites\490-e.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="_25_7" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\img\Pokemon Sprites\25-7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="_744_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\img\Pokemon Sprites\744-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="_745_2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\img\Pokemon Sprites\745-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="_800_1" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\img\Pokemon Sprites\800-1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="_800_2" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\img\Pokemon Sprites\800-2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="_800_3" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\img\Pokemon Sprites\800-3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="_803" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\img\Pokemon Sprites\803.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="_804" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\img\Pokemon Sprites\804.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="_805" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\img\Pokemon Sprites\805.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="_806" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\img\Pokemon Sprites\806.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="_807" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\img\Pokemon Sprites\807.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
</root>
|
||||
BIN
PKHeX.WinForms/Resources/img/Pokemon Sprites/25-7.png
Normal file
BIN
PKHeX.WinForms/Resources/img/Pokemon Sprites/25-7.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 475 B |
BIN
PKHeX.WinForms/Resources/img/Pokemon Sprites/744-1.png
Normal file
BIN
PKHeX.WinForms/Resources/img/Pokemon Sprites/744-1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 501 B |
BIN
PKHeX.WinForms/Resources/img/Pokemon Sprites/745-2.png
Normal file
BIN
PKHeX.WinForms/Resources/img/Pokemon Sprites/745-2.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 686 B |
BIN
PKHeX.WinForms/Resources/img/Pokemon Sprites/800-1.png
Normal file
BIN
PKHeX.WinForms/Resources/img/Pokemon Sprites/800-1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 838 B |
BIN
PKHeX.WinForms/Resources/img/Pokemon Sprites/800-2.png
Normal file
BIN
PKHeX.WinForms/Resources/img/Pokemon Sprites/800-2.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 833 B |
BIN
PKHeX.WinForms/Resources/img/Pokemon Sprites/800-3.png
Normal file
BIN
PKHeX.WinForms/Resources/img/Pokemon Sprites/800-3.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 753 B |
BIN
PKHeX.WinForms/Resources/img/Pokemon Sprites/803.png
Normal file
BIN
PKHeX.WinForms/Resources/img/Pokemon Sprites/803.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 587 B |
BIN
PKHeX.WinForms/Resources/img/Pokemon Sprites/804.png
Normal file
BIN
PKHeX.WinForms/Resources/img/Pokemon Sprites/804.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 790 B |
BIN
PKHeX.WinForms/Resources/img/Pokemon Sprites/805.png
Normal file
BIN
PKHeX.WinForms/Resources/img/Pokemon Sprites/805.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 739 B |
BIN
PKHeX.WinForms/Resources/img/Pokemon Sprites/806.png
Normal file
BIN
PKHeX.WinForms/Resources/img/Pokemon Sprites/806.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 686 B |
BIN
PKHeX.WinForms/Resources/img/Pokemon Sprites/807.png
Normal file
BIN
PKHeX.WinForms/Resources/img/Pokemon Sprites/807.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 618 B |
Loading…
Reference in a new issue