merge branch master

This commit is contained in:
DizzyEggg
2017-10-10 11:48:16 +02:00
94 changed files with 18136 additions and 6683 deletions
+1 -1
View File
@@ -4033,7 +4033,7 @@ _0818BD72:
beq _0818BD9C
movs r0, 0x5A
mov r9, r0
ldr r1, =gUnknown_083054E0
ldr r1, =gTrainerFrontPicCoords
b _0818BD9E
.pool
_0818BD98: