diff options
Diffstat (limited to 'asm/mystery_event_menu.s')
| -rw-r--r-- | asm/mystery_event_menu.s | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/asm/mystery_event_menu.s b/asm/mystery_event_menu.s index f15346b81..cc2744ba0 100644 --- a/asm/mystery_event_menu.s +++ b/asm/mystery_event_menu.s @@ -84,7 +84,7 @@ _081789AC: movs r0, 0x50 movs r1, 0 bl SetGpuReg - ldr r0, =sub_8009404 + ldr r0, =Task_DestroySelf movs r1, 0 bl CreateTask bl StopMapMusic @@ -236,11 +236,11 @@ _08178B56: ldr r2, =0x00005501 adds r0, r2, 0 strh r0, [r1] - bl sub_8009734 + bl OpenLink b _08178E58 .pool _08178B80: - ldr r0, =gUnknown_030030E0 + ldr r0, =gLinkStatus ldr r1, [r0] movs r0, 0x20 ands r0, r1 @@ -282,7 +282,7 @@ _08178BCC: _08178BDA: b _08178E34 _08178BDC: - bl sub_800ABAC + bl GetLinkPlayerCount_2 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x2 @@ -327,13 +327,13 @@ _08178C38: _08178C42: movs r0, 0x5 bl PlaySE - bl sub_80097E8 + bl CloseLink movs r0, 0x87 lsls r0, 3 adds r1, r4, r0 b _08178D1E _08178C54: - bl sub_800B320 + bl IsLinkConnectionEstablished lsls r0, 24 cmp r0, 0 beq _08178D00 @@ -345,7 +345,7 @@ _08178C54: _08178C68: movs r0, 0x2 movs r1, 0x2 - bl sub_800A0C8 + bl GetLinkPlayerDataExchangeStatusTimed lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 @@ -383,7 +383,7 @@ _08178CAC: b _08178E34 .pool _08178CCC: - bl sub_80097E8 + bl CloseLink _08178CD0: ldr r4, =gStringVar4 adds r0, r4, 0 @@ -416,7 +416,7 @@ _08178D00: _08178D0E: movs r0, 0x5 bl PlaySE - bl sub_80097E8 + bl CloseLink movs r2, 0x87 lsls r2, 3 adds r1, r4, r2 @@ -560,17 +560,17 @@ _08178E48: bne _08178E58 bl DoSoftReset _08178E58: - ldr r0, =gUnknown_030030E0 + ldr r0, =gLinkStatus ldr r0, [r0] movs r1, 0x40 ands r0, r1 cmp r0, 0 beq _08178E98 - bl sub_800ABBC + bl IsLinkMaster lsls r0, 24 cmp r0, 0 bne _08178E98 - bl sub_80097E8 + bl CloseLink ldr r4, =gStringVar4 adds r0, r4, 0 movs r1, 0x1 |