dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improved style of sub_800DD28

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-07-30 13:45:10 +08:00
parent 035df4d7a4
commit 353fe5e797
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/graphics.h
+1 -1
View File
@@ -975,6 +975,6 @@ extern const u32 gGhostFrontPic[];
extern const u32 gGhostPalette[]; extern const u32 gGhostPalette[];
extern const u32 gSubstituteDollGfx[]; extern const u32 gSubstituteDollGfx[];
extern const u32 gSubstituteDollTilemap[]; extern const u32 gSubstituteDollTilemap[];
extern const u16 gSubstituteDollPal[]; extern const u32 gSubstituteDollPal[];
#endif //GUARD_GRAPHICS_H #endif //GUARD_GRAPHICS_H
src/battle_controllers.c
+5 -4
View File
@@ -488,8 +488,7 @@ void sub_800DD28(void)
{ {
u8 i; u8 i;
s32 j; s32 j;
u16 r6; u8 *recvBuffer;
u8 *recvBuffer, *dest, *src;
if (gReceivedRemoteLinkPlayers && (gBattleTypeFlags & BATTLE_TYPE_20) && (gLinkPlayers[0].linkType == 0x2211)) if (gReceivedRemoteLinkPlayers && (gBattleTypeFlags & BATTLE_TYPE_20) && (gLinkPlayers[0].linkType == 0x2211))
{ {
@@ -501,7 +500,9 @@ void sub_800DD28(void)
ResetBlockReceivedFlag(i); ResetBlockReceivedFlag(i);
recvBuffer = (u8 *)gBlockRecvBuffer[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) if (gTasks[sLinkReceiveTaskId].data[14] + 9 + r6 > 0x1000)
{ {
gTasks[sLinkReceiveTaskId].data[12] = gTasks[sLinkReceiveTaskId].data[14]; gTasks[sLinkReceiveTaskId].data[12] = gTasks[sLinkReceiveTaskId].data[14];
@@ -511,11 +512,11 @@ void sub_800DD28(void)
src = recvBuffer; src = recvBuffer;
for (j = 0; j < r6 + 8; ++j) for (j = 0; j < r6 + 8; ++j)
dest[j] = src[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;
} }
} }
} }
}
} }
static void Task_HandleCopyReceivedLinkBuffersData(u8 taskId) static void Task_HandleCopyReceivedLinkBuffersData(u8 taskId)