From 3d87a88067c36e1296612bfaf3dc741884bc9bd4 Mon Sep 17 00:00:00 2001
From: PokeCodec <67983839+PokeCodec@users.noreply.github.com>
Date: Wed, 2 Sep 2020 18:46:49 -0400
Subject: Make battle pyramid defines into enums

---
 src/battle_pyramid.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'src/battle_pyramid.c')

diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c
index b015f3e0e..9e881d3a3 100644
--- a/src/battle_pyramid.c
+++ b/src/battle_pyramid.c
@@ -523,6 +523,19 @@ static const u8 sTrainerTextGroups[50][2] =
     {FACILITY_CLASS_HIKER, 4},
 };
 
+enum
+{
+    HINT_EXIT_DIRECTION,
+    HINT_REMAINING_ITEMS,
+    HINT_REMAINING_TRAINERS,
+    HINT_EXIT_SHORT_REMAINING_TRAINERS,
+    HINT_EXIT_SHORT_REMAINING_ITEMS,
+    HINT_EXIT_MEDIUM_REMAINING_TRAINERS,
+    HINT_EXIT_MEDIUM_REMAINING_ITEMS,
+    HINT_EXIT_FAR_REMAINING_TRAINERS,
+    HINT_EXIT_FAR_REMAINING_ITEMS,
+};
+
 static const u8 *const sExitDirectionHintTexts1[] =
 {
     BattlePyramid_Text_ExitHintUp1,
-- 
cgit v1.2.3


From 7dc95a0103af08c95c9093b6efa6c77af77a2538 Mon Sep 17 00:00:00 2001
From: aaaaaa123456789 <aaaaaa123456789@acidch.at>
Date: Sun, 13 Sep 2020 04:22:50 -0300
Subject: Undo PokeCodec's PRs

This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.

Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136,
#1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179,
#1180, #1181, #1182 and #1183.
---
 src/battle_pyramid.c | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'src/battle_pyramid.c')

diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c
index 9e881d3a3..b015f3e0e 100644
--- a/src/battle_pyramid.c
+++ b/src/battle_pyramid.c
@@ -523,19 +523,6 @@ static const u8 sTrainerTextGroups[50][2] =
     {FACILITY_CLASS_HIKER, 4},
 };
 
-enum
-{
-    HINT_EXIT_DIRECTION,
-    HINT_REMAINING_ITEMS,
-    HINT_REMAINING_TRAINERS,
-    HINT_EXIT_SHORT_REMAINING_TRAINERS,
-    HINT_EXIT_SHORT_REMAINING_ITEMS,
-    HINT_EXIT_MEDIUM_REMAINING_TRAINERS,
-    HINT_EXIT_MEDIUM_REMAINING_ITEMS,
-    HINT_EXIT_FAR_REMAINING_TRAINERS,
-    HINT_EXIT_FAR_REMAINING_ITEMS,
-};
-
 static const u8 *const sExitDirectionHintTexts1[] =
 {
     BattlePyramid_Text_ExitHintUp1,
-- 
cgit v1.2.3


From 52598983250fd8ad7b66ff2b9d77046859f169c8 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Thu, 1 Oct 2020 17:20:38 -0400
Subject: Replace POKEMON_SLOTS_NUMBER

---
 src/battle_pyramid.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/battle_pyramid.c')

diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c
index 9e881d3a3..203b572eb 100644
--- a/src/battle_pyramid.c
+++ b/src/battle_pyramid.c
@@ -35,7 +35,6 @@
 #include "constants/layouts.h"
 #include "constants/maps.h"
 #include "constants/moves.h"
-#include "constants/species.h"
 #include "constants/trainers.h"
 
 extern const struct MapLayout *const gMapLayouts[];
-- 
cgit v1.2.3


From 81d95b9325ed2526ce638744408f453a8169abb4 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Sat, 12 Dec 2020 23:28:01 -0500
Subject: Use BUGFIX for some inline fixes

---
 src/battle_pyramid.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/battle_pyramid.c')

diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c
index 1b220f145..ac6d95338 100644
--- a/src/battle_pyramid.c
+++ b/src/battle_pyramid.c
@@ -1757,7 +1757,9 @@ static bool8 SetPyramidObjectPositionsInAndNearSquare(u8 objType, u8 squareId)
 
         r7 &= 1;
     }
-    // free(floorLayoutOffsets); BUG: floorLayoutOffsets memory not freed
+    #ifdef BUGFIX
+    free(floorLayoutOffsets);
+    #endif
 
     return (numObjects / 2) > numPlacedObjects;
 }
@@ -1809,7 +1811,9 @@ static bool8 SetPyramidObjectPositionsNearSquare(u8 objType, u8 squareId)
         if (r8 == 4)
             break;
     }
-    // free(floorLayoutOffsets); BUG: floorLayoutOffsets memory not freed
+    #ifdef BUGFIX
+    free(floorLayoutOffsets);
+    #endif
 
     return (numObjects / 2) > numPlacedObjects;
 }
-- 
cgit v1.2.3