Map fixes

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)

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

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)

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)

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
 

Data/Scripts/052_AddOns/GeneralUtils.rb

@@ -481,10 +481,15 @@ def get_difficulty_text
   end
 end
 
-def pokemonExceedsLevelCap(pokemon)
-  return false if $Trainer.badge_count >= Settings::NB_BADGES
+def getCurrentLevelCap()
   current_max_level = Settings::LEVEL_CAPS[$Trainer.badge_count]
   current_max_level *= Settings::HARD_MODE_LEVEL_MODIFIER if $game_switches[SWITCH_GAME_DIFFICULTY_HARD]
+  return current_max_level
+end
+
+def pokemonExceedsLevelCap(pokemon)
+  return false if $Trainer.badge_count >= Settings::NB_BADGES
+  current_max_level = getCurrentLevelCap()
   return pokemon.level >= current_max_level
 end
 

Data/Scripts/052_AddOns/New Items effects.rb

@@ -1626,6 +1626,10 @@ def pbUnfuse(pokemon, scene, supersplicers, pcPosition = nil)
         end
       end
 
+      fused_pokemon_learned_moved = pokemon.learned_moves
+      pokemon.learned_moves = fused_pokemon_learned_moved
+      poke2.learned_moves = fused_pokemon_learned_moved
+
       pokemon.ability_index = pokemon.body_original_ability_index if pokemon.body_original_ability_index
       poke2.ability_index = pokemon.head_original_ability_index if pokemon.head_original_ability_index
 

Data/Scripts/052_AddOns/QuestIcons.rb

@@ -61,13 +61,16 @@ class Game_Event < Game_Character
     echoln "MATCH"
     echoln quest_id
     return nil if isQuestAlreadyAccepted?(quest_id)
+
     return quest_id
   end
 
   def validateEventIsCompatibleWithIcons(event)
     return false if event.is_a?(Game_Player)
     return false if event.erased
-    return false unless pbGetActiveEventPage(event)
+    page = pbGetActiveEventPage(event)
+    return false unless page
+    return false if page.graphic.character_name.empty?
     return true
   end