merge conflicts, review changes, daycare

This commit is contained in:
DizzyEggg
2017-11-17 19:31:03 +01:00
61 changed files with 3368 additions and 6216 deletions
+1 -1
View File
@@ -9892,7 +9892,7 @@ _081B55E8:
.pool
_081B5614:
ldr r1, =gUnknown_0203CEC8
ldr r0, =sub_8124690
ldr r0, =MCB2_FlyMap
b _081B5628
.pool
_081B5624: