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 8e67182ba..826e1e8a6 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 95c02103c..ae664fc04 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/Map001.rxdata b/Data/Map001.rxdata index 8de12b105..880ce3f89 100644 Binary files a/Data/Map001.rxdata and b/Data/Map001.rxdata differ diff --git a/Data/Map008.rxdata b/Data/Map008.rxdata index e639c5012..db278ee48 100644 Binary files a/Data/Map008.rxdata and b/Data/Map008.rxdata differ diff --git a/Data/Map077.rxdata b/Data/Map077.rxdata index cb04f1718..b81b09d4b 100644 Binary files a/Data/Map077.rxdata and b/Data/Map077.rxdata differ diff --git a/Data/Map080.rxdata b/Data/Map080.rxdata index dd21b49b3..43d42bb82 100644 Binary files a/Data/Map080.rxdata and b/Data/Map080.rxdata differ diff --git a/Data/Map129.rxdata b/Data/Map129.rxdata index 649380fe4..712a3d3d8 100644 Binary files a/Data/Map129.rxdata and b/Data/Map129.rxdata differ diff --git a/Data/Map267.rxdata b/Data/Map267.rxdata index d44a385ed..9b1f341a8 100644 Binary files a/Data/Map267.rxdata and b/Data/Map267.rxdata differ diff --git a/Data/Map292.rxdata b/Data/Map292.rxdata index 99f9cf549..727c24158 100644 Binary files a/Data/Map292.rxdata and b/Data/Map292.rxdata differ diff --git a/Data/Map295.rxdata b/Data/Map295.rxdata index 56bcb78eb..dfcbc5ad5 100644 Binary files a/Data/Map295.rxdata and b/Data/Map295.rxdata differ diff --git a/Data/Map341.rxdata b/Data/Map341.rxdata index 8f6733cac..7535d7ee2 100644 Binary files a/Data/Map341.rxdata and b/Data/Map341.rxdata differ diff --git a/Data/Map381.rxdata b/Data/Map381.rxdata index e9e13cc1b..5c4fcce4e 100644 Binary files a/Data/Map381.rxdata and b/Data/Map381.rxdata differ diff --git a/Data/Map400.rxdata b/Data/Map400.rxdata index 0339e5b5e..03787a84c 100644 Binary files a/Data/Map400.rxdata and b/Data/Map400.rxdata differ diff --git a/Data/Map401.rxdata b/Data/Map401.rxdata index cdad318fe..5ff825ed3 100644 Binary files a/Data/Map401.rxdata and b/Data/Map401.rxdata differ diff --git a/Data/Map402.rxdata b/Data/Map402.rxdata index d33be869b..ca4940cca 100644 Binary files a/Data/Map402.rxdata and b/Data/Map402.rxdata differ diff --git a/Data/Map403.rxdata b/Data/Map403.rxdata index 3299b15e5..2e1b2b729 100644 Binary files a/Data/Map403.rxdata and b/Data/Map403.rxdata differ diff --git a/Data/Map409.rxdata b/Data/Map409.rxdata index 41143ad0b..d6ec9b601 100644 Binary files a/Data/Map409.rxdata and b/Data/Map409.rxdata differ diff --git a/Data/Map464.rxdata b/Data/Map464.rxdata index 34da54e86..b0b6c9837 100644 Binary files a/Data/Map464.rxdata and b/Data/Map464.rxdata differ diff --git a/Data/Map465.rxdata b/Data/Map465.rxdata index 26ddd540e..e2d5ec205 100644 Binary files a/Data/Map465.rxdata and b/Data/Map465.rxdata differ diff --git a/Data/Map466.rxdata b/Data/Map466.rxdata index f3fd0398f..97f9926c3 100644 Binary files a/Data/Map466.rxdata and b/Data/Map466.rxdata differ diff --git a/Data/Map467.rxdata b/Data/Map467.rxdata index 84c292476..39488928d 100644 Binary files a/Data/Map467.rxdata and b/Data/Map467.rxdata differ diff --git a/Data/Map468.rxdata b/Data/Map468.rxdata index e03356de5..ed63136a7 100644 Binary files a/Data/Map468.rxdata and b/Data/Map468.rxdata differ diff --git a/Data/Map469.rxdata b/Data/Map469.rxdata index c6f4747b1..2ae55245d 100644 Binary files a/Data/Map469.rxdata and b/Data/Map469.rxdata differ diff --git a/Data/Map484.rxdata b/Data/Map484.rxdata index de48e0401..b8ff24c69 100644 Binary files a/Data/Map484.rxdata and b/Data/Map484.rxdata differ diff --git a/Data/Map485.rxdata b/Data/Map485.rxdata index c451ff2d6..b05ab3338 100644 Binary files a/Data/Map485.rxdata and b/Data/Map485.rxdata differ diff --git a/Data/Map486.rxdata b/Data/Map486.rxdata index c16bfed61..78a722290 100644 Binary files a/Data/Map486.rxdata and b/Data/Map486.rxdata differ diff --git a/Data/Map487.rxdata b/Data/Map487.rxdata index 2c324bbeb..f4ff94f8c 100644 Binary files a/Data/Map487.rxdata and b/Data/Map487.rxdata differ diff --git a/Data/Map528.rxdata b/Data/Map528.rxdata index 5c31c81b6..c9dc58e46 100644 Binary files a/Data/Map528.rxdata and b/Data/Map528.rxdata differ diff --git a/Data/Map531.rxdata b/Data/Map531.rxdata index 2e950bb84..450a0cb06 100644 Binary files a/Data/Map531.rxdata and b/Data/Map531.rxdata differ diff --git a/Data/Map556.rxdata b/Data/Map556.rxdata index f2a9ae035..9ef5fb854 100644 Binary files a/Data/Map556.rxdata and b/Data/Map556.rxdata differ diff --git a/Data/Map559.rxdata b/Data/Map559.rxdata index add29ec8c..afd645ab7 100644 Binary files a/Data/Map559.rxdata and b/Data/Map559.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index be4af9151..cb4249e0e 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 afb53e164..f81cb8f34 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.16 - beta" + GAME_VERSION_NUMBER = "5.0.17 - 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 c18374a67..4a0d200c8 100644 --- a/Data/Scripts/003_Game processing/001_StartGame.rb +++ b/Data/Scripts/003_Game processing/001_StartGame.rb @@ -2,13 +2,13 @@ module Game # Initializes various global variables and loads the game data. def self.initialize - $PokemonTemp = PokemonTemp.new - $game_temp = Game_Temp.new - $game_system = Game_System.new - $data_animations = load_data('Data/Animations.rxdata') - $data_tilesets = load_data('Data/Tilesets.rxdata') + $PokemonTemp = PokemonTemp.new + $game_temp = Game_Temp.new + $game_system = Game_System.new + $data_animations = load_data('Data/Animations.rxdata') + $data_tilesets = load_data('Data/Tilesets.rxdata') $data_common_events = load_data('Data/CommonEvents.rxdata') - $data_system = load_data('Data/System.rxdata') + $data_system = load_data('Data/System.rxdata') pbLoadBattleAnimations GameData.load_all map_file = format('Data/Map%03d.rxdata', $data_system.start_map_id) @@ -36,9 +36,50 @@ module Game end end + #For new game plus - resets everything in boxes/party to level 5 and 1st stage + def self.ngp_clean_pc_data(old_storage, old_party) + new_storage = old_storage + for pokemon in old_party + new_storage.pbStoreCaught(pokemon) + end + + for box in new_storage.boxes + for pokemon in box.pokemon + if pokemon != nil + if !pokemon.egg? + pokemon.level = 5 + pokemon.species = GameData::Species.get(pokemon.species).get_baby_species(false) + pokemon.reset_moves + end + end + end + end + return new_storage + end + + #For new game plus - removes key items + def self.ngp_clean_item_data(old_bag) + new_storage = old_bag + new_storage.clear + + for pocket in old_bag.pockets + for bagElement in pocket + 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 + end + end + return new_storage + end + # Called when starting a new game. Initializes global variables # and transfers the player into the map scene. - def self.start_new + def self.start_new(ngp_bag = nil, ngp_storage = nil, ngp_trainer = nil) + if $game_map && $game_map.events $game_map.events.each_value { |event| event.clear_starting } end @@ -53,6 +94,13 @@ module Game $PokemonEncounters.setup($game_map.map_id) $game_map.autoplay $game_map.update + # + # if ngp_bag != nil + # $PokemonBag = ngp_clean_item_data(ngp_bag) + # end + if ngp_storage != nil + $PokemonStorage = ngp_clean_pc_data(ngp_storage, ngp_trainer.party) + end end # Loads the game from the given save data and starts the map scene. diff --git a/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb b/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb index 96e9ec506..afc13259d 100644 --- a/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb +++ b/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb @@ -110,8 +110,46 @@ module GameData end end - # Creates a battle-ready version of a trainer's data. - # @return [Array] all information about a trainer in a usable form + + def replaceSingleSpeciesModeIfApplicable(species) + if $game_switches[SINGLE_POKEMON_MODE_SWITCH] + if $game_switches[SINGLE_POKEMON_MODE_HEAD_SWITCH] + return replaceFusionsHeadWithSpecies(species) + elsif $game_switches[SINGLE_POKEMON_MODE_BODY_SWITCH] + return replaceFusionsBodyWithSpecies(species) + elsif $game_switches[SINGLE_POKEMON_MODE_RANDOM_SWITCH] + if(rand(2) == 0) + return replaceFusionsHeadWithSpecies(species) + else + return replaceFusionsBodyWithSpecies(species) + end + end + end + return species + end + + def replaceFusionsHeadWithSpecies(species) + speciesId = getDexNumberForSpecies(species) + if speciesId > NB_POKEMON + bodyPoke = getBodyID(speciesId) + headPoke = pbGet(SINGLE_POKEMON_MODE_VAR) + newSpecies = bodyPoke*NB_POKEMON+headPoke + return getPokemon(newSpecies) + end + return species + end + + def replaceFusionsBodyWithSpecies(species) + speciesId = getDexNumberForSpecies(species) + if speciesId > NB_POKEMON + bodyPoke = pbGet(SINGLE_POKEMON_MODE_VAR) + headPoke = getHeadID(species) + newSpecies = bodyPoke*NB_POKEMON+headPoke + return getPokemon(newSpecies) + end + return species + end + def to_trainer placeholder_species = [Settings::RIVAL_STARTER_PLACEHOLDER_SPECIES, Settings::VAR_1_PLACEHOLDER_SPECIES, @@ -140,12 +178,13 @@ module GameData if placeholder_species.include?(species) species = replace_species_with_placeholder(species) end + species = replaceSingleSpeciesModeIfApplicable(species) if $game_switches[REVERSED_MODE] species = reverseFusionSpecies(species) end level = pkmn_data[:level] if $game_switches[GAME_DIFFICULTY_HARD] - level = (level*Settings::HARD_MODE_LEVEL_MODIFIER).ceil + level = (level * Settings::HARD_MODE_LEVEL_MODIFIER).ceil if level > Settings::MAXIMUM_LEVEL level = Settings::MAXIMUM_LEVEL end @@ -159,6 +198,7 @@ module GameData end #### + #trainer rematch infinite fusion edit if isRematch nbRematch = getNumberRematch(rematchId) diff --git a/Data/Scripts/011_Battle/001_Battler/003_Battler_ChangeSelf.rb b/Data/Scripts/011_Battle/001_Battler/003_Battler_ChangeSelf.rb index 6f61d21df..619d375e6 100644 --- a/Data/Scripts/011_Battle/001_Battler/003_Battler_ChangeSelf.rb +++ b/Data/Scripts/011_Battle/001_Battler/003_Battler_ChangeSelf.rb @@ -53,6 +53,7 @@ class PokeBattle_Battler end return if @fainted # Has already fainted properly @battle.pbDisplayBrief(_INTL("{1} fainted!",pbThis)) if showMessage + updateSpirits() PBDebug.log("[Pokémon fainted] #{pbThis} (#{@index})") if !showMessage @battle.scene.pbFaintBattler(self) pbInitEffects(false) @@ -80,6 +81,15 @@ class PokeBattle_Battler @battle.pbEndPrimordialWeather end + def updateSpirits() + if $PokemonBag.pbQuantity(:ODDKEYSTONE)>=1 && @pokemon.hasType?(:GHOST) + nbSpirits = pbGet(ODDKEYSTONE_NB_VARIABLE) + if nbSpirits < 108 + pbSet(ODDKEYSTONE_NB_VARIABLE,nbSpirits+1) + end + end + end + #============================================================================= # Move PP #============================================================================= diff --git a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb index 29e7297ae..d6c3e6cd2 100644 --- a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb +++ b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb @@ -305,7 +305,7 @@ def pbDive move = :DIVE movefinder = $Trainer.get_pokemon_with_move(move) if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_DIVE, false) || (!$DEBUG && !movefinder) - if $PokemonBag.pbQuantity(:SCUBAGEAR)>0 + if $PokemonBag.pbQuantity(:SCUBAGEAR)<=0 pbMessage(_INTL("The sea is deep here. A Pokémon may be able to go underwater.")) return false end @@ -343,10 +343,10 @@ def pbSurfacing return if !surface_map_id move = :DIVE movefinder = $Trainer.get_pokemon_with_move(move) - if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_DIVE, false) || (!$DEBUG && !movefinder) - pbMessage(_INTL("Light is filtering down from above. A Pokémon may be able to surface here.")) - return false - end + # if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_DIVE, false) || (!$DEBUG && !movefinder) + # pbMessage(_INTL("Light is filtering down from above. A Pokémon may be able to surface here.")) + # return false + # end if pbConfirmMessage(_INTL("Light is filtering down from above. Would you like to use Dive?")) speciesname = (movefinder) ? movefinder.name : $Trainer.name pbMessage(_INTL("{1} used {2}!", speciesname, GameData::Move.get(move).name)) diff --git a/Data/Scripts/014_Pokemon/001_Pokemon-related/004_PokemonStorage.rb b/Data/Scripts/014_Pokemon/001_Pokemon-related/004_PokemonStorage.rb index d9ed7e4f7..4f37f0ac0 100644 --- a/Data/Scripts/014_Pokemon/001_Pokemon-related/004_PokemonStorage.rb +++ b/Data/Scripts/014_Pokemon/001_Pokemon-related/004_PokemonStorage.rb @@ -1,5 +1,5 @@ class PokemonBox - attr_reader :pokemon + attr_accessor :pokemon attr_accessor :name attr_accessor :background diff --git a/Data/Scripts/015_Trainers and player/004_Player.rb b/Data/Scripts/015_Trainers and player/004_Player.rb index 0d06af339..628a545c4 100644 --- a/Data/Scripts/015_Trainers and player/004_Player.rb +++ b/Data/Scripts/015_Trainers and player/004_Player.rb @@ -30,7 +30,9 @@ class Player < Trainer attr_accessor :mystery_gift_unlocked # @return [Array] downloaded Mystery Gift data attr_accessor :mystery_gifts - + attr_accessor :beat_league + attr_accessor :new_game_plus_unlocked + attr_accessor :new_game_plus def trainer_type if @trainer_type.is_a?(Integer) @trainer_type = GameData::Metadata.get_player(@character_ID || 0)[0] @@ -52,6 +54,13 @@ class Player < Trainer @coins = value.clamp(0, Settings::MAX_COINS) end + + def beat_league=(value) + @beat_league = value + end + def new_game_plus_unlocked=(value) + @new_game_plus_unlocked = value + end # Sets the player's Battle Points amount. It can not exceed # {Settings::MAX_BATTLE_POINTS}. # @param value [Integer] new Battle Points value @@ -72,6 +81,10 @@ class Player < Trainer return @badges.count { |badge| badge == true } end + + def new_game_plus=(value) + @new_game_plus = value + end #============================================================================= # (see Pokedex#seen?) @@ -104,5 +117,8 @@ class Player < Trainer @seen_storage_creator = false @mystery_gift_unlocked = false @mystery_gifts = [] + @beat_league = false + @new_game_plus_unlocked = false + @new_game_plus = false end end diff --git a/Data/Scripts/016_UI/013_UI_Load.rb b/Data/Scripts/016_UI/013_UI_Load.rb index e0a6657c6..b376673e1 100644 --- a/Data/Scripts/016_UI/013_UI_Load.rb +++ b/Data/Scripts/016_UI/013_UI_Load.rb @@ -284,6 +284,7 @@ class PokemonLoadScreen cmd_debug = -1 cmd_quit = -1 show_continue = !@save_data.empty? + new_game_plus = @save_data[:player].new_game_plus_unlocked if show_continue commands[cmd_continue = commands.length] = _INTL('Continue') if @save_data[:player].mystery_gift_unlocked @@ -291,6 +292,9 @@ class PokemonLoadScreen end end commands[cmd_new_game = commands.length] = _INTL('New Game') + if new_game_plus + commands[cmd_new_game_plus = commands.length] = _INTL('New Game +') + end commands[cmd_options = commands.length] = _INTL('Options') commands[cmd_language = commands.length] = _INTL('Language') if Settings::LANGUAGES.length >= 2 commands[cmd_debug = commands.length] = _INTL('Debug') if $DEBUG @@ -312,6 +316,11 @@ class PokemonLoadScreen @scene.pbEndScene Game.start_new return + when cmd_new_game_plus + @scene.pbEndScene + Game.start_new(@save_data[:bag],@save_data[:storage_system],@save_data[:player]) + @save_data[:player].new_game_plus_unlocked=true + return when cmd_mystery_gift pbFadeOutIn { pbDownloadMysteryGift(@save_data[:player]) } when cmd_options diff --git a/Data/Scripts/020_Debug/001_Editor_Utilities.rb b/Data/Scripts/020_Debug/001_Editor_Utilities.rb index a79fa9821..2f2a170b2 100644 --- a/Data/Scripts/020_Debug/001_Editor_Utilities.rb +++ b/Data/Scripts/020_Debug/001_Editor_Utilities.rb @@ -128,6 +128,16 @@ def pbChooseSpeciesList(default = nil) return GameData::Species.get(dexNum) end +def pbChooseSpeciesTextList(default = nil) + commands = [] + for i in 1..NB_POKEMON + species = GameData::Species.get(i) + commands.push([species.id_number, species.real_name, species.id]) + end + return pbChooseList(commands, default, nil, -1) +end + + def pbChooseSpeciesFormList(default = nil) commands = [] GameData::Species.each do |s| diff --git a/Data/Scripts/021_Compiler/001_Compiler.rb b/Data/Scripts/021_Compiler/001_Compiler.rb index c76a94872..9778c106d 100644 --- a/Data/Scripts/021_Compiler/001_Compiler.rb +++ b/Data/Scripts/021_Compiler/001_Compiler.rb @@ -734,7 +734,7 @@ module Compiler end def main - #return + return return if !$DEBUG begin dataFiles = [ diff --git a/Data/Scripts/049_Compatibility/Constants.rb b/Data/Scripts/049_Compatibility/Constants.rb index 19f41a29b..2b1c75568 100644 --- a/Data/Scripts/049_Compatibility/Constants.rb +++ b/Data/Scripts/049_Compatibility/Constants.rb @@ -48,4 +48,11 @@ DIRECTION_DOWN = 2 DIRECTION_UP = 8 RACE_BIKE = 984 -IS_REMATCH_SWITCH=200 \ No newline at end of file +IS_REMATCH_SWITCH=200 +SINGLE_POKEMON_MODE_SWITCH=790 +SINGLE_POKEMON_MODE_VAR=251 +SINGLE_POKEMON_MODE_HEAD_SWITCH=791 +SINGLE_POKEMON_MODE_BODY_SWITCH=792 +SINGLE_POKEMON_MODE_RANDOM_SWITCH=793 + +ODDKEYSTONE_NB_VARIABLE=252 \ No newline at end of file diff --git a/Data/Scripts/050_AddOns/New Items effects.rb b/Data/Scripts/050_AddOns/New Items effects.rb index 30baa377b..b733f6c8a 100644 --- a/Data/Scripts/050_AddOns/New Items effects.rb +++ b/Data/Scripts/050_AddOns/New Items effects.rb @@ -373,6 +373,29 @@ ItemHandlers::UseFromBag.add(:DEBUGGER, proc { |item| end }) + +ItemHandlers::UseFromBag.add(:ODDKEYSTONE, proc { |item| + TOTAL_SPIRITS_NEEDED = 108 + nbSpirits = pbGet(ODDKEYSTONE_NB_VARIABLE) + if nbSpirits == 107 + Kernel.pbMessage(_INTL("The Odd Keystone appears to be moving on its own.")) + Kernel.pbMessage(_INTL("Voices can be heard whispering from it...")) + Kernel.pbMessage(_INTL("Just... one... more...")) + elsif nbSpirits < TOTAL_SPIRITS_NEEDED + nbNeeded = TOTAL_SPIRITS_NEEDED-nbSpirits + Kernel.pbMessage(_INTL("Voices can be heard whispering from the Odd Keystone...")) + Kernel.pbMessage(_INTL("Bring... us... {1}... spirits",nbNeeded.to_s)) + else + Kernel.pbMessage(_INTL("The Odd Keystone appears to be moving on its own.")) + Kernel.pbMessage(_INTL("It seems as if some poweful energy is trying to escape from it.")) + if (Kernel.pbMessage("Let it out?", ["No","Yes"], 0)) == 1 + pbWildBattle(:SPIRITOMB,27) + pbSet(ODDKEYSTONE_NB_VARIABLE,0) + end + next 1 + end +}) + ItemHandlers::UseFromBag.add(:MAGICBOOTS, proc { |item| if $DEBUG if Kernel.pbConfirmMessageSerious(_INTL("Take off the Magic Boots?")) 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 8d283f80c..cf96f0820 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index 8d34a0eef..9873e9ae6 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/items.dat b/Data/items.dat index c4f7b12e7..f9be63880 100644 Binary files a/Data/items.dat and b/Data/items.dat differ diff --git a/Data/messages.dat b/Data/messages.dat index 69b28ae25..875ac26c4 100644 Binary files a/Data/messages.dat and b/Data/messages.dat differ diff --git a/Data/trainers.dat b/Data/trainers.dat index 22e52903b..6f87d1117 100644 Binary files a/Data/trainers.dat and b/Data/trainers.dat differ diff --git a/PBS/items.txt b/PBS/items.txt index 7d8d0991c..0d50a1606 100644 --- a/PBS/items.txt +++ b/PBS/items.txt @@ -32,8 +32,8 @@ 32,CLAWFOSSIL,Claw Fossil,Claw Fossils,1,7000,"A fossil of an ancient Pokémon that lived in the sea. It appears to be part of a claw.",0,0,8, 33,SKULLFOSSIL,Skull Fossil,Skull Fossils,1,7000,"A fossil from a prehistoric Pokémon that lived on the land. It appears to be part of a head.",0,0,8, 34,ARMORFOSSIL,Armor Fossil,Armor Fossils,1,7000,"A fossil from a prehistoric Pokémon that lived on the land. It appears to be part of a collar.",0,0,8, -35,COVERFOSSIL,unknown_item,unknown_item,1,1000,"This item has been removed from the game.",0,0,8, -36,PLUMEFOSSIL,unknown_item,unknown_item,1,1000,"This item has been removed from the game.",0,0,8, +35,COVERFOSSIL,unknown_item,unknown_item,1,1000,"This item has been removed from the game. It can safely be sold or deleted.",0,0,8, +36,PLUMEFOSSIL,unknown_item,unknown_item,1,1000,"This item has been removed from the game. It can safely be sold or deleted.",0,0,8, 37,PRETTYWING,Pretty Wing,Pretty Wings,1,1000,"Though this feather is beautiful, it's just a regular feather and has no effect on Pokémon.",0,0,0, 38,TINYMUSHROOM,Tiny Mushroom,Tiny Mushrooms,1,400,"A small and edible mushroom. It is sought after by collectors.",0,0,0, 39,BIGMUSHROOM,Big Mushroom,Big Mushrooms,1,1000,"A large and rare mushroom. It is sought after by collectors.",0,0,0, @@ -62,7 +62,7 @@ 62,GOOEYMULCH,Gooey Mulch,Gooey Mulch,1,200,"A fertilizer to be spread on soft soil in regions where Berries are grown. A maniac will buy it for a high price.",0,0,11, 63,SHOALSALT,Shoal Salt,Shoal Salts,1,20,"Pure salt that can be discovered deep inside the Shoal Cave. A maniac will buy it for a high price.",0,0,0, 64,SHOALSHELL,Shoal Shell,Shoal Shells,1,20,"A pretty seashell that can be found deep inside the Shoal Cave. A maniac will buy it for a high price.",0,0,0, -65,ODDKEYSTONE,Odd Keystone,Odd Keystones,1,2100,"A vital item that is needed to keep a stone tower from collapsing. Voices can be heard from it occasionally.",0,0,0, +65,ODDKEYSTONE,Odd Keystone,Odd Keystones,8,0,"A vital item that is needed to keep a stone tower from collapsing. Voices can be heard from it occasionally.",2,0,6, 66,AIRBALLOON,Air Balloon,Air Balloons,1,4000,"An item to be held by a Pokémon. The holder will float in the air until hit. Once hit, this item will burst.",0,0,0, 67,BRIGHTPOWDER,Bright Powder,Bright Powders,1,4000,"An item to be held by a Pokémon. It casts a tricky glare that lowers the opponent's accuracy.",0,0,0, 68,EVIOLITE,Eviolite,Eviolites,1,4000,"A mysterious evolutionary lump. When held, it raises the Defense and Sp. Def if the holder can still evolve.",0,0,0, @@ -199,7 +199,7 @@ 199,SHOCKDRIVE,Shock Drive,Shock Drives,1,1000,"A cassette to be held by Genesect. It changes Techno Blast to an Electric-type move.",0,0,0, 200,BURNDRIVE,Burn Drive,Burn Drives,1,1000,"A cassette to be held by Genesect. It changes Techno Blast to a Fire-type move.",0,0,0, 201,CHILLDRIVE,Chill Drive,Chill Drives,1,1000,"A cassette to be held by Genesect. It changes Techno Blast to an Ice-type move.",0,0,0, -202,EVERSTONE,Everstone,Everstones,1,3000,"An item to be held by a Pokémon. The Pokémon holding this peculiar stone is prevented from evolving.",0,0,0, +202,EVERSTONE,Everstone,Everstones,1,300,"An item to be held by a Pokémon. The Pokémon holding this peculiar stone is prevented from evolving.",0,0,0, 203,DRAGONSCALE,Dragon Scale,Dragon Scales,1,2000,"A thick and tough scale. Dragon-type Pokémon may be holding this item when caught.",0,0,0, 204,UPGRADE,Upgrade,Upgrades,1,2000,"A transparent device filled with all sorts of data. It was produced by Silph Co.",1,0,7, 205,DUBIOUSDISC,Dubious Disc,Dubious Discs,1,2000,"A transparent device overflowing with dubious data. Its producer is unknown.",1,0,7, @@ -606,11 +606,11 @@ 598,ABILITYCAPSULE,Ability Capsule,Ability Capsules,1,25000,"A capsule that allows a Pokémon with two Abilities to switch between these Abilities when it is used.",1,0,0, 599,MAGICBOOTS,Magic Boots,Magic Boots,8,0,"A pair of magic boots that allow you to walk anywhere by pressing the CTRL key.",2,0,6, 600,ANCIENTSTONE,unknown_item,unknown_items,1,1,This item has been removed from the game.,1,0,7, -601,ICESTONE,Ice Stone,Ice Stones,1,2100,A peculiar stone that makes certain species of Pokémon evolve. It is made out of ice.,1,0,7, +601,ICESTONE,Ice Stone,Ice Stones,1,5000,A peculiar stone that makes certain species of Pokémon evolve. It is made out of ice.,1,0,7, 602,GSBALL,GS Ball,GS Balls,8,0,A mysterious ball. Its powers are unknown.,2,0,6, 603,MAGNETPASS,Train Pass,Train Passes,8,0,"A ticket required for riding the Saffron Train. It allows you to ride whenever and however much you'd like.",2,0,6, 604,SECRETCAPSULE,Secret Capsule,Secret Capsules,1,0,"A capsule that unlocks a Pokémon's hidden ability",1,0,0, -605,ODDKEYSTONE_FULL,Odd Keystone,Odd Keystones,8,0,A vital item that is needed to keep a stone tower from collapsing. It contains 108 spirits.,0,0,0, +605,ODDKEYSTONE_FULL,unknown_item,Odd Keystones,1,0,"This item has been removed from the game. It can safely be sold or deleted.",0,0,0, 607,DYNAMITE,Dynamite,Dynamites,1,100,"A stick of dynamite. Be careful with it!",1,1,0, 606,BERSERKGENE,Berserk Gene,Berserk Genes,8,0,A strange gene. It appears to have some mysterious powers.,2,0,6, 608,AZUREFLUTE,Azure Flute,Azure Flutes,8,0,"A flute that puts out echoing sounds that do not seem to be of this world. It is unknown who made it.",2,0,6,