diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-06 18:06:24 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-06 18:06:24 -0400 |
commit | 736b89ae3d4ffb335ef9e073556bc630c5541b70 (patch) | |
tree | e97d50e764c52c012092aecb2d80266442677a79 /include/overworld.h | |
parent | 5620b0ed1a330e38c0d4cdbbfea2c5ce75053925 (diff) | |
parent | fb9b695f9a366f662b5262f440d77c770b131d0d (diff) |
Merge branch 'master' into link
Diffstat (limited to 'include/overworld.h')
-rw-r--r-- | include/overworld.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/overworld.h b/include/overworld.h index 92b0f6001..f2ef24e9e 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -49,7 +49,7 @@ void IncrementGameStat(u8 index); void Overworld_SetMapObjTemplateCoords(u8, s16, s16); void Overworld_SetMapObjTemplateMovementType(u8, u8); -void Overworld_SetWarpDestination(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); +void SetWarpDestination(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void saved_warp2_set(int unused, s8 mapGroup, s8 mapNum, s8 warpId); void SetDynamicWarpWithCoords(int unused, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); @@ -137,6 +137,7 @@ u8 get_map_light_from_warp0(void); const struct MapHeader *warp1_get_mapheader(void); void sub_8055F88(void); void sub_8056788(void); +void ResetGameStats(void); void Overworld_CreditsMainCB(void); bool32 Overworld_DoScrollSceneForCredits(u8 *, const struct CreditsOverworldCmd *, u8); |