ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup and documentation

Browse Source
This commit is contained in:
Diegoisawesome 2018-12-31 02:22:21 -06:00
parent c5c6e437ec
commit ec780bb209
21 changed files with 382 additions and 440 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
asm/contest_link_80F57C4.s
View File

@ -606,7 +606,7 @@ _080F5DE0:
movs r0, 0x64
b _080F5E2C
_080F5DF4:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080F5EBA
@ -616,7 +616,7 @@ _080F5DF4:
strh r0, [r4, 0x8]
b _080F5EBA
_080F5E0A:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@ -741,7 +741,7 @@ sub_80F5F30: @ 80F5F30
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080F5F60
@ -5564,7 +5564,7 @@ sub_80F8714: @ 80F8714
ldrh r0, [r0]
cmp r0, 0x1
bne _080F8748
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080F877E

36
asm/contest_link_80FC4F4.s
View File

@ -213,7 +213,7 @@ sub_80FC670: @ 80FC670
beq _080FC6A0
cmp r0, 0x1
beq _080FC6AE
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@ -223,7 +223,7 @@ _080FC698:
b _080FC6B6
.pool
_080FC6A0:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080FC6B4
@ -280,7 +280,7 @@ _080FC6FE:
lsls r0, 24
cmp r0, 0
bne _080FC738
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080FC7F4
@ -412,7 +412,7 @@ _080FC830:
lsls r0, 24
cmp r0, 0
bne _080FC87A
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080FC880
@ -494,7 +494,7 @@ _080FC8DE:
lsls r0, 24
cmp r0, 0
bne _080FC904
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080FC986
@ -599,7 +599,7 @@ sub_80FC998: @ 80FC998
b _080FC9F0
.pool
_080FC9C4:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080FC9F0
@ -653,7 +653,7 @@ sub_80FC9F8: @ 80FC9F8
b _080FCAB2
.pool
_080FCA30:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080FCAB2
@ -763,7 +763,7 @@ _080FCAFC:
.4byte _080FCC38
.4byte _080FCB6C
_080FCB2C:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
bne _080FCB38
@ -810,7 +810,7 @@ _080FCB84:
strh r0, [r2, 0x8]
b _080FCC82
_080FCB90:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080FCC82
@ -833,7 +833,7 @@ _080FCBA4:
b _080FCC50
.pool
_080FCBCC:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080FCC82
@ -856,7 +856,7 @@ _080FCBE0:
b _080FCC50
.pool
_080FCC08:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080FCC82
@ -949,7 +949,7 @@ _080FCCB8:
.4byte _080FCDF8
.4byte _080FCD30
_080FCCE8:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
bne _080FCCF4
@ -1000,7 +1000,7 @@ _080FCD48:
strh r0, [r2, 0x8]
b _080FCE42
_080FCD54:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080FCE42
@ -1027,7 +1027,7 @@ _080FCD6C:
b _080FCE10
.pool
_080FCD98:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080FCE42
@ -1047,7 +1047,7 @@ _080FCDB0:
b _080FCE04
.pool
_080FCDC8:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080FCE42
@ -1149,7 +1149,7 @@ _080FCE92:
lsls r0, 24
cmp r0, 0
bne _080FCEB8
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080FCF2E
@ -1258,7 +1258,7 @@ sub_80FCF40: @ 80FCF40
b _080FCFBE
.pool
_080FCF80:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080FCFBE
@ -1324,7 +1324,7 @@ sub_80FCFD0: @ 80FCFD0
b _080FD04E
.pool
_080FD010:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080FD04E

10
asm/contest_link_81D9DE4.s
View File

@ -434,7 +434,7 @@ sub_81DA160: @ 81DA160
b _081DA224
.pool
_081DA1A4:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _081DA224
@ -536,7 +536,7 @@ _081DA284:
lsls r0, 24
cmp r0, 0
bne _081DA2CE
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _081DA2D4
@ -613,7 +613,7 @@ sub_81DA2E8: @ 81DA2E8
b _081DA39E
.pool
_081DA338:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _081DA39E
@ -716,7 +716,7 @@ sub_81DA3B8: @ 81DA3B8
b _081DA46E
.pool
_081DA408:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _081DA46E
@ -816,7 +816,7 @@ _081DA4CC:
lsls r0, 24
cmp r0, 0
bne _081DA4FA
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _081DA55C

