diff --git a/Data/Map481.rxdata b/Data/Map481.rxdata index 7ec78980b..e43762913 100644 Binary files a/Data/Map481.rxdata and b/Data/Map481.rxdata differ diff --git a/Data/Map532.rxdata b/Data/Map532.rxdata index 53f2fb85d..1106f809e 100644 Binary files a/Data/Map532.rxdata and b/Data/Map532.rxdata differ diff --git a/Data/Map561.rxdata b/Data/Map561.rxdata index 09092963c..ab4f72297 100644 Binary files a/Data/Map561.rxdata and b/Data/Map561.rxdata differ diff --git a/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb b/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb index 8afdb791a..b5e9cf5f0 100644 --- a/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb +++ b/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb @@ -414,9 +414,6 @@ def getCustomSpeciesList() for num in 1..NB_POKEMON path = Settings::CUSTOM_BATTLERS_FOLDER_INDEXED + "/" + num.to_s + "/*" filesList = Dir[path] - echo filesList - echo "\n\n" - maxDexNumber = (NB_POKEMON * NB_POKEMON) + NB_POKEMON maxVal = filesList.length - 1 for i in 0..maxVal diff --git a/Data/Scripts/048_Fusion/PokemonFusion.rb b/Data/Scripts/048_Fusion/PokemonFusion.rb index 97549bf30..e20fdfa1b 100644 --- a/Data/Scripts/048_Fusion/PokemonFusion.rb +++ b/Data/Scripts/048_Fusion/PokemonFusion.rb @@ -585,21 +585,6 @@ class PokemonFusionScene else avgLevel = (2 * level2 + level1) / 3 end - - ####CAPTURE RATES - ####Check success Poke 1 - # if (fusionCheckSuccess (30, leveldiff, level1,fusionmultiplier)) then - # return 1 - # else - # return 0 - #end - - ####Check success Poke 2 - # if (fusionCheckSuccess (30, leveldiff, level1,fusionmultiplier)) then - # return 1 - # else - # return 0 - # end return 1 end diff --git a/Data/Scripts/049_Compatibility/Constants.rb b/Data/Scripts/049_Compatibility/Constants.rb index 515ec355c..c684f5e8e 100644 --- a/Data/Scripts/049_Compatibility/Constants.rb +++ b/Data/Scripts/049_Compatibility/Constants.rb @@ -116,6 +116,7 @@ VAR_RIVAL_STARTER=250 VAR_FUSION_ICON_STYLE=220 VAR_SHINY_HUE_OFFSET=275 VAR_CURRENT_HIDDEN_MAP = 226 +VAR_FUSE_COUNTER = 126 #Randomizer VAR_RANDOMIZER_WILD_POKE_BST=197 diff --git a/Data/Scripts/050_AddOns/HiddenAbilityMaps.rb b/Data/Scripts/050_AddOns/HiddenAbilityMaps.rb index 5ac362e63..cfeabf716 100644 --- a/Data/Scripts/050_AddOns/HiddenAbilityMaps.rb +++ b/Data/Scripts/050_AddOns/HiddenAbilityMaps.rb @@ -5,7 +5,7 @@ HIDDEN_MAP_ALWAYS = [178,655,570,356] RANDOM_HIDDEN_MAP_LIST = [8,109,431,446,402,403,467,468,10,23,167,16,19,78,185,86, 491,90,40,342,490,102,103,104,105,106,1,12,413,445,484,485,486,140,350,146, 149,304,356,307,409,351,495,154,349,322,323,544,198,144,155,444,58,59,229,52,53,54, - 55,98,173,174,181,187,95,159,162,437,220,440,438,57,171,172,528,265,288,364,329, + 55,98,173,174,181,187,95,159,162,437,440,438,57,171,172,528,265,288,364,329, 335,254,261,262,266,230,145,147,258,284,283,267,586,285,286,287,300,311,47,580,529, 635,638,646,560,559,526,600,564,594,566,562,619,563,603,561,597,633,640,641,621,312, 670,692,643,523,698, diff --git a/Data/Scripts/050_AddOns/New Items effects.rb b/Data/Scripts/050_AddOns/New Items effects.rb index 3c1ba9e67..5de3ef365 100644 --- a/Data/Scripts/050_AddOns/New Items effects.rb +++ b/Data/Scripts/050_AddOns/New Items effects.rb @@ -379,8 +379,11 @@ ItemHandlers::UseFromBag.add(:ODDKEYSTONE, proc { |item| }) def useDreamMirror - map_name = Kernel.getMapName(pbGet(226)).to_s + visitedMap = $PokemonGlobal.visitedMaps[pbGet(226)] + map_name = visitedMap ? Kernel.getMapName(pbGet(226)).to_s : "an unknown location" + Kernel.pbMessage(_INTL("You peeked into the Dream Mirror...")) + Kernel.pbMessage(_INTL("You can see a faint glimpse of {1} in the reflection.", map_name)) end @@ -1384,50 +1387,14 @@ end def pbFuse(pokemon, poke2, supersplicers = false) newid = (pokemon.species_data.id_number) * NB_POKEMON + poke2.species_data.id_number - - # pathCustom = _INTL("Graphics/CustomBattlers/{1}.{2}.png", poke2.species_data.id_number, pokemon.species_data.id_number) - # hasCustom = false - # if (pbResolveBitmap(pathCustom)) - # picturePath = pathCustom - # hasCustom = true - # else - # picturePath = _INTL("Graphics/Battlers/{1}/{1}.{2}.png", poke2.species_data.id_number, pokemon.species_data.id_number) - # end - # previewwindow = PictureWindow.new(picturePath) - # - # new_level = calculateFusedPokemonLevel(pokemon.level, poke2.level, supersplicers) - # typeWindow = drawPokemonType(newid) - # drawFusionPreviewText(typeWindow, "Lv. " + new_level.to_s, 232, 0,) - # - # if !$Trainer.seen?(newid) - # if hasCustom - # previewwindow.picture.pbSetColor(150, 255, 150, 200) - # else - # previewwindow.picture.pbSetColor(255, 255, 255, 200) - # end - # end - # previewwindow.x = (Graphics.width / 2) - (previewwindow.width / 2) - # previewwindow.y = ((Graphics.height - 96) / 2) - (previewwindow.height / 2) - # previewwindow.z = 1000000 - - #if (Kernel.pbConfirmMessage(_INTL("Fuse the two Pokémon?", newid))) - # previewwindow.dispose - # typeWindow.dispose fus = PokemonFusionScene.new if (fus.pbStartScreen(pokemon, poke2, newid)) returnItemsToBag(pokemon, poke2) fus.pbFusionScreen(false, supersplicers) - $game_variables[126] += 1 #fuse counter + $game_variables[VAR_FUSE_COUNTER] += 1 #fuse counter fus.pbEndScreen return true - end - # else - # # previewwindow.dispose - # # typeWindow.dispose - # return false - # end - end def pbUnfuse(pokemon, scene, supersplicers, pcPosition = nil) diff --git a/x64-msvcrt-ruby310.dll b/x64-msvcrt-ruby310.dll new file mode 100644 index 000000000..95d8bc318 Binary files /dev/null and b/x64-msvcrt-ruby310.dll differ