From 6db668b4495fc96e604453075281dbf6ccb4fc04 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sun, 29 Aug 2021 18:20:52 +0100 Subject: [PATCH] Fixed HappinessMoveType, fixed particle effects on events not working --- Data/Scripts/007_Objects and windows/011_Messages.rb | 6 +++--- Data/Scripts/010_Data/001_Hardcoded data/007_Evolution.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Data/Scripts/007_Objects and windows/011_Messages.rb b/Data/Scripts/007_Objects and windows/011_Messages.rb index 635160d3d..20effc8e2 100644 --- a/Data/Scripts/007_Objects and windows/011_Messages.rb +++ b/Data/Scripts/007_Objects and windows/011_Messages.rb @@ -104,9 +104,9 @@ end #=============================================================================== def pbEventCommentInput(*args) parameters = [] - list = *args[0].list # Event or event page - elements = *args[1] # Number of elements - trigger = *args[2] # Trigger + list = args[0].list # List of commands for event or event page + elements = args[1] # Number of elements + trigger = args[2] # Trigger return nil if list == nil return nil unless list.is_a?(Array) for item in list diff --git a/Data/Scripts/010_Data/001_Hardcoded data/007_Evolution.rb b/Data/Scripts/010_Data/001_Hardcoded data/007_Evolution.rb index 896845700..cb908da6d 100644 --- a/Data/Scripts/010_Data/001_Hardcoded data/007_Evolution.rb +++ b/Data/Scripts/010_Data/001_Hardcoded data/007_Evolution.rb @@ -321,7 +321,7 @@ GameData::Evolution.register({ :minimum_level => 1, # Needs any level up :level_up_proc => proc { |pkmn, parameter| if pkmn.happiness >= 220 - next pkmn.moves.any? { |m| m && m.id > 0 && m.type == parameter } + next pkmn.moves.any? { |m| m && m.type == parameter } end } })