diff options
| -rw-r--r-- | include/graphics.h | 2 | ||||
| -rw-r--r-- | src/battle_controllers.c | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/graphics.h b/include/graphics.h index 6f9d8b762..e1bbb55ef 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -975,6 +975,6 @@ extern const u32 gGhostFrontPic[]; extern const u32 gGhostPalette[]; extern const u32 gSubstituteDollGfx[]; extern const u32 gSubstituteDollTilemap[]; -extern const u16 gSubstituteDollPal[]; +extern const u32 gSubstituteDollPal[]; #endif //GUARD_GRAPHICS_H diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 20c934a0c..509a00824 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -488,8 +488,7 @@ void sub_800DD28(void) { u8 i; s32 j; - u16 r6; - u8 *recvBuffer, *dest, *src; + u8 *recvBuffer; if (gReceivedRemoteLinkPlayers && (gBattleTypeFlags & BATTLE_TYPE_20) && (gLinkPlayers[0].linkType == 0x2211)) { @@ -501,7 +500,9 @@ void sub_800DD28(void) ResetBlockReceivedFlag(i); recvBuffer = (u8 *)gBlockRecvBuffer[i]; { - r6 = gBlockRecvBuffer[i][2]; + u8 *dest, *src; + u16 r6 = gBlockRecvBuffer[i][2]; + if (gTasks[sLinkReceiveTaskId].data[14] + 9 + r6 > 0x1000) { gTasks[sLinkReceiveTaskId].data[12] = gTasks[sLinkReceiveTaskId].data[14]; @@ -511,8 +512,8 @@ void sub_800DD28(void) src = recvBuffer; for (j = 0; j < r6 + 8; ++j) dest[j] = src[j]; + gTasks[sLinkReceiveTaskId].data[14] = gTasks[sLinkReceiveTaskId].data[14] + r6 + 8; } - gTasks[sLinkReceiveTaskId].data[14] = gTasks[sLinkReceiveTaskId].data[14] + r6 + 8; } } } |