diff options
Diffstat (limited to 'asm/battle_tower.s')
| -rw-r--r-- | asm/battle_tower.s | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/asm/battle_tower.s b/asm/battle_tower.s index d92881024..6cee2dc0a 100644 --- a/asm/battle_tower.s +++ b/asm/battle_tower.s @@ -2351,7 +2351,7 @@ _08163368: ldr r2, [sp, 0x30] str r2, [sp, 0x8] ldr r2, [sp, 0x20] - bl sub_8068634 + bl CreateMonWithEVSpreadPersonalityOTID movs r0, 0xFF mov r6, sp strb r0, [r6, 0x14] @@ -2775,7 +2775,7 @@ _081636CE: str r2, [sp, 0x8] ldr r2, [sp, 0x14] mov r3, r10 - bl sub_8068634 + bl CreateMonWithEVSpreadPersonalityOTID movs r1, 0 add r0, sp, 0xC strb r1, [r0] @@ -2894,7 +2894,7 @@ _081637D0: mov r2, r9 str r2, [sp, 0x8] movs r2, 0x1E - bl sub_8068634 + bl CreateMonWithEVSpreadPersonalityOTID movs r1, 0 add r0, sp, 0xC strb r1, [r0] @@ -3134,7 +3134,7 @@ _081639FC: bl __umodsi3 cmp r0, 0 bne _08163A78 - bl sub_81DA57C + bl UpdateGymLeaderRematch b _08163A78 .pool _08163A2C: @@ -3172,7 +3172,7 @@ _08163A3C: _08163A74: bl sub_816537C _08163A78: - ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music + ldr r0, =CB2_ReturnToFieldContinueScript bl SetMainCallback2 add sp, 0x4 pop {r4-r6} @@ -5264,7 +5264,7 @@ _08164D14: ldrb r0, [r0] cmp r0, 0 beq _08164DB0 - ldr r0, =gLinkVSyncDisabled + ldr r0, =gWirelessCommType ldrb r0, [r0] cmp r0, 0 bne _08164DB0 @@ -5302,7 +5302,7 @@ _08164DB6: thumb_func_start sub_8164DCC sub_8164DCC: @ 8164DCC push {lr} - ldr r0, =gLinkVSyncDisabled + ldr r0, =gWirelessCommType ldrb r0, [r0] cmp r0, 0 beq _08164DDA @@ -6289,7 +6289,7 @@ _081655A6: str r3, [sp, 0x8] lsrs r2, 24 mov r3, r12 - bl sub_8068634 + bl CreateMonWithEVSpreadPersonalityOTID movs r0, 0xFF str r0, [sp, 0x48] movs r0, 0 @@ -7550,7 +7550,7 @@ _08165FDA: ldr r2, [sp, 0x2C] str r2, [sp, 0x8] ldr r2, [sp, 0x20] - bl sub_8068634 + bl CreateMonWithEVSpreadPersonalityOTID add r1, sp, 0x14 movs r0, 0xFF strb r0, [r1] |