Merge branch 'master' into quest_log

3 files changed, 237 insertions, 0 deletions

diff --git a/include/constants/flags.h b/include/constants/flags.h
index 04c20b2f2..ea2d7d8bc 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_CONSTANTS_FLAGS_H
 #define GUARD_CONSTANTS_FLAGS_H
 
+// TODO: Get correct names and numbers
+
 #define FLAG_0x001               0x1
 #define FLAG_0x002               0x2
 #define FLAG_0x003               0x3
diff --git a/include/constants/metatile_behaviors.h b/include/constants/metatile_behaviors.h
new file mode 100644
index 000000000..0ceeda33f
--- /dev/null
+++ b/include/constants/metatile_behaviors.h
@@ -0,0 +1,118 @@
+#ifndef GUARD_METATILE_BEHAVIORS
+#define GUARD_METATILE_BEHAVIORS
+
+#define METATILE_COUNT 0xF0
+#define MB_NORMAL 0x00
+#define MB_01 0x01
+#define MB_TALL_GRASS 0x02
+#define MB_CAVE 0x08
+#define MB_0A 0x0A
+#define MB_0B 0x0B
+#define MB_0C 0x0C
+#define MB_POND_WATER 0x10
+#define MB_SEMI_DEEP_WATER 0x11
+#define MB_DEEP_WATER 0x12
+#define MB_WATERFALL 0x13
+#define MB_SPLASHING_WATER 0x15
+#define MB_PUDDLE 0x16
+#define MB_WATERFALL_BOTTOM 0x17
+#define MB_19 0x19
+#define MB_1A 0x1A
+#define MB_1B 0x1B
+#define MB_STRENGTH_BUTTON 0x20
+#define MB_21 0x21
+#define MB_22 0x22
+#define MB_ICE 0x23
+#define MB_THIN_ICE 0x26
+#define MB_CRACKED_ICE 0x27
+#define MB_HOT_SPRINGS 0x28
+#define MB_ROCK_STAIRS 0x2A
+#define MB_SAND 0x2B
+#define MB_IMPASSABLE_EAST 0x30
+#define MB_IMPASSABLE_WEST 0x31
+#define MB_IMPASSABLE_NORTH 0x32
+#define MB_IMPASSABLE_SOUTH 0x33
+#define MB_IMPASSABLE_NORTHEAST 0x34
+#define MB_IMPASSABLE_NORTHWEST 0x35
+#define MB_IMPASSABLE_SOUTHEAST 0x36
+#define MB_IMPASSABLE_SOUTHWEST 0x37
+#define MB_JUMP_EAST 0x38
+#define MB_JUMP_WEST 0x39
+#define MB_JUMP_NORTH 0x3A
+#define MB_JUMP_SOUTH 0x3B
+#define MB_JUMP_SOUTHEAST 0x3E
+#define MB_JUMP_SOUTHWEST 0x3F
+#define MB_WALK_EAST 0x40
+#define MB_WALK_WEST 0x41
+#define MB_WALK_NORTH 0x42
+#define MB_WALK_SOUTH 0x43
+#define MB_SLIDE_EAST 0x44
+#define MB_SLIDE_WEST 0x45
+#define MB_SLIDE_NORTH 0x46
+#define MB_SLIDE_SOUTH 0x47
+#define MB_UNKNOWN_MOVEMENT_48 0x48
+#define MB_EASTWARD_CURRENT 0x50
+#define MB_WESTWARD_CURRENT 0x51
+#define MB_NORTHWARD_CURRENT 0x52
+#define MB_SOUTHWARD_CURRENT 0x53
+#define MB_SPIN_RIGHT 0x54
+#define MB_SPIN_LEFT 0x55
+#define MB_SPIN_UP 0x56
+#define MB_SPIN_DOWN 0x57
+#define MB_STOP_SPINNING 0x58
+#define MB_CAVE_DOOR 0x60
+#define MB_LADDER 0x61
+#define MB_EAST_ARROW_WARP 0x62
+#define MB_WEST_ARROW_WARP 0x63
+#define MB_NORTH_ARROW_WARP 0x64
+#define MB_SOUTH_ARROW_WARP 0x65
+#define MB_FALL_WARP 0x66
+#define MB_REGULAR_WARP 0x67
+#define MB_68 0x68
+#define MB_WARP_DOOR 0x69
+#define MB_UP_ESCALATOR 0x6A
+#define MB_DOWN_ESCALATOR 0x6B
+#define MB_UNKNOWN_WARP_6C 0x6C
+#define MB_UNKNOWN_WARP_6D 0x6D
+#define MB_UNKNOWN_WARP_6E 0x6E
+#define MB_UNKNOWN_WARP_6F 0x6F
+#define MB_UNION_ROOM_WARP 0x71
+#define MB_COUNTER 0x80
+#define MB_BOOKSHELF 0x81
+#define MB_POKEMART_SHELF 0x82
+#define MB_PC 0x83
+#define MB_SIGNPOST 0x84
+#define MB_REGION_MAP 0x85
+#define MB_TELEVISION 0x86
+#define MB_POKEMON_CENTER_SIGN 0x87
+#define MB_POKEMART_SIGN 0x88
+#define MB_CABINET 0x89
+#define MB_KITCHEN 0x8A
+#define MB_DRESSER 0x8B
+#define MB_SNACKS 0x8C
+#define MB_8D 0x8D
+#define MB_BATTLE_RECORDS 0x8E
+#define MB_QUESTIONNAIRE 0x8F
+#define MB_FOOD 0x90
+#define MB_INDIGO_PLATEAU_MARK_DPAD 0x91
+#define MB_INDIGO_PLATEAU_MARK_2_DPAD 0x92
+#define MB_BLUEPRINTS 0x93
+#define MB_PAINTING 0x94
+#define MB_POWER_PLANT_MACHINE 0x95
+#define MB_TELEPHONE 0x96
+#define MB_COMPUTER 0x97
+#define MB_ADVERTISING_POSTER 0x98
+#define MB_FOOD_SMELLS_TASTY 0x99
+#define MB_TRASH_BIN 0x9A
+#define MB_CUP 0x9B
+#define MB_PORTHOLE 0x9C
+#define MB_BLINKING_LIGHTS 0x9E
+#define MB_9F 0x9F
+#define MB_IMPRESSIVE_MACHINE 0xA0
+#define MB_VIDEO_GAME 0xA1
+#define MB_BURGLARY 0xA2
+#define MB_A3 0xA3
+#define MB_CYCLING_ROAD_PULL_DOWN 0xD0
+#define MB_CYCLING_ROAD_PULL_DOWN_GRASS 0xD1
+
+#endif // GUARD_METATILE_BEHAVIORS
diff --git a/include/constants/movement_commands.h b/include/constants/movement_commands.h
new file mode 100644
index 000000000..0451e16b7
--- /dev/null
+++ b/include/constants/movement_commands.h
@@ -0,0 +1,117 @@
+#ifndef GUARD_CONSTANTS_MOVEMENT_COMMANDS_H
+#define GUARD_CONSTANTS_MOVEMENT_COMMANDS_H
+
+enum
+{
+    step_00,
+    step_01,
+    step_02,
+    step_03,
+    slow_step_down,
+    slow_step_up,
+    slow_step_left,
+    slow_step_right,
+    step_down,
+    step_up,
+    step_left,
+    step_right,
+    fast_step_down,
+    fast_step_up,
+    fast_step_left,
+    fast_step_right,
+    step_10,
+    step_11,
+    step_12,
+    step_13,
+    step_14,
+    step_15,
+    step_16,
+    step_17,
+    step_18,
+    step_19,
+    step_1a,
+    step_1b,
+    step_1c,
+    step_1d,
+    step_1e,
+    step_1f,
+    step_20,
+    step_21,
+    step_22,
+    step_23,
+    step_24,
+    step_25,
+    step_26,
+    step_27,
+    step_28,
+    step_29,
+    step_2a,
+    step_2b,
+    step_2c,
+    step_2d,
+    step_2e,
+    step_2f,
+    step_30,
+    step_31,
+    step_32,
+    step_33,
+    step_34,
+    step_35,
+    step_36,
+    step_37,
+    step_38,
+    step_39,
+    step_3a,
+    step_3b,
+    step_3c,
+    step_3d,
+    step_3e,
+    step_3f,
+    step_40,
+    step_41,
+    step_42,
+    step_43,
+    step_44,
+    step_45,
+    step_46,
+    step_47,
+    step_48,
+    step_49,
+    step_4a,
+    step_4b,
+    step_4c,
+    step_4d,
+    step_4e,
+    step_4f,
+    step_50,
+    step_51,
+    step_52,
+    step_53,
+    step_54,
+    step_55,
+    step_56,
+    step_57,
+    step_58,
+    step_59,
+    step_5a,
+    step_5b,
+    step_5c,
+    step_5d,
+    step_5e,
+    step_5f,
+    step_60,
+    step_61,
+    step_62,
+    step_63,
+    step_64,
+    step_65,
+
+    step_91 = 0x91,
+    step_92,
+
+    step_96 = 0x96,
+
+    step_end = 0xfe,
+};
+
+#endif //GUARD_CONSTANTS_MOVEMENT_COMMANDS_H