Fix formatting and remove unnecessary comments

2 files changed, 64 insertions, 64 deletions

diff --git a/include/constants/opponents.h b/include/constants/opponents.h
index e7315f141..79a125bda 100644
--- a/include/constants/opponents.h
+++ b/include/constants/opponents.h
@@ -33,8 +33,8 @@
 #define TRAINER_FREDRICK                     29
 #define TRAINER_MATT                         30
 #define TRAINER_ZANDER                       31
-#define TRAINER_SHELLY_WEATHER_INSTITUTE                     32
-#define TRAINER_SHELLY_SEAFLOOR_CAVERN                     33
+#define TRAINER_SHELLY_WEATHER_INSTITUTE     32
+#define TRAINER_SHELLY_SEAFLOOR_CAVERN       33
 #define TRAINER_ARCHIE                       34
 #define TRAINER_LEAH                         35
 #define TRAINER_DAISY                        36
@@ -515,30 +515,30 @@
 #define TRAINER_CONOR                       511
 #define TRAINER_EDWIN_1                     512
 #define TRAINER_HECTOR                      513
-#define TRAINER_TABITHA_MOSSDEEP                   514
+#define TRAINER_TABITHA_MOSSDEEP            514
 #define TRAINER_EDWIN_2                     515
 #define TRAINER_EDWIN_3                     516
 #define TRAINER_EDWIN_4                     517
 #define TRAINER_EDWIN_5                     518
-#define TRAINER_WALLY_VR_1                     519
-#define TRAINER_BRENDAN_ROUTE_103_MUDKIP                   520
-#define TRAINER_BRENDAN_ROUTE_110_MUDKIP                   521
-#define TRAINER_BRENDAN_ROUTE_119_MUDKIP                   522
-#define TRAINER_BRENDAN_ROUTE_103_TREECKO                   523
-#define TRAINER_BRENDAN_ROUTE_110_TREECKO                   524
-#define TRAINER_BRENDAN_ROUTE_119_TREECKO                   525
-#define TRAINER_BRENDAN_ROUTE_103_TORCHIC                   526
-#define TRAINER_BRENDAN_ROUTE_110_TORCHIC                   527
-#define TRAINER_BRENDAN_ROUTE_119_TORCHIC                   528
-#define TRAINER_MAY_ROUTE_103_MUDKIP                       529
-#define TRAINER_MAY_ROUTE_110_MUDKIP                       530
-#define TRAINER_MAY_ROUTE_119_MUDKIP                       531
-#define TRAINER_MAY_ROUTE_103_TREECKO                       532
-#define TRAINER_MAY_ROUTE_110_TREECKO                       533
-#define TRAINER_MAY_ROUTE_119_TREECKO                       534
-#define TRAINER_MAY_ROUTE_103_TORCHIC                       535
-#define TRAINER_MAY_ROUTE_110_TORCHIC                       536
-#define TRAINER_MAY_ROUTE_119_TORCHIC                       537
+#define TRAINER_WALLY_VR_1                  519
+#define TRAINER_BRENDAN_ROUTE_103_MUDKIP    520
+#define TRAINER_BRENDAN_ROUTE_110_MUDKIP    521
+#define TRAINER_BRENDAN_ROUTE_119_MUDKIP    522
+#define TRAINER_BRENDAN_ROUTE_103_TREECKO   523
+#define TRAINER_BRENDAN_ROUTE_110_TREECKO   524
+#define TRAINER_BRENDAN_ROUTE_119_TREECKO   525
+#define TRAINER_BRENDAN_ROUTE_103_TORCHIC   526
+#define TRAINER_BRENDAN_ROUTE_110_TORCHIC   527
+#define TRAINER_BRENDAN_ROUTE_119_TORCHIC   528
+#define TRAINER_MAY_ROUTE_103_MUDKIP        529
+#define TRAINER_MAY_ROUTE_110_MUDKIP        530
+#define TRAINER_MAY_ROUTE_119_MUDKIP        531
+#define TRAINER_MAY_ROUTE_103_TREECKO       532
+#define TRAINER_MAY_ROUTE_110_TREECKO       533
+#define TRAINER_MAY_ROUTE_119_TREECKO       534
+#define TRAINER_MAY_ROUTE_103_TORCHIC       535
+#define TRAINER_MAY_ROUTE_110_TORCHIC       536
+#define TRAINER_MAY_ROUTE_119_TORCHIC       537
 #define TRAINER_ISAAC_1                     538
 #define TRAINER_DAVIS                       539
 #define TRAINER_MITCHELL                    540
