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

swap SaffronCity map names

Browse Source
This commit is contained in:
garak
2019-03-02 17:29:35 -05:00
parent a0dcf770bc
commit fbd00ab00d
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/connections.s
+4 -4
View File
@@ -187,14 +187,14 @@ gUnknown_8352A54:: @ 8352A54
gUnknown_8352A5C:: @ 8352A5C gUnknown_8352A5C:: @ 8352A5C
connection up, 0, MAP_CERULEANCITY connection up, 0, MAP_CERULEANCITY
connection down, 0, MAP_SAFFRONCITY_DUPLICATE connection down, 0, MAP_SAFFRONCITY
gUnknown_8352A74:: @ 8352A74 gUnknown_8352A74:: @ 8352A74
.4byte 2 .4byte 2
.4byte gUnknown_8352A5C .4byte gUnknown_8352A5C
gUnknown_8352A7C:: @ 8352A7C gUnknown_8352A7C:: @ 8352A7C
connection up, 0, MAP_SAFFRONCITY_DUPLICATE connection up, 0, MAP_SAFFRONCITY
connection down, -12, MAP_VERMILIONCITY connection down, -12, MAP_VERMILIONCITY
gUnknown_8352A94:: @ 8352A94 gUnknown_8352A94:: @ 8352A94
@@ -203,14 +203,14 @@ gUnknown_8352A94:: @ 8352A94
gUnknown_8352A9C:: @ 8352A9C gUnknown_8352A9C:: @ 8352A9C
connection left, -10, MAP_CELADONCITY connection left, -10, MAP_CELADONCITY
connection right, -10, MAP_SAFFRONCITY_DUPLICATE connection right, -10, MAP_SAFFRONCITY
gUnknown_8352AB4:: @ 8352AB4 gUnknown_8352AB4:: @ 8352AB4
.4byte 2 .4byte 2
.4byte gUnknown_8352A9C .4byte gUnknown_8352A9C
gUnknown_8352ABC:: @ 8352ABC gUnknown_8352ABC:: @ 8352ABC
connection left, -10, MAP_SAFFRONCITY_DUPLICATE connection left, -10, MAP_SAFFRONCITY
connection right, 0, MAP_LAVENDERTOWN connection right, 0, MAP_LAVENDERTOWN
gUnknown_8352AD4:: @ 8352AD4 gUnknown_8352AD4:: @ 8352AD4
data/maps/groups.inc
+3 -3
View File
@@ -592,10 +592,10 @@ CinnabarIsland:: @ 83506F8
IndigoPlateau_Exterior:: @ 8350714 IndigoPlateau_Exterior:: @ 8350714
.incbin "baserom.gba", 0x350714, 0x1C .incbin "baserom.gba", 0x350714, 0x1C
SaffronCity:: @ 8350730 SaffronCity_Duplicate:: @ 8350730
.incbin "baserom.gba", 0x350730, 0x1C .incbin "baserom.gba", 0x350730, 0x1C
SaffronCity_Duplicate:: @ 835074C SaffronCity:: @ 835074C
.incbin "baserom.gba", 0x35074C, 0x1C .incbin "baserom.gba", 0x35074C, 0x1C
OneIsland:: @ 8350768 OneIsland:: @ 8350768
@@ -1478,8 +1478,8 @@ gMapGroup_03:: @ 83522F4
.4byte FuchsiaCity .4byte FuchsiaCity
.4byte CinnabarIsland .4byte CinnabarIsland
.4byte IndigoPlateau_Exterior .4byte IndigoPlateau_Exterior
.4byte SaffronCity
.4byte SaffronCity_Duplicate .4byte SaffronCity_Duplicate
.4byte SaffronCity
.4byte OneIsland .4byte OneIsland
.4byte TwoIsland .4byte TwoIsland
.4byte ThreeIsland .4byte ThreeIsland
include/constants/map_groups.h
+2 -2
View File
@@ -206,8 +206,8 @@
#define MAP_FUCHSIACITY (7 | (3 << 8)) #define MAP_FUCHSIACITY (7 | (3 << 8))
#define MAP_CINNABARISLAND (8 | (3 << 8)) #define MAP_CINNABARISLAND (8 | (3 << 8))
#define MAP_INDIGOPLATEAU_EXTERIOR (9 | (3 << 8)) #define MAP_INDIGOPLATEAU_EXTERIOR (9 | (3 << 8))
#define MAP_SAFFRONCITY (10 | (3 << 8)) #define MAP_SAFFRONCITY_DUPLICATE (10 | (3 << 8))
#define MAP_SAFFRONCITY_DUPLICATE (11 | (3 << 8)) #define MAP_SAFFRONCITY (11 | (3 << 8))
#define MAP_ONEISLAND (12 | (3 << 8)) #define MAP_ONEISLAND (12 | (3 << 8))
#define MAP_TWOISLAND (13 | (3 << 8)) #define MAP_TWOISLAND (13 | (3 << 8))
#define MAP_THREEISLAND (14 | (3 << 8)) #define MAP_THREEISLAND (14 | (3 << 8))