From 31a322fdc589c381af6ec4b4c4781d28cb394cc1 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Tue, 16 Jan 2018 19:14:14 -0500
Subject: use game stat defines

---
 src/scene/berry_blender.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/scene/berry_blender.c')

diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c
index b59d02939..0a7e14e4e 100644
--- a/src/scene/berry_blender.c
+++ b/src/scene/berry_blender.c
@@ -2567,9 +2567,9 @@ static void sub_8050954(void)
         if (Blender_PrintBlendingResults())
         {
             if (gInGameOpponentsNo == 0)
-                IncrementGameStat(34);
+                IncrementGameStat(GAME_STAT_POKEBLOCKS_WITH_FRIENDS);
             else
-                IncrementGameStat(33);
+                IncrementGameStat(GAME_STAT_POKEBLOCKS);
             gBerryBlenderData->field_6F++;
         }
         break;
-- 
cgit v1.2.3


From 093422f3065ed47db9a475b0c9d67e9c5bc2c364 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Wed, 17 Jan 2018 18:10:16 -0500
Subject: use dma macros for remaining missing dma while(1) loops

---
 src/scene/berry_blender.c | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

(limited to 'src/scene/berry_blender.c')

diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c
index 0a7e14e4e..6b6469634 100644
--- a/src/scene/berry_blender.c
+++ b/src/scene/berry_blender.c
@@ -842,24 +842,8 @@ static bool8 sub_804E2EC(void)
         }
         break;
     case 2:
-        {
-            void* offsetRead = ewram10000;
-            void* offsetWrite = (void*)(VRAM);
-            u32 size = 0x2000;
-            while (TRUE)
-            {
-                DmaCopy16(3, offsetRead, offsetWrite, 0x1000);
-                offsetRead += 0x1000;
-                offsetWrite += 0x1000;
-                size -= 0x1000;
-                if (size <= 0x1000)
-                {
-                    DmaCopy16(3, offsetRead, offsetWrite, size);
-                    break;
-                }
-            }
-            gBerryBlenderData->field_1++;
-        }
+        DmaCopyLarge16(3, ewram10000, (void *)(VRAM + 0x0), 0x2000, 0x1000);
+        gBerryBlenderData->field_1++;
         break;
     case 3:
         LZDecompressWram(gUnknown_08E6C920, ewram10000);
-- 
cgit v1.2.3


From 2869160d630f569110ca895ff924070d626fd54b Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Wed, 17 Jan 2018 19:31:23 -0500
Subject: use Defvars instead of some Dma macros and hopefully last while(1)s

---
 src/scene/berry_blender.c | 35 ++++++++---------------------------
 1 file changed, 8 insertions(+), 27 deletions(-)

(limited to 'src/scene/berry_blender.c')

diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c
index 6b6469634..7567899ae 100644
--- a/src/scene/berry_blender.c
+++ b/src/scene/berry_blender.c
@@ -832,14 +832,9 @@ static bool8 sub_804E2EC(void)
         gBerryBlenderData->field_1++;
         break;
     case 1:
-        {
-            const void* offsetRead = sBlenderCenterMap;
-            void* offsetWrite = (void*)(VRAM + 0x4000);
-
-            DmaCopy16(3, offsetRead, offsetWrite, 0x400);
-            LoadPalette(sBlenderCenterPal, 0, 0x100);
-            gBerryBlenderData->field_1++;
-        }
+        DmaCopy16Defvars(3, sBlenderCenterMap, (void *)(VRAM + 0x4000), 0x400);
+        LoadPalette(sBlenderCenterPal, 0, 0x100);
+        gBerryBlenderData->field_1++;
         break;
     case 2:
         DmaCopyLarge16(3, ewram10000, (void *)(VRAM + 0x0), 0x2000, 0x1000);
@@ -854,37 +849,23 @@ static bool8 sub_804E2EC(void)
         gBerryBlenderData->field_1++;
         break;
     case 5:
-        {
-            void* offsetRead = ewram10000;
-            void* offsetWrite = (void*)(VRAM + 0xE000);
-
-            DmaCopy16(3, offsetRead, offsetWrite, 0x1000);
-            gBerryBlenderData->field_1++;
-        }
+        DmaCopy16Defvars(3, ewram10000, (void *)(VRAM + 0xE000), 0x1000);
+        gBerryBlenderData->field_1++;
         break;
     case 6:
-        {
-            void* offsetRead = ewram11000;
-            void* offsetWrite = (void*)(VRAM + 0xF000);
-
-            DmaCopy16(3, offsetRead, offsetWrite, 0x1000);
-            gBerryBlenderData->field_1++;
-        }
+		DmaCopy16Defvars(3, ewram11000, (void *)(VRAM + 0xF000), 0x1000);
+        gBerryBlenderData->field_1++;
         break;
     case 7:
         {
             u16 i;
             u16* palStore = (u16*)(ewram13000);
-            void* offsetRead;
-            void* offsetWrite;
 
             for (i = 0; i < 640; i++)
             {
                 *(palStore + i) |= 0x100;
             }
-            offsetRead = ewram13000;
-            offsetWrite = (void*)(VRAM + 0x6000);
-            DmaCopy16(3, offsetRead, offsetWrite, 0x500);
+            DmaCopy16Defvars(3, ewram13000, (void *)(VRAM + 0x6000), 0x500);
             LoadPalette(sBlenderOuterPal, 0x80, 0x20);
             gBerryBlenderData->field_1++;
         }
-- 
cgit v1.2.3