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
@@ -900,7 +900,7 @@ sub_8166D44: @ 8166D44
thumb_func_start sub_8166DE4
sub_8166DE4: @ 8166DE4
push {r4,lr}
bl sub_8198C58
bl ProcessMenuInputNoWrap_
lsls r0, 24
lsrs r4, r0, 24
asrs r1, r0, 24