diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-14 10:41:27 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-14 10:46:04 -0400 |
| commit | b8fec3d9f617ec9a764bb56804c526ff7449631f (patch) | |
| tree | 2e84d0bf6107a15ebcb94a23c3158e2bc6382f6f /include/overworld.h | |
| parent | 9fe74ac590f75a0571de8ebcd499fdf892419328 (diff) | |
| parent | 8efae5c807bf6b27f5c90bfb0c5887dbde24f10d (diff) | |
Merge branch 'master' into trade
Diffstat (limited to 'include/overworld.h')
| -rw-r--r-- | include/overworld.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/overworld.h b/include/overworld.h index 77cacff94..38c213707 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -18,11 +18,6 @@ struct LinkPlayerMapObject u8 mode; }; -struct UCoords32 -{ - u32 x, y; -}; - struct CreditsOverworldCmd { s16 unk_0; @@ -43,6 +38,7 @@ extern MainCallback gFieldCallback; extern struct WarpData gUnknown_2031DBC; extern u8 gUnknown_2031DE0; +extern u8 gUnknown_300502C; void IncrementGameStat(u8 index); @@ -113,7 +109,6 @@ u32 sub_8054C04(void); extern u8 gDisableMapMusicChangeOnMapLoad; extern u8 gUnknown_2036E28; -extern void (*gFieldCallback)(void); extern bool8 (* gFieldCallback2)(void); void SetLastHealLocationWarp(u8 healLocaionId); @@ -144,4 +139,6 @@ bool32 Overworld_DoScrollSceneForCredits(u8 *, const struct CreditsOverworldCmd bool32 sub_8058318(void); +void CB2_ReturnToStartMenu(void); + #endif //GUARD_OVERWORLD_H |