@@ -593,17 +593,17 @@
 #define TRAINER_GRUNT_SPACE_CENTER_6        589
 #define TRAINER_GRUNT_SPACE_CENTER_7        590
 #define TRAINER_MACEY                       591
-#define TRAINER_BRENDAN_RUSTBORO_TREECKO                  592
-#define TRAINER_BRENDAN_RUSTBORO_MUDKIP                  593
+#define TRAINER_BRENDAN_RUSTBORO_TREECKO    592
+#define TRAINER_BRENDAN_RUSTBORO_MUDKIP     593
 #define TRAINER_PAXTON                      594
 #define TRAINER_ISABELLA                    595
 #define TRAINER_GRUNT_WEATHER_INST_5        596
-#define TRAINER_TABITHA_MT_CHIMNEY                   597
+#define TRAINER_TABITHA_MT_CHIMNEY          597
 #define TRAINER_JONATHAN                    598
-#define TRAINER_BRENDAN_RUSTBORO_TORCHIC                  599
-#define TRAINER_MAY_RUSTBORO_MUDKIP                      600
-#define TRAINER_MAXIE_MAGMA_HIDEOUT                     601
-#define TRAINER_MAXIE_MT_CHIMNEY                     602
+#define TRAINER_BRENDAN_RUSTBORO_TORCHIC    599
+#define TRAINER_MAY_RUSTBORO_MUDKIP         600
+#define TRAINER_MAXIE_MAGMA_HIDEOUT         601
+#define TRAINER_MAXIE_MT_CHIMNEY            602
 #define TRAINER_TIANA                       603
 #define TRAINER_HALEY_1                     604
 #define TRAINER_JANICE                      605
@@ -657,17 +657,17 @@
 #define TRAINER_RILEY                       653
 #define TRAINER_FLINT                       654
 #define TRAINER_ASHLEY                      655
-#define TRAINER_WALLY_MAUVILLE                     656
-#define TRAINER_WALLY_VR_2                     657
-#define TRAINER_WALLY_VR_3                     658
-#define TRAINER_WALLY_VR_4                     659
-#define TRAINER_WALLY_VR_5                     660
-#define TRAINER_BRENDAN_LILYCOVE_MUDKIP                  661
-#define TRAINER_BRENDAN_LILYCOVE_TREECKO                  662
-#define TRAINER_BRENDAN_LILYCOVE_TORCHIC                  663
-#define TRAINER_MAY_LILYCOVE_MUDKIP                      664
-#define TRAINER_MAY_LILYCOVE_TREECKO                      665
-#define TRAINER_MAY_LILYCOVE_TORCHIC                      666
+#define TRAINER_WALLY_MAUVILLE              656
+#define TRAINER_WALLY_VR_2                  657
+#define TRAINER_WALLY_VR_3                  658
+#define TRAINER_WALLY_VR_4                  659
+#define TRAINER_WALLY_VR_5                  660
+#define TRAINER_BRENDAN_LILYCOVE_MUDKIP     661
+#define TRAINER_BRENDAN_LILYCOVE_TREECKO    662
+#define TRAINER_BRENDAN_LILYCOVE_TORCHIC    663
+#define TRAINER_MAY_LILYCOVE_MUDKIP         664
+#define TRAINER_MAY_LILYCOVE_TREECKO        665
+#define TRAINER_MAY_LILYCOVE_TORCHIC        666
 #define TRAINER_JONAH                       667
 #define TRAINER_HENRY                       668
 #define TRAINER_ROGER                       669
@@ -733,9 +733,9 @@
 #define TRAINER_GRUNT_MAGMA_HIDEOUT_14      729
 #define TRAINER_GRUNT_MAGMA_HIDEOUT_15      730
 #define TRAINER_GRUNT_MAGMA_HIDEOUT_16      731
-#define TRAINER_TABITHA_MAGMA_HIDEOUT                   732
+#define TRAINER_TABITHA_MAGMA_HIDEOUT       732
 #define TRAINER_DARCY                       733
-#define TRAINER_MAXIE_MOSSDEEP                     734
+#define TRAINER_MAXIE_MOSSDEEP              734
 #define TRAINER_PETE                        735
 #define TRAINER_ISABELLE                    736
 #define TRAINER_ANDRES_1                    737
@@ -769,8 +769,8 @@
 #define TRAINER_MYLES                       765
 #define TRAINER_PAT                         766
 #define TRAINER_CRISTIN_1                   767
