From 94a20e55f3b69b672680b17d98ee92c9ac4b6ff6 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Wed, 7 Oct 2020 21:11:30 +0100 Subject: [PATCH] =?UTF-8?q?Fixed=20Advanced=20Wild=20Battles=20not=20gener?= =?UTF-8?q?ating=20true=20wild=20Pok=C3=A9mon,=20removed=20deprecated=20mo?= =?UTF-8?q?ve=20compatibility=20code,=20fixed=20pauses=20when=20turning=20?= =?UTF-8?q?during=20continuous=20movement?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Data/Scripts/003_Game classes/007_Game_Player.rb | 2 +- Data/Scripts/016_Pokemon/002_Pokemon_Forms.rb | 9 --------- Data/Scripts/021_Debug/001_Debug_Menu.rb | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/Data/Scripts/003_Game classes/007_Game_Player.rb b/Data/Scripts/003_Game classes/007_Game_Player.rb index ffd510db4..573251771 100644 --- a/Data/Scripts/003_Game classes/007_Game_Player.rb +++ b/Data/Scripts/003_Game classes/007_Game_Player.rb @@ -388,7 +388,7 @@ class Game_Player < Game_Character unless pbMapInterpreterRunning? or $game_temp.message_window_showing or $PokemonTemp.miniupdate or $game_temp.in_menu # Move player in the direction the directional button is being pressed - if dir==@lastdir && Graphics.frame_count-@lastdirframe>Graphics.frame_rate/20 + if @moved_last_frame || (dir==@lastdir && Graphics.frame_count-@lastdirframe>Graphics.frame_rate/20) case dir when 2; move_down when 4; move_left diff --git a/Data/Scripts/016_Pokemon/002_Pokemon_Forms.rb b/Data/Scripts/016_Pokemon/002_Pokemon_Forms.rb index ecada1c63..cef9e2f25 100644 --- a/Data/Scripts/016_Pokemon/002_Pokemon_Forms.rb +++ b/Data/Scripts/016_Pokemon/002_Pokemon_Forms.rb @@ -37,15 +37,6 @@ class PokeBattle_Pokemon return pbGetFSpeciesFromForm(@species,formSimple) end - alias __mf_compatibleWithMove? compatibleWithMove? # Deprecated - def compatibleWithMove?(move) - v = MultipleForms.call("getMoveCompatibility",self) - if v!=nil - return v.any? { |j| j==move } - end - return __mf_compatibleWithMove?(move) - end - alias __mf_initialize initialize def initialize(*args) @form = (pbGetSpeciesFromFSpecies(args[0])[1] rescue 0) diff --git a/Data/Scripts/021_Debug/001_Debug_Menu.rb b/Data/Scripts/021_Debug/001_Debug_Menu.rb index ba7f3b3a4..551fc2ed3 100644 --- a/Data/Scripts/021_Debug/001_Debug_Menu.rb +++ b/Data/Scripts/021_Debug/001_Debug_Menu.rb @@ -348,7 +348,7 @@ def pbDebugMenuActions(cmd="",sprites=nil,viewport=nil) params.setCancelValue(0) level = pbMessageChooseNumber(_INTL("Set the wild {1}'s level.",PBSpecies.getName(species)),params) if level>0 - pkmn.push(pbNewPkmn(species,level)) + pkmn.push(pbGenerateWildPokemon(species,level)) end end else # Edit a Pokémon