From 33ee3115ab77d326ffeca49ce9a124c31af587bb Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 6 Sep 2017 21:18:50 +0200 Subject: [PATCH] add glink defines from pokeruby --- asm/battle_controller_linkopponent.s | 20 +-- asm/battle_controller_linkpartner.s | 6 +- asm/battle_controller_opponent.s | 2 +- asm/battle_controller_player.s | 34 ++--- asm/battle_controller_player_partner.s | 2 +- asm/battle_controller_recorded_opponent.s | 4 +- asm/battle_controller_recorded_player.s | 8 +- asm/battle_controller_safari.s | 2 +- asm/battle_controller_wally.s | 2 +- asm/battle_message.s | 26 ++-- asm/battle_records.s | 2 +- asm/berry_blender.s | 40 ++--- asm/cable_club.s | 28 ++-- asm/contest.s | 2 +- asm/contest_link_80FC4F4.s | 14 +- asm/link.s | 170 +++++++++++----------- asm/mystery_event_menu.s | 2 +- asm/pokemon_1.s | 12 +- asm/pokemon_3.s | 20 +-- asm/record_mixing.s | 20 +-- asm/recorded_battle.s | 12 +- asm/rom3.s | 18 +-- asm/rom4.s | 4 +- asm/rom6.s | 20 +-- asm/rom_8034C54.s | 56 +++---- asm/rom_8161F74.s | 2 +- asm/rom_818CFC8.s | 2 +- asm/rom_81BE66C.s | 14 +- asm/script_pokemon_util_80F87D8.s | 6 +- asm/secret_base.s | 8 +- asm/trade.s | 58 ++++---- asm/trainer_card.s | 2 +- asm/tv.s | 8 +- sym_ewram.txt | 9 +- 34 files changed, 316 insertions(+), 319 deletions(-) diff --git a/asm/battle_controller_linkopponent.s b/asm/battle_controller_linkopponent.s index 269ff82bd6..1e5e0fce56 100644 --- a/asm/battle_controller_linkopponent.s +++ b/asm/battle_controller_linkopponent.s @@ -1492,7 +1492,7 @@ LinkOpponentBufferExecCompleted: @ 8065068 ands r0, r1 cmp r0, 0 beq _080650BC - bl link_get_multiplayer_id + bl GetMultiplayerId mov r1, sp strb r0, [r1] movs r0, 0x2 @@ -4072,7 +4072,7 @@ _08066796: _080667A8: ldrb r0, [r5] bl sub_806D864 - ldr r6, =gUnknown_020229E8 + ldr r6, =gLinkPlayers lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -4153,8 +4153,8 @@ _08066840: b _08066948 .pool _08066858: - bl link_get_multiplayer_id - ldr r6, =gUnknown_020229E8 + bl GetMultiplayerId + ldr r6, =gLinkPlayers movs r5, 0x1 eors r0, r5 lsls r0, 24 @@ -4167,7 +4167,7 @@ _08066858: ldrb r0, [r1] cmp r0, 0x4 beq _08066892 - bl link_get_multiplayer_id + bl GetMultiplayerId eors r0, r5 lsls r0, 24 lsrs r0, 24 @@ -4181,7 +4181,7 @@ _08066858: cmp r0, 0x5 bne _080668C8 _08066892: - bl link_get_multiplayer_id + bl GetMultiplayerId eors r0, r5 lsls r0, 24 lsrs r0, 24 @@ -4205,7 +4205,7 @@ _080668BC: b _0806694C .pool _080668C8: - bl link_get_multiplayer_id + bl GetMultiplayerId eors r0, r5 lsls r0, 24 lsrs r0, 24 @@ -4218,7 +4218,7 @@ _080668C8: ands r0, r1 cmp r0, 0x2 beq _080668FE - bl link_get_multiplayer_id + bl GetMultiplayerId eors r0, r5 lsls r0, 24 lsrs r0, 24 @@ -4231,7 +4231,7 @@ _080668C8: cmp r4, 0x1 bne _08066930 _080668FE: - bl link_get_multiplayer_id + bl GetMultiplayerId eors r0, r5 lsls r0, 24 lsrs r0, 24 @@ -4255,7 +4255,7 @@ _08066924: b _0806694C .pool _08066930: - bl link_get_multiplayer_id + bl GetMultiplayerId eors r0, r5 lsls r0, 24 lsrs r0, 24 diff --git a/asm/battle_controller_linkpartner.s b/asm/battle_controller_linkpartner.s index 80a846fdda..979f99ac1f 100644 --- a/asm/battle_controller_linkpartner.s +++ b/asm/battle_controller_linkpartner.s @@ -985,7 +985,7 @@ LinkPartnerBufferExecCompleted: @ 814B740 ands r0, r1 cmp r0, 0 beq _0814B794 - bl link_get_multiplayer_id + bl GetMultiplayerId mov r1, sp strb r0, [r1] movs r0, 0x2 @@ -3621,7 +3621,7 @@ _0814CF62: ldr r5, =gActiveBank ldrb r0, [r5] bl sub_806D864 - ldr r6, =gUnknown_020229E8 + ldr r6, =gLinkPlayers lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -5038,7 +5038,7 @@ sub_814DAA8: @ 814DAA8 lsrs r7, r0, 24 ldrb r0, [r6] bl sub_806D864 - ldr r4, =gUnknown_020229E8 + ldr r4, =gLinkPlayers lsls r1, r0, 3 subs r1, r0 lsls r1, 2 diff --git a/asm/battle_controller_opponent.s b/asm/battle_controller_opponent.s index d9b1638c31..c35c3badfb 100644 --- a/asm/battle_controller_opponent.s +++ b/asm/battle_controller_opponent.s @@ -1586,7 +1586,7 @@ OpponentBufferExecCompleted: @ 805FF18 ands r0, r1 cmp r0, 0 beq _0805FF6C - bl link_get_multiplayer_id + bl GetMultiplayerId mov r1, sp strb r0, [r1] movs r0, 0x2 diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s index d8ee0ed340..86381bf353 100644 --- a/asm/battle_controller_player.s +++ b/asm/battle_controller_player.s @@ -45,7 +45,7 @@ PlayerBufferExecCompleted: @ 805748C ands r0, r1 cmp r0, 0 beq _080574E0 - bl link_get_multiplayer_id + bl GetMultiplayerId mov r1, sp strb r0, [r1] movs r0, 0x2 @@ -7253,8 +7253,8 @@ sub_805B4F0: @ 805B4F0 ands r0, r1 cmp r0, 0 beq _0805B5B4 - bl link_get_multiplayer_id - ldr r5, =gUnknown_020229E8 + bl GetMultiplayerId + ldr r5, =gLinkPlayers lsls r0, 24 lsrs r0, 24 lsls r1, r0, 3 @@ -7265,7 +7265,7 @@ sub_805B4F0: @ 805B4F0 ldrb r0, [r1] cmp r0, 0x4 beq _0805B538 - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r0, 24 lsls r1, r0, 3 @@ -7278,7 +7278,7 @@ sub_805B4F0: @ 805B4F0 cmp r0, 0x5 bne _0805B558 _0805B538: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r0, 24 lsls r1, r0, 3 @@ -7290,7 +7290,7 @@ _0805B538: b _0805B5BA .pool _0805B558: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r0, 24 lsls r1, r0, 3 @@ -7302,7 +7302,7 @@ _0805B558: ands r0, r1 cmp r0, 0x2 beq _0805B58A - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r0, 24 lsls r1, r0, 3 @@ -7314,7 +7314,7 @@ _0805B558: cmp r4, 0x1 bne _0805B5A0 _0805B58A: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r0, 24 lsls r1, r0, 3 @@ -7325,7 +7325,7 @@ _0805B58A: adds r4, r0, 0x4 b _0805B5BA _0805B5A0: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r0, 24 lsls r1, r0, 3 @@ -7635,8 +7635,8 @@ dp01t_08_1_8032428: @ 805B864 ands r0, r1 cmp r0, 0 beq _0805B920 - bl link_get_multiplayer_id - ldr r5, =gUnknown_020229E8 + bl GetMultiplayerId + ldr r5, =gLinkPlayers lsls r0, 24 lsrs r0, 24 lsls r1, r0, 3 @@ -7647,7 +7647,7 @@ dp01t_08_1_8032428: @ 805B864 ldrb r0, [r1] cmp r0, 0x4 beq _0805B8A6 - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r0, 24 lsls r1, r0, 3 @@ -7660,7 +7660,7 @@ dp01t_08_1_8032428: @ 805B864 cmp r0, 0x5 bne _0805B8C4 _0805B8A6: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r0, 24 lsls r1, r0, 3 @@ -7672,7 +7672,7 @@ _0805B8A6: b _0805B926 .pool _0805B8C4: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r0, 24 lsls r1, r0, 3 @@ -7684,7 +7684,7 @@ _0805B8C4: ands r0, r1 cmp r0, 0x2 beq _0805B8F6 - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r0, 24 lsls r1, r0, 3 @@ -7696,7 +7696,7 @@ _0805B8C4: cmp r4, 0x1 bne _0805B90C _0805B8F6: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r0, 24 lsls r1, r0, 3 @@ -7707,7 +7707,7 @@ _0805B8F6: adds r4, r0, 0x4 b _0805B926 _0805B90C: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r0, 24 lsls r1, r0, 3 diff --git a/asm/battle_controller_player_partner.s b/asm/battle_controller_player_partner.s index 9438511e9b..0b4ef09735 100644 --- a/asm/battle_controller_player_partner.s +++ b/asm/battle_controller_player_partner.s @@ -1560,7 +1560,7 @@ PlayerPartnerBufferExecCompleted: @ 81BBB8C ands r0, r1 cmp r0, 0 beq _081BBBE0 - bl link_get_multiplayer_id + bl GetMultiplayerId mov r1, sp strb r0, [r1] movs r0, 0x2 diff --git a/asm/battle_controller_recorded_opponent.s b/asm/battle_controller_recorded_opponent.s index fd849d50f2..7eebf563bd 100644 --- a/asm/battle_controller_recorded_opponent.s +++ b/asm/battle_controller_recorded_opponent.s @@ -1473,7 +1473,7 @@ RecordedOpponentBufferExecCompleted: @ 81871AC ands r0, r1 cmp r0, 0 beq _08187200 - bl link_get_multiplayer_id + bl GetMultiplayerId mov r1, sp strb r0, [r1] movs r0, 0x2 @@ -4067,7 +4067,7 @@ _081888F6: b _08188928 .pool _08188910: - ldr r2, =gUnknown_020229E8 + ldr r2, =gLinkPlayers ldr r0, =gUnknown_0203C7B4 ldrb r0, [r0] movs r1, 0x1 diff --git a/asm/battle_controller_recorded_player.s b/asm/battle_controller_recorded_player.s index d7b0d03dec..141dfca111 100644 --- a/asm/battle_controller_recorded_player.s +++ b/asm/battle_controller_recorded_player.s @@ -1361,7 +1361,7 @@ RecordedPlayerBufferExecCompleted: @ 818A514 ands r0, r1 cmp r0, 0 beq _0818A568 - bl link_get_multiplayer_id + bl GetMultiplayerId mov r1, sp strb r0, [r1] movs r0, 0x2 @@ -3992,7 +3992,7 @@ sub_818BD04: @ 818BD04 b _0818BD4C .pool _0818BD30: - ldr r2, =gUnknown_020229E8 + ldr r2, =gLinkPlayers ldr r0, =gUnknown_0203C7B4 ldrb r1, [r0] lsls r0, r1, 3 @@ -4002,7 +4002,7 @@ _0818BD30: b _0818BD4A .pool _0818BD48: - ldr r0, =gUnknown_020229E8 + ldr r0, =gLinkPlayers _0818BD4A: ldrb r4, [r0, 0x13] _0818BD4C: @@ -5624,7 +5624,7 @@ sub_818CA64: @ 818CA64 ands r0, r1 cmp r0, 0 beq _0818CB54 - ldr r4, =gUnknown_020229E8 + ldr r4, =gLinkPlayers ldrb r0, [r6] bl sub_806D864 lsls r1, r0, 3 diff --git a/asm/battle_controller_safari.s b/asm/battle_controller_safari.s index 67c1db71d2..be274e81bb 100644 --- a/asm/battle_controller_safari.s +++ b/asm/battle_controller_safari.s @@ -448,7 +448,7 @@ SafariBufferExecCompleted: @ 8159704 ands r0, r1 cmp r0, 0 beq _08159758 - bl link_get_multiplayer_id + bl GetMultiplayerId mov r1, sp strb r0, [r1] movs r0, 0x2 diff --git a/asm/battle_controller_wally.s b/asm/battle_controller_wally.s index 3ea81bac67..978e2da2dd 100644 --- a/asm/battle_controller_wally.s +++ b/asm/battle_controller_wally.s @@ -871,7 +871,7 @@ WallyBufferExecCompleted: @ 8168AF8 ands r0, r1 cmp r0, 0 beq _08168B4C - bl link_get_multiplayer_id + bl GetMultiplayerId mov r1, sp strb r0, [r1] movs r0, 0x2 diff --git a/asm/battle_message.s b/asm/battle_message.s index 70172ac0a1..1e46ef5579 100644 --- a/asm/battle_message.s +++ b/asm/battle_message.s @@ -786,7 +786,7 @@ get_battle_strings: @ 814E764 b _0814E79C .pool _0814E794: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r7, r0, 24 _0814E79C: @@ -1000,7 +1000,7 @@ _0814E9C8: .pool _0814E9FC: ldr r2, =gBattlePartyID - ldr r1, =gUnknown_020229E8 + ldr r1, =gLinkPlayers lsls r0, r7, 3 subs r0, r7 lsls r0, 2 @@ -1022,7 +1022,7 @@ _0814E9FC: .pool _0814EA38: ldr r2, =gBattlePartyID - ldr r1, =gUnknown_020229E8 + ldr r1, =gLinkPlayers lsls r0, r7, 3 subs r0, r7 lsls r0, 2 @@ -1046,7 +1046,7 @@ _0814EA38: .pool _0814EA78: ldr r2, =gBattlePartyID - ldr r1, =gUnknown_020229E8 + ldr r1, =gLinkPlayers lsls r0, r7, 3 subs r0, r7 lsls r0, 2 @@ -1070,7 +1070,7 @@ _0814EA78: .pool _0814EAB8: ldr r2, =gBattlePartyID - ldr r1, =gUnknown_020229E8 + ldr r1, =gLinkPlayers lsls r0, r7, 3 subs r0, r7 lsls r0, 2 @@ -1632,7 +1632,7 @@ _0814EFEC: b _0814F5BE .pool _0814F014: - ldr r2, =gUnknown_020229E8 + ldr r2, =gLinkPlayers ldr r0, =gBattleScripting adds r0, 0x25 ldrb r1, [r0] @@ -1867,12 +1867,12 @@ _0814F220: lsls r0, r7, 3 subs r0, r7 lsls r0, 2 - ldr r1, =gUnknown_020229F0 + ldr r1, =gLinkPlayers + 8 adds r4, r0, r1 b _0814F5C0 .pool _0814F230: - ldr r4, =gUnknown_020229E8 + ldr r4, =gLinkPlayers lsls r0, r7, 3 subs r0, r7 lsls r0, 2 @@ -1882,7 +1882,7 @@ _0814F230: b _0814F266 .pool _0814F244: - ldr r4, =gUnknown_020229E8 + ldr r4, =gLinkPlayers lsls r0, r7, 3 subs r0, r7 lsls r0, 2 @@ -1892,7 +1892,7 @@ _0814F244: b _0814F266 .pool _0814F258: - ldr r4, =gUnknown_020229E8 + ldr r4, =gLinkPlayers lsls r0, r7, 3 subs r0, r7 lsls r0, 2 @@ -1917,7 +1917,7 @@ _0814F284: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r0, =gUnknown_020229F0 + ldr r0, =gLinkPlayers + 8 adds r4, r1, r0 b _0814F5C0 .pool @@ -1929,7 +1929,7 @@ _0814F298: ands r0, r1 cmp r0, 0 beq _0814F2B4 - ldr r4, =gUnknown_020229F0 + ldr r4, =gLinkPlayers + 8 b _0814F5C0 .pool _0814F2B4: @@ -2598,7 +2598,7 @@ _0814F858: beq _0814F8D6 cmp r2, 0xAF bne _0814F8CC - ldr r2, =gUnknown_020229E8 + ldr r2, =gLinkPlayers ldr r0, =gBattleScripting adds r0, 0x25 ldrb r1, [r0] diff --git a/asm/battle_records.s b/asm/battle_records.s index b0ba57ef4a..e386b14c78 100644 --- a/asm/battle_records.s +++ b/asm/battle_records.s @@ -311,7 +311,7 @@ sub_813C170: @ 813C170 strh r7, [r4, 0x8] adds r2, r6, 0 adds r2, 0x54 - ldr r1, =gUnknown_020229E8 + ldr r1, =gLinkPlayers mov r3, r9 lsls r0, r3, 3 subs r0, r3 diff --git a/asm/berry_blender.s b/asm/berry_blender.s index 5bf10bd5dc..816ae2d824 100644 --- a/asm/berry_blender.s +++ b/asm/berry_blender.s @@ -820,7 +820,7 @@ _0807FE7C: adds r0, 0x7C movs r1, 0x2 strb r1, [r0] - ldr r4, =gUnknown_020229F0 + ldr r4, =gLinkPlayers + 8 ldr r0, =gSaveBlock2Ptr ldr r1, [r0] adds r0, r4, 0 @@ -845,7 +845,7 @@ _0807FEC8: ldr r1, [r1] bl StringCopy _0807FED4: - ldr r1, =gUnknown_020229E8 + ldr r1, =gLinkPlayers movs r0, 0x2 strh r0, [r1, 0x1A] strh r0, [r1, 0x36] @@ -859,7 +859,7 @@ _0807FEE8: adds r0, 0x7C movs r1, 0x3 strb r1, [r0] - ldr r6, =gUnknown_020229F0 + ldr r6, =gLinkPlayers + 8 ldr r0, =gSaveBlock2Ptr ldr r1, [r0] adds r0, r6, 0 @@ -889,7 +889,7 @@ _0807FF3C: adds r0, 0x7C movs r1, 0x4 strb r1, [r0] - ldr r5, =gUnknown_020229F0 + ldr r5, =gLinkPlayers + 8 ldr r0, =gSaveBlock2Ptr ldr r1, [r0] adds r0, r5, 0 @@ -1214,7 +1214,7 @@ _08080248: b _08080546 _08080254: bl sub_800A5B4 - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 cmp r0, 0 beq _08080264 @@ -1880,7 +1880,7 @@ sub_80807BC: @ 80807BC ldrb r0, [r0] cmp r0, 0 beq _080807DE - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r0, 24 mov r10, r0 @@ -1935,7 +1935,7 @@ _080807E4: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r0, =gUnknown_020229F0 + ldr r0, =gLinkPlayers + 8 adds r1, r0 add r0, sp, 0x8 bl StringCopy @@ -3637,7 +3637,7 @@ sub_8081744: @ 8081744 ldrb r0, [r0] cmp r0, 0 beq _0808175A - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r6, r0, 24 _0808175A: @@ -4737,7 +4737,7 @@ sub_8081FC8: @ 8081FC8 bhi _08081FDE bl sub_8082D28 _08081FDE: - bl link_get_multiplayer_id + bl GetMultiplayerId ldr r0, [r4] adds r0, 0x63 ldrb r0, [r0] @@ -4836,7 +4836,7 @@ _080820C6: b _0808249E .pool _080820D4: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 cmp r0, 0 beq _080820E0 @@ -5551,7 +5551,7 @@ _080826EC: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r0, =gUnknown_020229F0 + ldr r0, =gLinkPlayers + 8 adds r1, r0 adds r0, r4, 0 bl StringCopy @@ -5571,7 +5571,7 @@ _0808271C: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r0, =gUnknown_020229F0 + ldr r0, =gLinkPlayers + 8 adds r1, r0 adds r0, r4, 0 bl StringCopy @@ -6026,7 +6026,7 @@ _08082B58: _08082B64: strh r1, [r0] _08082B66: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 cmp r0, 0 beq _08082B72 @@ -6246,7 +6246,7 @@ sub_8082D28: @ 8082D28 ldrb r0, [r4] cmp r0, 0 beq _08082D3C - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r1, r0, 24 _08082D3C: @@ -7340,7 +7340,7 @@ _08083564: lsls r4, r5, 3 subs r4, r5 lsls r4, 2 - ldr r3, =gUnknown_020229F0 + ldr r3, =gLinkPlayers + 8 adds r1, r4, r3 bl StringAppend ldr r1, [r7] @@ -7368,7 +7368,7 @@ _08083564: bl StringCopy ldr r0, [r7] adds r0, 0x9F - ldr r2, =gUnknown_020229E8 + ldr r2, =gLinkPlayers adds r4, r2 ldrb r1, [r4, 0x1A] bl ConvertInternationalString @@ -7917,7 +7917,7 @@ _08083A9E: b _08083ABC .pool _08083AB4: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r3, r0, 24 _08083ABC: @@ -8172,7 +8172,7 @@ _08083C84: lsls r1, r5, 3 subs r1, r5 lsls r1, 2 - ldr r2, =gUnknown_020229F0 + ldr r2, =gLinkPlayers + 8 adds r1, r2 bl StringAppend ldr r1, [r7] @@ -8542,7 +8542,7 @@ sub_8083F94: @ 8083F94 lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r5, =gUnknown_020229F0 + ldr r5, =gLinkPlayers + 8 adds r1, r5 adds r0, r7, 0 bl StringCopy @@ -8596,7 +8596,7 @@ _08084058: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r5, =gUnknown_020229F0 + ldr r5, =gLinkPlayers + 8 adds r1, r5 adds r0, r7, 0 bl StringCopy diff --git a/asm/cable_club.s b/asm/cable_club.s index 3d25017653..936bacc2e8 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -738,7 +738,7 @@ _080B2994: bl sub_800ABAC ldr r4, =gUnknown_03005DB8 strb r0, [r4] - bl link_get_multiplayer_id + bl GetMultiplayerId ldr r1, =gUnknown_03005DB4 strb r0, [r1] ldrb r0, [r4] @@ -828,7 +828,7 @@ _080B2A6C: bl sub_800ABAC ldr r4, =gUnknown_03005DB8 strb r0, [r4] - bl link_get_multiplayer_id + bl GetMultiplayerId ldr r1, =gUnknown_03005DB4 strb r0, [r1] ldrb r0, [r4] @@ -1038,7 +1038,7 @@ sub_80B2C30: @ 80B2C30 cmp r4, r0 bne _080B2C9C movs r4, 0 - ldr r6, =gUnknown_020229E8 + ldr r6, =gLinkPlayers b _080B2C7E .pool _080B2C5C: @@ -1367,7 +1367,7 @@ _080B2F0C: movs r4, 0 cmp r7, r5 bge _080B2F74 - ldr r0, =gUnknown_020229E8 + ldr r0, =gLinkPlayers ldrb r2, [r0] ldrh r3, [r0, 0x1A] subs r1, r2, 0x1 @@ -1848,7 +1848,7 @@ _080B3346: b _080B33A0 .pool _080B3354: - ldr r0, =gUnknown_020229E8 + ldr r0, =gLinkPlayers ldr r0, [r0, 0x4] movs r1, 0x1 ands r0, r1 @@ -1962,7 +1962,7 @@ _080B3458: cmp r4, r0 bne _080B3532 movs r4, 0 - ldr r5, =gUnknown_020229E8 + ldr r5, =gLinkPlayers b _080B349A .pool _080B3474: @@ -2018,7 +2018,7 @@ _080B34CE: strh r0, [r6] b _080B3532 _080B34DE: - ldr r0, =gUnknown_020229E8 + ldr r0, =gLinkPlayers ldr r0, [r0, 0x4] movs r1, 0x1 ands r0, r1 @@ -2033,7 +2033,7 @@ _080B34FC: lsls r0, 1 bl PlayNewMapMusic__default_for_battle _080B3504: - ldr r1, =gUnknown_020229E8 + ldr r1, =gLinkPlayers ldr r0, =0x00002211 str r0, [r1, 0x14] ldr r0, =gSpecialVar_0x8004 @@ -2087,7 +2087,7 @@ _080B357A: movs r2, 0 cmp r4, r3 bge _080B35AC - ldr r1, =gUnknown_020229E8 + ldr r1, =gLinkPlayers ldrb r0, [r1] subs r0, 0x4 cmp r0, 0x1 @@ -2185,8 +2185,8 @@ sub_80B360C: @ 80B360C b _080B36B2 .pool _080B3670: - ldr r4, =gUnknown_020229E8 - bl link_get_multiplayer_id + ldr r4, =gLinkPlayers + bl GetMultiplayerId eors r0, r5 lsls r0, 24 lsrs r0, 24 @@ -2201,8 +2201,8 @@ _080B3670: b _080B36B2 .pool _080B3694: - ldr r4, =gUnknown_020229E8 - bl link_get_multiplayer_id + ldr r4, =gLinkPlayers + bl GetMultiplayerId eors r0, r5 lsls r0, 24 lsrs r0, 24 @@ -2605,7 +2605,7 @@ sub_80B39D4: @ 80B39D4 lsls r1, r4, 3 subs r1, r4 lsls r1, 2 - ldr r2, =gUnknown_020229F0 + ldr r2, =gLinkPlayers + 8 adds r1, r2 bl StringCopy adds r0, r4, 0 diff --git a/asm/contest.s b/asm/contest.s index 0e2f457409..e5a728c3ca 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -837,7 +837,7 @@ sub_80D7DE8: @ 80D7DE8 lsls r1, 16 cmp r1, 0 bgt _080D7E2A - bl link_get_multiplayer_id + bl GetMultiplayerId adds r0, r4, 0 bl DestroyTask ldr r0, =gUnknown_02039F34 diff --git a/asm/contest_link_80FC4F4.s b/asm/contest_link_80FC4F4.s index d3984fb0d2..0d61167667 100644 --- a/asm/contest_link_80FC4F4.s +++ b/asm/contest_link_80FC4F4.s @@ -138,7 +138,7 @@ sub_80FC5DC: @ 80FC5DC ldrb r0, [r0] cmp r0, 0 beq _080FC650 - bl link_get_multiplayer_id + bl GetMultiplayerId ldr r1, =gUnknown_02039F25 strb r0, [r1] bl sub_8009FCC @@ -158,7 +158,7 @@ _080FC60C: ldrb r2, [r4] cmp r3, r2 bge _080FC64A - ldr r1, =gUnknown_020229E8 + ldr r1, =gLinkPlayers ldrb r0, [r1] subs r0, 0x1 adds r6, r4, 0 @@ -276,7 +276,7 @@ _080FC6F8: beq _080FC7C0 b _080FC7DC _080FC6FE: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 cmp r0, 0 bne _080FC738 @@ -318,7 +318,7 @@ _080FC758: ldrb r0, [r0] cmp r5, r0 bge _080FC798 - ldr r6, =gUnknown_020229E8 + ldr r6, =gLinkPlayers _080FC770: lsls r4, r5, 6 ldr r0, =gUnknown_02039E00 @@ -408,7 +408,7 @@ sub_80FC804: @ 80FC804 b _080FC880 .pool _080FC830: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 cmp r0, 0 bne _080FC87A @@ -490,7 +490,7 @@ _080FC8DE: ldr r1, =gUnknown_020228C4 ldrh r0, [r4, 0x1A] strb r0, [r1] - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 cmp r0, 0 bne _080FC904 @@ -1145,7 +1145,7 @@ _080FCE92: ldr r1, =gUnknown_020228C4 movs r0, 0x6E strb r0, [r1] - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 cmp r0, 0 bne _080FCEB8 diff --git a/asm/link.s b/asm/link.s index 7d2abd23f1..739d8b0d40 100644 --- a/asm/link.s +++ b/asm/link.s @@ -1002,7 +1002,7 @@ _08009C70: lsls r0, r6, 3 subs r0, r6 lsls r0, 2 - ldr r1, =gUnknown_020229E8 + ldr r1, =gLinkPlayers adds r2, r0, r1 adds r1, r2, 0 mov r0, r8 @@ -1406,7 +1406,7 @@ sub_8009FF8: @ 8009FF8 cmp r2, r4 bge _0800A030 movs r7, 0xFF - ldr r3, =gUnknown_020229E8 + ldr r3, =gLinkPlayers _0800A010: ldrh r0, [r3] adds r1, r7, 0 @@ -1488,7 +1488,7 @@ sub_800A07C: @ 800A07C adds r2, r0, 0 cmp r2, 0 blt _0800A0A4 - ldr r0, =gUnknown_020229E8 + ldr r0, =gLinkPlayers lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -1555,7 +1555,7 @@ _0800A0FC: bl sub_80097E8 _0800A10E: movs r6, 0 - ldr r4, =gUnknown_020229E8 + ldr r4, =gLinkPlayers movs r5, 0 b _0800A134 .pool @@ -1582,7 +1582,7 @@ _0800A134: lsrs r0, 24 cmp r7, r0 bne _0800A1AC - ldr r0, =gUnknown_020229E8 + ldr r0, =gLinkPlayers ldr r1, [r0, 0x14] ldr r0, =0x00001133 cmp r1, r0 @@ -1625,8 +1625,8 @@ _0800A1AC: ldr r6, =gUnknown_03000D5C movs r0, 0x3 str r0, [r6] - ldr r4, =gUnknown_020229E8 - bl link_get_multiplayer_id + ldr r4, =gLinkPlayers + bl GetMultiplayerId lsls r0, 24 lsrs r0, 24 lsls r1, r0, 3 @@ -1635,7 +1635,7 @@ _0800A1AC: adds r4, 0x14 adds r1, r4 ldr r5, [r1] - bl link_get_multiplayer_id + bl GetMultiplayerId movs r1, 0x1 eors r0, r1 lsls r0, 24 @@ -1692,7 +1692,7 @@ sub_800A23C: @ 800A23C push {r4-r6,lr} movs r6, 0 movs r4, 0 - ldr r5, =gUnknown_020229E8 + ldr r5, =gLinkPlayers b _0800A26C .pool _0800A24C: @@ -1746,7 +1746,7 @@ _0800A298: sub_800A2A4: @ 800A2A4 lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_020229E8 + ldr r2, =gLinkPlayers lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -1760,7 +1760,7 @@ sub_800A2A4: @ 800A2A4 thumb_func_start sub_800A2BC sub_800A2BC: @ 800A2BC push {r4,r5,lr} - ldr r5, =gUnknown_020229E8 + ldr r5, =gLinkPlayers movs r4, 0x4 _0800A2C2: adds r0, r5, 0 @@ -1802,7 +1802,7 @@ sub_800A2F4: @ 800A2F4 b _0800A34A .pool _0800A30C: - bl link_get_multiplayer_id + bl GetMultiplayerId strb r0, [r4, 0x9] movs r0, 0x1 strb r0, [r4, 0x8] @@ -1916,7 +1916,7 @@ sub_800A3EC: @ 800A3EC thumb_func_start sub_800A3F8 sub_800A3F8: @ 800A3F8 push {lr} - bl link_get_multiplayer_id + bl GetMultiplayerId ldr r0, =0x00004444 bl sub_8009D90 ldr r1, =gUnknown_020223C0 @@ -1969,8 +1969,8 @@ sub_800A458: @ 800A458 .pool thumb_func_end sub_800A458 - thumb_func_start link_get_multiplayer_id -link_get_multiplayer_id: @ 800A468 + thumb_func_start GetMultiplayerId +GetMultiplayerId: @ 800A468 push {lr} ldr r0, =gLinkVSyncDisabled ldrb r0, [r0] @@ -1989,12 +1989,12 @@ _0800A484: _0800A48C: pop {r1} bx r1 - thumb_func_end link_get_multiplayer_id + thumb_func_end GetMultiplayerId thumb_func_start bitmask_all_link_players_but_self bitmask_all_link_players_but_self: @ 800A490 push {lr} - bl link_get_multiplayer_id + bl GetMultiplayerId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -2554,7 +2554,7 @@ task00_link_test: @ 800A850 movs r2, 0xA movs r3, 0x2 bl sub_800A6E8 - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r0, 24 movs r1, 0xF @@ -2713,10 +2713,10 @@ sub_800AA04: @ 800AA04 push {r4-r7,lr} ldr r1, =gUnknown_03003100 strb r0, [r1] - bl link_get_multiplayer_id + bl GetMultiplayerId ldr r1, =gUnknown_03003120 strb r0, [r1] - ldr r4, =gUnknown_020229E8 + ldr r4, =gLinkPlayers ldr r3, =gUnknown_02022A74 movs r2, 0x4 _0800AA18: @@ -2767,7 +2767,7 @@ sub_800AA60: @ 800AA60 mov r9, r0 cmp r3, r1 bge _0800AAB4 - ldr r0, =gUnknown_020229E8 + ldr r0, =gLinkPlayers mov r12, r0 ldr r0, =gUnknown_02022A74 ldr r2, =0x00002288 @@ -2859,7 +2859,7 @@ sub_800AB18: @ 800AB18 cmp r4, r0 bcs _0800AB78 ldr r6, =gUnknown_02022A74 - ldr r5, =gUnknown_020229E8 + ldr r5, =gLinkPlayers movs r0, 0x8 adds r0, r6 mov r8, r0 @@ -3150,7 +3150,7 @@ sub_800AD88: @ 800AD88 cmp r1, r3 bge _0800ADB6 ldr r5, =gUnknown_030030F0 - ldr r4, =gUnknown_020229E8 + ldr r4, =gLinkPlayers _0800AD9E: ldrh r0, [r4, 0x1A] cmp r0, 0x1 @@ -3818,7 +3818,7 @@ sub_800B3A4: @ 800B3A4 lsls r2, r0, 3 subs r2, r0 lsls r2, 2 - ldr r0, =gUnknown_020229E8 + ldr r0, =gLinkPlayers adds r2, r0 adds r1, r2, 0 adds r0, r4, 0 @@ -9927,7 +9927,7 @@ _0800E3D0: subs r0, r4 lsls r0, 2 str r0, [sp, 0x1C] - ldr r7, =gUnknown_020229F0 + ldr r7, =gLinkPlayers + 8 mov r10, r7 ldr r6, =0x00003b98 movs r4, 0 @@ -9979,12 +9979,12 @@ _0800E434: b _0800E4AC .pool _0800E45C: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r0, 24 cmp r4, r0 beq _0800E4A6 - ldr r2, =gUnknown_020229E8 + ldr r2, =gLinkPlayers adds r0, r5, r2 ldrh r0, [r0, 0x1A] cmp r0, 0x1 @@ -10258,7 +10258,7 @@ _0800E64A: bl CpuSet mov r0, r9 strh r5, [r0] - ldr r1, =gUnknown_020229E8 + ldr r1, =gLinkPlayers ldr r2, =0x01000046 bl CpuSet add sp, 0x8 @@ -12301,7 +12301,7 @@ sub_800F820: @ 800F820 movs r0, 0x88 lsls r0, 7 bl sub_800FD14 - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 cmp r0, 0 bne _0800F83C @@ -13124,7 +13124,7 @@ _0800FEC8: negs r4, r0 orrs r4, r0 lsrs r4, 31 - bl link_get_multiplayer_id + bl GetMultiplayerId adds r1, r5, 0 adds r1, 0x7D strb r0, [r1] @@ -13206,7 +13206,7 @@ rfufunc_80F9F44: @ 800FF4C b _0800FF9C .pool _0800FF84: - bl link_get_multiplayer_id + bl GetMultiplayerId ldr r1, =gUnknown_03003090 lsls r0, 24 lsrs r0, 20 @@ -13296,7 +13296,7 @@ rfufunc_80FA020: @ 8010028 ldr r5, =gUnknown_03005000 ldr r0, [r5, 0x70] mov r8, r0 - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r6, r0, 24 ldrb r0, [r5, 0xC] @@ -13606,7 +13606,7 @@ _080102AC: thumb_func_start sub_80102B8 sub_80102B8: @ 80102B8 push {r4,r5,lr} - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 cmp r0, 0 beq _080102E6 @@ -13713,7 +13713,7 @@ _0801037A: thumb_func_start sub_8010390 sub_8010390: @ 8010390 push {r4,lr} - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 cmp r0, 0 beq _080103CC @@ -14563,7 +14563,7 @@ _08010A28: cmp r4, 0x3 ble _08010A28 adds r6, r2, 0 - ldr r5, =gUnknown_020229E8 + ldr r5, =gLinkPlayers movs r4, 0x4 _08010A3C: adds r0, r5, 0 @@ -14717,7 +14717,7 @@ _08010B8C: lsls r2, r4, 8 ldr r0, =gUnknown_020223C4 adds r2, r0 - ldr r1, =gUnknown_020229E8 + ldr r1, =gLinkPlayers lsls r0, r4, 3 subs r0, r4 lsls r0, 2 @@ -14759,7 +14759,7 @@ _08010BE2: adds r2, 0x1 cmp r2, 0x3 ble _08010BE2 - ldr r1, =gUnknown_020229E8 + ldr r1, =gLinkPlayers adds r0, r5, 0 adds r0, 0x14 movs r2, 0x8C @@ -14777,7 +14777,7 @@ _08010C0A: ldrb r0, [r1, 0xD] strb r0, [r5, 0xF] movs r2, 0 - ldr r3, =gUnknown_020229E8 + ldr r3, =gLinkPlayers mov r12, r3 adds r4, r5, 0 adds r4, 0x10 @@ -15254,7 +15254,7 @@ sub_8010FCC: @ 8010FCC sub_801100C: @ 801100C push {r4,lr} movs r4, 0x80 - ldr r3, =gUnknown_020229E8 + ldr r3, =gLinkPlayers lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -15367,7 +15367,7 @@ sub_80110B8: @ 80110B8 mov r8, r1 movs r4, 0 movs r6, 0x1 - ldr r2, =gUnknown_020229E8 + ldr r2, =gLinkPlayers mov r12, r2 ldr r0, =0x00000cde adds r0, r3 @@ -20767,7 +20767,7 @@ sub_8013F90: @ 8013F90 lsrs r6, r0, 24 ldr r0, =gUnknown_02022C40 mov r8, r0 - bl link_get_multiplayer_id + bl GetMultiplayerId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -20815,7 +20815,7 @@ _08013FFC: lsrs r0, 24 cmp r0, 0x3 bne _080140BC - bl link_get_multiplayer_id + bl GetMultiplayerId adds r1, r0, 0 ldr r0, =gEnemyParty movs r2, 0x1 @@ -20860,7 +20860,7 @@ _08014070: cmp r0, 0x3 bne _080140BC ldr r4, =gUnknown_020321C0 - bl link_get_multiplayer_id + bl GetMultiplayerId adds r1, r0, 0 movs r0, 0x1 eors r1, r0 @@ -20913,7 +20913,7 @@ sub_80140E0: @ 80140E0 b _0801419E .pool _08014104: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 cmp r0, 0 bne _08014114 @@ -20933,7 +20933,7 @@ _0801411C: cmp r4, r0 bne _0801419E movs r4, 0 - ldr r5, =gUnknown_020229E8 + ldr r5, =gLinkPlayers b _08014152 .pool _08014138: @@ -20960,7 +20960,7 @@ _08014152: lsrs r0, 24 cmp r0, 0x2 bne _08014190 - bl link_get_multiplayer_id + bl GetMultiplayerId movs r1, 0x1 eors r0, r1 lsls r0, 24 @@ -21014,7 +21014,7 @@ _080141D4: lsls r0, 24 cmp r0, 0 bne _080141F2 - bl link_get_multiplayer_id + bl GetMultiplayerId movs r1, 0x1 eors r0, r1 lsls r0, 24 @@ -21041,12 +21041,12 @@ sub_8014210: @ 8014210 bl sp000_heal_pokemon bl copy_player_party_to_sav1 bl copy_bags_and_unk_data_from_save_blocks - ldr r5, =gUnknown_020229E8 + ldr r5, =gLinkPlayers ldr r0, =0x00002211 str r0, [r5, 0x14] - bl link_get_multiplayer_id + bl GetMultiplayerId adds r4, r0, 0 - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r4, 24 lsrs r4, 24 lsls r1, r4, 3 @@ -21056,9 +21056,9 @@ sub_8014210: @ 8014210 lsls r0, 24 lsrs r0, 24 strh r0, [r1, 0x18] - bl link_get_multiplayer_id + bl GetMultiplayerId adds r4, r0, 0 - bl link_get_multiplayer_id + bl GetMultiplayerId movs r2, 0x1 eors r4, r2 lsls r4, 24 @@ -21162,7 +21162,7 @@ sub_8014304: @ 8014304 bl sub_8009FCC ldr r1, =gUnknown_03005DB8 strb r0, [r1] - bl link_get_multiplayer_id + bl GetMultiplayerId ldr r1, =gUnknown_03005DB4 strb r0, [r1] bl sub_809D2BC @@ -21487,7 +21487,7 @@ _080146C4: b _08014764 .pool _080146D8: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 cmp r0, 0 bne _080146E8 @@ -21632,7 +21632,7 @@ _08014818: .4byte _080148B8 .4byte _08014854 _08014854: - ldr r1, =gUnknown_020229E8 + ldr r1, =gLinkPlayers ldr r0, =0x00002211 str r0, [r1, 0x14] movs r2, 0 @@ -23815,7 +23815,7 @@ _08015CB2: bl sub_800FE50 ldr r0, =gStringVar4 ldr r2, =gUnknown_082EEB80 - ldr r1, =gUnknown_020229E8 + ldr r1, =gLinkPlayers ldrb r1, [r1, 0x13] lsls r1, 2 adds r1, r2 @@ -23963,7 +23963,7 @@ _08015E32: ldrb r2, [r4] movs r1, 0x40 orrs r1, r2 - ldr r2, =gUnknown_020229E8 + ldr r2, =gLinkPlayers ldrb r2, [r2, 0x13] bl sub_8017D9C strb r5, [r4] @@ -24020,12 +24020,12 @@ _08015EC4: bne _08015ED2 bl _08016878 _08015ED2: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 cmp r0, 0 bne _08015F2C ldr r5, =gStringVar1 - bl link_get_multiplayer_id + bl GetMultiplayerId movs r1, 0x1 eors r0, r1 lsls r0, 24 @@ -24033,7 +24033,7 @@ _08015ED2: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r4, =gUnknown_020229F0 + ldr r4, =gLinkPlayers + 8 adds r1, r4 adds r0, r5, 0 bl StringCopy @@ -25123,7 +25123,7 @@ sub_80168DC: @ 80168DC cmp r0, 0 beq _0801692C ldr r0, =gStringVar4 - ldr r1, =gUnknown_020229E8 + ldr r1, =gLinkPlayers adds r1, 0x2F ldrb r1, [r1] adds r2, r5, 0 @@ -27828,10 +27828,10 @@ sub_8017E00: @ 8017E00 lsls r1, 24 lsrs r4, r1, 24 adds r6, r4, 0 - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r3, r0, 24 - ldr r2, =gUnknown_020229E8 + ldr r2, =gLinkPlayers movs r0, 0x1 adds r1, r3, 0 eors r1, r0 @@ -28369,7 +28369,7 @@ sub_8018220: @ 8018220 lsls r2, 24 lsrs r2, 24 str r2, [sp] - bl link_get_multiplayer_id + bl GetMultiplayerId movs r1, 0x1 eors r0, r1 lsls r0, 24 @@ -30557,7 +30557,7 @@ _080194B4: movs r0, 0xB strb r0, [r5, 0x8] ldr r0, =gStringVar1 - ldr r1, =gUnknown_020229F0 + ldr r1, =gLinkPlayers + 8 bl StringCopy b _08019922 .pool @@ -30670,7 +30670,7 @@ _0801959C: cmp r0, 0x1 bne _080195AA ldr r0, =gStringVar1 - ldr r1, =gUnknown_020229F0 + ldr r1, =gLinkPlayers + 8 bl StringCopy _080195AA: movs r0, 0xF @@ -33783,7 +33783,7 @@ _0801AEA6: _0801AEE0: bl sub_800AC34 ldr r4, =gUnknown_020223C4 - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r0, 16 adds r0, r4 @@ -39699,7 +39699,7 @@ sub_801DDD0: @ 801DDD0 strb r0, [r4, 0x1A] bl sub_8009FCC strb r0, [r4, 0xD] - bl link_get_multiplayer_id + bl GetMultiplayerId strb r0, [r4, 0x13] strb r5, [r4, 0x17] strb r5, [r4, 0x18] @@ -45508,7 +45508,7 @@ _08020CAC: lsls r0, 24 lsrs r0, 24 mov r8, r0 - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r7, r0, 24 mov r0, r8 @@ -45893,7 +45893,7 @@ _08020FCC: lsls r1, r5, 3 subs r1, r5 lsls r1, 2 - ldr r2, =gUnknown_020229F0 + ldr r2, =gLinkPlayers + 8 adds r1, r2 bl StringCopy adds r0, r5, 0x1 @@ -53038,7 +53038,7 @@ sub_802493C: @ 802493C bl sub_8024A30 ldr r0, [r4] str r5, [r0] - bl link_get_multiplayer_id + bl GetMultiplayerId ldr r1, [r4] adds r1, 0x28 strb r0, [r1] @@ -53262,7 +53262,7 @@ _08024B2C: lsrs r5, r0, 24 cmp r5, 0xA bls _08024B2C - bl link_get_multiplayer_id + bl GetMultiplayerId movs r1, 0 lsls r0, 24 cmp r0, 0 @@ -53274,7 +53274,7 @@ _08024B6A: bl sub_8009FCC mov r1, r8 strb r0, [r1] - bl link_get_multiplayer_id + bl GetMultiplayerId ldr r3, [sp, 0x18] strb r0, [r3] movs r5, 0x1 @@ -58660,7 +58660,7 @@ _0802768C: lsls r0, r2, 3 subs r0, r2 lsls r0, 2 - ldr r1, =gUnknown_020229F0 + ldr r1, =gLinkPlayers + 8 _08027694: adds r0, r1 pop {r1} @@ -59535,7 +59535,7 @@ _08027D48: lsls r0, r4, 3 subs r0, r4 lsls r0, 2 - ldr r1, =gUnknown_020229F0 + ldr r1, =gLinkPlayers + 8 adds r0, r1 lsls r1, r4, 2 adds r1, r5 @@ -60509,7 +60509,7 @@ _080284C6: thumb_func_start sub_80284CC sub_80284CC: @ 80284CC push {lr} - bl link_get_multiplayer_id + bl GetMultiplayerId ldr r1, =gUnknown_02022C9C lsls r0, 24 lsrs r0, 22 @@ -60536,7 +60536,7 @@ sub_80284CC: @ 80284CC thumb_func_start sub_8028504 sub_8028504: @ 8028504 push {lr} - bl link_get_multiplayer_id + bl GetMultiplayerId ldr r1, =gUnknown_02022C9C lsls r0, 24 lsrs r0, 22 @@ -60665,7 +60665,7 @@ _080285F0: strh r0, [r5, 0x2E] movs r4, 0 _080285FE: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r0, 24 adds r1, r4, 0 @@ -62582,7 +62582,7 @@ _080294DC: ldrb r0, [r0] movs r1, 0x11 bl FillWindowPixelBuffer - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r0, 24 cmp r4, r0 @@ -62871,7 +62871,7 @@ _08029774: movs r1, 0x1 movs r3, 0x8 bl PrintTextOnWindow - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r0, 24 cmp r4, r0 @@ -63099,7 +63099,7 @@ _0802996C: b _08029B2A _080299E2: movs r4, 0 - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r0, 24 cmp r9, r0 @@ -64840,7 +64840,7 @@ sub_802A9A8: @ 802A9A8 strh r1, [r0, 0x8] str r6, [r0] strb r4, [r0, 0x4] - bl link_get_multiplayer_id + bl GetMultiplayerId ldr r1, [r5] strb r0, [r1, 0x6] ldr r0, [r5] @@ -64928,7 +64928,7 @@ sub_802AA94: @ 802AA94 strh r5, [r0] str r5, [r4, 0x1C] str r5, [r4, 0x5C] - bl link_get_multiplayer_id + bl GetMultiplayerId movs r1, 0 lsls r0, 24 cmp r0, 0 @@ -67368,7 +67368,7 @@ _0802BDFE: ldr r2, [sp] cmp r0, 0 beq _0802BE38 - ldr r1, =gUnknown_020229F0 + ldr r1, =gLinkPlayers + 8 add r1, r9 adds r0, r7, 0 bl StringCopy @@ -73093,7 +73093,7 @@ sub_802EAB0: @ 802EAB0 ldrh r0, [r1, 0x4] strh r0, [r4, 0x16] _0802EAD8: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 cmp r0, 0 bne _0802EB1A diff --git a/asm/mystery_event_menu.s b/asm/mystery_event_menu.s index 003fa80f57..27ab158adf 100644 --- a/asm/mystery_event_menu.s +++ b/asm/mystery_event_menu.s @@ -19,7 +19,7 @@ sub_8178944: @ 8178944 sub_8178958: @ 8178958 push {lr} movs r2, 0 - ldr r1, =gUnknown_020229E8 + ldr r1, =gLinkPlayers ldrh r0, [r1, 0x1A] ldrh r1, [r1, 0x36] cmp r0, r1 diff --git a/asm/pokemon_1.s b/asm/pokemon_1.s index b101c2c8a1..28e8e65966 100644 --- a/asm/pokemon_1.s +++ b/asm/pokemon_1.s @@ -784,8 +784,8 @@ _08068990: cmp r2, 0 beq _080689F4 _080689B6: - ldr r4, =gUnknown_020229E8 - bl link_get_multiplayer_id + ldr r4, =gLinkPlayers + bl GetMultiplayerId lsls r0, 24 lsrs r0, 24 lsls r1, r0, 3 @@ -989,13 +989,13 @@ sub_8068B48: @ 8068B48 b _08068B78 .pool _08068B6C: - bl link_get_multiplayer_id + bl GetMultiplayerId movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r0, 24 _08068B78: - ldr r3, =gUnknown_020229E8 + ldr r3, =gLinkPlayers lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -1037,13 +1037,13 @@ sub_8068BB0: @ 8068BB0 b _08068BE0 .pool _08068BD4: - bl link_get_multiplayer_id + bl GetMultiplayerId movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r0, 24 _08068BE0: - ldr r3, =gUnknown_020229E8 + ldr r3, =gLinkPlayers lsls r1, r0, 3 subs r1, r0 lsls r1, 2 diff --git a/asm/pokemon_3.s b/asm/pokemon_3.s index f03b898d98..9790cd74dd 100644 --- a/asm/pokemon_3.s +++ b/asm/pokemon_3.s @@ -1371,8 +1371,8 @@ _0806D7D4: sub_806D7EC: @ 806D7EC push {r4,r5,lr} movs r5, 0 - ldr r4, =gUnknown_020229E8 - bl link_get_multiplayer_id + ldr r4, =gLinkPlayers + bl GetMultiplayerId lsls r0, 24 lsrs r0, 24 lsls r1, r0, 3 @@ -1409,7 +1409,7 @@ sub_806D82C: @ 806D82C lsls r0, 24 lsrs r0, 24 movs r3, 0 - ldr r2, =gUnknown_020229E8 + ldr r2, =gLinkPlayers lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -1443,7 +1443,7 @@ sub_806D864: @ 806D864 lsls r0, 16 lsrs r3, r0, 16 movs r2, 0 - ldr r1, =gUnknown_020229E8 + ldr r1, =gLinkPlayers b _0806D87C .pool _0806D874: @@ -3938,10 +3938,10 @@ _0806EC28: b _0806EC64 .pool _0806EC3C: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r0, 24 - ldr r4, =gUnknown_020229E8 + ldr r4, =gLinkPlayers lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -4284,10 +4284,10 @@ sub_806EF08: @ 806EF08 lsls r0, 24 lsrs r4, r0, 24 movs r5, 0 - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_020229E8 + ldr r2, =gLinkPlayers lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -4321,7 +4321,7 @@ _0806EF4C: ands r5, r0 _0806EF56: movs r2, 0 - ldr r4, =gUnknown_020229E8 + ldr r4, =gLinkPlayers ldrh r0, [r4, 0x18] adds r1, r5, 0 cmp r0, r1 @@ -4353,7 +4353,7 @@ sub_806EF84: @ 806EF84 lsls r1, 24 lsrs r1, 24 movs r4, 0 - ldr r2, =gUnknown_020229E8 + ldr r2, =gLinkPlayers lsls r0, r1, 3 subs r0, r1 lsls r0, 2 diff --git a/asm/record_mixing.s b/asm/record_mixing.s index 19a3dda3cf..793726c5e3 100644 --- a/asm/record_mixing.s +++ b/asm/record_mixing.s @@ -110,7 +110,7 @@ sub_80E6CA0: @ 80E6CA0 ldr r2, =0x00001124 adds r1, r5, r2 bl sub_81659DC - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 cmp r0, 0 bne _080E6D1C @@ -182,7 +182,7 @@ sub_80E6D54: @ 80E6D54 bl sub_81659DC adds r0, r4, 0 bl TaskDummy4 - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 cmp r0, 0 bne _080E6DEE @@ -278,7 +278,7 @@ _080E6E60: ldr r0, [r5] adds r0, r4 bl sub_80E8AC0 - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 cmp r0, 0 bne _080E6EFA @@ -999,7 +999,7 @@ _080E75AC: b _080E75FC .pool _080E75D0: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 cmp r0, 0 bne _080E75FC @@ -1291,7 +1291,7 @@ sub_80E7808: @ 80E7808 thumb_func_start sub_80E7810 sub_80E7810: @ 80E7810 push {lr} - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r0, 24 pop {r1} @@ -1405,7 +1405,7 @@ sub_80E78C4: @ 80E78C4 muls r0, r1 mov r2, r9 adds r6, r2, r0 - ldr r2, =gUnknown_020229E8 + ldr r2, =gLinkPlayers lsls r0, r1, 3 subs r0, r1 lsls r0, 2 @@ -1481,7 +1481,7 @@ sub_80E7948: @ 80E7948 cmp r0, 0x1 bne _080E79FE adds r7, r6, 0 - ldr r2, =gUnknown_020229E8 + ldr r2, =gLinkPlayers ldr r1, [r5] lsls r0, r1, 3 subs r0, r1 @@ -1735,7 +1735,7 @@ sub_80E7B60: @ 80E7B60 lsls r0, 16 lsrs r0, 16 str r0, [sp, 0x38] - ldr r0, =gUnknown_020229E8 + ldr r0, =gLinkPlayers ldrh r0, [r0, 0x4] bl SeedRng2 bl sub_8009FCC @@ -1797,7 +1797,7 @@ _080E7BF8: muls r0, r1 ldr r2, [sp, 0x2C] adds r7, r2, r0 - ldr r1, =gUnknown_020229E8 + ldr r1, =gLinkPlayers mov r3, r8 lsls r0, r3, 3 subs r0, r3 @@ -2280,7 +2280,7 @@ sub_80E7F68: @ 80E7F68 ldrh r1, [r4] bl VarSet ldr r0, =gStringVar1 - ldr r1, =gUnknown_020229F0 + ldr r1, =gLinkPlayers + 8 bl StringCopy ldrh r1, [r4] ldr r0, =0x00000113 diff --git a/asm/recorded_battle.s b/asm/recorded_battle.s index 128b155d65..5a4a811e6e 100644 --- a/asm/recorded_battle.s +++ b/asm/recorded_battle.s @@ -122,7 +122,7 @@ _08184EAC: ands r5, r0 cmp r5, 0 beq _08184F64 - bl link_get_multiplayer_id + bl GetMultiplayerId ldr r1, =gUnknown_0203C7B4 strb r0, [r1] bl sub_8009FCC @@ -132,7 +132,7 @@ _08184EAC: movs r5, 0 ldr r0, =gUnknown_0203CC80 mov r9, r0 - ldr r6, =gUnknown_020229E8 + ldr r6, =gLinkPlayers movs r0, 0x8 adds r0, r6 mov r8, r0 @@ -174,7 +174,7 @@ _08184EDC: .pool _08184F3C: adds r5, 0x1 - ldr r0, =gUnknown_020229F0 + ldr r0, =gLinkPlayers + 8 adds r1, r3, r0 ldr r0, =gUnknown_0203CC84 adds r2, r4, r0 @@ -495,7 +495,7 @@ sub_81851A8: @ 81851A8 cmp r0, 0 beq _0818525E movs r5, 0 - ldr r4, =gUnknown_020229E8 + ldr r4, =gLinkPlayers b _081851DA .pool _081851D0: @@ -1624,7 +1624,7 @@ _08185B7C: cmp r6, 0x5 ble _08185B7C movs r6, 0 - ldr r3, =gUnknown_020229E8 + ldr r3, =gLinkPlayers mov r8, r3 mov r0, r8 adds r0, 0x8 @@ -2007,7 +2007,7 @@ _08185F02: sub_8185F40: @ 8185F40 push {r4,r5,lr} movs r2, 0 - ldr r0, =gUnknown_020229E8 + ldr r0, =gLinkPlayers ldr r3, =gActiveBank ldrh r1, [r0, 0x18] adds r4, r0, 0 diff --git a/asm/rom3.s b/asm/rom3.s index bce623188c..ac74e07358 100644 --- a/asm/rom3.s +++ b/asm/rom3.s @@ -468,7 +468,7 @@ _08032AAA: ldrb r5, [r0] movs r0, 0 mov r10, r0 - ldr r1, =gUnknown_020229E8 + ldr r1, =gLinkPlayers mov r12, r1 adds r7, r4, 0 mov r8, r0 @@ -492,7 +492,7 @@ _08032AE4: cmp r0, 0x3 bne _08032B06 _08032AE8: - ldr r0, =gUnknown_020229E8 + ldr r0, =gLinkPlayers adds r0, r4, r0 ldrb r0, [r0, 0x18] movs r1, 0 @@ -507,7 +507,7 @@ _08032AFC: _08032B06: cmp r10, r5 bne _08032B56 - ldr r0, =gUnknown_020229E8 + ldr r0, =gLinkPlayers adds r3, r4, r0 ldrh r1, [r3, 0x18] lsls r1, 2 @@ -544,7 +544,7 @@ _08032B4C: ldrh r0, [r3, 0x18] b _08032C24 _08032B56: - ldr r2, =gUnknown_020229E8 + ldr r2, =gLinkPlayers adds r0, r4, r2 ldrh r1, [r0, 0x18] movs r3, 0x1 @@ -895,7 +895,7 @@ _08032E2E: b _0803303C .pool _08032E8C: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r5, r0, 24 ldr r0, [r4] @@ -909,7 +909,7 @@ _08032E8C: _08032EA4: movs r0, 0 mov r10, r0 - ldr r1, =gUnknown_020229E8 + ldr r1, =gLinkPlayers mov r12, r1 ldr r7, =gBanksBySide mov r8, r0 @@ -933,7 +933,7 @@ _08032EE0: cmp r0, 0x3 bne _08032F02 _08032EE4: - ldr r0, =gUnknown_020229E8 + ldr r0, =gLinkPlayers adds r0, r4, r0 ldrb r0, [r0, 0x18] movs r1, 0 @@ -948,7 +948,7 @@ _08032EF8: _08032F02: cmp r10, r5 bne _08032F52 - ldr r0, =gUnknown_020229E8 + ldr r0, =gLinkPlayers adds r3, r4, r0 ldrh r1, [r3, 0x18] lsls r1, 2 @@ -985,7 +985,7 @@ _08032F48: ldrh r0, [r3, 0x18] b _08033020 _08032F52: - ldr r2, =gUnknown_020229E8 + ldr r2, =gLinkPlayers adds r0, r4, r2 ldrh r1, [r0, 0x18] movs r3, 0x1 diff --git a/asm/rom4.s b/asm/rom4.s index c22c5c16fe..2b38b65ff8 100644 --- a/asm/rom4.s +++ b/asm/rom4.s @@ -4490,7 +4490,7 @@ sub_8086B14: @ 8086B14 ldrb r0, [r0] cmp r6, r0 bcs _08086B7E - ldr r7, =gUnknown_020229E8 + ldr r7, =gLinkPlayers _08086B44: lsls r5, r6, 24 lsrs r5, 24 @@ -4538,7 +4538,7 @@ sub_8086B9C: @ 8086B9C ldrb r0, [r0] cmp r4, r0 bcs _08086BCA - ldr r5, =gUnknown_020229E8 + ldr r5, =gLinkPlayers _08086BAA: lsls r0, r4, 24 lsrs r0, 24 diff --git a/asm/rom6.s b/asm/rom6.s index e303c17c7f..e562e8a265 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -5396,7 +5396,7 @@ sub_8138240: @ 8138240 mov r7, r8 push {r7} movs r6, 0 - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r7, r0, 24 bl sub_8009FCC @@ -5416,7 +5416,7 @@ _08138262: lsls r1, r4, 3 subs r1, r4 lsls r1, 2 - ldr r2, =gUnknown_020229F0 + ldr r2, =gLinkPlayers + 8 adds r1, r2 bl StringCopy adds r0, r6, 0x1 @@ -5459,7 +5459,7 @@ SpawnLinkPartnerFieldObject: @ 81382A0 adds r0, r4, 0 movs r2, 0x8 bl memcpy - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r0, 24 mov r10, r0 @@ -5531,7 +5531,7 @@ _08138350: _08138358: cmp r10, r6 beq _0813840A - ldr r0, =gUnknown_020229E8 + ldr r0, =gLinkPlayers lsls r2, r6, 3 subs r1, r2, r6 lsls r1, 2 @@ -9940,7 +9940,7 @@ nullsub_55: @ 813A768 sub_813A76C: @ 813A76C push {r4-r6,lr} movs r4, 0 - ldr r6, =gUnknown_020229E8 + ldr r6, =gLinkPlayers ldr r0, =0x0000401f adds r5, r0, 0 _0813A776: @@ -11640,7 +11640,7 @@ _0813B5E4: beq _0813B5F2 b _0813B7C6 _0813B5F2: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 cmp r0, 0 bne _0813B5FE @@ -11662,7 +11662,7 @@ _0813B614: bne _0813B622 b _0813B7C6 _0813B622: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 cmp r0, 0 beq _0813B62E @@ -11729,7 +11729,7 @@ _0813B6B4: beq _0813B6C2 b _0813B7C6 _0813B6C2: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 cmp r0, 0 bne _0813B790 @@ -11747,7 +11747,7 @@ _0813B6E4: ands r1, r0 cmp r1, 0 beq _0813B7C6 - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 cmp r0, 0 beq _0813B790 @@ -11769,7 +11769,7 @@ _0813B708: b _0813B7C6 .pool _0813B728: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 cmp r0, 0 bne _0813B74C diff --git a/asm/rom_8034C54.s b/asm/rom_8034C54.s index 2c72549a34..f350404cf0 100644 --- a/asm/rom_8034C54.s +++ b/asm/rom_8034C54.s @@ -1900,7 +1900,7 @@ _08035C68: beq _08035CE2 cmp r2, 0x1 bne _08035CAE - ldr r2, =gUnknown_020229E8 + ldr r2, =gLinkPlayers ldr r0, =gBattleScripting adds r0, 0x25 ldrb r1, [r0] @@ -1924,7 +1924,7 @@ _08035CA4: bne _08035D68 b _08035CFC _08035CAE: - ldr r2, =gUnknown_020229E8 + ldr r2, =gLinkPlayers ldr r0, =gBattleScripting adds r0, 0x25 ldrb r1, [r0] @@ -1950,7 +1950,7 @@ _08035CD8: _08035CE2: cmp r2, 0x1 bne _08035D20 - ldr r2, =gUnknown_020229E8 + ldr r2, =gLinkPlayers ldr r0, =gBattleScripting adds r0, 0x25 ldrb r1, [r0] @@ -1971,7 +1971,7 @@ _08035CFC: b _08035D68 .pool _08035D20: - ldr r2, =gUnknown_020229E8 + ldr r2, =gLinkPlayers ldr r0, =gBattleScripting adds r0, 0x25 ldrb r1, [r0] @@ -2046,7 +2046,7 @@ _08035DAC: movs r5, 0 movs r6, 0x3 _08035DBC: - ldr r0, =gUnknown_020229F0 + ldr r0, =gLinkPlayers + 8 adds r1, r5, r0 subs r0, 0x8 adds r4, r5, r0 @@ -2121,7 +2121,7 @@ _08035E44: adds r6, r5, 0 eors r6, r0 adds r1, r6, 0 - ldr r4, =gUnknown_020229E8 + ldr r4, =gLinkPlayers lsls r0, r5, 3 subs r0, r5 lsls r0, 2 @@ -3727,7 +3727,7 @@ _08036D66: blt _08036D6E b _08036EA0 _08036D6E: - ldr r0, =gUnknown_020229E8 + ldr r0, =gLinkPlayers mov r12, r0 ldr r3, =gEnigmaBerries adds r6, r3, 0 @@ -4031,7 +4031,7 @@ sub_8036FAC: @ 8036FAC bl RunTasks bl AnimateSprites bl BuildOamBuffer - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r6, r0, 24 ldr r0, =gBattleScripting @@ -4138,7 +4138,7 @@ _08037098: lsls r0, 4 cmp r1, r0 bne _080370D8 - ldr r0, =gUnknown_020229E8 + ldr r0, =gLinkPlayers movs r1, 0 strh r1, [r0, 0x18] movs r1, 0x1 @@ -4373,7 +4373,7 @@ _08037318: cmp r0, 0 beq _08037372 movs r3, 0 - ldr r1, =gUnknown_020229E8 + ldr r1, =gLinkPlayers ldrb r0, [r1] adds r5, r2, 0 cmp r0, 0x3 @@ -4501,7 +4501,7 @@ sub_8037458: @ 8037458 bl RunTasks bl AnimateSprites bl BuildOamBuffer - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r6, r0, 24 ldr r0, =gBattleScripting @@ -4578,7 +4578,7 @@ _08037518: bne _08037530 b _080379D6 _08037530: - ldr r6, =gUnknown_020229E8 + ldr r6, =gLinkPlayers movs r0, 0 strh r0, [r6, 0x18] strh r3, [r6, 0x34] @@ -4731,7 +4731,7 @@ _08037694: b _080379D6 _080376A2: bl sub_800A5B4 - ldr r0, =gUnknown_020229E8 + ldr r0, =gLinkPlayers lsls r1, r6, 3 subs r1, r6 lsls r1, 2 @@ -4797,7 +4797,7 @@ _08037734: b _080379D6 _08037742: bl sub_800A5B4 - ldr r0, =gUnknown_020229E8 + ldr r0, =gLinkPlayers lsls r1, r6, 3 subs r1, r6 lsls r1, 2 @@ -4861,7 +4861,7 @@ _080377CC: b _080379D6 _080377DA: bl sub_800A5B4 - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 cmp r0, 0 bne _080377EA @@ -4894,7 +4894,7 @@ _08037818: b _080379D6 _08037826: bl sub_800A5B4 - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 cmp r0, 0 bne _08037836 @@ -4927,7 +4927,7 @@ _08037864: b _080379D6 _08037872: bl sub_800A5B4 - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 cmp r0, 0 beq _0803788A @@ -5197,7 +5197,7 @@ sub_8037ADC: @ 8037ADC mov r9, r1 movs r4, 0x3 _08037B02: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r7, r0, 24 ldr r0, =gBattleScripting @@ -5288,7 +5288,7 @@ _08037BC6: mov r2, r9 cmp r2, 0x4 bne _08037C14 - ldr r2, =gUnknown_020229E8 + ldr r2, =gLinkPlayers mov r1, r8 adds r0, r1, r2 ldrh r1, [r0, 0x18] @@ -5514,7 +5514,7 @@ sub_8037DF4: @ 8037DF4 mov r7, r8 push {r7} sub sp, 0x4 - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r7, r0, 24 ldr r0, =gBattleScripting @@ -5687,7 +5687,7 @@ _08037FA4: ldrh r0, [r5] str r2, [sp] bl sub_8185F90 - ldr r0, =gUnknown_020229E8 + ldr r0, =gLinkPlayers ldr r2, [sp] adds r0, r2, r0 ldrh r0, [r0, 0x18] @@ -5781,7 +5781,7 @@ _0803805A: _0803806C: cmp r6, r7 bne _080380A0 - ldr r0, =gUnknown_020229E8 + ldr r0, =gLinkPlayers adds r0, r5, r0 ldrh r0, [r0, 0x18] cmp r0, 0x2 @@ -5804,7 +5804,7 @@ _08038098: b _08038110 .pool _080380A0: - ldr r2, =gUnknown_020229E8 + ldr r2, =gLinkPlayers adds r0, r5, r2 ldrh r1, [r0, 0x18] movs r3, 0x1 @@ -5920,7 +5920,7 @@ _08038172: _08038184: cmp r6, r7 bne _080381B8 - ldr r0, =gUnknown_020229E8 + ldr r0, =gLinkPlayers adds r0, r5, r0 ldrh r0, [r0, 0x18] cmp r0, 0x2 @@ -5943,7 +5943,7 @@ _080381B0: b _08038228 .pool _080381B8: - ldr r2, =gUnknown_020229E8 + ldr r2, =gLinkPlayers adds r0, r5, r2 ldrh r1, [r0, 0x18] movs r3, 0x1 @@ -6081,7 +6081,7 @@ _080382CC: cmp r0, 0 beq _08038326 movs r6, 0 - ldr r0, =gUnknown_020229E8 + ldr r0, =gLinkPlayers ldrb r1, [r0] adds r4, r3, 0 adds r2, r0, 0 @@ -7133,7 +7133,7 @@ sub_8038B94: @ 8038B94 ands r0, r1 cmp r0, 0 beq _08038C04 - ldr r1, =gUnknown_020229E8 + ldr r1, =gLinkPlayers lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -7594,7 +7594,7 @@ _08038FFC: ldr r6, =gSaveBlock2Ptr cmp r4, r3 bge _08039022 - ldr r1, =gUnknown_020229E8 + ldr r1, =gLinkPlayers ldrb r0, [r1] cmp r0, 0x3 bne _08039022 diff --git a/asm/rom_8161F74.s b/asm/rom_8161F74.s index 056b76f19c..e1d86ce5ca 100644 --- a/asm/rom_8161F74.s +++ b/asm/rom_8161F74.s @@ -5075,7 +5075,7 @@ sub_8164B74: @ 8164B74 ldr r2, =0x00000cb2 adds r0, r2 ldrh r6, [r0] - bl link_get_multiplayer_id + bl GetMultiplayerId ldr r0, =gScriptResult ldrh r0, [r0] cmp r0, 0x6 diff --git a/asm/rom_818CFC8.s b/asm/rom_818CFC8.s index 9afa548a02..450a39d382 100644 --- a/asm/rom_818CFC8.s +++ b/asm/rom_818CFC8.s @@ -42670,7 +42670,7 @@ _081A3298: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r5, =gUnknown_020229F0 + ldr r5, =gLinkPlayers + 8 adds r1, r5 mov r0, sp bl StringCopy diff --git a/asm/rom_81BE66C.s b/asm/rom_81BE66C.s index bb849687a9..c7a17c1efb 100644 --- a/asm/rom_81BE66C.s +++ b/asm/rom_81BE66C.s @@ -8656,12 +8656,12 @@ sub_81C3220: @ 81C3220 ldr r0, =gEnemyParty cmp r1, r0 bne _081C326C - bl link_get_multiplayer_id + bl GetMultiplayerId movs r1, 0x1 eors r0, r1 lsls r0, 24 lsrs r0, 24 - ldr r2, =gUnknown_020229E8 + ldr r2, =gLinkPlayers lsls r1, r0, 3 subs r1, r0 lsls r1, 2 @@ -53887,7 +53887,7 @@ _081DA02A: ldrb r0, [r4] cmp r0, 0x4 beq _081DA0B8 - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 cmp r0, 0 bne _081DA0B8 @@ -54088,7 +54088,7 @@ _081DA1D4: ldrb r0, [r0] cmp r5, r0 bge _081DA214 - ldr r6, =gUnknown_020229E8 + ldr r6, =gLinkPlayers _081DA1EC: lsls r4, r5, 6 ldr r0, =gUnknown_02039E00 @@ -54157,7 +54157,7 @@ sub_81DA244: @ 81DA244 b _081DA2D4 .pool _081DA284: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 cmp r0, 0 bne _081DA2CE @@ -54437,7 +54437,7 @@ sub_81DA488: @ 81DA488 b _081DA55C .pool _081DA4CC: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 cmp r0, 0 bne _081DA4FA @@ -54485,7 +54485,7 @@ _081DA50C: bgt _081DA54C lsls r0, r4, 6 adds r5, r0, r5 - ldr r7, =gUnknown_020229E8 + ldr r7, =gLinkPlayers _081DA53C: ldrh r1, [r7, 0x1A] adds r0, r5, 0 diff --git a/asm/script_pokemon_util_80F87D8.s b/asm/script_pokemon_util_80F87D8.s index f234b9a25d..b8c6186357 100644 --- a/asm/script_pokemon_util_80F87D8.s +++ b/asm/script_pokemon_util_80F87D8.s @@ -427,7 +427,7 @@ sub_80F8AFC: @ 80F8AFC cmp r3, r0 bge _080F8B50 adds r2, r5, 0 - ldr r1, =gUnknown_020229E8 + ldr r1, =gLinkPlayers _080F8B1C: ldrb r0, [r1] subs r0, 0x1 @@ -524,7 +524,7 @@ _080F8BBA: ands r0, r2 orrs r0, r6 strb r0, [r1, 0x5] - ldr r0, =gUnknown_020229E8 + ldr r0, =gLinkPlayers adds r1, r7, r0 ldrb r0, [r1] subs r0, 0x1 @@ -953,7 +953,7 @@ sub_80F8FA0: @ 80F8FA0 cmp r0, 0 bne _080F8FD8 ldr r4, =gScriptResult - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r0, 24 strh r0, [r4] diff --git a/asm/secret_base.s b/asm/secret_base.s index 056e0913a5..b3215cf11a 100644 --- a/asm/secret_base.s +++ b/asm/secret_base.s @@ -4539,7 +4539,7 @@ _080EAFE4: _080EAFEE: adds r0, r6, r5 str r0, [sp] - ldr r4, =gUnknown_020229E8 + ldr r4, =gLinkPlayers movs r3, 0xFF ldrb r0, [r4, 0x1C] str r0, [sp, 0x4] @@ -4573,7 +4573,7 @@ _080EB030: lsls r2, r5, 1 adds r0, r6, r2 str r0, [sp] - ldr r4, =gUnknown_020229E8 + ldr r4, =gLinkPlayers ldrh r3, [r4, 0x38] movs r1, 0xFF adds r0, r1, 0 @@ -4608,7 +4608,7 @@ _080EB074: adds r0, r5 adds r0, r6, r0 str r0, [sp] - ldr r1, =gUnknown_020229E8 + ldr r1, =gLinkPlayers adds r0, r1, 0 adds r0, 0x54 ldrb r0, [r0] @@ -4631,7 +4631,7 @@ _080EB074: .pool _080EB0A8: str r6, [sp] - ldr r1, =gUnknown_020229E8 + ldr r1, =gLinkPlayers ldrb r0, [r1] str r0, [sp, 0x4] ldrh r0, [r1, 0x1A] diff --git a/asm/trade.s b/asm/trade.s index 1b74b9440f..51bfc49fc0 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -762,7 +762,7 @@ _08077834: movs r2, 0 movs r3, 0 bl sub_80C6D80 - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 movs r1, 0x80 lsls r1, 17 @@ -771,7 +771,7 @@ _08077834: lsls r0, r1, 3 subs r0, r1 lsls r0, 2 - ldr r1, =gUnknown_020229F0 + ldr r1, =gLinkPlayers + 8 adds r0, r1 ldr r1, [r5, 0xC] str r4, [sp] @@ -842,7 +842,7 @@ _080778DE: adds r6, 0x1 cmp r6, 0x2 ble _080778DE - bl link_get_multiplayer_id + bl GetMultiplayerId movs r1, 0x1 eors r0, r1 lsls r0, 24 @@ -850,7 +850,7 @@ _080778DE: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r0, =gUnknown_020229F0 + ldr r0, =gLinkPlayers + 8 adds r1, r0 movs r0, 0x1 movs r2, 0x78 @@ -1380,7 +1380,7 @@ _08077DFC: movs r2, 0 movs r3, 0 bl sub_80C6D80 - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 movs r1, 0x80 lsls r1, 17 @@ -1389,7 +1389,7 @@ _08077DFC: lsls r0, r1, 3 subs r0, r1 lsls r0, 2 - ldr r1, =gUnknown_020229F0 + ldr r1, =gLinkPlayers + 8 adds r0, r1 ldr r1, [r5, 0xC] str r4, [sp] @@ -1466,7 +1466,7 @@ _08077EB4: adds r6, 0x1 cmp r6, 0x2 ble _08077EB4 - bl link_get_multiplayer_id + bl GetMultiplayerId movs r1, 0x1 eors r0, r1 lsls r0, 24 @@ -1474,7 +1474,7 @@ _08077EB4: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r0, =gUnknown_020229F0 + ldr r0, =gLinkPlayers + 8 adds r1, r0 movs r0, 0x1 movs r2, 0x78 @@ -2100,7 +2100,7 @@ _08078452: shedinja_maker_maybe: @ 8078458 push {r4-r6,lr} sub sp, 0xC - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r5, r0, 24 ldr r0, =gUnknown_0203229C @@ -2977,7 +2977,7 @@ sub_8078C10: @ 8078C10 thumb_func_start sub_8078C34 sub_8078C34: @ 8078C34 push {r4,lr} - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r4, r0, 24 bl sub_8077200 @@ -3146,7 +3146,7 @@ sub_8078D78: @ 8078D78 adds r0, 0x6F movs r1, 0x64 strb r1, [r0] - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -3851,7 +3851,7 @@ _08079356: thumb_func_start sub_807935C sub_807935C: @ 807935C push {r4,lr} - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 cmp r0, 0 bne _08079384 @@ -6165,7 +6165,7 @@ _0807A64C: movs r0, 0x2 b _0807A718 _0807A65C: - bl link_get_multiplayer_id + bl GetMultiplayerId movs r1, 0x1 eors r0, r1 lsls r0, 24 @@ -6173,7 +6173,7 @@ _0807A65C: lsls r1, r0, 3 subs r1, r0 lsls r1, 2 - ldr r0, =gUnknown_020229E8 + ldr r0, =gLinkPlayers adds r1, r0 ldrb r0, [r1] subs r0, 0x1 @@ -6284,8 +6284,8 @@ sub_807A728: @ 807A728 cmp r0, 0 beq _0807A7B4 movs r4, 0 - bl link_get_multiplayer_id - ldr r5, =gUnknown_020229E8 + bl GetMultiplayerId + ldr r5, =gLinkPlayers movs r7, 0x1 eors r0, r7 lsls r0, 24 @@ -6309,7 +6309,7 @@ sub_807A728: @ 807A728 _0807A762: cmp r4, 0 ble _0807A7B4 - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r0, 24 lsls r1, r0, 3 @@ -6324,7 +6324,7 @@ _0807A762: beq _0807A7B0 cmp r4, 0x2 bne _0807A7B4 - bl link_get_multiplayer_id + bl GetMultiplayerId eors r0, r7 lsls r0, 24 lsrs r0, 24 @@ -6586,7 +6586,7 @@ _0807A95A: movs r7, 0 movs r6, 0x1 movs r5, 0 - ldr r4, =gUnknown_020229E8 + ldr r4, =gLinkPlayers b _0807A980 .pool _0807A96C: @@ -6612,7 +6612,7 @@ _0807A980: movs r4, 0 b _0807A9B4 _0807A992: - ldr r0, =gUnknown_020229E8 + ldr r0, =gLinkPlayers adds r2, r4, r0 ldrb r1, [r2, 0x10] movs r0, 0xF @@ -7062,7 +7062,7 @@ sub_807ACDC: @ 807ACDC b _0807ACF8 .pool _0807ACF0: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 lsrs r0, 24 _0807ACF8: @@ -7700,7 +7700,7 @@ _0807B2D0: strb r0, [r1] movs r0, 0x6 strb r0, [r1, 0x1] - ldr r4, =gUnknown_020229F0 + ldr r4, =gLinkPlayers + 8 ldr r0, =gSaveBlock2Ptr ldr r1, [r0] adds r0, r4, 0 @@ -7900,7 +7900,7 @@ _0807B4B8: thumb_func_start sub_807B4C4 sub_807B4C4: @ 807B4C4 push {lr} - bl link_get_multiplayer_id + bl GetMultiplayerId pop {r0} bx r0 thumb_func_end sub_807B4C4 @@ -8521,7 +8521,7 @@ sub_807BAD8: @ 807BAD8 ldrb r0, [r0] cmp r0, 0 beq _0807BB68 - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 ldr r3, =gStringVar1 movs r2, 0x80 @@ -8531,7 +8531,7 @@ sub_807BAD8: @ 807BAD8 lsls r1, r2, 3 subs r1, r2 lsls r1, 2 - ldr r0, =gUnknown_020229F0 + ldr r0, =gLinkPlayers + 8 adds r1, r0 adds r0, r3, 0 bl StringCopy @@ -13835,8 +13835,8 @@ _0807EDCE: ldrb r0, [r0] cmp r0, 0 beq _0807EDF6 - ldr r4, =gUnknown_020229E8 - bl link_get_multiplayer_id + ldr r4, =gLinkPlayers + bl GetMultiplayerId movs r1, 0x1 eors r0, r1 lsls r0, 24 @@ -13930,7 +13930,7 @@ _0807EE9C: bhi _0807EEAC b _0807F03A _0807EEAC: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 cmp r0, 0 bne _0807EED4 @@ -14751,7 +14751,7 @@ _0807F5D0: bhi _0807F5E0 b _0807F70C _0807F5E0: - bl link_get_multiplayer_id + bl GetMultiplayerId lsls r0, 24 cmp r0, 0 bne _0807F608 diff --git a/asm/trainer_card.s b/asm/trainer_card.s index cadb46a062..250b8920c5 100644 --- a/asm/trainer_card.s +++ b/asm/trainer_card.s @@ -4585,7 +4585,7 @@ sub_80C4E74: @ 80C4E74 movs r2, 0x64 bl memcpy ldr r1, [r5] - ldr r2, =gUnknown_020229E8 + ldr r2, =gLinkPlayers lsls r0, r4, 3 subs r0, r4 lsls r0, 2 diff --git a/asm/tv.s b/asm/tv.s index 991de413ad..64180f152a 100644 --- a/asm/tv.s +++ b/asm/tv.s @@ -1538,7 +1538,7 @@ _080ECBA4: lsls r0, r7, 3 subs r0, r7 lsls r5, r0, 2 - ldr r6, =gUnknown_020229F0 + ldr r6, =gLinkPlayers + 8 adds r1, r5, r6 mov r0, sp bl StringCopy @@ -1919,7 +1919,7 @@ sub_80ECEB4: @ 80ECEB4 ldrb r0, [r0] cmp r1, r0 ble _080ECF30 - ldr r0, =gUnknown_020229E8 + ldr r0, =gLinkPlayers ldrh r0, [r0, 0x1A] b _080ECF4A .pool @@ -1928,7 +1928,7 @@ _080ECF30: ldrb r0, [r0] cmp r0, 0x1 beq _080ECF48 - ldr r1, =gUnknown_020229E8 + ldr r1, =gLinkPlayers lsls r0, r6, 3 subs r0, r6 lsls r0, 2 @@ -7956,7 +7956,7 @@ _080F0208: bls _080F0208 mov r5, r8 movs r4, 0 - ldr r7, =gUnknown_020229E8 + ldr r7, =gLinkPlayers b _080F0276 .pool _080F0238: diff --git a/sym_ewram.txt b/sym_ewram.txt index 5dabaf3a46..2c00a43aa3 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -52,12 +52,9 @@ gUnknown_020229C8: @ 20229C8 gUnknown_020229CC: @ 20229CC .space 0x1C -gUnknown_020229E8: @ 20229E8 - .space 0x8 - -gUnknown_020229F0: @ 20229F0 - .space 0x1C - +gLinkPlayers: @ 20229E8 + .space 0x24 + gUnknown_02022A0C: @ 2022A0C .space 0x68