diff options
author | YamaArashi <shadow962@live.com> | 2016-10-29 22:56:19 -0700 |
---|---|---|
committer | YamaArashi <shadow962@live.com> | 2016-10-29 22:56:19 -0700 |
commit | b86183aecd4e7e264158cd6cdb5e1332c41d4340 (patch) | |
tree | 57e87c34002d9123e551b4a0dfa62ca3f78ca96c | |
parent | ad7aa68d9b9b5bc388f1b391dd4754889c29e3a9 (diff) |
fix typo in function name
-rw-r--r-- | asm/berry_blender.s | 4 | ||||
-rw-r--r-- | asm/cable_club.s | 2 | ||||
-rw-r--r-- | asm/contest_link_80C857C.s | 4 | ||||
-rw-r--r-- | asm/mystery_event_menu.s | 2 | ||||
-rw-r--r-- | asm/record_mixing.s | 2 | ||||
-rw-r--r-- | asm/rom3.s | 2 | ||||
-rw-r--r-- | asm/rom_800D42C.s | 16 | ||||
-rw-r--r-- | asm/trade.s | 16 | ||||
-rw-r--r-- | include/link.h | 2 | ||||
-rw-r--r-- | src/link.c | 6 |
10 files changed, 28 insertions, 28 deletions
diff --git a/asm/berry_blender.s b/asm/berry_blender.s index 6b47805ca..4936cc58d 100644 --- a/asm/berry_blender.s +++ b/asm/berry_blender.s @@ -1277,7 +1277,7 @@ _0804EDB8: b _0804F0CE _0804EDCE: bl MenuZeroFillScreen - bl GetBlockRecievedStatus + bl GetBlockReceivedStatus adds r4, r0, 0 bl sub_8008198 lsls r4, 24 @@ -4950,7 +4950,7 @@ _08050A64: .align 2, 0 _08050A90: .4byte gUnknown_03004854 _08050A94: - bl GetBlockRecievedStatus + bl GetBlockReceivedStatus lsls r0, 24 cmp r0, 0 bne _08050AA0 diff --git a/asm/cable_club.s b/asm/cable_club.s index 212e28a95..c8d038338 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -802,7 +802,7 @@ sub_8083314: @ 8083314 bl sub_8082DF4 cmp r0, 0x1 beq _080833B6 - bl GetBlockRecievedStatus + bl GetBlockReceivedStatus adds r4, r0, 0 bl sub_8008198 lsls r4, 24 diff --git a/asm/contest_link_80C857C.s b/asm/contest_link_80C857C.s index 4e7da323d..b44220769 100644 --- a/asm/contest_link_80C857C.s +++ b/asm/contest_link_80C857C.s @@ -39,7 +39,7 @@ sub_80C85AC: @ 80C85AC lsls r1, 17 lsls r1, r0 lsrs r4, r1, 24 - bl GetBlockRecievedStatus + bl GetBlockReceivedStatus adds r1, r4, 0 ands r1, r0 cmp r1, 0 @@ -61,7 +61,7 @@ sub_80C85D8: @ 80C85D8 push {r4,lr} movs r4, 0 _080C85DC: - bl GetBlockRecievedStatus + bl GetBlockReceivedStatus lsls r0, 24 lsrs r0, 24 asrs r0, r4 diff --git a/asm/mystery_event_menu.s b/asm/mystery_event_menu.s index 1bb8d76bc..6331199de 100644 --- a/asm/mystery_event_menu.s +++ b/asm/mystery_event_menu.s @@ -397,7 +397,7 @@ _08146C64: _08146C70: b _08146D7C _08146C72: - bl GetBlockRecievedStatus + bl GetBlockReceivedStatus lsls r0, 24 cmp r0, 0 bne _08146C7E diff --git a/asm/record_mixing.s b/asm/record_mixing.s index d8d0e26c0..e9c39eadc 100644 --- a/asm/record_mixing.s +++ b/asm/record_mixing.s @@ -730,7 +730,7 @@ sub_80B9890: @ 80B9890 ldr r1, _080B98D0 @ =gTasks adds r0, r1 mov r10, r0 - bl GetBlockRecievedStatus + bl GetBlockReceivedStatus lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x4] diff --git a/asm/rom3.s b/asm/rom3.s index 257163aa2..823ac4e0c 100644 --- a/asm/rom3.s +++ b/asm/rom3.s @@ -1415,7 +1415,7 @@ _0800C394: .4byte gLinkPlayers _0800C398: .4byte 0x00002211 _0800C39C: .4byte gBlockRecvBuffer _0800C3A0: - bl GetBlockRecievedStatus + bl GetBlockReceivedStatus lsls r0, 24 lsrs r0, 24 ldr r2, _0800C468 @ =gBitTable diff --git a/asm/rom_800D42C.s b/asm/rom_800D42C.s index 85b369486..6c2a1d58b 100644 --- a/asm/rom_800D42C.s +++ b/asm/rom_800D42C.s @@ -3046,7 +3046,7 @@ _0800ED64: .align 2, 0 _0800ED78: .4byte gUnknown_02024D1E _0800ED7C: - bl GetBlockRecievedStatus + bl GetBlockReceivedStatus movs r1, 0x3 ands r1, r0 cmp r1, 0x3 @@ -3199,7 +3199,7 @@ _0800EE94: .align 2, 0 _0800EEA8: .4byte gPlayerParty _0800EEAC: - bl GetBlockRecievedStatus + bl GetBlockReceivedStatus movs r1, 0x3 ands r1, r0 cmp r1, 0x3 @@ -3234,7 +3234,7 @@ _0800EEE4: .align 2, 0 _0800EEF8: .4byte gUnknown_03004428 _0800EEFC: - bl GetBlockRecievedStatus + bl GetBlockReceivedStatus movs r1, 0x3 ands r1, r0 cmp r1, 0x3 @@ -3267,7 +3267,7 @@ _0800EF28: .align 2, 0 _0800EF44: .4byte gUnknown_030044F0 _0800EF48: - bl GetBlockRecievedStatus + bl GetBlockReceivedStatus movs r1, 0x3 ands r1, r0 cmp r1, 0x3 @@ -3535,7 +3535,7 @@ _0800F17E: .align 2, 0 _0800F19C: .4byte gReceivedRemoteLinkPlayers _0800F1A0: - bl GetBlockRecievedStatus + bl GetBlockReceivedStatus movs r1, 0xF ands r1, r0 cmp r1, 0xF @@ -3723,7 +3723,7 @@ _0800F316: _0800F338: .4byte gReceivedRemoteLinkPlayers _0800F33C: .4byte 0x02000000 _0800F340: - bl GetBlockRecievedStatus + bl GetBlockReceivedStatus movs r1, 0xF ands r1, r0 cmp r1, 0xF @@ -3956,7 +3956,7 @@ _0800F4EA: _0800F4FC: .4byte gUnknown_02024D1E _0800F500: .4byte 0x0201d000 _0800F504: - bl GetBlockRecievedStatus + bl GetBlockReceivedStatus movs r1, 0xF ands r1, r0 cmp r1, 0xF @@ -4105,7 +4105,7 @@ _0800F604: .align 2, 0 _0800F618: .4byte 0x0201d0c8 _0800F61C: - bl GetBlockRecievedStatus + bl GetBlockReceivedStatus movs r1, 0xF ands r1, r0 cmp r1, 0xF diff --git a/asm/trade.s b/asm/trade.s index d17fef24e..078273d4c 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -2009,7 +2009,7 @@ _08048DF8: bne _08048E04 b _0804907C _08048E04: - bl GetBlockRecievedStatus + bl GetBlockReceivedStatus lsls r0, 24 cmp r0, 0 bne _08048E18 @@ -2037,7 +2037,7 @@ _08048E32: .align 2, 0 _08048E38: .4byte gUnknown_03004824 _08048E3C: - bl GetBlockRecievedStatus + bl GetBlockReceivedStatus lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 @@ -2085,7 +2085,7 @@ _08048E9A: .align 2, 0 _08048EA0: .4byte gUnknown_03004824 _08048EA4: - bl GetBlockRecievedStatus + bl GetBlockReceivedStatus lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 @@ -2133,7 +2133,7 @@ _08048F02: .align 2, 0 _08048F08: .4byte gUnknown_03004824 _08048F0C: - bl GetBlockRecievedStatus + bl GetBlockReceivedStatus lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 @@ -2181,7 +2181,7 @@ _08048F6A: .align 2, 0 _08048F70: .4byte gUnknown_03004824 _08048F74: - bl GetBlockRecievedStatus + bl GetBlockReceivedStatus lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 @@ -2229,7 +2229,7 @@ _08048FD2: .align 2, 0 _08048FD8: .4byte gUnknown_03004824 _08048FDC: - bl GetBlockRecievedStatus + bl GetBlockReceivedStatus lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 @@ -2868,7 +2868,7 @@ sub_80494D8: @ 80494D8 bl GetMultiplayerId lsls r0, 24 lsrs r4, r0, 24 - bl GetBlockRecievedStatus + bl GetBlockReceivedStatus lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 @@ -10747,7 +10747,7 @@ _0804D638: .4byte gUnknown_020297D8 sub_804D63C: @ 804D63C push {r4-r6,lr} bl sub_804B2B0 - bl GetBlockRecievedStatus + bl GetBlockReceivedStatus lsls r0, 24 lsrs r5, r0, 24 movs r6, 0x1 diff --git a/include/link.h b/include/link.h index f857b6d19..550102fb9 100644 --- a/include/link.h +++ b/include/link.h @@ -154,7 +154,7 @@ u8 bitmask_all_link_players_but_self(void); bool8 SendBlock(u8, void *, u16); bool8 sub_8007E9C(u8); bool8 sub_8007ECC(void); -u8 GetBlockRecievedStatus(void); +u8 GetBlockReceivedStatus(void); void ResetBlockReceivedFlags(void); void ResetBlockReceivedFlag(u8); void sub_8007F4C(void); diff --git a/src/link.c b/src/link.c index 3f4ffe97d..2a412ee35 100644 --- a/src/link.c +++ b/src/link.c @@ -370,7 +370,7 @@ static void TestBlockTransfer(u32 a1, u32 a2, u32 a3) } } - val = GetBlockRecievedStatus(); + val = GetBlockReceivedStatus(); if (val == 0xF) { @@ -889,7 +889,7 @@ bool8 sub_8007ECC(void) return retVal; } -u8 GetBlockRecievedStatus(void) +u8 GetBlockReceivedStatus(void) { return (gBlockReceived[3] << 3) | (gBlockReceived[2] << 2) @@ -975,7 +975,7 @@ void Task_PrintTestData(u8 taskId) PrintHex(GetMultiplayerId(), 15, 12, 2); PrintHex(gLastSendQueueCount, 25, 1, 2); PrintHex(gLastRecvQueueCount, 25, 2, 2); - PrintHex(GetBlockRecievedStatus(), 15, 5, 2); + PrintHex(GetBlockReceivedStatus(), 15, 5, 2); PrintHex(gLinkDebugValue1, 2, 12, 8); PrintHex(gLinkDebugValue2, 2, 13, 8); PrintHex(GetSioMultiSI(), 25, 5, 1); |