Merge branch 'master' into pokeball-doc

1 files changed, 24 insertions, 24 deletions

diff --git a/src/berry_blender.c b/src/berry_blender.c
index a2a96c089..399a9e7b8 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -116,8 +116,8 @@ struct BerryBlenderData
     u16 field_116;
     u16 field_118;
     u16 field_11A;
-    u16 bg_X;
-    u16 bg_Y;
+    s16 bg_X;
+    s16 bg_Y;
     u8 field_120[3];
     u8 field_123;
     u16 scores[BLENDER_MAX_PLAYERS][BLENDER_SCORES_NO];
@@ -1058,7 +1058,7 @@ static void sub_807FD08(struct Sprite* sprite)
         if (++sprite->data[5] > 3)
             DestroySprite(sprite);
         else
-            PlaySE(SE_TB_KARA);
+            PlaySE(SE_BALL_TRAY_EXIT);
     }
     sprite->pos1.x = sprite->data[1];
     sprite->pos1.y = sprite->data[2];
@@ -1230,7 +1230,7 @@ static void sub_8080018(void)
         sBerryBlenderData->field_114 = 0;
         Blender_CopyBerryData(&sBerryBlenderData->blendedBerries[0], gSpecialVar_ItemId);
         memcpy(gBlockSendBuffer, &sBerryBlenderData->blendedBerries[0], sizeof(struct BlenderBerry));
-        sub_800ADF8();
+        SetLinkStandbyCallback();
         sBerryBlenderData->framesToWait = 0;
         break;
     case 9:
@@ -1238,7 +1238,7 @@ static void sub_8080018(void)
         {
             ResetBlockReceivedFlags();
             if (GetMultiplayerId() == 0)
-                sub_800A4D8(4);
+                SendBlockRequest(4);
             sBerryBlenderData->mainState++;
         }
         break;
@@ -1295,7 +1295,7 @@ static void sub_8080018(void)
         {
             sBerryBlenderData->mainState++;
             sub_8082CB4(&sBerryBlenderData->bgAffineSrc);
-            PlaySE(SE_RU_HYUU);
+            PlaySE(SE_FALL);
             ShowBg(2);
         }
         break;
@@ -1310,7 +1310,7 @@ static void sub_8080018(void)
             sBerryBlenderData->field_11A = 0x100;
             sBerryBlenderData->arrowPos = sUnknown_083399DC[sUnknown_083399E4[sBerryBlenderData->playersNo - 2]];
             sBerryBlenderData->framesToWait = 0;
-            PlaySE(SE_TRACK_DOOR);
+            PlaySE(SE_TRUCK_DOOR);
             sub_808074C();
             Blender_PrintPlayerNames();
         }
@@ -1332,7 +1332,7 @@ static void sub_8080018(void)
         sBerryBlenderData->mainState++;
         break;
     case 19:
-        sub_800ADF8();
+        SetLinkStandbyCallback();
         sBerryBlenderData->mainState++;
         break;
     case 20:
@@ -1582,7 +1582,7 @@ static void sub_80808D4(void)
     case 13:
         sBerryBlenderData->mainState++;
         sub_808074C();
-        PlaySE(SE_RU_HYUU);
+        PlaySE(SE_FALL);
         sub_8082CB4(&sBerryBlenderData->bgAffineSrc);
         ShowBg(2);
         break;
@@ -1597,7 +1597,7 @@ static void sub_80808D4(void)
             sBerryBlenderData->arrowPos = sUnknown_083399DC[sUnknown_083399E4[sBerryBlenderData->playersNo - 2]];
             SetGpuRegBits(REG_OFFSET_BG2CNT, 2);
             sBerryBlenderData->framesToWait = 0;
-            PlaySE(SE_TRACK_DOOR);
+            PlaySE(SE_TRUCK_DOOR);
             Blender_PrintPlayerNames();
         }
         sub_8082CB4(&sBerryBlenderData->bgAffineSrc);
@@ -1648,7 +1648,7 @@ static void sub_80808D4(void)
             sBerryBlenderData->field_154 = GetCurrentMapMusic();
 
         PlayBGM(MUS_CYCLING);
