summaryrefslogtreecommitdiff
path: root/include/overworld.h
diff options
context:
space:
mode:
authorSlawter666 <38655737+Slawter666@users.noreply.github.com>2018-10-17 02:53:05 +0100
committerSlawter666 <38655737+Slawter666@users.noreply.github.com>2018-10-17 02:53:05 +0100
commitbb72dcf19dc13d07234b50fbaabb7e5f74f1ac63 (patch)
tree0d6daa2877725eebc49fcfdaf0b253fb72191a02 /include/overworld.h
parent9e3e6173760ebdbe58eda2986b9f21d31f774f16 (diff)
Further synchronisation
Diffstat (limited to 'include/overworld.h')
-rw-r--r--include/overworld.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/include/overworld.h b/include/overworld.h
index 3b193b685..d6e6d1ae5 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -113,8 +113,7 @@ bool32 is_c1_link_related_active(void);
// c1_overworld
// OverworldBasic
void CB2_OverworldBasic(void);
-void c2_overworld(void);
-// set_callback1
+// SetMainCallback1
// sub_80543DC
void CB2_NewGame(void);
void CB2_WhiteOut(void);
@@ -122,9 +121,9 @@ void CB2_LoadMap(void);
void CB2_LoadMap2(void);
void sub_8054534(void);
void sub_8054588(void);
-void c2_exit_to_overworld_2_switch(void);
-void c2_exit_to_overworld_2_local(void);
-void c2_exit_to_overworld_2_link(void);
+void CB2_ReturnToField(void);
+void CB2_ReturnToFieldLocal(void);
+void CB2_ReturnToFieldLink(void);
// sub_805465C
void c2_exit_to_overworld_1_sub_8080DEC(void);
// sub_80546B8