From e19b9c9d467aa51c1ca550d2d9af4e3e9e5fd11e Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.richards@comcast.net>
Date: Fri, 8 Nov 2019 03:07:19 -0500
Subject: Resolve Littleroot merge conflict

---
 src/field_specials.c | 2 +-
 src/save_location.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/field_specials.c b/src/field_specials.c
index 65bc3a095..b84e4dde9 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -4033,7 +4033,7 @@ void sub_813BA30(void)
     }
 }
 
-void sub_813BA60(void)
+void UpdateTrainerFanClubGameClear(void)
 {
     if (!((gSaveBlock1Ptr->vars[VAR_FANCLUB_UNKNOWN_1 - VARS_START] >> 7) & 1))
     {
diff --git a/src/save_location.c b/src/save_location.c
index 7a9b08a09..b31d1ac9e 100644
--- a/src/save_location.c
+++ b/src/save_location.c
@@ -131,7 +131,7 @@ void sub_81AFDA0(void)
     gSaveBlock2Ptr->field_A8 |= 0x8;
 }
 
-void sub_81AFDD0(void)
+void SetChampionSaveWarp(void)
 {
     gSaveBlock2Ptr->specialSaveWarpFlags |= 0x80;
 }
-- 
cgit v1.2.3