Merge branch 'master' into doc-tilesets

include/constants/field_tasks.h

@@ -0,0 +1,13 @@
+#ifndef GUARD_CONSTANTS_FIELD_TASKS_H
+#define GUARD_CONSTANTS_FIELD_TASKS_H
+
+#define STEP_CB_DUMMY               0
+#define STEP_CB_ASH                 1 // Unused
+#define STEP_CB_FORTREE_BRIDGE      2 // Unused, dummied
+#define STEP_CB_PACIFIDLOG_BRIDGE   3 // Unused, dummied
+#define STEP_CB_ICE                 4
+#define STEP_CB_TRUCK               5 // Unused, dummied
+#define STEP_CB_SECRET_BASE         6 // Unused, dummied
+#define STEP_CB_CRACKED_FLOOR       7 // Unused
+
+#endif // GUARD_CONSTANTS_FIELD_TASKS_H

include/constants/layouts.h

@@ -301,7 +301,7 @@
 #define LAYOUT_ONE_ISLAND_POKEMON_CENTER_2F 316
 #define LAYOUT_SIX_ISLAND_PATTERN_BUSH 317
 #define LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL 318
-#define LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_2 319
+#define LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_DUG_OUT 319
 #define LAYOUT_FIVE_ISLAND_LOST_CAVE_ENTRANCE 320
 #define LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM1 321
 #define LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM2 322

include/constants/metatile_labels.h

@@ -117,6 +117,12 @@
 // gTileset_MtEmber
 #define METATILE_MtEmber_CaveEntrance  0x346
 
+// gTileset_Cave
+#define METATILE_Cave_Floor_Ledge_Top    0x2D1
+#define METATILE_Cave_Floor_Ledge_Bottom 0x2E1
+#define METATILE_Cave_RockBarrier_Top    0x307
+#define METATILE_Cave_RockBarrier_Bottom 0x317
+
 // gTileset_TrainerTower
 #define METATILE_TrainerTower_Floor_ShadeBottomLeft  0x287
 #define METATILE_TrainerTower_CounterBarrier         0x2B4

include/constants/weather.h

@@ -12,7 +12,7 @@
 #define WEATHER_SANDSTORM          8   // unused
 #define WEATHER_FOG_DIAGONAL       9   // unused
 #define WEATHER_UNDERWATER         10  // unused
-#define WEATHER_CLOUDY             11
+#define WEATHER_SHADE              11
 #define WEATHER_DROUGHT            12  // unused and broken in overworld
 #define WEATHER_DOWNPOUR           13  // unused
 #define WEATHER_UNDERWATER_BUBBLES 14  // unused