diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-09-25 13:49:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-25 13:49:16 -0400 |
| commit | 0e217e22d8fa3e075416cb332435c3756548357e (patch) | |
| tree | 59ef21892a02c9d266f5cac36872458bdbe0de61 /include/overworld.h | |
| parent | 2599dac8ac8c12268fca902910bfe1aab40a68ca (diff) | |
| parent | 6539884c8850aca6c2057017dba9c3d78ca15784 (diff) | |
Merge branch 'master' into battle
Diffstat (limited to 'include/overworld.h')
| -rw-r--r-- | include/overworld.h | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/include/overworld.h b/include/overworld.h index 8f15f5a85..8c5dde2b0 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -1,5 +1,5 @@ -#ifndef GUARD_ROM4_H -#define GUARD_ROM4_H +#ifndef GUARD_OVERWORLD_H +#define GUARD_OVERWORLD_H #include "global.h" #include "main.h" @@ -23,6 +23,18 @@ struct UCoords32 u32 x, y; }; +struct CreditsOverworldCmd +{ + s16 unk_0; + u16 unk_2; + u16 unk_4; +}; + +/* gDisableMapMusicChangeOnMapLoad */ +#define MUSIC_DISABLE_OFF 0 +#define MUSIC_DISABLE_STOP 1 +#define MUSIC_DISABLE_KEEP 2 + extern struct UCoords32 gDirectionToVectors[]; extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4]; @@ -98,7 +110,7 @@ void sub_8055D40(u16 mapDataId); void CleanupOverworldWindowsAndTilemaps(void); u32 sub_8054C04(void); -extern u8 gUnknown_2031DD8; +extern u8 gDisableMapMusicChangeOnMapLoad; extern u8 gUnknown_2036E28; extern void (*gFieldCallback)(void); @@ -121,4 +133,7 @@ void Overworld_ResetStateAfterDigEscRope(void); bool32 sub_8058244(void); u8 GetCurrentMapType(void); -#endif //GUARD_ROM4_H +void Overworld_CreditsMainCB(void); +bool32 Overworld_DoScrollSceneForCredits(u8 *, const struct CreditsOverworldCmd *, u8); + +#endif //GUARD_OVERWORLD_H |