Resolve Littleroot merge conflict

2019-11-08 03:07:19 -05:00
parent bef24a45f0
commit e19b9c9d46
7 changed files with 60 additions and 61 deletions
--- 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