diff --git a/asm/link.s b/asm/link.s index c5fcb39de..437f2e0c6 100644 --- a/asm/link.s +++ b/asm/link.s @@ -5,67 +5,6 @@ .text - thumb_func_start sub_800B2E8 -sub_800B2E8: @ 800B2E8 - ldr r0, =0x04000128 - ldrh r0, [r0] - lsrs r0, 2 - movs r1, 0x1 - ands r0, r1 - bx lr - .pool - thumb_func_end sub_800B2E8 - - thumb_func_start sub_800B2F8 -sub_800B2F8: @ 800B2F8 - push {lr} - movs r3, 0 - ldr r2, =0x04000128 - ldrh r1, [r2] - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - beq _0800B314 - ldrh r1, [r2] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - bne _0800B314 - movs r3, 0x1 -_0800B314: - adds r0, r3, 0 - pop {r1} - bx r1 - .pool - thumb_func_end sub_800B2F8 - - thumb_func_start sub_800B320 -sub_800B320: @ 800B320 - ldr r0, =gLinkStatus - ldr r0, [r0] - lsrs r0, 6 - movs r1, 0x1 - ands r0, r1 - bx lr - .pool - thumb_func_end sub_800B320 - - thumb_func_start SetSuppressLinkErrorMessage -SetSuppressLinkErrorMessage: @ 800B330 - ldr r1, =gSuppressLinkErrorMessage - strb r0, [r1] - bx lr - .pool - thumb_func_end SetSuppressLinkErrorMessage - - thumb_func_start sub_800B33C -sub_800B33C: @ 800B33C - ldr r0, =gLinkErrorOccurred - ldrb r0, [r0] - bx lr - .pool - thumb_func_end sub_800B33C - thumb_func_start sub_800B348 sub_800B348: @ 800B348 push {r4-r6,lr} diff --git a/src/link.c b/src/link.c index 1ee4ade4f..71efbf358 100644 --- a/src/link.c +++ b/src/link.c @@ -1663,7 +1663,7 @@ void CB2_LinkError(void) } } -void sub_800B080(void) +static void sub_800B080(void) { LoadBgTiles(0, g2BlankTilesGfx, 0x20, 0); copy_decompressed_tile_data_to_vram_autofree(1, gWirelessLinkDisplayGfx, FALSE, 0, 0); @@ -1680,7 +1680,7 @@ void sub_800B080(void) CopyWindowToVram(2, 3); } -void sub_800B138(void) +static void sub_800B138(void) { LoadBgTiles(0, g2BlankTilesGfx, 0x20, 0); FillWindowPixelBuffer(1, 0x00); @@ -1760,3 +1760,28 @@ static void sub_800B1A0(void) gMain.state ++; } } + +bool8 sub_800B2E8(void) +{ + return (REG_SIOCNT & 0x04) != 0; +} + +bool8 sub_800B2F8(void) +{ + return (REG_SIOCNT & 0x8) && !(REG_SIOCNT & 0x04); +} + +bool8 sub_800B320(void) +{ + return EXTRACT_CONN_ESTABLISHED(gLinkStatus); +} + +void SetSuppressLinkErrorMessage(bool8 flag) +{ + gSuppressLinkErrorMessage = flag; +} + +bool8 sub_800B33C(void) +{ + return gLinkErrorOccurred; +}