From bb82032208a328a9332839f55df92c9b73d2c5a0 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 16 Dec 2017 01:15:19 +0100
Subject: [PATCH] battle setup review changes

---
 constants/battle_constants.inc |  2 +-
 include/battle.h               |  2 +-
 include/battle_transition.h    | 15 +--------------
 src/battle_setup.c             |  4 ++--
 src/recorded_battle.c          |  2 +-
 src/trainer_see.c              |  2 +-
 6 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/constants/battle_constants.inc b/constants/battle_constants.inc
index bf1f2db6a5..7309d68cd8 100644
--- a/constants/battle_constants.inc
+++ b/constants/battle_constants.inc
@@ -28,7 +28,7 @@
     .set BATTLE_TYPE_x4000000,        0x4000000
     .set BATTLE_TYPE_SECRET_BASE,     0x8000000
     .set BATTLE_TYPE_GROUDON,         0x10000000
-    .set BATTLE_TYPE_KYORGE,          0x20000000
+    .set BATTLE_TYPE_KYOGRE,          0x20000000
     .set BATTLE_TYPE_RAYQUAZA,        0x40000000
     .set BATTLE_TYPE_x80000000,       0x80000000
     
diff --git a/include/battle.h b/include/battle.h
index 297711bd8d..155c38afd2 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -62,7 +62,7 @@
 #define BATTLE_TYPE_x4000000        0x4000000
 #define BATTLE_TYPE_SECRET_BASE     0x8000000
 #define BATTLE_TYPE_GROUDON         0x10000000
-#define BATTLE_TYPE_KYORGE          0x20000000
+#define BATTLE_TYPE_KYOGRE          0x20000000
 #define BATTLE_TYPE_RAYQUAZA        0x40000000
 #define BATTLE_TYPE_x80000000       0x80000000
 
diff --git a/include/battle_transition.h b/include/battle_transition.h
index b160f3e021..84b5e37ec7 100644
--- a/include/battle_transition.h
+++ b/include/battle_transition.h
@@ -6,19 +6,6 @@ void BattleTransition_StartOnField(u8 transitionID);
 void BattleTransition_Start(u8 transitionID);
 bool8 IsBattleTransitionDone(void);
 
-#define TRANSITIONS_NO         25
-
-enum // TRANSITION_MUGSHOT
-{
-    MUGSHOT_SYDNEY,
-    MUGSHOT_PHOEBE,
-    MUGSHOT_GLACIA,
-    MUGSHOT_DRAKE,
-    MUGSHOT_CHAMPION,
-};
-
-#define MUGSHOTS_NO             5
-
 // credits for the names go to Dyskinesia and Tetrable
 // names are naturally subject to change
 
@@ -45,7 +32,7 @@ enum // TRANSITION_MUGSHOT
 #define B_TRANSITION_REGICE                 19
 #define B_TRANSITION_REGISTEEL              20
 #define B_TRANSITION_REGIROCK               21
-#define B_TRANSITION_KYORGE                 22
+#define B_TRANSITION_KYOGRE                 22
 #define B_TRANSITION_GROUDON                23
 #define B_TRANSITION_RAYQUAZA               24
 #define B_TRANSITION_25                     25
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 774aba9b29..dbb20b1480 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -528,8 +528,8 @@ void BattleSetup_StartLegendaryBattle(void)
         CreateBattleStartTask(B_TRANSITION_GROUDON, BGM_BATTLE34);
         break;
     case SPECIES_KYOGRE:
-        gBattleTypeFlags |= BATTLE_TYPE_KYORGE;
-        CreateBattleStartTask(B_TRANSITION_KYORGE, BGM_BATTLE34);
+        gBattleTypeFlags |= BATTLE_TYPE_KYOGRE;
+        CreateBattleStartTask(B_TRANSITION_KYOGRE, BGM_BATTLE34);
         break;
     case SPECIES_RAYQUAZA:
         gBattleTypeFlags |= BATTLE_TYPE_RAYQUAZA;
diff --git a/src/recorded_battle.c b/src/recorded_battle.c
index 4f3fe4ab90..c88229c61c 100644
--- a/src/recorded_battle.c
+++ b/src/recorded_battle.c
@@ -19,7 +19,7 @@
                               | BATTLE_TYPE_WALLY_TUTORIAL | BATTLE_TYPE_ROAMER | BATTLE_TYPE_EREADER_TRAINER   \
                               | BATTLE_TYPE_KYOGRE_GROUDON | BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI           \
                               | BATTLE_TYPE_RECORDED | BATTLE_TYPE_x4000000 | BATTLE_TYPE_SECRET_BASE           \
-                              | BATTLE_TYPE_GROUDON | BATTLE_TYPE_KYORGE | BATTLE_TYPE_RAYQUAZA))
+                              | BATTLE_TYPE_GROUDON | BATTLE_TYPE_KYOGRE | BATTLE_TYPE_RAYQUAZA))
 
 extern u32 gBattleTypeFlags;
 extern u16 gTrainerBattleOpponent_A;
diff --git a/src/trainer_see.c b/src/trainer_see.c
index c469e11edf..b30f273478 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -28,7 +28,7 @@ bool8 CheckForTrainersWantingBattle(void)
 
         retVal = CheckIfTrainerWantsBattle(i);
         if (retVal == 2)
-            break; // two trainers has been found
+            break; // two trainers have been found
 
         if (retVal == 0) // no trainers
             continue;