diff options
| author | chaos-lord <dd4791.mariokarter@hotmail.co.uk> | 2017-07-11 18:46:53 +0100 |
|---|---|---|
| committer | chaos-lord <dd4791.mariokarter@hotmail.co.uk> | 2017-07-11 18:46:53 +0100 |
| commit | cfb351f0729f832aa0cc90594d0e3cdececbe082 (patch) | |
| tree | 1cdd3c69e72a9322801a671438b0dc3ef4147d39 /engine | |
| parent | 8ab77c0d8e08664717914a390010e202877c3147 (diff) | |
more travel changes
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/pinball_game/map_move.asm | 28 | ||||
| -rw-r--r-- | engine/pinball_game/object_collision/red_stage_resolve_collision.asm | 16 |
2 files changed, 22 insertions, 22 deletions
diff --git a/engine/pinball_game/map_move.asm b/engine/pinball_game/map_move.asm index ebd26e1..4c27b29 100755 --- a/engine/pinball_game/map_move.asm +++ b/engine/pinball_game/map_move.asm @@ -430,15 +430,15 @@ Func_314ae: ; 0x314ae ld a, [wd54c]
jr z, .asm_314d0
cp $1
- jp z, Func_31591
+ jp z, OpenRedMapMoveSlotFromLeft
cp $3
- jp z, Func_31591
+ jp z, OpenRedMapMoveSlotFromLeft
cp $2
- jp z, Func_315b3
+ jp z, OpenRedMapMoveSlotFromRight
cp $5
- jp z, Func_315b3
+ jp z, OpenRedMapMoveSlotFromRight
cp $d
- jp z, Func_315d5
+ jp z, ResolveSucsessfulRedMapMove
.asm_314d0
cp $0
jr z, .asm_314d6
@@ -515,13 +515,13 @@ UpdateMapMove_RedField: ; 0x3151f handle map move timer and fail when it expires call LoadScrollingText
ret
-Func_31591: ; 0x31591
+OpenRedMapMoveSlotFromLeft: ; 0x31591
ld a, [wMapMoveDirection]
and a
- jr nz, .asm_315b1
+ jr nz, .NotApplicibleOrCompleted
ld a, [wIndicatorStates]
and a
- jr z, .asm_315b1
+ jr z, .NotApplicibleOrCompleted
xor a
ld [wIndicatorStates], a
ld [wIndicatorStates + 2], a
@@ -530,17 +530,17 @@ Func_31591: ; 0x31591 ld a, $1
ld [wSlotIsOpen], a
ld [wd54d], a
-.asm_315b1
+.NotApplicibleOrCompleted
scf
ret
-Func_315b3: ; 0x315b3
+OpenRedMapMoveSlotFromRight: ; 0x315b3
ld a, [wMapMoveDirection]
and a
- jr z, .asm_315d3
+ jr z, .NotApplicibleOrCompleted
ld a, [wIndicatorStates + 1]
and a
- jr z, .asm_315d3
+ jr z, .NotApplicibleOrCompleted
xor a
ld [wIndicatorStates + 1], a
ld [wIndicatorStates + 3], a
@@ -549,11 +549,11 @@ Func_315b3: ; 0x315b3 ld a, $1
ld [wSlotIsOpen], a
ld [wd54d], a
-.asm_315d3
+.NotApplicibleOrCompleted
scf
ret
-Func_315d5: ; 0x315d5
+ResolveSucsessfulRedMapMove: ; 0x315d5
ld de, $0000
call PlaySong
rst AdvanceFrame
diff --git a/engine/pinball_game/object_collision/red_stage_resolve_collision.asm b/engine/pinball_game/object_collision/red_stage_resolve_collision.asm index 6679037..df0118b 100644 --- a/engine/pinball_game/object_collision/red_stage_resolve_collision.asm +++ b/engine/pinball_game/object_collision/red_stage_resolve_collision.asm @@ -224,31 +224,31 @@ ResolveWildMonCollision_RedField: ; 0x14795 ResolveDiglettCollision: ; 0x147aa
ld a, [wWhichDiglett]
and a
- jp z, .asm_14834
+ jp z, .asm_14834 ;if no diglett hit (runs every frame when above a certain line on bottom boards, jump
xor a
ld [wWhichDiglett], a
ld a, [wWhichDiglettId]
sub $1
sla a
- ld c, a
+ ld c, a ;-1 then * 2
ld b, $0
- ld hl, wLeftMapMoveCounter
+ ld hl, wLeftMapMoveCounter ;select approprioate map move counter
add hl, bc
ld a, [hl]
cp $3
- jr z, .asm_14834
+ jr z, .asm_14834 ;if counter is set to 3, jump
inc a
- ld [hld], a
- ld [hl], $50
+ ld [hld], a ;oherwise, add 1 to the counter
+ ld [hl], $50 ;and set the animation of that diglett
ld hl, wLeftMapMoveCounterFramesUntilDecrease
add hl, bc
- ld a, MAP_MOVE_FRAMES_COUNTER & $ff
+ ld a, MAP_MOVE_FRAMES_COUNTER & $ff ;load in time until digletts decay
ld [hli], a
ld a, MAP_MOVE_FRAMES_COUNTER >> 8
ld [hl], a
ld a, c
and a
- jr z, .asm_14807
+ jr z, .asm_14807 ;if left diglett, jump
ld a, $6a
ld [wStageCollisionMap + $f0], a
ld a, $6b
|