summaryrefslogtreecommitdiff
path: root/include/overworld.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/overworld.h')
-rw-r--r--include/overworld.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/overworld.h b/include/overworld.h
index ac3d5283f..f03db2a3a 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -63,7 +63,7 @@ void strange_npc_table_clear(void);
const struct MapHeader *get_mapheader_by_bank_and_number(u16, u16);
void FieldObjectMoveDestCoords(struct MapObject *, u32, s16 *, s16 *);
void sub_8086230(void);
-void c2_exit_to_overworld_2_switch(void);
+void CB2_ReturnToField(void);
bool32 sub_8087598(void);
void c2_exit_to_overworld_1_continue_scripts_restart_music(void);
void warp_in(void);
@@ -84,19 +84,19 @@ void sub_805726C(void);
void sub_8057430(void);
void sub_8055DC4(void);
-u8 sav1_map_get_name(void);
+u8 GetCurrentRegionMapSectionId(void);
void SetCurrentMapLayout(u16 mapDataId);
void SetWarpDestinationToFixedHoleWarp(s16 x, s16 y);
void ResetInitialPlayerAvatarState(void);
void sub_8055D40(u16 mapDataId);
-void sub_80563F0(void);
+void CleanupOverworldWindowsAndTilemaps(void);
extern u8 gUnknown_2031DD8;
extern u8 gUnknown_2036E28;
-extern void (*gUnknown_3005020)(void);
+extern void (*gFieldCallback)(void);
extern bool8 (* gFieldCallback2)(void);
void SetLastHealLocationWarp(u8 healLocaionId);