dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
DizzyEggg
2017-10-19 19:46:37 +02:00
parent dd0f19476c 8ceecd9fba
commit dee6133076
39 changed files with 1929 additions and 4080 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/contest_link_80FC4F4.s
+1 -1
View File
@@ -50,7 +50,7 @@ sub_80FC530: @ 80FC530
cmp r4, 0
beq _080FC552
adds r0, r5, 0
bl sub_800A5EC
bl ResetBlockReceivedFlag
movs r0, 0x1
b _080FC554
_080FC552: