move mon data fix conflicts

This commit is contained in:
DizzyEggg
2018-02-07 20:17:55 +01:00
302 changed files with 14099 additions and 23834 deletions
+1 -1
View File
@@ -581,7 +581,7 @@ _080689E4:
beq _080689CE
_080689F4:
adds r0, r5, 0
bl GetBankSide
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080689CE