diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-02-16 12:14:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-16 12:14:55 -0500 |
| commit | 9addd6a6b6703f5d0810ce191a43869927cb9974 (patch) | |
| tree | e8c11ab9d7e1f9003d4c0749f42e730e65482ece /include/constants | |
| parent | 3b40ec23c7200a72b49c0cf0ede06e886a702aec (diff) | |
| parent | 533df93dc16c6af8666033711ce66b4d9a4afd64 (diff) | |
Merge pull request #248 from GriffinRichards/doc-caves
Document remaining cave scripts
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/field_tasks.h | 13 | ||||
| -rw-r--r-- | include/constants/layouts.h | 2 | ||||
| -rw-r--r-- | include/constants/metatile_labels.h | 6 | ||||
| -rw-r--r-- | include/constants/weather.h | 2 |
4 files changed, 21 insertions, 2 deletions
diff --git a/include/constants/field_tasks.h b/include/constants/field_tasks.h new file mode 100644 index 000000000..31edb6ffe --- /dev/null +++ b/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 diff --git a/include/constants/layouts.h b/include/constants/layouts.h index 5f9ae3107..29846f292 100644 --- a/include/constants/layouts.h +++ b/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 diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index 93c4ca6f1..cac87984d 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -117,6 +117,12 @@ // gTileset_82D504C. Below metatile probably needs generic name #define METATILE_MtEmber_CaveEntrance 0x346 +// gTileset_82D4BFC +#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 + // Trainer Tower #define METATILE_TrainerTower_Floor_ShadeBottomLeft 0x287 #define METATILE_TrainerTower_CounterBarrier 0x2B4 diff --git a/include/constants/weather.h b/include/constants/weather.h index a45d2e523..77be45c51 100644 --- a/include/constants/weather.h +++ b/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 |