diff --git a/Data/Scripts/004_Game classes/002_Game_System.rb b/Data/Scripts/004_Game classes/002_Game_System.rb index 648ab8695..7db54145f 100644 --- a/Data/Scripts/004_Game classes/002_Game_System.rb +++ b/Data/Scripts/004_Game classes/002_Game_System.rb @@ -51,7 +51,6 @@ class Game_System def bgm_play_internal2(name,volume,pitch,position) # :nodoc: vol = volume vol *= $PokemonSystem.bgmvolume/100.0 - vol+=30 vol = vol.to_i begin Audio.bgm_play(name,vol,pitch,position) diff --git a/Data/Scripts/013_Items/001_Item_Utilities.rb b/Data/Scripts/013_Items/001_Item_Utilities.rb index 874b8fc6a..0d4eecf7d 100644 --- a/Data/Scripts/013_Items/001_Item_Utilities.rb +++ b/Data/Scripts/013_Items/001_Item_Utilities.rb @@ -445,7 +445,6 @@ def pbLearnMove(pkmn, move, ignoreifknown = false, bymachine = false, fast = fal end pkmnname = pkmn.name movename = GameData::Move.get(move).name - pkmn.add_learned_move(move) if !bymachine if pkmn.hasMove?(move) pbMessage(_INTL("{1} already knows {2}.", pkmnname, movename), &block) if !ignoreifknown return false diff --git a/Data/Scripts/013_Items/004_1_PokeradarUI.rb b/Data/Scripts/013_Items/004_1_PokeradarUI.rb index 9f947d373..73c496081 100644 --- a/Data/Scripts/013_Items/004_1_PokeradarUI.rb +++ b/Data/Scripts/013_Items/004_1_PokeradarUI.rb @@ -62,6 +62,7 @@ class PokeRadar_UI def addPokemonIcon(species, blackened = false, rare=false) pokemonId=dexNum(species) + return if !pokemonId iconId = _INTL("{1}", species) pokemonBitmap = pbCheckPokemonIconFiles(species) diff --git a/Data/Scripts/014_Pokemon/001_Pokemon.rb b/Data/Scripts/014_Pokemon/001_Pokemon.rb index 29a48d452..418564285 100644 --- a/Data/Scripts/014_Pokemon/001_Pokemon.rb +++ b/Data/Scripts/014_Pokemon/001_Pokemon.rb @@ -977,8 +977,10 @@ class Pokemon end def pokemon_can_learn_move(species_data, move_data) + moveset = species_data.moves.map { |pair| pair[1] } return species_data.tutor_moves.include?(move_data.id) || - species_data.moves.include?(move_data.id) || + species_data.moves.include?(move_data.id) || ##this is formatted as such [[1, :PECK],[etc.]] so it never finds anything when move_data is just the symbol. Leaving it there in case something depends on that for some reason. + moveset.include?(move_data.id) || species_data.egg_moves.include?(move_data.id) end @@ -1599,7 +1601,6 @@ class Pokemon @hat_y = 0 @size_category = determine_size_category() @sprite_scale=determine_scale() - echoln @sprite_scale calc_stats if @form == 0 && recheck_form f = MultipleForms.call("getFormOnCreation", self) diff --git a/Data/Scripts/016_UI/005_UI_Party.rb b/Data/Scripts/016_UI/005_UI_Party.rb index 75a1c333a..c0fd8c864 100644 --- a/Data/Scripts/016_UI/005_UI_Party.rb +++ b/Data/Scripts/016_UI/005_UI_Party.rb @@ -1196,7 +1196,6 @@ class PokemonPartyScreen #exclude current moves echoln "learned moves: #{learnable_moves}" for current_move in pokemon.moves - echoln current_move.id if learnable_moves.include?(current_move.id) learnable_moves.delete(current_move.id) end @@ -1204,7 +1203,7 @@ class PokemonPartyScreen move_ids = [] for move in learnable_moves if move.is_a?(Symbol) - move_ids << move + move_ids << move if pokemon.compatible_with_move?(move) end end