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.s
+1 -1
View File
@@ -1048,7 +1048,7 @@ _080D8004:
bl sub_80DC594
bl sub_80DC5E8
bl sub_80DC7EC
ldr r1, =gBanksBySide
ldr r1, =gBanksByIdentity
strb r4, [r1]
movs r0, 0x1
strb r0, [r1, 0x1]