diff --git a/ootw/ootw_c1_beast.s b/ootw/ootw_c1_beast.s index 56a5371a..ad1fd655 100644 --- a/ootw/ootw_c1_beast.s +++ b/ootw/ootw_c1_beast.s @@ -1,6 +1,8 @@ ;======================================= + ;======================================= ; Setup Beast Running -- for each room - ; + ;======================================= + ;======================================= ; FIXME: distance for count should be related ; to X distance behind on previous screen @@ -29,10 +31,13 @@ setup_beast_left: setup_no_beast: rts + ;======================================= ;======================================= ; Move Beast - ; - ; FIXME: stop at edge of screen, or at physicist + ;======================================= + ;======================================= + ; stop if catch physicist + ; also stop if swinging move_beast: lda BEAST_STATE @@ -53,23 +58,28 @@ move_beast_running: beq check_beast_left check_beast_right: - - clc - lda BEAST_X - adc #$80 - - cmp RIGHT_LIMIT - bcc beast_no_stop ; (blt==bcc) - bcs stop_beast + ; Bbbb^b + ; Pp^pp + ; if (B+6)==P + ; if B=P-6 + sec + lda PHYSICIST_X + sbc #$6 + cmp BEAST_X + bne beast_no_stop + beq beast_caught check_beast_left: + ; Pp^pp Bbbbbb + ; if B=p clc - lda BEAST_X - adc #$80 + lda PHYSICIST_X + adc #$2 + cmp BEAST_X - cmp LEFT_LIMIT - bcs beast_no_stop ; (bge==bcs) + bne beast_no_stop + beq beast_caught stop_beast: lda #B_STANDING @@ -96,6 +106,12 @@ b_run_left: b_no_move_run: rts + +beast_caught: + jmp beast_slash_cutscene + + + ;====================== ; standing diff --git a/ootw/ootw_c5.s b/ootw/ootw_c5.s index b5986a1b..fa31a53d 100644 --- a/ootw/ootw_c5.s +++ b/ootw/ootw_c5.s @@ -109,3 +109,6 @@ end_message: .include "ootw_graphics/sprites/physicist.inc" .include "ootw_graphics/sprites/alien.inc" + + +; "NOW GO BACK TO ANOTHER EARTH" diff --git a/ootw/ootw_graphics/l15final/battle.png b/ootw/ootw_graphics/l15final/battle.png new file mode 100644 index 00000000..3b9e418f Binary files /dev/null and b/ootw/ootw_graphics/l15final/battle.png differ diff --git a/ootw/ootw_graphics/l15final/grabbed.png b/ootw/ootw_graphics/l15final/grabbed.png new file mode 100644 index 00000000..9f6034ae Binary files /dev/null and b/ootw/ootw_graphics/l15final/grabbed.png differ