diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-11-24 08:44:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-24 08:44:21 -0500 |
| commit | bb8c712f75e6ed5ec66b2ee94c6da1157693c284 (patch) | |
| tree | dc8d135873f6a7cc8ca1fad8bb5d1a7a84e4b0f7 /include/overworld.h | |
| parent | 2177f1f40b4dda2091ac3be3522c1bc4f6690e88 (diff) | |
| parent | 2b2dfa7e49a0d28983a4e516ca44aee8cb7c66bb (diff) | |
Merge pull request #160 from jiangzhengwenjz/party_menu
party_menu
Diffstat (limited to 'include/overworld.h')
| -rw-r--r-- | include/overworld.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/overworld.h b/include/overworld.h index 36c890eb5..ab20d9ff0 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -72,7 +72,7 @@ void Overworld_ChangeMusicTo(u16); bool32 IsUpdateLinkStateCBActive(void); void strange_npc_table_clear(void); -const struct MapHeader *get_mapheader_by_bank_and_number(u16, u16); +const struct MapHeader *Overworld_GetMapHeaderByGroupAndId(u16, u16); void FieldObjectMoveDestCoords(struct MapObject *, u32, s16 *, s16 *); void sub_8086230(void); void CB2_ReturnToField(void); @@ -140,7 +140,7 @@ bool32 Overworld_DoScrollSceneForCredits(u8 *, const struct CreditsOverworldCmd bool32 sub_8058318(void); -void CB2_ReturnToStartMenu(void); +void CB2_ReturnToFieldWithOpenMenu(void); void CB2_WhiteOut(void); void c2_8056854(void); void sub_8054F38(u32 newKey); |