Resolve Littleroot merge conflict

This commit is contained in:
GriffinR committed 2019-11-08 03:07:19 -05:00
1 parent bef24a45f0
commit e19b9c9d46
7 files changed
+60 -61

No files matched your search

+1 -1
View File
@@ -9,6 +9,6 @@
void TrySetMapSaveWarpStatus(void);
void sub_81AFDA0(void);
void sub_81AFDD0(void);
void SetChampionSaveWarp(void);
#endif // GUARD_SAVE_LOCATION_H