From 9c4a59f865360b7d6e0dede0e52812b897526588 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Mon, 5 Jun 2023 19:53:59 -0400
Subject: [PATCH] Fix swapped Dodrio Berry Picking palettes

---
 graphics/dodrio_berry_picking/bg.pal          | 19 -------------------
 graphics/dodrio_berry_picking/tree_border.pal | 19 -------------------
 src/dodrio_berry_picking.c                    |  8 ++++----
 3 files changed, 4 insertions(+), 42 deletions(-)
 delete mode 100644 graphics/dodrio_berry_picking/bg.pal
 delete mode 100644 graphics/dodrio_berry_picking/tree_border.pal

diff --git a/graphics/dodrio_berry_picking/bg.pal b/graphics/dodrio_berry_picking/bg.pal
deleted file mode 100644
index c06550002f..0000000000
--- a/graphics/dodrio_berry_picking/bg.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-230 246 255
-82 180 172
-82 205 189
-156 156 131
-106 156 148
-123 123 98
-189 172 98
-189 189 139
-74 172 156
-172 172 131
-74 156 123
-115 115 82
-139 139 106
-164 164 115
-197 197 148
-230 246 255
diff --git a/graphics/dodrio_berry_picking/tree_border.pal b/graphics/dodrio_berry_picking/tree_border.pal
deleted file mode 100644
index be2b62cc98..0000000000
--- a/graphics/dodrio_berry_picking/tree_border.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-230 246 255
-246 246 222
-230 230 180
-139 238 139
-246 246 189
-197 246 164
-246 230 197
-230 246 255
-230 213 180
-205 197 164
-148 222 148
-222 238 255
-139 205 139
-213 238 246
-222 246 255
-213 205 164
diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c
index 8d47595c8b..1ba82c6d21 100644
--- a/src/dodrio_berry_picking.c
+++ b/src/dodrio_berry_picking.c
@@ -552,8 +552,8 @@ static const u8 sUnsharedColumns[MAX_RFU_PLAYERS][MAX_RFU_PLAYERS] =
 };
 
 // Duplicate and unused gfx. Feel free to remove.
-static const u32 sDuplicateGfx[] = INCBIN_U32("graphics/dodrio_berry_picking/bg.gbapal",
-                                     "graphics/dodrio_berry_picking/tree_border.gbapal",
+static const u32 sDuplicateGfx[] = INCBIN_U32("graphics/dodrio_berry_picking/tree_border.gbapal",
+                                     "graphics/dodrio_berry_picking/bg.gbapal",
                                      "graphics/dodrio_berry_picking/dodrio.gbapal",
                                      "graphics/dodrio_berry_picking/shiny.gbapal",
                                      "graphics/dodrio_berry_picking/status.gbapal",
@@ -3586,8 +3586,8 @@ static const u8 sUnsharedColumns_Duplicate[MAX_RFU_PLAYERS][MAX_RFU_PLAYERS] =
     {1, 3, 5, 6, 9},
 };
 
-static const u16 sBg_Pal[]                  = INCBIN_U16("graphics/dodrio_berry_picking/bg.gbapal",
-                                                         "graphics/dodrio_berry_picking/tree_border.gbapal");
+static const u16 sBg_Pal[]                  = INCBIN_U16("graphics/dodrio_berry_picking/tree_border.gbapal",
+                                                         "graphics/dodrio_berry_picking/bg.gbapal");
 static const u16 sDodrioNormal_Pal[]        = INCBIN_U16("graphics/dodrio_berry_picking/dodrio.gbapal");
 static const u16 sDodrioShiny_Pal[]         = INCBIN_U16("graphics/dodrio_berry_picking/shiny.gbapal");
 static const u16 sStatus_Pal[]              = INCBIN_U16("graphics/dodrio_berry_picking/status.gbapal");