fix record mixing merge conflicts

2018-05-19 12:32:44 +02:00
parent 0c1f85f200 db898d0e48
commit e44f35c7b7
26 changed files with 1631 additions and 2452 deletions
--- a/src/link.c
+++ b/src/link.c
@@ -798,7 +798,7 @@ bool32 sub_800A040(void)
    return TRUE;
 }

-bool32 sub_800A064(void)
+bool32 Link_AnyPartnersPlayingRubyOrSapphire(void)
 {
    if (sub_8009FF8(VERSION_RUBY, VERSION_SAPPHIRE) >= 0)
    {