From 76b882d9523915ca8ced96e8c5e889ca2728241e Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 16 Jul 2020 12:32:19 -0400 Subject: Reformat map scripts' coordinate and movement data 'dbmapcoord' has X, Y order like other coordinate-related data macros --- scripts/Route23.asm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'scripts/Route23.asm') diff --git a/scripts/Route23.asm b/scripts/Route23.asm index fbcc2f8b..e5318862 100755 --- a/scripts/Route23.asm +++ b/scripts/Route23.asm @@ -32,16 +32,16 @@ Route23Script0: EventFlagBit c, EVENT_PASSED_EARTHBADGE_CHECK + 1, EVENT_PASSED_CASCADEBADGE_CHECK .asm_51224 ld a, [hli] - cp $ff + cp -1 ret z inc e dec c cp b jr nz, .asm_51224 - cp $23 + cp 35 jr nz, .asm_51237 ld a, [wXCoord] - cp $e + cp 14 ret nc .asm_51237 ld a, e @@ -61,8 +61,14 @@ Route23Script0: ret YCoordsData_51255: - db $23,$38,$55,$60,$69,$77,$88 - db $FF + db 35 + db 56 + db 85 + db 96 + db 105 + db 119 + db 136 + db -1 ; end Route23Script_5125d: ld hl, BadgeTextPointers -- cgit v1.2.3