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

---
 include/save_location.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/save_location.h b/include/save_location.h
index c330124ad..2eb550b1a 100644
--- a/include/save_location.h
+++ b/include/save_location.h
@@ -9,6 +9,6 @@
 
 void TrySetMapSaveWarpStatus(void);
 void sub_81AFDA0(void);
-void sub_81AFDD0(void);
+void SetChampionSaveWarp(void);
 
 #endif // GUARD_SAVE_LOCATION_H
-- 
cgit v1.2.3