82
asm/rom_8011DC0.s
View File

@ -8257,7 +8257,7 @@ _0801AF24:
b _0801AF8A
.pool
_0801AF40:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0801AFAE
@ -13680,7 +13680,7 @@ _0801DA72:
beq _0801DB46
b _0801DB5E
_0801DA7C:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0801DB5E
@ -13713,7 +13713,7 @@ _0801DA7C:
b _0801DB3E
.pool
_0801DAC8:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0801DB5E
@ -13752,7 +13752,7 @@ _0801DB08:
strh r0, [r4, 0x10]
b _0801DB5E
_0801DB1C:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0801DB5E
@ -14364,7 +14364,7 @@ _0801DFCE:
adds r0, 0x1
strh r0, [r1, 0x6]
_0801DFE0:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0801E028
@ -14389,7 +14389,7 @@ _0801DFE0:
b _0801E028
.pool
_0801E018:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0801E028
@ -14838,7 +14838,7 @@ _0801E3AC:
b _0801E458
.pool
_0801E3D4:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0801E414
@ -14978,7 +14978,7 @@ _0801E4E8:
b _0801E59A
.pool
_0801E50C:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0801E5BC
@ -15013,7 +15013,7 @@ _0801E540:
b _0801E59A
.pool
_0801E560:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0801E5BC
@ -15100,7 +15100,7 @@ _0801E604:
lsls r0, 24
cmp r0, 0
bne _0801E662
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0801E662
@ -15212,7 +15212,7 @@ _0801E6F0:
lsrs r0, 24
cmp r0, 0x1
beq _0801E75C
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0801E75C
@ -15304,7 +15304,7 @@ _0801E7AC:
adds r0, 0x1
strh r0, [r1, 0x6]
_0801E7C0:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@ -15348,7 +15348,7 @@ _0801E812:
b _0801E830
.pool
_0801E820:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0801E830
@ -20715,7 +20715,7 @@ _08021358:
bl sub_8010434
b _0802143E
_0802135E:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08021444
@ -23804,7 +23804,7 @@ _08022CE4:
bl sub_8010434
b _08022D06
_08022CEA:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
bne _08022D06
@ -24016,7 +24016,7 @@ _08022E6C:
bl sub_8010434
b _08022E9C
_08022E72:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08022EA2
@ -24148,7 +24148,7 @@ _08022F74:
bl sub_8010434
b _08023060
_08022F7A:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08023066
@ -24170,7 +24170,7 @@ _08022F7A:
bl SendBlock
b _08023060
_08022FAA:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08023066
@ -24300,7 +24300,7 @@ _080230A8:
bl sub_8010434
b _080231A8
_080230BA:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080231AE
@ -24369,7 +24369,7 @@ _08023120:
b _080231A8
.pool
_08023150:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080231AE
@ -24395,7 +24395,7 @@ _08023172:
bl sub_8010434
b _080231A8
_08023184:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080231AE
@ -24547,7 +24547,7 @@ _0802329C:
bl sub_8010434
b _080232DC
_080232BE:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080232E2
@ -24591,7 +24591,7 @@ _08023302:
beq _08023338
b _0802338C
_0802330C:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08023392
@ -24612,7 +24612,7 @@ _08023332:
bl sub_8010434
b _0802338C
_08023338:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08023392
@ -25683,7 +25683,7 @@ _08023B7A:
strh r0, [r4, 0x10]
b _08023BB2
_08023B94:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08023BB8
@ -25785,7 +25785,7 @@ _08023C2A:
bl SetGpuReg
b _08023C9C
_08023C5C:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08023CA2
@ -25884,7 +25884,7 @@ _08023D12:
bl SendBlock
b _0802402E
_08023D2A:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
bne _08023D36
@ -26227,7 +26227,7 @@ _08023FC4:
bl SendBlock
b _0802402E
_08023FD0:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08024034
@ -26451,7 +26451,7 @@ _080241A0:
bl sub_8010434
b _08024218
_080241A6:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0802421E
@ -26630,7 +26630,7 @@ _08024300:
bl sub_8010434
b _080243AC
_08024306:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080243B2
@ -26646,7 +26646,7 @@ _08024306:
bl SendBlock
b _080243AC
_08024328:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080243B2
@ -26914,7 +26914,7 @@ _08024522:
bl sub_8010434
b _08024558
_08024528:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0802455E
@ -27814,7 +27814,7 @@ _08024C4C:
bl sub_8010434
b _08024D20
_08024C5A:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08024D40
@ -28075,7 +28075,7 @@ _08024E90:
b _08024EF0
.pool
_08024EA0:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08024F08
@ -28116,7 +28116,7 @@ _08024EF0:
strb r0, [r1, 0x10]
b _08024F08
_08024EF8:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08024F08
@ -28475,7 +28475,7 @@ _080251BA:
strb r4, [r0, 0x8]
b _08025202
_080251D0:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08025226
@ -28560,7 +28560,7 @@ _08025252:
ldr r1, [r5]
b _080252CC
_08025274:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08025316
@ -28710,7 +28710,7 @@ _0802539C:
b _08025448
.pool
_080253BC:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08025466
@ -28900,7 +28900,7 @@ _0802553C:
b _080255E8
.pool
_08025564:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0802563C
@ -29391,7 +29391,7 @@ _0802593E:
b _08025976
.pool
_0802596C:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080259E8
@ -39683,7 +39683,7 @@ _0802AD3C:
b _0802ADC0
.pool
_0802AD68:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0802AE08

