diff --git a/asm/battle_frontier_1.s b/asm/battle_frontier_1.s index 561bd26517..52d91cf9b6 100644 --- a/asm/battle_frontier_1.s +++ b/asm/battle_frontier_1.s @@ -2563,9 +2563,7 @@ sub_818FFC0: @ 818FFC0 cmp r3, r0 beq _0818FFF0 ldr r0, =gBattleMoves - lsls r1, r3, 1 - adds r1, r3 - lsls r1, 2 + lsls r1, r3, 4 adds r3, r1, r0 ldrb r0, [r3, 0x1] cmp r0, 0 @@ -10002,9 +10000,7 @@ _08193F8C: lsls r1, 1 add r1, r10 ldrh r2, [r1] - lsls r1, r2, 1 - adds r1, r2 - lsls r1, 2 + lsls r1, r2, 4 adds r1, r0 ldrb r6, [r1, 0x1] cmp r6, 0 diff --git a/asm/contest.s b/asm/contest.s index 453ecb04c3..9e7a817a28 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -13856,9 +13856,7 @@ sub_80DEAA8: @ 80DEAA8 lsls r0, 16 lsrs r0, 16 ldr r2, =gBattleMoves - lsls r1, r0, 1 - adds r1, r0 - lsls r1, 2 + lsls r1, r0, 4 adds r1, r2 ldrb r0, [r1, 0x6] cmp r0, 0x20 diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index 988aaf41e8..319bdea92a 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -203,9 +203,7 @@ _081C3FD0: _081C3FEC: ldr r4, =gStringVar1 ldr r1, =gBattleMoves - lsls r0, r5, 1 - adds r0, r5 - lsls r0, 2 + lsls r0, r5, 4 adds r0, r1 ldrb r1, [r0, 0x4] adds r0, r4, 0 @@ -724,9 +722,7 @@ _081C442E: cmp r0, 0 beq _081C4468 adds r1, r0, 0 - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 + lsls r0, r1, 4 adds r0, r6 ldrb r0, [r0, 0x2] lsls r2, r4, 28 @@ -836,9 +832,7 @@ _081C4514: bne _081C4540 ldr r2, =gBattleMoves ldrh r1, [r3] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 + lsls r0, r1, 4 adds r0, r2 ldrb r0, [r0, 0x2] movs r1, 0x55 diff --git a/asm/pokenav.s b/asm/pokenav.s index 1ad4354a23..cf8864bc71 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -22461,9 +22461,7 @@ sub_81D28FC: @ 81D28FC .pool _081D29C4: mov r1, r9 - lsls r0, r1, 1 - add r0, r9 - lsls r0, 2 + lsls r0, r1, 4 ldr r1, =gBattleMoves adds r6, r0, r1 ldrb r1, [r6, 0x2]