#----------------------------------------------------------------------------
# 〇 ステートの自然解除タイミングがやたらおかしい不具合の修正
#----------------------------------------------------------------------------

class Game_Battler
  #--------------------------------------------------------------------------
  # ● Remove State Auto ATB
  #--------------------------------------------------------------------------  
  def remove_states_auto_atb(timing)
    states.each do |state|
      next if state.auto_removal_timing != timing # ☆
      if @state_turns[state.id] == 0
        return remove_state(state.id) if restriction == 4
        unless state.auto_removal_timing == 2 and state.max_turns <= 1
          remove_state(state.id)
        end
      end
    end
  end
end


#----------------------------------------------------------------------------
# 〇 戦闘中に選択肢ウィンドウを開くと固まる不具合の修正
#----------------------------------------------------------------------------

#==============================================================================
# ■ Window Selectable
#==============================================================================
class Window_Selectable < Window_Base
  #--------------------------------------------------------------------------
  # ● Process Handling
  #--------------------------------------------------------------------------
  def skip_command?
    return false if self.is_a?(Window_VictorySpoils) if $imported["YEA-VictoryAftermath"]
    return false if self.is_a?(Window_ChoiceList) && active
    return true if !$game_temp.sprite_visible
    return true if $game_temp.battle_end
    return true if $game_temp.end_phase_duration[1] > 0
    return true if BattleManager.actor == nil
    return false  
  end
end