From a8880f4c2d1629e06a2ce2b7763f4e63f48f7316 Mon Sep 17 00:00:00 2001
From: Tustin2121 <tustin2121@gmail.com>
Date: Mon, 19 Aug 2019 09:56:55 -0400
Subject: [PATCH] v1.0.11

- Removed general Legendary catching restriction. The weather trio still cannot be caught. Regis can, however, if chat manages to actually pull it off.
---
 Makefile                     | 2 +-
 include/constants/battle.h   | 1 +
 src/battle_main.c            | 2 +-
 src/battle_script_commands.c | 2 +-
 src/battle_setup.c           | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 8f8c30b04..55ea9b527 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ TPP_MODE		?= 1
 EMULATOR_ONLY	?= 1
 
 # Version branch
-VERSION	:= 1.0.10
+VERSION	:= 1.0.11
 
 ifeq ($(OS),Windows_NT)
 EXE := .exe
diff --git a/include/constants/battle.h b/include/constants/battle.h
index 385469090..f19bdee17 100644
--- a/include/constants/battle.h
+++ b/include/constants/battle.h
@@ -79,6 +79,7 @@
 #define BATTLE_TYPE_FRONTIER                (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE | BATTLE_TYPE_PYRAMID)
 #define BATTLE_TYPE_FRONTIER_NO_PYRAMID     (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE)
 #define BATTLE_TYPE_RAGING_LEGENDARY        (BATTLE_TYPE_GROUDON | BATTLE_TYPE_KYOGRE)
+#define BATTLE_TYPE_WEATHER_TRIO            (BATTLE_TYPE_GROUDON | BATTLE_TYPE_KYOGRE | BATTLE_TYPE_RAYQUAZA)
 
 // Battle Outcome defines
 #define B_OUTCOME_WON                  0x1
diff --git a/src/battle_main.c b/src/battle_main.c
index 6f1e4d18c..d35c5a626 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -5715,7 +5715,7 @@ static void HandleAction_Run(void)
 {
     gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber];
 
-    if (gBattleTypeFlags & BATTLE_TYPE_LEGENDARY) //BATTLE_TYPE_RAGING_LEGENDARY)
+    if (gBattleTypeFlags & BATTLE_TYPE_WEATHER_TRIO) //BATTLE_TYPE_RAGING_LEGENDARY)
     {
         ClearFuryCutterDestinyBondGrudge(gBattlerAttacker);
         gBattleCommunication[MULTISTRING_CHOOSER] = 3;
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 785f6776a..293092293 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -10180,7 +10180,7 @@ static void atkEF_handleballthrow(void)
     gActiveBattler = gBattlerAttacker;
     gBattlerTarget = gBattlerAttacker ^ BIT_SIDE;
 
-    if (gBattleTypeFlags & BATTLE_TYPE_LEGENDARY)
+    if (gBattleTypeFlags & BATTLE_TYPE_WEATHER_TRIO)
     {
         BtlController_EmitBallThrowAnim(0, BALL_TRAINER_BLOCK);
         MarkBattlerForControllerExec(gActiveBattler);
diff --git a/src/battle_setup.c b/src/battle_setup.c
index f8ae3ab58..7ba77b5d0 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -1595,7 +1595,7 @@ const u8 *GetTrainerWonSpeech(void)
     
     if (gBattleTypeFlags & BATTLE_TYPE_RAYQUAZA)
         string = gText_Whiteout_Rayquaza;
-    else if (gBattleTypeFlags & BATTLE_TYPE_LEGENDARY)
+    else if (gBattleTypeFlags & BATTLE_TYPE_RAGING_LEGENDARY)
         string = gText_Whiteout_RagingLegendary;
     else if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER) == 0)
         string = gText_Whiteout_WildMon;