diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata index 7967a5432..41edc8e26 100644 Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata index b5413ec5f..b9a6bc5fe 100644 Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata index 2249bec14..901f2bb2b 100644 Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata index 632925ac7..d83bead15 100644 Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata index 004ee903d..be622f513 100644 Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ diff --git a/Data/Items.rxdata b/Data/Items.rxdata index 3e62ba6d2..fe767fa0b 100644 Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ diff --git a/Data/Map008.rxdata b/Data/Map008.rxdata index eef62e97e..b18aba7cd 100644 Binary files a/Data/Map008.rxdata and b/Data/Map008.rxdata differ diff --git a/Data/Map012.rxdata b/Data/Map012.rxdata index 53ee23fe1..89b311eb9 100644 Binary files a/Data/Map012.rxdata and b/Data/Map012.rxdata differ diff --git a/Data/Map019.rxdata b/Data/Map019.rxdata index e9480b09c..53c95f403 100644 Binary files a/Data/Map019.rxdata and b/Data/Map019.rxdata differ diff --git a/Data/Map026.rxdata b/Data/Map026.rxdata index 228740280..66a055851 100644 Binary files a/Data/Map026.rxdata and b/Data/Map026.rxdata differ diff --git a/Data/Map095.rxdata b/Data/Map095.rxdata index 0d5983326..90739e1ce 100644 Binary files a/Data/Map095.rxdata and b/Data/Map095.rxdata differ diff --git a/Data/Map171.rxdata b/Data/Map171.rxdata index 72ab0f2b3..2da21c135 100644 Binary files a/Data/Map171.rxdata and b/Data/Map171.rxdata differ diff --git a/Data/Map380.rxdata b/Data/Map380.rxdata index 826a1930d..b7b7ca014 100644 Binary files a/Data/Map380.rxdata and b/Data/Map380.rxdata differ diff --git a/Data/Map431.rxdata b/Data/Map431.rxdata index b4f51d8e9..b7572b246 100644 Binary files a/Data/Map431.rxdata and b/Data/Map431.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index c3e261ce9..6b16057b9 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/012_Overworld/001_Overworld.rb b/Data/Scripts/012_Overworld/001_Overworld.rb index 8364fcd75..f8f65fe05 100644 --- a/Data/Scripts/012_Overworld/001_Overworld.rb +++ b/Data/Scripts/012_Overworld/001_Overworld.rb @@ -701,7 +701,7 @@ end #=============================================================================== # Picking up an item found on the ground #=============================================================================== -def pbItemBall(item,quantity=1) +def pbItemBall(item,quantity=1,item_name="",canRandom=true) item = GameData::Item.get(item) return false if !item || quantity<1 itemname = (quantity>1) ? item.name_plural : item.name @@ -745,7 +745,8 @@ end #=============================================================================== # Being given an item #=============================================================================== -def pbReceiveItem(item,quantity=1) +def pbReceiveItem(item,quantity=1,item_name="",music=nil) + #item_name -> pour donner un autre nom à l'item. Pas encore réimplémenté et surtout là pour éviter que ça plante quand des events essaient de le faire item = GameData::Item.get(item) return false if !item || quantity<1 itemname = (quantity>1) ? item.name_plural : item.name diff --git a/Data/Scripts/014_Pokemon/001_Pokemon-related/003_Pokemon_Sprites.rb b/Data/Scripts/014_Pokemon/001_Pokemon-related/003_Pokemon_Sprites.rb index ac65c3a47..b5cf77c68 100644 --- a/Data/Scripts/014_Pokemon/001_Pokemon-related/003_Pokemon_Sprites.rb +++ b/Data/Scripts/014_Pokemon/001_Pokemon-related/003_Pokemon_Sprites.rb @@ -154,7 +154,7 @@ class PokemonIconSprite < SpriteWrapper end def useRegularIcon(species) - dexNum = convertSpeciesSymbolToDexNumber(species) + dexNum = getDexNumberForSpecies(species) return true if dexNum <= Settings::NB_POKEMON return false if $game_variables == nil return true if $game_variables[220] != 0 diff --git a/Data/Scripts/016_UI/017_UI_PokemonStorage.rb b/Data/Scripts/016_UI/017_UI_PokemonStorage.rb index dc9371dfe..ef5a14d69 100644 --- a/Data/Scripts/016_UI/017_UI_PokemonStorage.rb +++ b/Data/Scripts/016_UI/017_UI_PokemonStorage.rb @@ -15,7 +15,7 @@ class PokemonBoxIcon < IconSprite end def useRegularIcon(species) - dexNum = convertSpeciesSymbolToDexNumber(species) + dexNum = getDexNumberForSpecies(species) return true if dexNum <= Settings::NB_POKEMON return false if $game_variables == nil return true if $game_variables[220] != 0 diff --git a/Data/Scripts/049_Compatibility/PBItems.rb b/Data/Scripts/049_Compatibility/PBItems.rb index 950b9e33a..b8d1b8790 100644 --- a/Data/Scripts/049_Compatibility/PBItems.rb +++ b/Data/Scripts/049_Compatibility/PBItems.rb @@ -466,30 +466,31 @@ module PBItems AIRMAIL = 462 MOSAICMAIL = 463 BRICKMAIL = 464 - XATTACK = 465 - XATTACK2 = 466 - XATTACK3 = 467 - XATTACK6 = 468 - XDEFENSE = 469 - XDEFENSE2 = 470 - XDEFENSE3 = 471 - XDEFENSE6 = 472 - XSPATK = 473 - XSPATK2 = 474 - XSPATK3 = 475 - XSPATK6 = 476 - XSPDEF = 477 - XSPDEF2 = 478 - XSPDEF3 = 479 - XSPDEF6 = 480 - XSPEED = 481 - XSPEED2 = 482 - XSPEED3 = 483 - XSPEED6 = 484 - XACCURACY = 485 - XACCURACY2 = 486 - XACCURACY3 = 487 - XACCURACY6 = 488 + XATTACK = 465 + XATTACK2 = 466 + XATTACK3 = 467 + XATTACK6 = 468 + XDEFENSE = 469 + XDEFENSE2 = 470 + XDEFENSE3 = 471 + XDEFENSE6 = 472 + XSPATK = 473 + XSPECIAL = 473 + XSPATK2 = 474 + XSPATK3 = 475 + XSPATK6 = 476 + XSPDEF = 477 + XSPDEF2 = 478 + XSPDEF3 = 479 + XSPDEF6 = 480 + XSPEED = 481 + XSPEED2 = 482 + XSPEED3 = 483 + XSPEED6 = 484 + XACCURACY = 485 + XACCURACY2 = 486 + XACCURACY3 = 487 + XACCURACY6 = 488 DIREHIT = 489 DIREHIT2 = 490 DIREHIT3 = 491 diff --git a/Data/Scripts/050_AddOns/Gen 2.rb b/Data/Scripts/050_AddOns/Gen 2.rb index 38878fa7b..f1b2fc799 100644 --- a/Data/Scripts/050_AddOns/Gen 2.rb +++ b/Data/Scripts/050_AddOns/Gen 2.rb @@ -130,8 +130,8 @@ end #in: pokemon number def Kernel.isPartPokemon(src, target) - src = convertSpeciesSymbolToDexNumber(src) - target = convertSpeciesSymbolToDexNumber(target) + src = getDexNumberForSpecies(src) + target = getDexNumberForSpecies(target) return true if src == target return false if src <= NB_POKEMON bod = getBasePokemonID(src, true) @@ -152,8 +152,6 @@ def getBasePokemonID(pokemon, body = true) # cname = getConstantName(PBSpecies, pokemon) rescue nil cname = GameData::Species.get(pokemon).id.to_s - - return pokemon if pokemon <= NB_POKEMON return pokemon if cname == nil diff --git a/Data/Scripts/050_AddOns/GeneralUtils.rb b/Data/Scripts/050_AddOns/GeneralUtils.rb index 94c1d1ca4..23168be2a 100644 --- a/Data/Scripts/050_AddOns/GeneralUtils.rb +++ b/Data/Scripts/050_AddOns/GeneralUtils.rb @@ -116,7 +116,7 @@ def pbCheckPokemonIconFiles(speciesNum,egg=false, dna=false) end -def convertSpeciesSymbolToDexNumber(species) +def getDexNumberForSpecies(species) return species if species.is_a?(Integer) if species.is_a?(Symbol) dexNum = GameData::Species.get(species).id_number @@ -158,13 +158,13 @@ def getRandomCustomFusion(returnRandomPokemonIfNoneFound=true,customPokeList=[], end def getBodyID(species) - dexNum = convertSpeciesSymbolToDexNumber(species) + dexNum = getDexNumberForSpecies(species) return (dexNum / NB_POKEMON).round end def getHeadID(species, bodyId) - head_dexNum = convertSpeciesSymbolToDexNumber(species) - body_dexNum = convertSpeciesSymbolToDexNumber(bodyId) + head_dexNum = getDexNumberForSpecies(species) + body_dexNum = getDexNumberForSpecies(bodyId) calculated_number = (head_dexNum - (body_dexNum * NB_POKEMON)).round return calculated_number == 0 ? 420 : calculated_number end diff --git a/Data/Scripts/050_AddOns/PokemonFusion.rb b/Data/Scripts/050_AddOns/PokemonFusion.rb index 03e5c80bd..f31faa51e 100644 --- a/Data/Scripts/050_AddOns/PokemonFusion.rb +++ b/Data/Scripts/050_AddOns/PokemonFusion.rb @@ -788,9 +788,9 @@ def pbChooseAbility(poke, hidden1 = false, hidden2 = false) ability2_name = GameData::Ability.get(abID2).name if (Kernel.pbMessage("Choose an ability.", [_INTL("{1}", ability1_name), _INTL("{1}", ability2_name)], 2)) == 0 - return hidden1 ? 4 : 0 + return abID1#hidden1 ? 4 : 0 end - return hidden2 ? 5 : 1 + return abID2#hidden2 ? 5 : 1 end def pbChooseNature(species1_nature, species2_nature) diff --git a/Data/Scripts/050_AddOns/Trainers Rebattle.rb b/Data/Scripts/050_AddOns/Trainers Rebattle.rb index d17519f8f..00b8e6a2b 100644 --- a/Data/Scripts/050_AddOns/Trainers Rebattle.rb +++ b/Data/Scripts/050_AddOns/Trainers Rebattle.rb @@ -148,17 +148,15 @@ def getEvolution(species) head = getBasePokemonID(species,false) ret_evoB = pbGetEvolvedFormData(body) ret_evoH = pbGetEvolvedFormData(head) - evoBody = ret_evoB.any? ? ret_evoB[0][2] : -1 evoHead = ret_evoH.any? ? ret_evoH[0][2] : -1 - return -1 if isNegativeOrNull(evoBody) && isNegativeOrNull(evoHead) return body*Settings::NB_POKEMON+evoHead if isNegativeOrNull(evoBody) #only head evolves return evoBody*Settings::NB_POKEMON + head if isNegativeOrNull(evoHead) #only body evolves return evoBody*Settings::NB_POKEMON+evoHead #both evolve else evo = pbGetEvolvedFormData(species) - return evo.any? ? evo[0][2] : -1 + return evo.any? ? getDexNumberForSpecies(evo[0][0]) : -1 end end @@ -169,25 +167,27 @@ def getFusionSpecies(body,head) end # def evolveHead(species) - if species <= Settings::NB_POKEMON - evo = getEvolution(species) - return evo == -1 ? species : evo + species_id = getDexNumberForSpecies(species) + if species_id <= Settings::NB_POKEMON + evo = getEvolution(species_id) + return evo == -1 ? species_id : evo end - head = getBasePokemonID(species,false) - body = getBasePokemonID(species) + head = getBasePokemonID(species_id,false) + body = getBasePokemonID(species_id) headEvo = getEvolution(head) - return headEvo == -1 ? species : getFusionSpecies(body,headEvo) + return headEvo == -1 ? species_id : getFusionSpecies(body,headEvo) end def evolveBody(species) - if species <= Settings::NB_POKEMON - evo = getEvolution(species) - return evo == -1 ? species : evo + species_id = getDexNumberForSpecies(species) + if species_id <= Settings::NB_POKEMON + evo = getEvolution(species_id) + return evo == -1 ? species_id : evo end - head = getBasePokemonID(species,false) - body = getBasePokemonID(species) + head = getBasePokemonID(species_id,false) + body = getBasePokemonID(species_id) bodyEvo = getEvolution(body) - return bodyEvo == -1 ? species : getFusionSpecies(bodyEvo,head) + return bodyEvo == -1 ? species_id : getFusionSpecies(bodyEvo,head) end diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata index 61cba7ea2..a45219f5e 100644 Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ diff --git a/Data/States.rxdata b/Data/States.rxdata index 0f9b4ae5d..868d49e59 100644 Binary files a/Data/States.rxdata and b/Data/States.rxdata differ diff --git a/Data/System.rxdata b/Data/System.rxdata index 2399a2d44..0835d6691 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index 516185f40..ed4e48a4b 100644 Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata index d9bd35260..c7ea19a7a 100644 Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ diff --git a/Data/messages.dat b/Data/messages.dat index bcae4ecd2..03956ee77 100644 Binary files a/Data/messages.dat and b/Data/messages.dat differ diff --git a/changelog.txt b/changelog.txt index fc548ba6e..a71c0a433 100644 --- a/changelog.txt +++ b/changelog.txt @@ -107,7 +107,7 @@ Removed features that probably won't be coming back ############ KNOWN ISSUES ############## -- Some areas might have abnormal lag (please tell me in the discord if you find one that's unreasonably laggy) +- Some areas might have abnormal lag - please tell me in the discord if you find one that's unreasonably laggy (you will know if you see one) - Some side-stairs might act strange - The Pokedex is currently all sorts of messed up - Long loading time when starting up the game @@ -116,4 +116,5 @@ Removed features that probably won't be coming back - Significant stutter in the overworld when playing the game on an AMD CPU - Several custom items have not yet been reimplemented - Some battle backgrounds might be missing +- Erika's backsprite uses's May's backsprite from RSE - Some NPC trades likely to crash the game