From eae373576ddb6893d500d4a4134538f480b0d322 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 28 Jan 2020 04:21:03 -0500 Subject: Document Victory Road scripts --- include/constants/metatile_labels.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include/constants') diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index 8726113f4..8b101b0f1 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -85,5 +85,10 @@ // 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 #endif // GUARD_METATILE_LABELS_H -- cgit v1.2.3 From 0ddd7ebb1d15a8dc03baaa7c581096eb295ac352 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 28 Jan 2020 14:26:18 -0500 Subject: Sync STEB_CB, WEATHER_SHADE --- include/constants/field_tasks.h | 13 +++++++++++++ include/constants/weather.h | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 include/constants/field_tasks.h (limited to 'include/constants') 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/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 -- cgit v1.2.3 From 30f01c7df68bb9cf80ece491a457c8ce96c52c83 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 28 Jan 2020 14:26:34 -0500 Subject: Document Sevii Island caves --- include/constants/layouts.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/constants') diff --git a/include/constants/layouts.h b/include/constants/layouts.h index 657d531e8..769378cfd 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 -- cgit v1.2.3