ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

šFix BattleMove struct access in asm

Browse Source
This commit is contained in:
DizzyEggg 2018-07-19 20:24:52 +02:00
parent e8f7699c2c
commit ad6fa078c9
4 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
asm/battle_frontier_1.s
View File

@ -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

4
asm/contest.s
View File

@ -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

12
asm/pokemon_summary_screen.s
View File

@ -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

4
asm/pokenav.s
View File

@ -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]