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/LancesRoom.asm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'scripts/LancesRoom.asm') diff --git a/scripts/LancesRoom.asm b/scripts/LancesRoom.asm index e1b9a1f2..513ab9a8 100755 --- a/scripts/LancesRoom.asm +++ b/scripts/LancesRoom.asm @@ -78,12 +78,12 @@ LanceScript0: jp LanceShowOrHideEntranceBlocks LanceTriggerMovementCoords: - db $01,$05 - db $02,$06 - db $0B,$05 - db $0B,$06 - db $10,$18 - db $FF + dbmapcoord 5, 1 + dbmapcoord 6, 2 + dbmapcoord 5, 11 + dbmapcoord 6, 11 + dbmapcoord 24, 16 + db -1 ; end LanceScript2: call EndTrainerBattle @@ -110,15 +110,15 @@ WalkToLance: ret WalkToLance_RLEList: - db D_UP, $0C - db D_LEFT, $0C - db D_DOWN, $07 - db D_LEFT, $06 - db $FF + db D_UP, 12 + db D_LEFT, 12 + db D_DOWN, 7 + db D_LEFT, 6 + db -1 ; end LanceScript3: - ld a, [wSimulatedJoypadStatesIndex] - and a + ld a, [wSimulatedJoypadStatesIndex] + and a ret nz call Delay3 xor a -- cgit v1.2.3 From 84abdb0237caedebe9b7ec41e5fcc51775e87ca9 Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 16 Jul 2020 12:48:42 -0400 Subject: =?UTF-8?q?$ec=20=3D=20"=E2=96=B7"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/LancesRoom.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/LancesRoom.asm') diff --git a/scripts/LancesRoom.asm b/scripts/LancesRoom.asm index 513ab9a8..5c7301ef 100755 --- a/scripts/LancesRoom.asm +++ b/scripts/LancesRoom.asm @@ -117,8 +117,8 @@ WalkToLance_RLEList: db -1 ; end LanceScript3: - ld a, [wSimulatedJoypadStatesIndex] - and a + ld a, [wSimulatedJoypadStatesIndex] + and a ret nz call Delay3 xor a -- cgit v1.2.3