diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-11-25 09:15:34 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-11-25 09:15:34 -0500 |
| commit | 10aa908f56599c155ecf70ccee6b07eea07fb643 (patch) | |
| tree | 0bec37a7083498f43dcf1124ceb0ce13c74ca420 /include/overworld.h | |
| parent | 0e3d574276db954994b0be24c61813b0b0e28c0c (diff) | |
| parent | 46773995020da0bc7984933f7f407ff30394596d (diff) | |
Merge branch 'dism_more_data' of github.com:PikalaxALT/pokefirered into dism_more_data
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); |