-        PlaySE(SE_MOTER);
+        PlaySE(SE_BERRY_BLENDER);
         Blender_ControlHitPitch();
         break;
     }
@@ -1873,17 +1873,17 @@ static void sub_8081288(u16 a0, u8 a1)
     {
         StartSpriteAnim(&gSprites[spriteId], 2);
         gSprites[spriteId].callback = sub_8082F9C;
-        PlaySE(SE_RU_GASHIN);
+        PlaySE(SE_ICE_STAIRS);
     }
     else if (a0 == 0x5432)
     {
         StartSpriteAnim(&gSprites[spriteId], 0);
-        PlaySE(SE_SEIKAI);
+        PlaySE(SE_SUCCESS);
     }
     else if (a0 == 0x2345)
     {
         StartSpriteAnim(&gSprites[spriteId], 1);
-        PlaySE(SE_HAZURE);
+        PlaySE(SE_FAILURE);
     }
     sub_8082E84();
 }
@@ -2587,7 +2587,7 @@ static bool8 LinkPlayAgainHandleSaving(void)
     switch (sBerryBlenderData->field_1A0)
     {
     case 0:
-        sub_800ADF8();
+        SetLinkStandbyCallback();
         sBerryBlenderData->field_1A0 = 1;
         sBerryBlenderData->framesToWait = 0;
         break;
@@ -2606,7 +2606,7 @@ static bool8 LinkPlayAgainHandleSaving(void)
     case 3:
         if (++sBerryBlenderData->framesToWait == 10)
         {
-            sub_800ADF8();
+            SetLinkStandbyCallback();
             sBerryBlenderData->field_1A0++;
         }
         break;
@@ -2682,7 +2682,7 @@ static void CB2_HandlePlayerLinkPlayAgainChoice(void)
         break;
     case 5:
         Blender_PrintText(&sBerryBlenderData->textState, gText_SavingDontTurnOff2, 0);
-        sub_800ADF8();
+        SetLinkStandbyCallback();
         sBerryBlenderData->gameEndState++;
         break;
     case 6:
@@ -2702,7 +2702,7 @@ static void CB2_HandlePlayerLinkPlayAgainChoice(void)
         break;
     case 8:
         sBerryBlenderData->gameEndState++;
-        sub_800ADF8();
+        SetLinkStandbyCallback();
         break;
     case 9:
         if (IsLinkTaskFinished())
@@ -2732,7 +2732,7 @@ static void CB2_HandlePlayerLinkPlayAgainChoice(void)
     case 11:
         if (++sBerryBlenderData->framesToWait > 30)
         {
-            sub_800AC34();
+            SetCloseLinkCallback();
             sBerryBlenderData->gameEndState++;
         }
         break;
@@ -3025,7 +3025,7 @@ static void sub_8083010(struct Sprite* sprite)
         {
             sprite->data[1] = 88;
             sprite->data[0]++;
-            PlaySE(SE_KON);
+            PlaySE(SE_BALL_BOUNCE_1);
         }
         break;
     case 1:
@@ -3166,13 +3166,13 @@ static void sub_80832E8(s16* a0)
 
 static void sub_808330C(void)
 {
-    sub_80832E8(&sBerryBlenderData->bg_X);
-    sub_80832E8(&sBerryBlenderData->bg_Y);
+    sub_80832E8((s16 *)&sBerryBlenderData->bg_X);
+    sub_80832E8((s16 *)&sBerryBlenderData->bg_Y);
 }
 
 static void sub_8083334(s16* a0, u16 a1)
 {
-    s32 var;
+    u8 var;
 
     if (a1 < 10)
         var = 16;
@@ -3567,7 +3567,7 @@ static void sub_8083F3C(u8 taskId)
 {
     if (gTasks[taskId].data[0] == 0)
     {
-        PlayFanfare(MUS_FANFA1);
+        PlayFanfare(MUS_LEVEL_UP);
         gTasks[taskId].data[0]++;
     }
     if (IsFanfareTaskInactive())