summaryrefslogtreecommitdiff
path: root/include/overworld.h
diff options
context:
space:
mode:
authorjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-07-02 11:28:48 +0800
committerjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-07-07 01:46:05 +0800
commit40a808351a5b76b0a536c5fac6c9479284468af8 (patch)
tree859372f605e07b09299a58fe327634408d826715 /include/overworld.h
parent7980c4aa071685983f84861cc7dc69d6daf30a90 (diff)
finished safari_zone
Diffstat (limited to 'include/overworld.h')
-rw-r--r--include/overworld.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/overworld.h b/include/overworld.h
index bab4797ff..71625415a 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -69,8 +69,8 @@ void FieldObjectMoveDestCoords(struct MapObject *, u32, s16 *, s16 *);
void sub_8086230(void);
void CB2_ReturnToField(void);
bool32 sub_8087598(void);
-void c2_exit_to_overworld_1_continue_scripts_restart_music(void);
-void warp_in(void);
+void CB2_ReturnToFieldContinueScriptPlayMapMusic(void);
+void WarpIntoMap(void);
u8 get_map_light_level_by_bank_and_number(s8 mapGroup, s8 mapNum);
void sub_8086194(void);
void sub_8084CCC(u8 spawn);
@@ -110,7 +110,7 @@ bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType);
void Overworld_ResetStateAfterTeleport(void);
void Overworld_FadeOutMapMusic(void);
-void sub_805671C(void);
+void CB2_LoadMap(void);
bool8 sub_8055FC4(void);
bool8 is_light_level_8_or_9(u8 mapType);
bool32 sub_8055C9C(void);