dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finish fixing SEAVAULT to SEVAULT

Browse Source
This commit is contained in:
PikalaxALT
2019-10-23 15:32:23 -04:00
parent 661e5d9221
commit f33f58eff7
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/layouts/layouts.json
+1 -1
View File
@@ -3884,7 +3884,7 @@
"blockdata_filepath": "data/layouts/SixIsland_AlteringCave/map.bin" "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", "name": "SevenIsland_SevaultCanyon_TanobyKey_Layout",
"width": 15, "width": 15,
"height": 16, "height": 16,
data/maps/SevenIsland_SevaultCanyon/map.json
+1 -1
View File
@@ -290,7 +290,7 @@
"x": 7, "x": 7,
"y": 17, "y": 17,
"elevation": 5, "elevation": 5,
"dest_map": "MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY", "dest_map": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY",
"dest_warp_id": 0 "dest_warp_id": 0
}, },
{ {
data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json
+2 -2
View File
@@ -1,7 +1,7 @@
{ {
"id": "MAP_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY", "id": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY",
"name": "SevenIsland_SevaultCanyon_TanobyKey", "name": "SevenIsland_SevaultCanyon_TanobyKey",
"layout": "LAYOUT_SEVEN_ISLAND_SEAVAULT_CANYON_TANOBY_KEY", "layout": "LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY",
"music": "MUS_NANAISEKI", "music": "MUS_NANAISEKI",
"region_map_section": "MAPSEC_TANOBY_KEY", "region_map_section": "MAPSEC_TANOBY_KEY",
"requires_flash": false, "requires_flash": false,
data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc
+1 -1
View File
@@ -3,7 +3,7 @@ SevenIsland_SevaultCanyon_TanobyKey_MapScripts:: @ 8164DCC
.byte 0 .byte 0
SevenIsland_SevaultCanyon_TanobyKey_MapScript1_164DD2:: @ 8164DD2 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 checkflag FLAG_SYS_UNLOCKED_TANOBY_RUINS
call_if TRUE, EventScript_164E07 call_if TRUE, EventScript_164E07
setvar VAR_0x4001, 0 setvar VAR_0x4001, 0
include/constants/flags.h
+1 -1
View File
@@ -1422,7 +1422,7 @@
#define FLAG_WORLD_MAP_SIX_ISLAND_ALTERING_CAVE (SYS_FLAGS + 0xBE) #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_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER (SYS_FLAGS + 0xBF)
#define FLAG_WORLD_MAP_THREE_ISLAND_DUNSPARCE_TUNNEL (SYS_FLAGS + 0xC0) #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_WORLD_MAP_BIRTH_ISLAND_EXTERIOR (SYS_FLAGS + 0xC2)
#define FLAG_0x8D5 (SYS_FLAGS + 0xD5) #define FLAG_0x8D5 (SYS_FLAGS + 0xD5)
include/constants/layouts.h
+1 -1
View File
@@ -323,7 +323,7 @@
#define LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER 338 #define LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER 338
#define LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_SCUFIB_CHAMBER 339 #define LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_SCUFIB_CHAMBER 339
#define LAYOUT_SIX_ISLAND_ALTERING_CAVE 340 #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_BIRTH_ISLAND_EXTERIOR 342
#define LAYOUT_NAVEL_ROCK_EXTERIOR 343 #define LAYOUT_NAVEL_ROCK_EXTERIOR 343
#define LAYOUT_NAVEL_ROCK_1F 344 #define LAYOUT_NAVEL_ROCK_1F 344
include/constants/map_groups.h
+1 -1
View File
@@ -169,7 +169,7 @@
#define MAP_SEVEN_ISLAND_TANOBY_RUINS_RIXY_CHAMBER (32 | (2 << 8)) #define MAP_SEVEN_ISLAND_TANOBY_RUINS_RIXY_CHAMBER (32 | (2 << 8))
#define MAP_SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER (33 | (2 << 8)) #define MAP_SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER (33 | (2 << 8))
#define MAP_THREE_ISLAND_DUNSPARCE_TUNNEL (34 | (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_1F (36 | (2 << 8))
#define MAP_NAVEL_ROCK_SUMMIT (37 | (2 << 8)) #define MAP_NAVEL_ROCK_SUMMIT (37 | (2 << 8))
#define MAP_NAVEL_ROCK_BASE (38 | (2 << 8)) #define MAP_NAVEL_ROCK_BASE (38 | (2 << 8))