diff --git a/Data/Map013.rxdata b/Data/Map013.rxdata index 3d93d17a3..6fba6bc62 100644 Binary files a/Data/Map013.rxdata and b/Data/Map013.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 4d87013ff..c30f4426d 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb index ff9ba7bdf..573bdd257 100644 --- a/Data/Scripts/001_Settings.rb +++ b/Data/Scripts/001_Settings.rb @@ -5,8 +5,8 @@ #==============================================================================# module Settings # The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format. - GAME_VERSION = '6.4.1' - GAME_VERSION_NUMBER = "6.4.1" + GAME_VERSION = '6.4.2' + GAME_VERSION_NUMBER = "6.4.2" LATEST_GAME_RELEASE = "6.4" POKERADAR_LIGHT_ANIMATION_RED_ID = 17 diff --git a/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb b/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb index f8877b177..ec805a3ae 100644 --- a/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb +++ b/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb @@ -375,7 +375,7 @@ class PokemonPokedexInfo_Scene entryText = customEntry shadowColor = shadowCustom else - if $PokemonSystem.use_generated_dex_entries + if false#$PokemonSystem.use_generated_dex_entries aiEntry = getAIDexEntry(species_data.species, species_data.name) if aiEntry entryText = aiEntry @@ -385,7 +385,8 @@ class PokemonPokedexInfo_Scene shadowColor = shadow end else - entryText = "No custom Pokédex entry available for this Pokémon. Auto-generated placeholder entries can be enabled in the game's options." + entryText = "No custom Pokédex entry available for this Pokémon. Due to community backlash, auto-generated Pokédex entries are no longer available." + #entryText = "No custom Pokédex entry available for this Pokémon. Auto-generated placeholder entries can be enabled in the game's options." shadowColor = shadow end end diff --git a/Data/Scripts/052_AddOns/GameOptions.rb b/Data/Scripts/052_AddOns/GameOptions.rb index b1dc73c15..0b0ef7dd9 100644 --- a/Data/Scripts/052_AddOns/GameOptions.rb +++ b/Data/Scripts/052_AddOns/GameOptions.rb @@ -110,19 +110,19 @@ class PokemonGameOption_Scene < PokemonOption_Scene }, "Automatically download missing custom sprites and Pokédex entries from the internet" ) - - generated_entries_option_selected=$PokemonSystem.use_generated_dex_entries ? 1 : 0 - options << EnumOption.new(_INTL("Autogen dex entries"), [_INTL("Off"), _INTL("On")], - proc { generated_entries_option_selected }, - proc { |value| - $PokemonSystem.use_generated_dex_entries = value == 1 - }, - [ - "Fusions without a custom Pokédex entry display nothing.", - "Fusions without a custom Pokédex entry display an auto-generated placeholder." - - ] - ) + # + # generated_entries_option_selected=$PokemonSystem.use_generated_dex_entries ? 1 : 0 + # options << EnumOption.new(_INTL("Autogen dex entries"), [_INTL("Off"), _INTL("On")], + # proc { generated_entries_option_selected }, + # proc { |value| + # $PokemonSystem.use_generated_dex_entries = value == 1 + # }, + # [ + # "Fusions without a custom Pokédex entry display nothing.", + # "Fusions without a custom Pokédex entry display an auto-generated placeholder." + # + # ] + # ) if $game_switches && ($game_switches[SWITCH_NEW_GAME_PLUS] || $game_switches[SWITCH_BEAT_THE_LEAGUE]) #beat the league options << diff --git a/Data/System.rxdata b/Data/System.rxdata index e7602ef54..d5bff207e 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