wild encounter, fix merge conflicts

This commit is contained in:
DizzyEggg committed 2017-11-18 21:45:52 +01:00
commit 3de416662b
59 files changed
+4681 -7626

No files matched your search

+1 -1
View File
@@ -1390,7 +1390,7 @@ _0809CA04:
b _0809CB28
.pool
_0809CA48:
bl sub_8070BD0
bl DoEggActions_CheckHatch
lsls r0, 24
cmp r0, 0
beq _0809CA64