From 9a8fae01685cdd50a7aeb40a2de764125e6e3bb4 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sun, 4 Oct 2020 16:37:42 +0100 Subject: [PATCH] Fixed some battle rules not being applied --- Data/Scripts/013_Overworld/006_PField_Battles.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Data/Scripts/013_Overworld/006_PField_Battles.rb b/Data/Scripts/013_Overworld/006_PField_Battles.rb index 87b40282c..c8204bba6 100644 --- a/Data/Scripts/013_Overworld/006_PField_Battles.rb +++ b/Data/Scripts/013_Overworld/006_PField_Battles.rb @@ -34,8 +34,8 @@ class PokemonTemp when "canrun"; rules["canRun"] = true when "cannotrun"; rules["canRun"] = false when "roamerflees"; rules["roamerFlees"] = true - when "noExp"; rules["expGain"] = false - when "noMoney"; rules["moneyGain"] = false + when "noexp"; rules["expGain"] = false + when "nomoney"; rules["moneyGain"] = false when "switchstyle"; rules["switchStyle"] = true when "setstyle"; rules["switchStyle"] = false when "anims"; rules["battleAnims"] = true @@ -45,7 +45,7 @@ class PokemonTemp when "environment", "environ"; rules["environment"] = getID(PBEnvironment,var) when "backdrop", "battleback"; rules["backdrop"] = var when "base"; rules["base"] = var - when "outcomevar", "outcome"; rules["outcomeVar"] = var + when "outcome", "outcomevar"; rules["outcomeVar"] = var when "nopartner"; rules["noPartner"] = true else raise _INTL("Battle rule \"{1}\" does not exist.",rule) @@ -64,7 +64,7 @@ def setBattleRule(*args) else case arg.downcase when "terrain", "weather", "environment", "environ", "backdrop", - "battleback", "base", "outcomevar", "outcome" + "battleback", "base", "outcome", "outcomevar" r = arg next end