Leahnaya/libpokemegb
1
0
Fork 0
mirror of https://github.com/risingPhil/libpokemegb.git synced 2026-04-25 16:23:50 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bugfix/fix distribution event pokemon inconsistencies (#5)

Browse Source 
* Add Gen I Japanese Distribution Event Pokémon

* Remove external definitions of each individual distribution pokémon from the headers and make them static in the source file

* Add isJapanese field to Gen2DistributionPokemon struct and adapt every existing definition

* Fix mistake in last commit

* Make sure the OT name is replaced when dealing with Japanese distribution pokémon on a different language cart and vice versa

* Add Japanese Mystery Egg #3 gen II  event distribution Pokémon

* Add remaining Japanese Event Distribution Pokémon

* Fix another issue with Gen I nicknames. Gen II is also still entirely broken in this regard

* Fix OT and nicknames for Japanese gen I games

* Refactor the gen1 related code to store the different SRAM offsets for gen 1 saves similarly as we do for gen 2

* Fix some inconsistencies with Gen II distribution event pokémon.
This commit is contained in:
Philippe Symons 2025-02-10 21:15:18 +01:00 committed by GitHub
parent a8d8be3c1f
commit fd1ef36089
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/gen2/Gen2DistributionPokemon.cpp
View File

@ -479,7 +479,7 @@ static const Gen2DistributionPokemon g2_jpn_pcMysteryEggPsyduck = {
};
static const Gen2DistributionPokemon g2_jpn_pcMysteryEggChikorita = {
.name = "PC Mystery Egg Chikorita (JPN)",
.name = "PC Mystery Egg #1|#2 Chikorita (JPN)",
.originalTrainer = "",
.originalTrainerID = 0,
.setPlayerAsOriginalTrainer = true,
@ -4928,7 +4928,7 @@ static const Gen2DistributionPokemon g2_pcny_petalDanceCleffa = {
};
static const Gen2DistributionPokemon g2_pcny_scaryFaceCleffa = {
.name = "Petal Dance Cleffa",
.name = "Scary Face Cleffa",
.originalTrainer = "",
.originalTrainerID = 0,
.setPlayerAsOriginalTrainer = true,
@ -5116,7 +5116,7 @@ static const Gen2DistributionPokemon g2_pcny_petalDanceIgglybuff = {
};
static const Gen2DistributionPokemon g2_pcny_scaryFaceIgglybuff = {
.name = "Petal Dance Igglybuff",
.name = "Scary Face Igglybuff",
.originalTrainer = "",
.originalTrainerID = 0,
.setPlayerAsOriginalTrainer = true,
@ -5304,7 +5304,7 @@ static const Gen2DistributionPokemon g2_pcny_hydroPumpMarill = {
};
static const Gen2DistributionPokemon g2_pcny_scaryFaceMarill = {
.name = "Hydro Pump Marill",
.name = "Scary Face Marill",
.originalTrainer = "",
.originalTrainerID = 0,
.setPlayerAsOriginalTrainer = true,
@ -5586,7 +5586,7 @@ static const Gen2DistributionPokemon g2_pcny_steelWingYanma = {
};
static const Gen2DistributionPokemon g2_pcny_sweetKissYanma = {
.name = "Steel Wing Yanma",
.name = "Sweet Kiss Yanma",
.originalTrainer = "",
.originalTrainerID = 0,
.setPlayerAsOriginalTrainer = true,
@ -7290,12 +7290,12 @@ static const Gen2DistributionPokemon g2_pcny_Celebi = {
.randomizeIVs = true,
.isJapanese = false,
.poke = {
.poke_index = 246,
.poke_index = 251,
.held_item_index = 0,
.index_move1 = 44, // Leech Seed
.index_move2 = 43, // Confusion
.index_move3 = 99, // Heal Bell
.index_move4 = 0, // Recover
.index_move1 = 73, // Leech Seed
.index_move2 = 93, // Confusion
.index_move3 = 215, // Heal Bell
.index_move4 = 105, // Recover
.original_trainer_ID = 0,
.exp = getExpNeededForLevel(5, GEN2_GRW_MEDIUM_SLOW),
.hp_effort_value = 0,
@ -7304,10 +7304,10 @@ static const Gen2DistributionPokemon g2_pcny_Celebi = {
.speed_effort_value = 0,
.special_effort_value = 0,
.iv_data = {0, 0},
.pp_move1 = 25,
.pp_move2 = 30,
.pp_move3 = 20,
.pp_move4 = 0,
.pp_move1 = 10,
.pp_move2 = 25,
.pp_move3 = 5,
.pp_move4 = 5,
.friendship_or_remaining_egg_cycles = 0,
.pokerus = 0,
.caught_data = 0,