Merge remote-tracking branch 'pret/master' into trade

This commit is contained in:
Diegoisawesome
2018-12-25 15:03:13 -06:00
517 changed files with 41317 additions and 67419 deletions
+1 -1
View File
@@ -656,7 +656,7 @@ _0807AD94:
_0807ADB2:
mov r0, r8
bl GetMonSpritePalStruct
bl LoadCompressedObjectPalette
bl LoadCompressedSpritePalette
ldr r0, =gUnknown_020322A0
ldr r1, [r0]
adds r0, r1, 0