fix pokeblock conflicts

This commit is contained in:
DizzyEggg
2017-12-18 16:58:14 +01:00
174 changed files with 5529 additions and 7226 deletions
+1 -1
View File
@@ -447,5 +447,5 @@ _081357EE:
bx r0
.pool
thumb_func_end sub_81357BC
.align 2, 0 @ Don't pad with nop.