diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2016-01-18 00:39:01 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2016-01-18 00:39:01 -0500 |
| commit | 8bf255b9f84f7e4f93e85a75512a002ef240a10f (patch) | |
| tree | 786ae5588f8bfe4b067cb3e91fd66cc4d95bd2da /engine/player_movement.asm | |
| parent | 7cc2571529d6b3f5ffcbb71c62fab31b27ba224a (diff) | |
Prepare to merge
Diffstat (limited to 'engine/player_movement.asm')
| -rwxr-xr-x | engine/player_movement.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engine/player_movement.asm b/engine/player_movement.asm index 0820bd11e..4bc4c483e 100755 --- a/engine/player_movement.asm +++ b/engine/player_movement.asm @@ -136,7 +136,7 @@ DoPlayerMovement:: ; 80000 jr z, .land2 cp $70 ; warps jr z, .warps - jr .asm_8013c + jr .no_walk .water ld a, c @@ -147,7 +147,7 @@ DoPlayerMovement:: ; 80000 add hl, bc ld a, [hl] ld [WalkingDirection], a - jr .asm_8013e + jr .continue_walk .water_table db RIGHT @@ -164,9 +164,9 @@ DoPlayerMovement:: ; 80000 add hl, bc ld a, [hl] cp STANDING - jr z, .asm_8013c + jr z, .no_walk ld [WalkingDirection], a - jr .asm_8013e + jr .continue_walk .land1_table db STANDING @@ -187,9 +187,9 @@ DoPlayerMovement:: ; 80000 add hl, bc ld a, [hl] cp STANDING - jr z, .asm_8013c + jr z, .no_walk ld [WalkingDirection], a - jr .asm_8013e + jr .continue_walk .land2_table db RIGHT @@ -210,18 +210,18 @@ DoPlayerMovement:: ; 80000 cp $7a ; stairs jr z, .down cp $7b ; cave - jr nz, .asm_8013c + jr nz, .no_walk .down ld a, DOWN ld [WalkingDirection], a - jr .asm_8013e + jr .continue_walk -.asm_8013c +.no_walk xor a ret -.asm_8013e +.continue_walk ld a, STEP_WALK call .DoStep ld a, 5 |