Merge remote-tracking branch 'pret/master'

This commit is contained in:
Diegoisawesome committed 2017-09-16 14:24:47 -05:00
commit 5a74c0e913
111 files changed
+6263 -10954

No files matched your search

+2 -2
View File
@@ -3024,12 +3024,12 @@ _0815B8E0:
lsls r0, 24
lsrs r1, r0, 24
_0815B8EA:
ldr r0, =gUnknown_020244D4
ldr r0, =gBattleSpritesGfx
ldr r2, [r0]
lsls r0, r1, 2
adds r2, 0x4
adds r2, r0
ldr r1, =gUnknown_020244E4
ldr r1, =gBattleMonForms
ldr r0, =gAnimationBankAttacker
ldrb r0, [r0]
adds r0, r1