diff options
| -rw-r--r-- | data/layouts/layouts.json | 2 | ||||
| -rw-r--r-- | data/maps/SevenIsland_SevaultCanyon/map.json | 2 | ||||
| -rw-r--r-- | data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json | 4 | ||||
| -rw-r--r-- | data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc | 2 | ||||
| -rw-r--r-- | include/constants/flags.h | 2 | ||||
| -rw-r--r-- | include/constants/layouts.h | 2 | ||||
| -rw-r--r-- | include/constants/map_groups.h | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index 7d49dc48f..fbeee8c39 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -3884,7 +3884,7 @@ "blockdata_filepath": "data/layouts/SixIsland_AlteringCave/map.bin" }, { - "id": "LAYOUT_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY", + "id": "LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY", "name": "SevenIsland_SevaultCanyon_TanobyKey_Layout", "width": 15, "height": 16, diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index ecc28a62d..cf4f14540 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -290,7 +290,7 @@ "x": 7, "y": 17, "elevation": 5, - "dest_map": "MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY", + "dest_map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY", "dest_warp_id": 0 }, { diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json index d5735302c..4f492d72d 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY", + "id": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY", "name": "SevenIsland_SevaultCanyon_TanobyKey", - "layout": "LAYOUT_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY", + "layout": "LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY", "music": "MUS_NANAISEKI", "region_map_section": "MAPSEC_TANOBY_KEY", "requires_flash": false, diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc index ce843d9e4..442e13942 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc @@ -3,7 +3,7 @@ SevenIsland_SevaultCanyon_TanobyKey_MapScripts:: @ 8164DCC .byte 0 SevenIsland_SevaultCanyon_TanobyKey_MapScript1_164DD2:: @ 8164DD2 - setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY + setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY checkflag FLAG_SYS_UNLOCKED_TANOBY_RUINS call_if TRUE, EventScript_164E07 setvar VAR_0x4001, 0 diff --git a/include/constants/flags.h b/include/constants/flags.h index 994221afd..0719371d8 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1422,7 +1422,7 @@ #define FLAG_WORLD_MAP_SIX_ISLAND_ALTERING_CAVE (SYS_FLAGS + 0xBE) #define FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER (SYS_FLAGS + 0xBF) #define FLAG_WORLD_MAP_THREE_ISLAND_DUNSPARCE_TUNNEL (SYS_FLAGS + 0xC0) -#define FLAG_WORLD_MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY (SYS_FLAGS + 0xC1) +#define FLAG_WORLD_MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY (SYS_FLAGS + 0xC1) #define FLAG_WORLD_MAP_BIRTH_ISLAND_EXTERIOR (SYS_FLAGS + 0xC2) #define FLAG_0x8D5 (SYS_FLAGS + 0xD5) diff --git a/include/constants/layouts.h b/include/constants/layouts.h index 3d17cd441..24cdcec13 100644 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -323,7 +323,7 @@ #define LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER 338 #define LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_SCUFIB_CHAMBER 339 #define LAYOUT_SIX_ISLAND_ALTERING_CAVE 340 -#define LAYOUT_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY 341 +#define LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY 341 #define LAYOUT_BIRTH_ISLAND_EXTERIOR 342 #define LAYOUT_NAVEL_ROCK_EXTERIOR 343 #define LAYOUT_NAVEL_ROCK_1F 344 diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index 44fa03eda..1cf5a4e94 100644 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -169,7 +169,7 @@ #define MAP_SEVEN_ISLAND_TANOBY_RUINS_RIXY_CHAMBER (32 | (2 << 8)) #define MAP_SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER (33 | (2 << 8)) #define MAP_THREE_ISLAND_DUNSPARCE_TUNNEL (34 | (2 << 8)) -#define MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY (35 | (2 << 8)) +#define MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY (35 | (2 << 8)) #define MAP_NAVEL_ROCK_1F (36 | (2 << 8)) #define MAP_NAVEL_ROCK_SUMMIT (37 | (2 << 8)) #define MAP_NAVEL_ROCK_BASE (38 | (2 << 8)) |