summaryrefslogtreecommitdiff
path: root/asm/rom_8011DC0.s
diff options
context:
space:
mode:
Diffstat (limited to 'asm/rom_8011DC0.s')
-rw-r--r--asm/rom_8011DC0.s106
1 files changed, 53 insertions, 53 deletions
diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s
index 3e07135e6..64c021001 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
@@ -11006,7 +11006,7 @@ _0801C52C:
cmp r0, 0x1
bne _0801C5EE
ldr r0, =gUnknown_082F1D00
- bl LoadCompressedObjectPicUsingHeap
+ bl LoadCompressedSpriteSheetUsingHeap
ldr r0, [r4]
movs r2, 0xB8
lsls r2, 1
@@ -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
@@ -14596,7 +14596,7 @@ _0801E1B4:
movs r0, 0x5
bl PlaySE
movs r0, 0x1
- bl MoveMenuCursor
+ bl Menu_MoveCursor
b _0801E23A
.pool
_0801E1D4:
@@ -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
@@ -15686,7 +15686,7 @@ _0801EB04:
lsls r0, 24
cmp r0, 0
bne _0801EBC2
- bl sub_8076D5C
+ bl SetContinueGameWarpStatusToDynamicWarp
movs r0, 0
bl TrySavingData
ldr r0, =gUnknown_02022C84
@@ -15713,7 +15713,7 @@ _0801EB40:
bne _0801EBC2
movs r0, 0x37
bl PlaySE
- bl sav2_gender2_inplace_and_xFE
+ bl ClearContinueGameWarpStatus2
ldr r0, =gUnknown_02022C84
ldr r1, [r0]
movs r0, 0xA
@@ -19425,7 +19425,7 @@ sub_8020890: @ 8020890
ldr r4, =gUnknown_082F3134
_08020896:
adds r0, r4, 0
- bl LoadCompressedObjectPic
+ bl LoadCompressedSpriteSheet
adds r4, 0x8
adds r5, 0x1
cmp r5, 0x4
@@ -20568,7 +20568,7 @@ _080211EC:
beq _080211F8
b _08021302
_080211F8:
- bl sub_81971D0
+ bl InitStandardTextBoxWindows
bl sub_8197200
adds r0, r5, 0
bl sub_8022588
@@ -20715,7 +20715,7 @@ _08021358:
bl sub_8010434
b _0802143E
_0802135E:
- bl sub_800A520
+ bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08021444
@@ -23100,7 +23100,7 @@ sub_8022730: @ 8022730
_08022746:
lsls r0, r5, 3
adds r0, r4
- bl LoadCompressedObjectPic
+ bl LoadCompressedSpriteSheet
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@@ -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
@@ -39128,7 +39128,7 @@ _0802A7CE:
movs r1, 0
movs r2, 0
bl ChangeBgY
- bl sub_81971D0
+ bl InitStandardTextBoxWindows
bl sub_8197200
movs r1, 0x82
lsls r1, 5
@@ -39683,7 +39683,7 @@ _0802AD3C:
b _0802ADC0
.pool
_0802AD68:
- bl sub_800A520
+ bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0802AE08
@@ -43324,7 +43324,7 @@ sub_802C974: @ 802C974
ldr r5, =gUnknown_082FBE08
_0802C97C:
adds r0, r5, 0
- bl LoadCompressedObjectPic
+ bl LoadCompressedSpriteSheet
adds r5, 0x8
adds r4, 0x1
cmp r4, 0x4
@@ -43447,7 +43447,7 @@ _0802CA32:
ands r1, r5
orrs r1, r4
str r1, [r0, 0x4]
- bl LoadCompressedObjectPalette
+ bl LoadCompressedSpritePalette
mov r0, r8
bl Free
mov r0, r10
@@ -47113,7 +47113,7 @@ sub_802E75C: @ 802E75C
lsls r0, 3
ldr r1, =gUnknown_082FE6C8
adds r0, r1
- bl LoadCompressedObjectPic
+ bl LoadCompressedSpriteSheet
movs r2, 0x8
ldrsh r0, [r4, r2]
lsls r0, 3
@@ -48126,7 +48126,7 @@ sub_802EF50: @ 802EF50
orrs r0, r1
str r0, [r4, 0x4]
mov r0, sp
- bl LoadCompressedObjectPic
+ bl LoadCompressedSpriteSheet
adds r0, r4, 0
bl LoadSpritePalette
add sp, 0x10