From fbd00ab00dfc77396f0201f5fbdd2a1c8d3dd8b8 Mon Sep 17 00:00:00 2001 From: garak Date: Sat, 2 Mar 2019 17:29:35 -0500 Subject: swap SaffronCity map names --- data/connections.s | 8 ++++---- data/maps/groups.inc | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'data') diff --git a/data/connections.s b/data/connections.s index ff011533d..3e1b03999 100644 --- a/data/connections.s +++ b/data/connections.s @@ -187,14 +187,14 @@ gUnknown_8352A54:: @ 8352A54 gUnknown_8352A5C:: @ 8352A5C connection up, 0, MAP_CERULEANCITY - connection down, 0, MAP_SAFFRONCITY_DUPLICATE + connection down, 0, MAP_SAFFRONCITY gUnknown_8352A74:: @ 8352A74 .4byte 2 .4byte gUnknown_8352A5C gUnknown_8352A7C:: @ 8352A7C - connection up, 0, MAP_SAFFRONCITY_DUPLICATE + connection up, 0, MAP_SAFFRONCITY connection down, -12, MAP_VERMILIONCITY gUnknown_8352A94:: @ 8352A94 @@ -203,14 +203,14 @@ gUnknown_8352A94:: @ 8352A94 gUnknown_8352A9C:: @ 8352A9C connection left, -10, MAP_CELADONCITY - connection right, -10, MAP_SAFFRONCITY_DUPLICATE + connection right, -10, MAP_SAFFRONCITY gUnknown_8352AB4:: @ 8352AB4 .4byte 2 .4byte gUnknown_8352A9C gUnknown_8352ABC:: @ 8352ABC - connection left, -10, MAP_SAFFRONCITY_DUPLICATE + connection left, -10, MAP_SAFFRONCITY connection right, 0, MAP_LAVENDERTOWN gUnknown_8352AD4:: @ 8352AD4 diff --git a/data/maps/groups.inc b/data/maps/groups.inc index c21c970af..4785ec2b7 100644 --- a/data/maps/groups.inc +++ b/data/maps/groups.inc @@ -592,10 +592,10 @@ CinnabarIsland:: @ 83506F8 IndigoPlateau_Exterior:: @ 8350714 .incbin "baserom.gba", 0x350714, 0x1C -SaffronCity:: @ 8350730 +SaffronCity_Duplicate:: @ 8350730 .incbin "baserom.gba", 0x350730, 0x1C -SaffronCity_Duplicate:: @ 835074C +SaffronCity:: @ 835074C .incbin "baserom.gba", 0x35074C, 0x1C OneIsland:: @ 8350768 @@ -1478,8 +1478,8 @@ gMapGroup_03:: @ 83522F4 .4byte FuchsiaCity .4byte CinnabarIsland .4byte IndigoPlateau_Exterior - .4byte SaffronCity .4byte SaffronCity_Duplicate + .4byte SaffronCity .4byte OneIsland .4byte TwoIsland .4byte ThreeIsland -- cgit v1.2.3