Merge branch 'decompile_frontier_2' of https://github.com/DizzyEggg/pokeemerald into decompile_frontier_2

1 files changed, 71 insertions, 8 deletions

diff --git a/src/berry_blender.c b/src/berry_blender.c
index 92d44ea78..a5b940189 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -322,18 +322,72 @@ static const struct BgTemplate sBerryBlenderBgTemplates[3] =
 
 static const struct WindowTemplate sBerryBlender_WindowTemplates[] =
 {
-    {0, 1, 6, 7, 2, 0xE, 0x28},
-    {0, 0x16, 6, 7, 2, 0xE, 0x36},
-    {0, 1, 0xC, 7, 2, 0xE, 0x44},
-    {0, 0x16, 0xC, 7, 2, 0xE, 0x52},
-    {0, 2, 0xF, 0x1B, 4, 0xE, 0x60},
-    {0, 5, 3, 0x15, 0xE, 0xE, 0x60},
+    {
+        .priority = 0,
+        .tilemapLeft = 1,
+        .tilemapTop = 6,
+        .width = 7,
+        .height = 2,
+        .paletteNum = 14,
+        .baseBlock = 0x28,
+    },
+    {
+        .priority = 0,
+        .tilemapLeft = 22,
+        .tilemapTop = 6,
+        .width = 7,
+        .height = 2,
+        .paletteNum = 14,
+        .baseBlock = 0x36,
+    },
+    {
+        .priority = 0,
+        .tilemapLeft = 1,
+        .tilemapTop = 12,
+        .width = 7,
+        .height = 2,
+        .paletteNum = 14,
+        .baseBlock = 0x44,
+    },
+    {
+        .priority = 0,
+        .tilemapLeft = 22,
+        .tilemapTop = 12,
+        .width = 7,
+        .height = 2,
+        .paletteNum = 14,
+        .baseBlock = 0x52,
+    },
+    {
+        .priority = 0,
+        .tilemapLeft = 2,
+        .tilemapTop = 15,
+        .width = 27,
+        .height = 4,
+        .paletteNum = 14,
+        .baseBlock = 0x60,
+    },
+    {
+        .priority = 0,
+        .tilemapLeft = 5,
+        .tilemapTop = 3,
+        .width = 21,
+        .height = 14,
+        .paletteNum = 14,
+        .baseBlock = 0x60,
+    },
     DUMMY_WIN_TEMPLATE
 };
 
 static const struct WindowTemplate sBlender_YesNoWindowTemplate =
 {
-    0, 0x15, 9, 5, 4, 0xE, 0xCC
+    .priority = 0,
+    .tilemapLeft = 21,
+    .tilemapTop = 9,
+    .width = 5,
+    .height = 4,
+    .paletteNum = 14,
+    .baseBlock = 0xCC
 };
 
 static const s8 sUnknown_083399C0[][2] =
@@ -790,7 +844,16 @@ static const u8 sUnknown_08339CD2[] =
     0x05, 0x03, 0x03, 0x03, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x02
 };
 
-static const struct WindowTemplate sBlenderRecordWindowTemplate = {0, 6, 4, 0x12, 0xB, 0xF, 8};
+static const struct WindowTemplate sBlenderRecordWindowTemplate =
+{
+    .priority = 0,
+    .tilemapLeft = 6,
+    .tilemapTop = 4,
+    .width = 18,
+    .height = 11,
+    .paletteNum = 15,
+    .baseBlock = 8
+};
 
 // code