summaryrefslogtreecommitdiff
path: root/include/overworld.h
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-06-19 19:58:56 -0400
committerGriffinR <griffin.g.richards@gmail.com>2020-06-23 15:48:53 -0400
commit18d57a38021a7fee9d8f2131f776946d81c83fbe (patch)
tree6ec3be0259f311b58eb4788e237b9938c5b83e4b /include/overworld.h
parent46f4a4bbf7239743c333cd32d30b74a7b3176acc (diff)
Document some overworld and field effects
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 78a5b4ad0..a2eac7e29 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -24,6 +24,8 @@
#define MOVEMENT_MODE_FROZEN 1
#define MOVEMENT_MODE_SCRIPTED 2
+#define SKIP_OBJECT_EVENT_LOAD 1
+
struct InitialPlayerAvatarState
{
u8 transitionFlags;
@@ -99,8 +101,7 @@ void SetDefaultFlashLevel(void);
void Overworld_SetFlashLevel(s32 flashLevel);
u8 Overworld_GetFlashLevel(void);
void SetCurrentMapLayout(u16 mapLayoutId);
-void sub_8085540(u8 var);
-u8 sub_808554C(void);
+void SetObjectEventLoadFlag(u8 var);
u16 GetLocationMusic(struct WarpData *warp);
u16 GetCurrLocationDefaultMusic(void);
u16 GetWarpDestinationMusic(void);
@@ -135,11 +136,9 @@ void SetUnusedCallback(void *a0);
void CB2_NewGame(void);
void CB2_WhiteOut(void);
void CB2_LoadMap(void);
-void sub_8086024(void);
+void CB2_ReturnToFieldContestHall(void);
void CB2_ReturnToFieldCableClub(void);
void CB2_ReturnToField(void);
-void CB2_ReturnToFieldLocal(void);
-void CB2_ReturnToFieldLink(void);
void CB2_ReturnToFieldFromMultiplayer(void);
void CB2_ReturnToFieldWithOpenMenu(void);
void CB2_ReturnToFieldContinueScript(void);