summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2018-12-31 02:22:21 -0600
committerDiegoisawesome <diego@domoreaweso.me>2018-12-31 02:22:21 -0600
commitec780bb2098be75e591b212e85947f88c91d4e37 (patch)
tree4b93fedcc9e949640ff2270a938f6ae3c784b696 /asm
parentc5c6e437ec77138505cd236c572f8d9956a4c4b4 (diff)
Cleanup and documentation
Diffstat (limited to 'asm')
-rw-r--r--asm/contest_link_80F57C4.s8
-rw-r--r--asm/contest_link_80FC4F4.s36
-rw-r--r--asm/contest_link_81D9DE4.s10
-rw-r--r--asm/rom_8011DC0.s82
4 files changed, 68 insertions, 68 deletions
diff --git a/asm/contest_link_80F57C4.s b/asm/contest_link_80F57C4.s
index b869adf1b..21dffa7ef 100644
--- a/asm/contest_link_80F57C4.s
+++ b/asm/contest_link_80F57C4.s
@@ -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
diff --git a/asm/contest_link_80FC4F4.s b/asm/contest_link_80FC4F4.s
index 5934c3623..33207e246 100644
--- a/asm/contest_link_80FC4F4.s
+++ b/asm/contest_link_80FC4F4.s
@@ -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
diff --git a/asm/contest_link_81D9DE4.s b/asm/contest_link_81D9DE4.s
index 3969be9a2..5a3393374 100644
--- a/asm/contest_link_81D9DE4.s
+++ b/asm/contest_link_81D9DE4.s
@@ -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
diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s
index b90c9701e..13b7a5f37 100644
--- a/asm/rom_8011DC0.s
+++ b/asm/rom_8011DC0.s
@@ -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