diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-06 21:18:50 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-06 21:18:50 +0200 |
| commit | 33ee3115ab77d326ffeca49ce9a124c31af587bb (patch) | |
| tree | 1391412170c4a3ea5c2a871988df3835105c1d4c /asm/battle_controller_linkopponent.s | |
| parent | b7d75cb6151b5b43a3c467c61b2c93e877db4a00 (diff) | |
add glink defines from pokeruby
Diffstat (limited to 'asm/battle_controller_linkopponent.s')
| -rw-r--r-- | asm/battle_controller_linkopponent.s | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/asm/battle_controller_linkopponent.s b/asm/battle_controller_linkopponent.s index 269ff82bd..1e5e0fce5 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 |