diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-09-25 13:49:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-25 13:49:34 -0400 |
| commit | 44f8d694ce5760fba5272936cfe3ab1fe48537a8 (patch) | |
| tree | 59ef21892a02c9d266f5cac36872458bdbe0de61 /include/overworld.h | |
| parent | 6539884c8850aca6c2057017dba9c3d78ca15784 (diff) | |
| parent | 0e217e22d8fa3e075416cb332435c3756548357e (diff) | |
Merge pull request #86 from jiangzhengwenjz/battle
battle
Diffstat (limited to 'include/overworld.h')
| -rw-r--r-- | include/overworld.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/overworld.h b/include/overworld.h index 472ebf544..8c5dde2b0 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -108,6 +108,7 @@ void SetWarpDestinationToFixedHoleWarp(s16 x, s16 y); void ResetInitialPlayerAvatarState(void); void sub_8055D40(u16 mapDataId); void CleanupOverworldWindowsAndTilemaps(void); +u32 sub_8054C04(void); extern u8 gDisableMapMusicChangeOnMapLoad; extern u8 gUnknown_2036E28; @@ -130,6 +131,7 @@ bool8 is_light_level_8_or_9(u8 mapType); bool32 sub_8055C9C(void); void Overworld_ResetStateAfterDigEscRope(void); bool32 sub_8058244(void); +u8 GetCurrentMapType(void); void Overworld_CreditsMainCB(void); bool32 Overworld_DoScrollSceneForCredits(u8 *, const struct CreditsOverworldCmd *, u8); |