diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-05-11 09:25:26 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-05-11 09:25:26 -0400 |
| commit | 4488bbe9e69a8551cb5bb34e70b8ffb9d8e554db (patch) | |
| tree | d9c5a70fd1c4f42dc29f43becd142cc89456f19d /include/overworld.h | |
| parent | c15b50ac686632130512de37d01037bff6e10cd2 (diff) | |
| parent | 3e93615e38842643b8dd115c1fd2e0b4a0dbcd01 (diff) | |
Merge branch 'master' into contest
Diffstat (limited to 'include/overworld.h')
| -rw-r--r-- | include/overworld.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/overworld.h b/include/overworld.h index 59d4d6a30..15d7bb362 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -23,6 +23,8 @@ extern u16 *gBGTilemapBuffers1; extern u16 *gBGTilemapBuffers2; extern u16 *gBGTilemapBuffers3; +extern void (*gFieldCallback)(void); + // Exported ROM declarations extern const struct UCoords32 gUnknown_08339D64[]; @@ -101,7 +103,7 @@ u8 GetMapTypeByGroupAndId(s8 mapGroup, s8 mapNum); u8 GetMapTypeByWarpData(struct WarpData *warp); u8 Overworld_GetMapTypeOfSaveblockLocation(void); u8 get_map_light_from_warp0(void); -bool8 is_light_level_1_2_3_5_or_6(u8 mapType); +bool8 is_map_type_1_2_3_5_or_6(u8 mapType); bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType); bool8 Overworld_MapTypeIsIndoors(u8 mapType); u8 sav1_saved_warp2_map_get_name(void); |