diff --git a/Data/Map001.rxdata b/Data/Map001.rxdata index ce02bf008..2a7a97190 100644 Binary files a/Data/Map001.rxdata and b/Data/Map001.rxdata differ diff --git a/Data/Map077.rxdata b/Data/Map077.rxdata index dcb1348d5..96ab47d41 100644 Binary files a/Data/Map077.rxdata and b/Data/Map077.rxdata differ diff --git a/Data/Map129.rxdata b/Data/Map129.rxdata index 3719f0a45..dd0b0608c 100644 Binary files a/Data/Map129.rxdata and b/Data/Map129.rxdata differ diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb index a586549a0..7920600c5 100644 --- a/Data/Scripts/001_Settings.rb +++ b/Data/Scripts/001_Settings.rb @@ -6,7 +6,7 @@ module Settings # The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format. GAME_VERSION = '5.0.0' - GAME_VERSION_NUMBER = "5.0.33 - beta" + GAME_VERSION_NUMBER = "5.0.34 - beta" POKERADAR_LIGHT_ANIMATION_RED_ID = 17 POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18 diff --git a/Data/Scripts/003_Game processing/001_StartGame.rb b/Data/Scripts/003_Game processing/001_StartGame.rb index 1993f062f..3e4a3c7b3 100644 --- a/Data/Scripts/003_Game processing/001_StartGame.rb +++ b/Data/Scripts/003_Game processing/001_StartGame.rb @@ -69,7 +69,6 @@ module Game item_id = bagElement[0] item_qt = bagElement[1] item = GameData::Item.get(item_id) - p item if !item.is_key_item? && !item.is_HM? new_storage.pbStoreItem(item, 1) end diff --git a/Data/Scripts/050_AddOns/Wondertrade.rb b/Data/Scripts/050_AddOns/Wondertrade.rb index 3d4d64f2e..a143aff96 100644 --- a/Data/Scripts/050_AddOns/Wondertrade.rb +++ b/Data/Scripts/050_AddOns/Wondertrade.rb @@ -62,7 +62,11 @@ def pbWonderTrade(lvl, except = [], except2 = [], premiumWonderTrade = true) (poke.level >= lvl) && !(except.include?(poke.species)) # None under "lvl", no exceptions. }) poke = $Trainer.party[pbGet(1)] - $PokemonBag.pbStoreItem(poke.item, 1) if poke.item != nil + if !pbConfirmMessage(_INTL("Trade {1} away?",poke.name)) + return + end + + $PokemonBag.pbStoreItem(poke.item, 1) if poke.item != nil myPoke = poke.species chosenBST = calcBaseStatsSum(myPoke) # The following excecption fields are for hardcoding the blacklisted pokemon diff --git a/Data/System.rxdata b/Data/System.rxdata index 0b2aa89bf..957dad6e0 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/encounters_randomized.dat b/Data/encounters_randomized.dat index 1d239e623..1258dc4db 100644 Binary files a/Data/encounters_randomized.dat and b/Data/encounters_randomized.dat differ