diff options
author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-16 17:00:57 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-16 17:00:57 -0400 |
commit | d44c7c305c3f94b59e3e2c008408779836a0020a (patch) | |
tree | 2cdc51be4a22992701038b959d6c964e9ee8fc58 /scripts/LancesRoom.asm | |
parent | b9a113a9f4712771e37313a4c8a76f7ef23cebb2 (diff) | |
parent | 7306c1dc2dca5666a5276a6758d1a64e1ddeae20 (diff) |
Merge pull request #277 from Rangi42/master
Miscellaneous constant and label updates
Diffstat (limited to 'scripts/LancesRoom.asm')
-rwxr-xr-x | scripts/LancesRoom.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/scripts/LancesRoom.asm b/scripts/LancesRoom.asm index e1b9a1f2..5c7301ef 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,11 +110,11 @@ 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] |