Merge pull request #401 from SethBarberee/emerald_backport_1

Backport 2 nonmatching fixes from emerald

2 files changed, 25 insertions, 42 deletions

diff --git a/src/berry_crush_2.c b/src/berry_crush_2.c
index 0382ef3fd..1b76ee05a 100644
--- a/src/berry_crush_2.c
+++ b/src/berry_crush_2.c
@@ -149,29 +149,29 @@ static u32 BerryCrushCommand_BeginNormalPaletteFade(struct BerryCrushGame * game
     // byte 9: if TRUE, communicate on fade complete
 
     u16 color;
-    u32 selectedPals;
-    selectedPals = ({
-#ifndef NONMATCHING
-        register u32 value asm("r2");
-        register u32 b asm("r3");
-#else
-        u32 value;
-        u32 b;
-#endif //NONMATCHING
-        value  =      params[0] << 0;
-        value |= (b = params[1] << 8);
-        value |= (b = params[2] << 16);
-        value |= (b = params[3] << 24);
-        value;
-    });
+    u32 selectedPals[2];
+
+    selectedPals[0] = (u32)params[0];
+    selectedPals[1] = (u32)params[1];
+    selectedPals[1] <<= 8;
+
+    selectedPals[0] |= selectedPals[1];
+    selectedPals[1] = (u32)params[2];
+    selectedPals[1] <<= 16;
+
+    selectedPals[0] |= selectedPals[1];
+    selectedPals[1] = (u32)params[3];
+    selectedPals[1] <<= 24;
 
+    selectedPals[0] |= selectedPals[1];
     params[0] = params[9];
 
-    color  = params[8] << 8;
-    color |= params[7] << 0;
+    color = params[8];
+    color <<= 8;
+    color |= params[7];
 
     gPaletteFade.bufferTransferDisabled = FALSE;
-    BeginNormalPaletteFade(selectedPals, params[4], params[5], params[6], color);
+    BeginNormalPaletteFade(selectedPals[0], params[4], params[5], params[6], color);
     UpdatePaletteFade();
     game->nextCmd = BCCMD_WaitPaletteFade;
     return 0;
diff --git a/src/mystery_gift_menu.c b/src/mystery_gift_menu.c
index 39de542d7..33f31515d 100644
--- a/src/mystery_gift_menu.c
+++ b/src/mystery_gift_menu.c
@@ -1220,18 +1220,10 @@ void task00_mystery_gift(u8 taskId)
         }
         break;
     case  5:
-    {
-        #ifndef NONMATCHING
-            register u8 eos asm("r1");
-            gStringVar1[0] = (eos = EOS);
-            gStringVar2[0] = eos;
-            gStringVar3[0] = eos;
-        #else
-            gStringVar1[0] = EOS;
-            gStringVar2[0] = EOS;
-            gStringVar3[0] = EOS;
-        #endif
-    }
+        *gStringVar1 = EOS;
+        *gStringVar2 = EOS;
+        *gStringVar3 = EOS;
+
         switch (data->IsCardOrNews)
         {
         case 0:
@@ -1622,18 +1614,9 @@ void task00_mystery_gift(u8 taskId)
         }
         break;
     case 31:
-    {
-        #ifndef NONMATCHING
-            register u8 eos asm("r1");
-            gStringVar1[0] = (eos = EOS);
-            gStringVar2[0] = eos;
-            gStringVar3[0] = eos;
-        #else
-            gStringVar1[0] = EOS;
-            gStringVar2[0] = EOS;
-            gStringVar3[0] = EOS;
-        #endif
-    }
+        *gStringVar1 = EOS;
+        *gStringVar2 = EOS;
+        *gStringVar3 = EOS;
         if (data->IsCardOrNews == 0)
         {
             AddTextPrinterToWindow1(gText_SendingWonderCard);