summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2020-02-28 15:19:50 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2020-02-28 15:19:50 -0500
commit0c492c087eca215e7dd29a90b8a3e9232ffe3bf6 (patch)
treed67a1d8ad00648e501ba82e7db8527d73899bbca /include
parent410aaa00ff6bb8d0e9dae755b60e216be24b9660 (diff)
Show Mon field effect
Diffstat (limited to 'include')
-rw-r--r--include/global.fieldmap.h9
-rw-r--r--include/overworld.h1
2 files changed, 8 insertions, 2 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index aa1bb43ee..c1a4e775e 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -4,6 +4,13 @@
#define OBJECT_EVENTS_COUNT 16
#define METATILE_COLLISION_MASK 0x0C00
+#define METATILE_ID_MASK 0x03FF
+#define METATILE_ID_UNDEFINED 0x03FF
+#define METATILE_ELEVATION_SHIFT 12
+#define METATILE_COLLISION_SHIFT 10
+#define METATILE_ELEVATION_MASK 0xF000
+
+#define METATILE_ID(tileset, name) (METATILE_##tileset##_##name)
enum
{
@@ -17,8 +24,6 @@ enum
typedef void (*TilesetCB)(void);
-#define METATILE_ID(tileset, name) (METATILE_##tileset##_##name)
-
struct Tileset
{
/*0x00*/ bool8 isCompressed;
diff --git a/include/overworld.h b/include/overworld.h
index 51e94fe63..3b7fd7bc1 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -84,6 +84,7 @@ void sub_8084E80(s8, s8, s8, s8, s8);
void sub_8084EBC(s16, s16);
void sub_80555E0(void);
void copy_saved_warp3_bank_and_enter_x_to_warp1(void);
+u8 IsMapTypeOutdoors(u8 mapType);
void player_avatar_init_params_reset(void);