diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-09 10:13:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-09 10:13:55 -0400 |
| commit | c40d7241ff2d2c0220550339b27a2725aac856fe (patch) | |
| tree | 05e2c9607d600aa3d36c9d3c8a3b2ca172b66a4c /include/overworld.h | |
| parent | ac38e814546eca637ea4bafe8792b8d38ff486a3 (diff) | |
| parent | 02aed8fc8e2496cc62873fc52de54c89f0b9ac83 (diff) | |
Merge pull request #294 from PikalaxALT/fldeff_flash
fldeff_flash.c
Diffstat (limited to 'include/overworld.h')
| -rw-r--r-- | include/overworld.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/overworld.h b/include/overworld.h index daaa5e6e8..02492f74b 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -157,7 +157,7 @@ void Overworld_ResetStateAfterDigEscRope(void); bool32 sub_8058244(void); u8 GetCurrentMapType(void); -u8 get_map_light_from_warp0(void); +u8 GetLastUsedWarpMapType(void); const struct MapHeader *warp1_get_mapheader(void); void TryFadeOutOldMapMusic(void); void CB2_ReturnToFieldCableClub(void); @@ -192,6 +192,7 @@ void sub_8057F48(void); void SetMainCallback1(MainCallback cb); void CB1_Overworld(void); void sub_80568C4(void); +u8 GetLastUsedWarpMapSectionId(void); extern u16 gHeldKeyCodeToSend; |