2
include/link.h
View File

@ -240,7 +240,7 @@ void SerialCB(void);
u8 GetLinkPlayerCount(void);
bool32 InUnionRoom(void);
void sub_800E0E8(void);
bool8 sub_800A520(void);
bool8 IsLinkTaskFinished(void);
void CreateWirelessStatusIndicatorSprite(u8, u8);
void sub_800ADF8(void);
void sub_800B488(void);

4
src/battle_controller_player.c
View File

@ -869,7 +869,7 @@ static void sub_80586F8(void)
}
else
{
if (sub_800A520())
if (IsLinkTaskFinished())
{
m4aSongNumStop(SE_HINSI);
gMain.inBattle = 0;
@ -888,7 +888,7 @@ void sub_80587B0(void)
{
if (gBattleTypeFlags & BATTLE_TYPE_LINK)
{
if (sub_800A520())
if (IsLinkTaskFinished())
{
if (gWirelessCommType == 0)
sub_800AC34();

2
src/battle_controllers.c
View File

@ -800,7 +800,7 @@ static void Task_HandleSendLinkBuffersData(u8 taskId)
}
break;
case 4:
if (sub_800A520())
if (IsLinkTaskFinished())
{
blockSize = gLinkBattleSendBuffer[gTasks[taskId].data[15] + LINK_BUFF_SIZE_LO] | (gLinkBattleSendBuffer[gTasks[taskId].data[15] + LINK_BUFF_SIZE_HI] << 8);
gTasks[taskId].data[13] = 1;

46
src/battle_main.c
View File

@ -986,7 +986,7 @@ static void CB2_HandleStartBattle(void)
{
if (gReceivedRemoteLinkPlayers != 0)
{
if (sub_800A520())
if (IsLinkTaskFinished())
{
*(&gBattleStruct->field_180) = 0;
*(&gBattleStruct->field_181) = 3;
@ -1035,7 +1035,7 @@ static void CB2_HandleStartBattle(void)
}
break;
case 3:
if (sub_800A520())
if (IsLinkTaskFinished())
{
SendBlock(bitmask_all_link_players_but_self(), gPlayerParty, sizeof(struct Pokemon) * 2);
gBattleCommunication[MULTIUSE_STATE]++;
@ -1050,7 +1050,7 @@ static void CB2_HandleStartBattle(void)
}
break;
case 7:
if (sub_800A520())
if (IsLinkTaskFinished())
{
SendBlock(bitmask_all_link_players_but_self(), gPlayerParty + 2, sizeof(struct Pokemon) * 2);
gBattleCommunication[MULTIUSE_STATE]++;
@ -1065,7 +1065,7 @@ static void CB2_HandleStartBattle(void)
}
break;
case 11:
if (sub_800A520())
if (IsLinkTaskFinished())
{
SendBlock(bitmask_all_link_players_but_self(), gPlayerParty + 4, sizeof(struct Pokemon) * 2);
gBattleCommunication[MULTIUSE_STATE]++;
@ -1107,7 +1107,7 @@ static void CB2_HandleStartBattle(void)
}
break;
case 16:
if (sub_800A520())
if (IsLinkTaskFinished())
{
SendBlock(bitmask_all_link_players_but_self(), &gRecordedBattleRngSeed, sizeof(gRecordedBattleRngSeed));
gBattleCommunication[MULTIUSE_STATE]++;
@ -1194,7 +1194,7 @@ static void CB2_HandleStartMultiPartnerBattle(void)
GetBattleTowerTrainerLanguage(&language, gTrainerBattleOpponent_B);
gLinkPlayers[3].language = language;
if (sub_800A520())
if (IsLinkTaskFinished())
{
*(&gBattleStruct->field_180) = 0;
*(&gBattleStruct->field_181) = 3;
@ -1234,7 +1234,7 @@ static void CB2_HandleStartMultiPartnerBattle(void)
}
break;
case 3:
if (sub_800A520())
if (IsLinkTaskFinished())
{
SendBlock(bitmask_all_link_players_but_self(), gPlayerParty, sizeof(struct Pokemon) * 2);
gBattleCommunication[MULTIUSE_STATE]++;
@ -1258,7 +1258,7 @@ static void CB2_HandleStartMultiPartnerBattle(void)
}
break;
case 5:
if (sub_800A520())
if (IsLinkTaskFinished())
{
SendBlock(bitmask_all_link_players_but_self(), gPlayerParty + 2, sizeof(struct Pokemon));
gBattleCommunication[MULTIUSE_STATE]++;
@ -1282,7 +1282,7 @@ static void CB2_HandleStartMultiPartnerBattle(void)
}
break;
case 7:
if (sub_800A520())
if (IsLinkTaskFinished())
{
SendBlock(bitmask_all_link_players_but_self(), gEnemyParty, sizeof(struct Pokemon) * 2);
gBattleCommunication[MULTIUSE_STATE]++;
@ -1300,7 +1300,7 @@ static void CB2_HandleStartMultiPartnerBattle(void)
}
break;
case 9:
if (sub_800A520())
if (IsLinkTaskFinished())
{
SendBlock(bitmask_all_link_players_but_self(), gEnemyParty + 2, sizeof(struct Pokemon) * 2);
gBattleCommunication[MULTIUSE_STATE]++;
@ -1318,7 +1318,7 @@ static void CB2_HandleStartMultiPartnerBattle(void)
}
break;
case 11:
if (sub_800A520())
if (IsLinkTaskFinished())
{
SendBlock(bitmask_all_link_players_but_self(), gEnemyParty + 4, sizeof(struct Pokemon) * 2);
gBattleCommunication[MULTIUSE_STATE]++;
@ -1360,7 +1360,7 @@ static void CB2_HandleStartMultiPartnerBattle(void)
}
break;
case 14:
if (sub_800A520())
if (IsLinkTaskFinished())
{
SendBlock(bitmask_all_link_players_but_self(), &gRecordedBattleRngSeed, sizeof(gRecordedBattleRngSeed));
gBattleCommunication[MULTIUSE_STATE]++;
@ -1440,7 +1440,7 @@ static void CB2_PreInitMultiBattle(void)
switch (gBattleCommunication[MULTIUSE_STATE])
{
case 0:
if (gReceivedRemoteLinkPlayers != 0 && sub_800A520())
if (gReceivedRemoteLinkPlayers != 0 && IsLinkTaskFinished())
{
gUnknown_02023058 = Alloc(sizeof(struct UnknownPokemonStruct4) * 3);
sub_80379F8(0);
@ -1478,7 +1478,7 @@ static void CB2_PreInitMultiBattle(void)
}
break;
case 2:
if (sub_800A520() && !gPaletteFade.active)
if (IsLinkTaskFinished() && !gPaletteFade.active)
{
gBattleCommunication[MULTIUSE_STATE]++;
if (gWirelessCommType)
@ -1581,7 +1581,7 @@ static void CB2_HandleStartMultiBattle(void)
{
if (gReceivedRemoteLinkPlayers != 0)
{
if (sub_800A520())
if (IsLinkTaskFinished())
{
*(&gBattleStruct->field_180) = 0;
*(&gBattleStruct->field_181) = 3;
@ -1643,7 +1643,7 @@ static void CB2_HandleStartMultiBattle(void)
break;
// fall through
case 3:
if (sub_800A520())
if (IsLinkTaskFinished())
{
SendBlock(bitmask_all_link_players_but_self(), gPlayerParty, sizeof(struct Pokemon) * 2);
gBattleCommunication[MULTIUSE_STATE]++;
@ -1706,7 +1706,7 @@ static void CB2_HandleStartMultiBattle(void)
}
break;
case 5:
if (sub_800A520())
if (IsLinkTaskFinished())
{
SendBlock(bitmask_all_link_players_but_self(), gPlayerParty + 2, sizeof(struct Pokemon));
gBattleCommunication[MULTIUSE_STATE]++;
@ -1802,7 +1802,7 @@ static void CB2_HandleStartMultiBattle(void)
}
break;
case 8:
if (sub_800A520())
if (IsLinkTaskFinished())
{
u32* ptr = (u32*)(&gBattleStruct->field_180);
ptr[0] = gBattleTypeFlags;
@ -2361,7 +2361,7 @@ static void sub_8038F34(void)
gBattleCommunication[MULTIUSE_STATE]++;
break;
case 6:
if (sub_800A520() == TRUE)
if (IsLinkTaskFinished() == TRUE)
{
sub_800ADF8();
BattlePutTextOnWindow(gText_LinkStandby3, 0);
@ -2371,7 +2371,7 @@ static void sub_8038F34(void)
case 7:
if (!IsTextPrinterActive(0))
{
if (sub_800A520() == TRUE)
if (IsLinkTaskFinished() == TRUE)
gBattleCommunication[MULTIUSE_STATE]++;
}
break;
@ -2546,7 +2546,7 @@ static void sub_803939C(void)
}
break;
case 6:
if (sub_800A520() == TRUE)
if (IsLinkTaskFinished() == TRUE)
{
HandleBattleWindow(0x18, 8, 0x1D, 0xD, WINDOW_CLEAR);
if (gMain.field_439_x4)
@ -2596,7 +2596,7 @@ static void sub_803939C(void)
}
break;
case 11:
if (sub_800A520() == TRUE && !IsTextPrinterActive(0) && --gBattleCommunication[1] == 0)
if (IsLinkTaskFinished() == TRUE && !IsTextPrinterActive(0) && --gBattleCommunication[1] == 0)
{
if (gMain.field_439_x4)
{
@ -2612,7 +2612,7 @@ static void sub_803939C(void)
{
if (gMain.field_439_x4)
{
if (sub_800A520() == TRUE)
if (IsLinkTaskFinished() == TRUE)
{
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
gBattleCommunication[1] = 0x20;

4
src/battle_tower.c
View File

@ -2799,7 +2799,7 @@ static void sub_8164B74(void)
if (battleMode == FRONTIER_MODE_LINK_MULTIS)
{
challengeNum = gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode] / 7;
if (sub_800A520())
if (IsLinkTaskFinished())
{
SendBlock(bitmask_all_link_players_but_self(), &challengeNum, sizeof(challengeNum));
gSpecialVar_Result = 1;
@ -2836,7 +2836,7 @@ static void sub_8164B74(void)
}
break;
case 2:
if (sub_800A520())
if (IsLinkTaskFinished())
{
SendBlock(bitmask_all_link_players_but_self(), &gSaveBlock2Ptr->frontier.field_CB4, sizeof(gSaveBlock2Ptr->frontier.field_CB4));
gSpecialVar_Result = 3;

16
src/berry_blender.c
View File

@ -1240,7 +1240,7 @@ static void sub_8080018(void)
sBerryBlenderData->framesToWait = 0;
break;
case 9:
if (sub_800A520())
if (IsLinkTaskFinished())
{
ResetBlockReceivedFlags();
if (GetMultiplayerId() == 0)
@ -1297,7 +1297,7 @@ static void sub_8080018(void)
}
break;
case 13:
if (sub_800A520())
if (IsLinkTaskFinished())
{
sBerryBlenderData->mainState++;
sub_8082CB4(&sBerryBlenderData->bgAffineSrc);
@ -1342,7 +1342,7 @@ static void sub_8080018(void)
sBerryBlenderData->mainState++;
break;
case 20:
if (sub_800A520())
if (IsLinkTaskFinished())
{
sub_800A418();
sBerryBlenderData->mainState++;
@ -2412,7 +2412,7 @@ static void CB2_HandleBlenderEndGame(void)
{
sBerryBlenderData->gameEndState++;
}
else if (sub_800A520())
else if (IsLinkTaskFinished())
{
if (gReceivedRemoteLinkPlayers != 0 && gWirelessCommType)
{
@ -2593,7 +2593,7 @@ static bool8 LinkPlayAgainHandleSaving(void)
sBerryBlenderData->framesToWait = 0;
break;
case 1:
if (sub_800A520())
if (IsLinkTaskFinished())
{
sBerryBlenderData->field_1A0++;
gSoftResetDisabled = TRUE;
@ -2612,7 +2612,7 @@ static bool8 LinkPlayAgainHandleSaving(void)
}
break;
case 4:
if (sub_800A520())
if (IsLinkTaskFinished())
{
if (sub_8153474())
{
@ -2687,7 +2687,7 @@ static void CB2_HandlePlayerLinkPlayAgainChoice(void)
sBerryBlenderData->gameEndState++;
break;
case 6:
if (sub_800A520())
if (IsLinkTaskFinished())
{
sBerryBlenderData->framesToWait = 0;
sBerryBlenderData->gameEndState++;
@ -2706,7 +2706,7 @@ static void CB2_HandlePlayerLinkPlayAgainChoice(void)
sub_800ADF8();
break;
case 9:
if (sub_800A520())
if (IsLinkTaskFinished())
{
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0);
sBerryBlenderData->gameEndState++;

4
src/cable_club.c
View File

@ -898,7 +898,7 @@ static void sub_80B33BC(u8 taskId)
data[0] = 6;
break;
case 6:
if (sub_800A520())
if (IsLinkTaskFinished())
{
data[0] = 7;
}
@ -1123,7 +1123,7 @@ static void sub_80B3894(u8 taskId)
data[0]++;
break;
case 3:
if (sub_800A520())
if (IsLinkTaskFinished())
{
sub_8013F78();
DestroyTask(taskId);

4
src/contest.c
View File

@ -473,14 +473,14 @@ void sub_80D7CB4(u8 taskId)
gTasks[taskId].data[0]++;
// fallthrough
case 1:
if (sub_800A520())
if (IsLinkTaskFinished())
{
sub_800ADF8();
gTasks[taskId].data[0]++;
}
return;
case 2:
if (sub_800A520() != TRUE)
if (IsLinkTaskFinished() != TRUE)
return;
gTasks[taskId].data[0]++;
break;

4
src/field_screen_effect.c
View File

@ -215,7 +215,7 @@ static void sub_80AF234(u8 taskId)
task->data[0]++;
break;
case 1:
if (!sub_800A520())
if (!IsLinkTaskFinished())
{
if (++task->data[1] > 1800)
sub_8011170(0x6000);
@ -248,7 +248,7 @@ void sub_80AF2B4(u8 taskId)
task->data[0]++;
break;
case 1:
if (sub_800A520())
if (IsLinkTaskFinished())
{
task->data[0]++;
}

8
src/field_specials.c
View File

@ -3616,7 +3616,7 @@ static void sub_813B57C(u8 taskId)
}
break;
case 1:
if (sub_800A520() == TRUE)
if (IsLinkTaskFinished() == TRUE)
{
if (GetMultiplayerId() == 0)
{
@ -3657,7 +3657,7 @@ static void sub_813B57C(u8 taskId)
}
break;
case 3:
if (sub_800A520() == TRUE)
if (IsLinkTaskFinished() == TRUE)
{
if (GetMultiplayerId() != 0)
{
@ -3709,14 +3709,14 @@ static void sub_813B57C(u8 taskId)
}
break;
case 7:
if (sub_800A520() == 1)
if (IsLinkTaskFinished() == 1)
{
sub_800ADF8();
gTasks[taskId].data[0]++;
}
break;
case 8:
if (sub_800A520() == 1)
if (IsLinkTaskFinished() == 1)
{
gTasks[taskId].data[0]++;
}

2
src/link.c
View File

@ -1080,7 +1080,7 @@ bool8 sub_800A4D8(u8 a0)
return FALSE;
}
bool8 sub_800A520(void)
bool8 IsLinkTaskFinished(void)
{
if (gWirelessCommType == TRUE)
{

4
src/link_rfu.c
View File

@ -4123,7 +4123,7 @@ void sub_8010AAC(u8 taskId)
gTasks[taskId].data[0]++;
break;
case 5:
if (sub_800A520() && GetBlockReceivedStatus() & 1)
if (IsLinkTaskFinished() && GetBlockReceivedStatus() & 1)
{
CpuFill16(0, gBlockRecvBuffer, sizeof(struct UnkRfuStruct_8010A14));
ResetBlockReceivedFlag(0);
@ -4162,7 +4162,7 @@ void sub_8010D0C(u8 taskId)
}
break;
case 1:
if (sub_800A520())
if (IsLinkTaskFinished())
gTasks[taskId].data[0]++;
break;
case 2:

2
src/record_mixing.c
View File

@ -1530,7 +1530,7 @@ static void sub_80E7FF8(u8 taskId)
task->data[0] ++;
break;
case 9:
if (sub_800A520())
if (IsLinkTaskFinished())
DestroyTask(taskId);
break;
}

12
src/rom_8011DC0.c
View File

@ -1838,7 +1838,7 @@ void sub_8014790(u8 taskId)
}
break;
case 3:
if (sub_800A520())
if (IsLinkTaskFinished())
{
DestroyTask(taskId);
sub_80149D8();
@ -2095,7 +2095,7 @@ void sub_8014A40(u8 taskId)
data->state++;
break;
case 17:
if (sub_800A520())
if (IsLinkTaskFinished())
DestroyTask(taskId);
break;
}
@ -2264,7 +2264,7 @@ void sub_8014F48(u8 taskId)
sub_800ADF8();
break;
case 12:
if (sub_800A520())
if (IsLinkTaskFinished())
DestroyTask(taskId);
break;
}
@ -2443,7 +2443,7 @@ void sub_80152F4(u8 taskId)
sub_800ADF8();
break;
case 14:
if (sub_800A520())
if (IsLinkTaskFinished())
DestroyTask(taskId);
break;
}
@ -2836,7 +2836,7 @@ void sub_80156E0(u8 taskId)
}
break;
case 41:
if (sub_800A520())
if (IsLinkTaskFinished())
{
if (GetMultiplayerId() == 0)
{
@ -3033,7 +3033,7 @@ void sub_80156E0(u8 taskId)
data->state = 15;
break;
case 15:
if (sub_800A520())
if (IsLinkTaskFinished())
data->state = 16;
break;
case 16:

8
src/save.c
View File

@ -77,7 +77,7 @@ extern void DoSaveFailedScreen(u8); // save_failed_screen
extern bool32 ProgramFlashSectorAndVerify(u8 sector, u8 *data);
extern void save_serialize_map(void);
extern void sub_800ADF8(void);
extern bool8 sub_800A520(void);
extern bool8 IsLinkTaskFinished(void);
// iwram common
u16 gLastWrittenSector;
@ -914,7 +914,7 @@ void sub_8153688(u8 taskId)
taskData[0] = 2;
break;
case 2:
if (sub_800A520())
if (IsLinkTaskFinished())
{
if (taskData[2] == 0)
save_serialize_map();
@ -951,7 +951,7 @@ void sub_8153688(u8 taskId)
taskData[0] = 8;
break;
case 8:
if (sub_800A520())
if (IsLinkTaskFinished())
{
sub_8153408();
taskData[0] = 9;
@ -962,7 +962,7 @@ void sub_8153688(u8 taskId)
taskData[0] = 10;
break;
case 10:
if (sub_800A520())
if (IsLinkTaskFinished())
taskData[0]++;
break;
case 11:

4
src/script_pokemon_util_80F87D8.c
View File

@ -451,7 +451,7 @@ static void sub_80F9088(u8 taskId)
switch (gTasks[taskId].data[0])
{
case 0:
if (sub_800A520())
if (IsLinkTaskFinished())
{
sub_800ADF8();
gTasks[taskId].data[0]++;
@ -461,7 +461,7 @@ static void sub_80F9088(u8 taskId)
gTasks[taskId].data[0]++;
break;
default:
if (sub_800A520() == 1)
if (IsLinkTaskFinished() == 1)
{
EnableBothScriptContexts();
DestroyTask(taskId);

560
src/trade.c
View File

File diff suppressed because it is too large Load Diff