-#define TRAINER_MAY_RUSTBORO_TREECKO                      768
-#define TRAINER_MAY_RUSTBORO_TORCHIC                      769
+#define TRAINER_MAY_RUSTBORO_TREECKO        768
+#define TRAINER_MAY_RUSTBORO_TORCHIC        769
 #define TRAINER_ROXANNE_2                   770
 #define TRAINER_ROXANNE_3                   771
 #define TRAINER_ROXANNE_4                   772
@@ -854,8 +854,8 @@
 #define TRAINER_EVERETT                     850
 #define TRAINER_RED                         851
 #define TRAINER_LEAF                        852
-#define TRAINER_BRENDAN_PLACEHOLDER                  853
-#define TRAINER_MAY_PLACEHOLDER                      854
+#define TRAINER_BRENDAN_PLACEHOLDER         853
+#define TRAINER_MAY_PLACEHOLDER             854
 
 #define TRAINERS_COUNT                      855
 
diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h
index 68104ed74..173d81329 100644
--- a/src/data/trainer_parties.h
+++ b/src/data/trainer_parties.h
@@ -6781,7 +6781,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_WallyVR1[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute103Mudkip[] = {//Brendan1
+static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute103Mudkip[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -6789,7 +6789,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute103Mudkip[]
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute110Mudkip[] = {//Brendan2
+static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute110Mudkip[] = {
     {
     .iv = 50,
     .lvl = 18,
@@ -6807,7 +6807,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute110Mudkip[]
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute119Mudkip[] = {//Brendan3
+static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute119Mudkip[] = {
     {
     .iv = 100,
     .lvl = 29,
@@ -6825,7 +6825,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute119Mudkip[]
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute103Treecko[] = {//Brendan4
+static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute103Treecko[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -6833,7 +6833,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute103Treecko[]
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute110Treecko[] = {//Brendan5
+static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute110Treecko[] = {
     {
     .iv = 50,
     .lvl = 18,
@@ -6851,7 +6851,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute110Treecko[]
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute119Treecko[] = {//Brendan6
+static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute119Treecko[] = {
     {
     .iv = 100,
     .lvl = 29,
@@ -6869,7 +6869,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute119Treecko[]
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute103Torchic[] = {//Brendan7
+static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute103Torchic[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -6877,7 +6877,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute103Torchic[]
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute110Torchic[] = {//Brendan8
+static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute110Torchic[] = {
     {
     .iv = 50,
     .lvl = 18,
@@ -6895,7 +6895,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute110Torchic[]
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute119Torchic[] = {//Brendan9
+static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute119Torchic[] = {
     {
     .iv = 100,
     .lvl = 29,
@@ -6913,7 +6913,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute119Torchic[]
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute103Mudkip[] = {//May1
+static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute103Mudkip[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -6921,7 +6921,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute103Mudkip[] = {/
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute110Mudkip[] = {//May2
+static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute110Mudkip[] = {
     {
     .iv = 50,
     .lvl = 18,
@@ -6939,7 +6939,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute110Mudkip[] = {/
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute119Mudkip[] = {//May3
+static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute119Mudkip[] = {
     {
     .iv = 100,
     .lvl = 29,
@@ -6957,7 +6957,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute119Mudkip[] = {/
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute103Treecko[] = {//May4
+static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute103Treecko[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -6965,7 +6965,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute103Treecko[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute110Treecko[] = {//May5
+static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute110Treecko[] = {
     {
     .iv = 50,
     .lvl = 18,
@@ -6983,7 +6983,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute110Treecko[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute119Treecko[] = {//May6
+static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute119Treecko[] = {
     {
     .iv = 100,
     .lvl = 29,
@@ -7001,7 +7001,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute119Treecko[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute103Torchic[] = {//May7
+static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute103Torchic[] = {
     {
     .iv = 0,
     .lvl = 5,
@@ -7009,7 +7009,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute103Torchic[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute110Torchic[] = {//May8
+static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute110Torchic[] = {
     {
     .iv = 50,
     .lvl = 18,
@@ -7027,7 +7027,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute110Torchic[] = {
     }
 };
 
-static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute119Torchic[] = {//May9
+static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute119Torchic[] = {
     {
     .iv = 100,
     .lvl = 29,