diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata index 41edc8e26..7967a5432 100644 Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata index 069b904f5..aa34e5699 100644 Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata index 901f2bb2b..2249bec14 100644 Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata index 31fa46f77..4383f12a5 100644 Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata index be622f513..004ee903d 100644 Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ diff --git a/Data/Items.rxdata b/Data/Items.rxdata index fe767fa0b..3e62ba6d2 100644 Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ diff --git a/Data/Map086.rxdata b/Data/Map086.rxdata index dc03443c6..6b63ad05e 100644 Binary files a/Data/Map086.rxdata and b/Data/Map086.rxdata differ diff --git a/Data/Map293.rxdata b/Data/Map293.rxdata index 184d9cc3a..dba4ecf65 100644 Binary files a/Data/Map293.rxdata and b/Data/Map293.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index ed3d8914e..63d29ac84 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/013_Items/002_Item_Effects.rb b/Data/Scripts/013_Items/002_Item_Effects.rb index 80ab23ff9..470dd9cbe 100644 --- a/Data/Scripts/013_Items/002_Item_Effects.rb +++ b/Data/Scripts/013_Items/002_Item_Effects.rb @@ -1084,10 +1084,10 @@ ItemHandlers::UseOnPokemon.add(:ABILITYCAPSULE, proc { |item, pkmn, scene| }) -ItemHandlers::UseInField.add(:REGITABLET, proc { |item| - pbCommonEvent(COMMON_EVENT_REGI_TABLET) - next true -}) +# ItemHandlers::UseInField.add(:REGITABLET, proc { |item| +# pbCommonEvent(COMMON_EVENT_REGI_TABLET) +# next true +# }) ItemHandlers::UseFromBag.add(:POKERADAR, proc { |item| next (pbCanUsePokeRadar?) ? 2 : 0 diff --git a/Data/Scripts/050_AddOns/GameplayUtils.rb b/Data/Scripts/050_AddOns/GameplayUtils.rb index ba42bb20b..e5310d03b 100644 --- a/Data/Scripts/050_AddOns/GameplayUtils.rb +++ b/Data/Scripts/050_AddOns/GameplayUtils.rb @@ -141,7 +141,6 @@ def getFossilsGuyTeam(level) elsif $game_switches[SWITCH_PICKED_ANORITH_FOSSIL] fossils << :LILEEP if level < fossils_evolution_level_1 fossils << :CRADILY if level >= fossils_evolution_level_1 - end #Celadon fossil if $game_switches[SWITCH_PICKED_ARMOR_FOSSIL] diff --git a/Data/Scripts/050_AddOns/Wondertrade.rb b/Data/Scripts/050_AddOns/Wondertrade.rb index 753f6739c..a143aff96 100644 --- a/Data/Scripts/050_AddOns/Wondertrade.rb +++ b/Data/Scripts/050_AddOns/Wondertrade.rb @@ -98,7 +98,7 @@ def pbWonderTrade(lvl, except = [], except2 = [], premiumWonderTrade = true) end if species > 0 skipLegendaryCheck = premiumWonderTrade && rand(100) < luck - species = 0 if pokemonIsPartLegendary(species) && !$game_switches[SWITCH_BEAT_THcE_LEAGUE] && !skipLegendaryCheck + species = 0 if pokemonIsPartLegendary(species) && !$game_switches[SWITCH_BEAT_THE_LEAGUE] && !skipLegendaryCheck end #Redo loop if below BST - 200 species = 0 if bst < (chosenBST - 200) diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata index a45219f5e..61cba7ea2 100644 Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ diff --git a/Data/States.rxdata b/Data/States.rxdata index 868d49e59..0f9b4ae5d 100644 Binary files a/Data/States.rxdata and b/Data/States.rxdata differ diff --git a/Data/System.rxdata b/Data/System.rxdata index 8b41276cc..005815fee 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index c8af80f12..4d8bbbb09 100644 Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata index c7ea19a7a..d9bd35260 100644 Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