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

fix record mixing merge conflicts

Browse Source
This commit is contained in:
DizzyEggg
2018-05-19 12:32:44 +02:00
parent 0c1f85f200 db898d0e48
commit e44f35c7b7
26 changed files with 1631 additions and 2452 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/cable_club.s
+1 -1
View File
@@ -795,7 +795,7 @@ sub_80B2A08: @ 80B2A08
ldrh r0, [r0]
cmp r0, 0x4
bne _080B2A38
bl sub_800A064
bl Link_AnyPartnersPlayingRubyOrSapphire
cmp r0, 0
bne _080B2A4A
bl sub_800AC34