summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main.asm16
-rw-r--r--wram.asm16
2 files changed, 16 insertions, 16 deletions
diff --git a/main.asm b/main.asm
index d75d984df..71ee950bf 100644
--- a/main.asm
+++ b/main.asm
@@ -16821,9 +16821,9 @@ EnterWestConnection: ; 1045ed
ld [MapGroup], a
ld a, [WestConnectedMapNumber]
ld [MapNumber], a
- ld a, [WestConnectionStripYOffset]
- ld [XCoord], a
ld a, [WestConnectionStripXOffset]
+ ld [XCoord], a
+ ld a, [WestConnectionStripYOffset]
ld hl, YCoord
add [hl]
ld [hl], a
@@ -16858,9 +16858,9 @@ EnterEastConnection: ; 104629
ld [MapGroup], a
ld a, [EastConnectedMapNumber]
ld [MapNumber], a
- ld a, [EastConnectionStripYOffset]
- ld [XCoord], a
ld a, [EastConnectionStripXOffset]
+ ld [XCoord], a
+ ld a, [EastConnectionStripYOffset]
ld hl, YCoord
add [hl]
ld [hl], a
@@ -16895,9 +16895,9 @@ EnterNorthConnection: ; 104665
ld [MapGroup], a
ld a, [NorthConnectedMapNumber]
ld [MapNumber], a
- ld a, [NorthConnectionStripXOffset]
- ld [YCoord], a
ld a, [NorthConnectionStripYOffset]
+ ld [YCoord], a
+ ld a, [NorthConnectionStripXOffset]
ld hl, XCoord
add [hl]
ld [hl], a
@@ -16922,9 +16922,9 @@ EnterSouthConnection: ; 104696
ld [MapGroup], a
ld a, [SouthConnectedMapNumber]
ld [MapNumber], a
- ld a, [SouthConnectionStripXOffset]
- ld [YCoord], a
ld a, [SouthConnectionStripYOffset]
+ ld [YCoord], a
+ ld a, [SouthConnectionStripXOffset]
ld hl, XCoord
add [hl]
ld [hl], a
diff --git a/wram.asm b/wram.asm
index 1cc6c0c8d..7b8a82abf 100644
--- a/wram.asm
+++ b/wram.asm
@@ -1048,9 +1048,9 @@ NorthConnectionStripLength: ; d1af
ds 1
NorthConnectedMapWidth: ; d1b0
ds 1
-NorthConnectionStripXOffset: ; d1b1
+NorthConnectionStripYOffset: ; d1b1
ds 1
-NorthConnectionStripYOffset: ; d1b2
+NorthConnectionStripXOffset: ; d1b2
ds 1
NorthConnectionWindow: ; d1b3
ds 2
@@ -1068,9 +1068,9 @@ SouthConnectionStripLength: ; d1bb
ds 1
SouthConnectedMapWidth: ; d1bc
ds 1
-SouthConnectionStripXOffset: ; d1bd
+SouthConnectionStripYOffset: ; d1bd
ds 1
-SouthConnectionStripYOffset: ; d1be
+SouthConnectionStripXOffset: ; d1be
ds 1
SouthConnectionWindow: ; d1bf
ds 2
@@ -1088,9 +1088,9 @@ WestConnectionStripLength: ; d1c7
ds 1
WestConnectedMapWidth: ; d1c8
ds 1
-WestConnectionStripXOffset: ; d1c9
+WestConnectionStripYOffset: ; d1c9
ds 1
-WestConnectionStripYOffset: ; d1ca
+WestConnectionStripXOffset: ; d1ca
ds 1
WestConnectionWindow: ; d1cb
ds 2
@@ -1108,9 +1108,9 @@ EastConnectionStripLength: ; d1d3
ds 1
EastConnectedMapWidth: ; d1d4
ds 1
-EastConnectionStripXOffset: ; d1d5
+EastConnectionStripYOffset: ; d1d5
ds 1
-EastConnectionStripYOffset: ; d1d6
+EastConnectionStripXOffset: ; d1d6
ds 1
EastConnectionWindow: ; d1d7
ds 2