From 3d6d400716d1865de59113a0e963fea52d7f3ebc Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Sat, 9 Mar 2019 16:42:14 -0500 Subject: [PATCH] ootw: add running sprites possibly broke walking --- ootw/TODO | 5 +- ootw/keyboard.s | 4 +- .../ootw_running-20190309-163912.piskel | 1 + .../ootw_walking-20190309-154332.piskel | 1 + ootw/sprites_physicist.inc | 413 +++++++++++++----- ootw/zp.inc | 5 + 6 files changed, 304 insertions(+), 125 deletions(-) create mode 100644 ootw/ootw_graphics/sprites/ootw_running-20190309-163912.piskel create mode 100644 ootw/ootw_graphics/sprites/ootw_walking-20190309-154332.piskel diff --git a/ootw/TODO b/ootw/TODO index f95e798e..c0bad601 100644 --- a/ootw/TODO +++ b/ootw/TODO @@ -1,7 +1,7 @@ TODO: intro: - there's still a bit of a pause when the elevator door finishes opening ++ there's still a bit of a pause when the elevator door finishes opening movement -- note these are hard due to limitations of the Apple II keyboard + ability to run @@ -21,10 +21,11 @@ sprites_to_draw: + physicist shot pool: -+ ++ bacground of beast moving off cavern: + slugs on ceiling drop ++ background of beast moving off underwater: + add arrival-underwater scene diff --git a/ootw/keyboard.s b/ootw/keyboard.s index 55471bb5..52f8d8c8 100644 --- a/ootw/keyboard.s +++ b/ootw/keyboard.s @@ -15,8 +15,8 @@ keypress: and #$7f ; clear high bit check_quit: - cmp #'Q' - beq quit +; cmp #'Q' +; beq quit cmp #27 bne check_left quit: diff --git a/ootw/ootw_graphics/sprites/ootw_running-20190309-163912.piskel b/ootw/ootw_graphics/sprites/ootw_running-20190309-163912.piskel new file mode 100644 index 00000000..ecd5f2f4 --- /dev/null +++ b/ootw/ootw_graphics/sprites/ootw_running-20190309-163912.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"ootw_running","description":"","fps":5,"height":48,"width":80,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":9,\"chunks\":[{\"layout\":[[0],[1],[2],[3],[4],[5],[6],[7],[8]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAtAAAAAwCAYAAAA4jE03AAAGOUlEQVR4nO3dsZHbOABAUc64BceuZGu4GhQ7dD0KPOM6LtoCTj24Boc3vGSp2QMFASBBEqCeZ37gXVICnyAtqKXl4fLX3+Pnxu9v4/j9bfz6z79Vu72P4+19rH67R98vP378+B19HPz48ePHb9/7HbYGnA4gbG/IreLHj1+/8ePHr9/48Tuy4fLjy3j58WXzM5Cp6c9RB1z7AeTHjx8/fvz48eP3Wn6zBfS9j6/XHmBrZyJrx8GPHz9+/Pjx48fvtfzul3BMZx5LAXMHMm139JlIrfjx49dv/Pjx6zd+/I5sCMGWXhNTupJv5Qxk7fj48ePXXvz48ePHj9+WftUW0KV33Dpgbvz48es3fvz49Rs/fkc2+xSOtYC5cL0BxsbLjx+/9uPHjx8/fvxq+u2+gO7l2pdhGMZhGJKg/Pjxay9+/Pjx48dvS7/kAjp8a3/twMKVfGtnIr+/Xcbf3y53wBQkP378+PHjx4/f0fHb1y95DfTazwlMvWW/1ZnO0kK4FCQ/fvz48ePHjx+/1/LbfAGdKryf8Pb3PkNpbQLy48ePHz9+/Pjxa8tvfgnHBBYcULjdVoBTse1TvwKoBV48Afnx48ePHz9+/Pi9hF/8GujggFoBXFopdBQs+Do/fvz48ePHjx+/1/JL/yPC8AB3Blx6RnG9Xsfr9VoMPJs4qfjx48ePHz9+/Pi9lF/8Eo7Y32sDRgYWfn8pYOk1O7EHNHsC8uPHjx8/fvz48Tu1nwW0CciPHz9+/Pjx48dv1QI6VgCZe01J6gBqA07bT4Clb+XPIGvFjx8/fvz48ePH7xR+ixfQn3s0gAk0PIAQOoQLwUsBQ7jFgOGDWuDBjx8/fvz48ePH77x+yxbQwY3nHNBsgOHtBgONAeae+YRv4ZdejD4bVwi5ZgLy48ePHz9+/Pjx69Yv/R+pZLYXYO6Bp85AYqDRcaUmID9+/Pjx48ePH7+X8DvdAnrtW/ivPgH58ePHjx8/fvz4PfdLfwpHrMgN5h5IbcDoAT/pIVzmcUad+PHjx48fP378+J3aL/0/Eaa+H7mDGGBY7P7u3//4+nQty9TsdoLxhNs/Anx4/7FyJyA/fvz48ePHjx+/U/utX0AnYGNgiwF/3sbx5y0N+LFddcC1Pvz48ePHjx8/fvy69lu+gM4sesaRgJ+BbACYBVcKy48fP378+PHjx+/UfrstoJPbpgAjcDHAcL/eJyA/fvz48ePHjx+/NvzyPwd6bWsHOgzjMAy77bd6AvLjx48fP378+PE7pV/xAjp2BlCjaVCPvpf71n3YszOQKmPmx48fP378+PHj16TfI8caY04uoGMHdx9I6ZnIwu4AsW0WTMBH+5c+QPz48avnF77gPX0HgZ/5x4/fCf2eLfz45ftNPz8eOlbwuy+gU2cBsx9kO8Ht9gReCnlSv+IFDL+HL3z8zL8j/bz+mX/mX39+oSO/ZX7ZC+iFfuUL6J3h1j6Bi18AI5DVJmDjfuFE41fnCcyPHz9+/Pgt8cteAPLb1W8IoWIr76MBh1+Xcfh1KQec9it9AocTK3Oi8ePHjx8/fvz48Tu3X3QBHe4Qnomk4Kdu7+N4ex/jD1DkfsL9JojUA10CuGbcyYnXud/XP2/j1z9v/Pjx69AvfP2bmv7w47elX+jm+ctvT7/Qcfp5Utuv+HOgo7+SWXp2kdo/XAgvPAOZAP8HXjKOSsfVi1/OAoYfv639ZvvzW+Q39XkByC/uF3Pkl+f37MTD8zffL/Y85pfn9/T1sILfEHvhiLX55xLG7vfZQqRgv9QZy+bH0anf0v1f1S9rAciP305+rdSLX6uOvfo9XEDzy96+lXnIL7ifswKu3W+z4+jMrzXH1v1iv1ryA6Rs/sROdI927MWvlR+4vfq16sjv3H7hn9YcW/dLbV/bMWsBPaF9bm/Q2MSqtf2mD36Hfi05nsHvCLce/VpcOPfod/Rv2nr1a9GR3+v5teTYk19su60cV78DPQPMveblRePHj1+/8ePHr9/48avqUXzR9AQW+bv48Ws3fvz49Rs/fvzaaXj09rwkSZKkaIcPQJIkSeqpwwcgSZIk9dThA5AkSZJ66vABSJIkST11+AAkSZKknjp8AJIkSVJPHT4ASZIkqZv+AyhEkcakR4mMAAAAAElFTkSuQmCC\"}]}"],"hiddenFrames":[]}} \ No newline at end of file diff --git a/ootw/ootw_graphics/sprites/ootw_walking-20190309-154332.piskel b/ootw/ootw_graphics/sprites/ootw_walking-20190309-154332.piskel new file mode 100644 index 00000000..bdda7d5b --- /dev/null +++ b/ootw/ootw_graphics/sprites/ootw_walking-20190309-154332.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"ootw_walking","description":"","fps":5,"height":48,"width":80,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":7,\"chunks\":[{\"layout\":[[0],[1],[2],[3],[4],[5],[6]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAjAAAAAwCAYAAAAPbkBGAAAFVklEQVR4nO3dz43bOBQHYAFpYc6pZGrYGnzOMfXYQIDUsacUsNNDashxob2MvINn0yQlipI83wC/w9iS9fiZth8o/xlOf/09fsz47XUcv72OL//82zRvv8bx7dfY/Ha3Pi4/fvz4bT0Ofvw+o9+wNuA0gJjekGuFHz9+xw0/fvyOm+H0/ct4+v5l9Q5wyvS31YBb34H8+PHjx48fv/5+Nw3MNe+Xty5wb53g0jr48ePHjx8/fv39htj5zQUsLWTabutOsFX48eN33PDjx++4GSLY3HNytZ3UXjrApfXx48dvf+HHj9/z+zVrYGoPvHfA0vDjx++44ceP33Fz8ymkpYClcEcDTNXLjx+//YcfP37P59e9gTnKubdhGMZhGLKg/Pjx21/48eP3/H7ZBiYubS0tLHZSe+sEf389jb+/nq6AOUh+/Pjx48ePX3+/7Htgln5OPbdktVanOTcRLgfJjx8/fvz48evvt3oDk0s8Trz93h3i3iYgP378+PHjx+9RAxPBwoDidmsB5j7/nlsCawVePQH58ePHjx8/ft380u+BCQPaC+Dc1EInwcLl/Pjx48ePH7/+fvk38cYBdgac29Gdz+fxfD5XA99MnFz48ePHjx8/ft390qeQUv+3BkwUFq+fC1h7zjDZAZdOQH78+PHjx4/f6n4aGBOQHz9+/PjxO5zf7FNIpee0cgNoDThtPwHWLmXdQLYKP378+PHjx6+Z3+wG5mPuFTCBxgFE6AgXwWsBI9xswNpOmR8/fvz48ePXzW9eA5Po1h4N6KbAeLuh0BRgaecZl7Bq34yU6kybTEB+/Pjx48eP3yK//BfZFaYXYOnAcx1gCjRZV24C8uPHjx8/fvy6+T1dA7N0CeuzT0B+/Pjx48fvCH75TyGlkrjB0oG0BkwO+EHuwhWOM+nEjx8/fvz48VvdL/9NvLnrEwdIAcakjne9/v3y6VzalJvbCfXE7e8B3j1+KqUTkB8/fvz48eO3ut/yBiYDmwKbDfjjbRx/vOUB37drDrjUhx8/fvz48eO32G9+A1OYZMeXgb8BWQGwCK4Wlh8/fvz48eO3ul+3Bia7bQ4wAZcCjPsdfQLy48ePHz9+/P5P+ffALM3SQt9/hbLXfosnID9+/Pjx48dvNb/qBibVgbXIVNS960qXrmIedYBNaubHjx8/fvz4dffLNjCpwV0L6dRBXiEqO8zsElbYv/YO4sePHz9+/Pj197s2MLku7GYpqBNcN8C5kE/qN23/cAmQHz+PX35P7DfVfdeR3+bzr76B6Qw3F3D2C0gCstkE3LlfnHDVD2B+/Bb4efy28Zv9AsLv7vzz+O3UAFb6DREq1flsDTj8PI3Dz1M94LRf7QM4TqzCicaPHz9+/PjxW98v2cDEHWInmIOfEn/Wu/Q4cb8JIndH1wAuqTs78fjx48ePHz9+q/lVfw9Mckl3bneX2z9CFHaAL39ex5c/r+Ud4NJx8OPHr5lfyRMgv7TftD0/8++Z/YbUgZMFpQBXzkOIOyl6AdkgR/Xbi+PR/Obu/9n9oiO/uvFP28d5uHWO4rd0P359/J62gekF+Kx+0xKdF5B5fhqYZX5T4h+/Oi8NTJ1f3H7y24vjUfxSjs3rqkH7mN6gtU9ke3riO6LfnhyP5He5XMbL5XJtAPnNm0el59j58WvpF//24Hgkv5xjc5u5mEnA0nNunzT8+PE7bvjx47efVP+UwBUs8b/w47ff8OPH77jhd+NxuzwlIiIisvNsXoCIiIhIbTYvQERERKQ2mxcgIiIiUpvNCxARERGpzeYFiIiIiNRm8wJEREREarN5ASIiIiJV+Q+HM5CloNPaWQAAAABJRU5ErkJggg==\"}]}"],"hiddenFrames":[]}} \ No newline at end of file diff --git a/ootw/sprites_physicist.inc b/ootw/sprites_physicist.inc index dc8249f0..5f056cd0 100644 --- a/ootw/sprites_physicist.inc +++ b/ootw/sprites_physicist.inc @@ -1,3 +1,32 @@ +; note, for some reason these are all facing left + +;===================== +;===================== +; STANDING +;===================== +;===================== + + ;==================== + ; Going Left + +phys_stand: + .byte $5,$8 + .byte $aa,$9a,$9a,$aa,$aa + .byte $aa,$bb,$99,$aa,$aa + .byte $aa,$aa,$0b,$aa,$aa + .byte $aa,$aa,$bb,$aa,$aa + .byte $aa,$aa,$bb,$aa,$aa + .byte $aa,$aa,$44,$aa,$aa + .byte $aa,$aa,$44,$aa,$aa + .byte $aa,$fa,$f4,$aa,$aa + + +;===================== +;===================== +; WALKING +;===================== +;===================== + phys_walk_progression: .word phys_stand .word phys_walk_left1 @@ -8,100 +37,282 @@ phys_walk_progression: .word phys_walk_left6 .word phys_walk_left7 - ;==================== - ; Going Left -phys_stand: - .byte $4,$8 - .byte $aa,$9a,$9a,$aa - .byte $aa,$bb,$99,$aa - .byte $aa,$aa,$0b,$aa - .byte $aa,$aa,$bb,$aa - .byte $aa,$aa,$bb,$aa - .byte $aa,$aa,$44,$aa - .byte $aa,$aa,$44,$aa - .byte $aa,$fa,$f4,$aa phys_walk_left1: - .byte $4,$8 - .byte $aa,$9a,$9a,$aa - .byte $aa,$bb,$99,$aa - .byte $aa,$aa,$0b,$aa - .byte $aa,$aa,$bb,$aa - .byte $aa,$ba,$0b,$aa - .byte $aa,$aa,$44,$aa - .byte $aa,$cc,$44,$aa - .byte $aa,$fa,$f4,$a5 + .byte $5,$8 + .byte $aa,$9a,$9a,$aa,$aa + .byte $aa,$bb,$99,$aa,$aa + .byte $aa,$aa,$0b,$aa,$aa + .byte $aa,$aa,$bb,$aa,$aa + .byte $aa,$ba,$0b,$aa,$aa + .byte $aa,$aa,$44,$aa,$aa + .byte $aa,$cc,$44,$aa,$aa + .byte $aa,$fa,$f4,$a5,$aa phys_walk_left2: - .byte $4,$8 - .byte $aa,$9a,$9a,$aa - .byte $aa,$bb,$99,$aa - .byte $aa,$aa,$0b,$aa - .byte $aa,$aa,$bb,$aa - .byte $ba,$ab,$00,$ba - .byte $aa,$aa,$44,$aa - .byte $aa,$cc,$44,$4a - .byte $aa,$a5,$fc,$f4 + .byte $5,$8 + .byte $aa,$9a,$9a,$aa,$aa + .byte $aa,$bb,$99,$aa,$aa + .byte $aa,$aa,$0b,$aa,$aa + .byte $aa,$aa,$bb,$aa,$aa + .byte $ba,$ab,$00,$ba,$aa + .byte $aa,$aa,$44,$aa,$aa + .byte $aa,$cc,$44,$4a,$aa + .byte $aa,$a5,$fc,$f4,$aa phys_walk_left3: - .byte $4,$8 - .byte $aa,$9a,$9a,$aa - .byte $aa,$bb,$99,$aa - .byte $aa,$aa,$0b,$aa - .byte $aa,$aa,$bb,$aa - .byte $ba,$ab,$00,$ba - .byte $aa,$aa,$44,$aa - .byte $aa,$cc,$a4,$4a - .byte $5a,$5c,$fa,$f4 + .byte $5,$8 + .byte $aa,$9a,$9a,$aa,$aa + .byte $aa,$bb,$99,$aa,$aa + .byte $aa,$aa,$0b,$aa,$aa + .byte $aa,$aa,$bb,$aa,$aa + .byte $ba,$ab,$00,$ba,$aa + .byte $aa,$aa,$44,$aa,$aa + .byte $aa,$cc,$a4,$4a,$aa + .byte $5a,$5c,$fa,$f4,$aa phys_walk_left4: - .byte $4,$8 - .byte $aa,$9a,$9a,$aa - .byte $aa,$bb,$99,$aa - .byte $aa,$aa,$0b,$aa - .byte $aa,$aa,$bb,$aa - .byte $aa,$ba,$0b,$aa - .byte $aa,$aa,$44,$aa - .byte $aa,$aa,$c4,$4a - .byte $aa,$5a,$5f,$af + .byte $5,$8 + .byte $aa,$9a,$9a,$aa,$aa + .byte $aa,$bb,$99,$aa,$aa + .byte $aa,$aa,$0b,$aa,$aa + .byte $aa,$aa,$bb,$aa,$aa + .byte $aa,$ba,$0b,$aa,$aa + .byte $aa,$aa,$44,$aa,$aa + .byte $aa,$aa,$c4,$4a,$aa + .byte $aa,$5a,$5f,$af,$aa phys_walk_left5: - .byte $4,$8 - .byte $aa,$9a,$9a,$aa - .byte $aa,$bb,$99,$aa - .byte $aa,$aa,$0b,$aa - .byte $aa,$aa,$bb,$aa - .byte $aa,$aa,$bb,$aa - .byte $aa,$aa,$44,$aa - .byte $aa,$44,$c4,$aa - .byte $af,$5f,$5c,$aa + .byte $5,$8 + .byte $aa,$9a,$9a,$aa,$aa + .byte $aa,$bb,$99,$aa,$aa + .byte $aa,$aa,$0b,$aa,$aa + .byte $aa,$aa,$bb,$aa,$aa + .byte $aa,$aa,$bb,$aa,$aa + .byte $aa,$aa,$44,$aa,$aa + .byte $aa,$44,$c4,$aa,$aa + .byte $af,$5f,$5c,$aa,$aa phys_walk_left6: - .byte $4,$8 - .byte $aa,$9a,$9a,$aa - .byte $aa,$bb,$99,$aa - .byte $aa,$aa,$0b,$aa - .byte $aa,$aa,$bb,$aa - .byte $aa,$ba,$00,$bb - .byte $aa,$aa,$44,$aa - .byte $aa,$aa,$44,$aa - .byte $fa,$f4,$5c,$5c + .byte $5,$8 + .byte $aa,$9a,$9a,$aa,$aa + .byte $aa,$bb,$99,$aa,$aa + .byte $aa,$aa,$0b,$aa,$aa + .byte $aa,$aa,$bb,$aa,$aa + .byte $aa,$ba,$00,$bb,$aa + .byte $aa,$aa,$44,$aa,$aa + .byte $aa,$aa,$44,$aa,$aa + .byte $fa,$f4,$5c,$5c,$aa phys_walk_left7: - .byte $4,$8 - .byte $aa,$9a,$9a,$aa - .byte $aa,$bb,$99,$aa - .byte $aa,$aa,$0b,$aa - .byte $aa,$aa,$bb,$aa - .byte $aa,$aa,$0b,$ba - .byte $aa,$aa,$44,$aa - .byte $aa,$aa,$44,$aa - .byte $aa,$fa,$f4,$5c + .byte $5,$8 + .byte $aa,$9a,$9a,$aa,$aa + .byte $aa,$bb,$99,$aa,$aa + .byte $aa,$aa,$0b,$aa,$aa + .byte $aa,$aa,$bb,$aa,$aa + .byte $aa,$aa,$0b,$ba,$aa + .byte $aa,$aa,$44,$aa,$aa + .byte $aa,$aa,$44,$aa,$aa + .byte $aa,$fa,$f4,$5c,$aa -;======================= -; I've got a match -; your embrace, and my collapse +;===================== +;===================== +; RUNNING +;===================== +;===================== + +phys_run_progression: + .word phys_run_left1 + .word phys_run_left2 + .word phys_run_left3 + .word phys_run_left4 + .word phys_run_left5 + .word phys_run_left6 + .word phys_run_left7 + .word phys_run_left8 + .word phys_run_left9 + +phys_run_left1: + .byte $5,$8 + .byte $aa,$9a,$9a,$aa,$aa + .byte $aa,$bb,$99,$aa,$aa + .byte $aa,$aa,$0b,$aa,$aa + .byte $aa,$aa,$bb,$aa,$aa + .byte $aa,$ba,$0b,$aa,$aa + .byte $aa,$aa,$44,$aa,$aa + .byte $aa,$aa,$44,$ac,$55 + .byte $aa,$fa,$f4,$aa,$aa + +phys_run_left2: + .byte $5,$8 + .byte $aa,$9a,$9a,$aa,$aa + .byte $aa,$bb,$99,$aa,$aa + .byte $aa,$aa,$0b,$aa,$aa + .byte $aa,$aa,$bb,$aa,$aa + .byte $ba,$ab,$00,$aa,$aa + .byte $aa,$ca,$44,$aa,$aa + .byte $aa,$ac,$44,$4a,$aa + .byte $aa,$aa,$fa,$f4,$aa + +phys_run_left3: + .byte $5,$8 + .byte $aa,$9a,$9a,$aa,$aa + .byte $aa,$bb,$99,$aa,$aa + .byte $aa,$aa,$0b,$aa,$aa + .byte $aa,$aa,$bb,$aa,$aa + .byte $ab,$ab,$00,$aa,$aa + .byte $aa,$ca,$44,$aa,$aa + .byte $aa,$cc,$a4,$4a,$aa + .byte $a5,$a5,$fa,$af,$aa + +phys_run_left4: + .byte $5,$8 + .byte $aa,$9a,$9a,$aa,$aa + .byte $aa,$bb,$99,$aa,$aa + .byte $aa,$aa,$0b,$aa,$aa + .byte $ba,$ba,$0b,$aa,$aa + .byte $aa,$ab,$00,$aa,$aa + .byte $aa,$ca,$44,$aa,$aa + .byte $aa,$cc,$aa,$44,$aa + .byte $5a,$a5,$aa,$fa,$af + +phys_run_left5: + .byte $5,$8 + .byte $aa,$9a,$9a,$aa,$aa + .byte $aa,$bb,$99,$aa,$aa + .byte $aa,$aa,$0b,$aa,$aa + .byte $aa,$aa,$bb,$aa,$aa + .byte $aa,$ab,$0b,$aa,$aa + .byte $aa,$aa,$44,$4a,$fa + .byte $aa,$cc,$aa,$aa,$af + .byte $5a,$5c,$aa,$aa,$aa + +phys_run_left6: + .byte $5,$8 + .byte $aa,$9a,$9a,$aa,$aa + .byte $aa,$bb,$99,$aa,$aa + .byte $aa,$aa,$0b,$aa,$aa + .byte $aa,$aa,$bb,$aa,$aa + .byte $aa,$ab,$00,$aa,$aa + .byte $aa,$aa,$44,$4a,$fa + .byte $aa,$aa,$cc,$aa,$af + .byte $aa,$5a,$5c,$aa,$aa + +phys_run_left7: + .byte $5,$8 + .byte $aa,$9a,$9a,$aa,$aa + .byte $aa,$bb,$99,$aa,$aa + .byte $aa,$aa,$0b,$aa,$aa + .byte $aa,$aa,$bb,$aa,$aa + .byte $aa,$ab,$0b,$aa,$aa + .byte $aa,$4a,$44,$aa,$aa + .byte $aa,$a4,$c4,$ff,$aa + .byte $aa,$5a,$5c,$aa,$aa + +phys_run_left8: + .byte $5,$8 + .byte $aa,$9a,$9a,$aa,$aa + .byte $aa,$bb,$99,$aa,$aa + .byte $aa,$aa,$0b,$aa,$aa + .byte $aa,$ba,$bb,$aa,$aa + .byte $aa,$aa,$0b,$ba,$aa + .byte $aa,$4a,$44,$aa,$aa + .byte $aa,$44,$ac,$ca,$aa + .byte $af,$af,$5a,$5c,$aa + +phys_run_left9: + .byte $5,$8 + .byte $aa,$9a,$9a,$aa,$aa + .byte $aa,$bb,$99,$aa,$aa + .byte $aa,$aa,$0b,$aa,$aa + .byte $aa,$ba,$0b,$bb,$aa + .byte $aa,$aa,$00,$bb,$aa + .byte $aa,$aa,$44,$ca,$aa + .byte $aa,$44,$aa,$cc,$aa + .byte $fa,$f4,$aa,$5a,$5c + + +;===================== +;===================== +; JUMPING +;===================== +;===================== + +;===================== +;===================== +; KICKING +;===================== +;===================== + +; note: he needs to be facing left by default +kick1: + .byte $5,$8 + .byte $aa,$9a,$9a,$aa,$aa + .byte $aa,$bb,$99,$aa,$aa + .byte $aa,$aa,$0b,$aa,$aa + .byte $aa,$ba,$0b,$aa,$aa + .byte $bb,$ab,$00,$ba,$aa + .byte $aa,$aa,$44,$aa,$aa + .byte $aa,$44,$a4,$ca,$aa + .byte $af,$f4,$5a,$5c,$aa + +;===================== +;===================== +; FALLING +;===================== +;===================== + + + +;===================== +;===================== +; CROUCHING +;===================== +;===================== + +crouch_progression: + .word crouch1 + .word crouch2 + +crouch1: + .byte $3,$8 + .byte $aa,$aa,$aa + .byte $9a,$9a,$aa + .byte $bb,$99,$aa + .byte $aa,$0b,$aa + .byte $aa,$bb,$aa + .byte $aa,$bb,$aa + .byte $44,$44,$aa + .byte $5a,$fc,$f4 + +crouch2: + .byte $3,$8 + .byte $aa,$aa,$aa + .byte $aa,$aa,$aa + .byte $9a,$9a,$aa + .byte $bb,$99,$aa + .byte $aa,$0b,$0a + .byte $aa,$bb,$00 + .byte $ba,$4b,$aa + .byte $54,$f4,$f4 + + +;===================== +;===================== +; SWIMMING +;===================== +;===================== + +;===================== +;===================== +; COLLAPSING +;===================== +;===================== + + ;======================= + ; I've got a match + ; your embrace, and my collapse collapse_progression: .word collapse1 @@ -170,49 +381,9 @@ collapse5: .byte $ff,$44,$b4,$bb,$aa,$aa,$ab,$a9 -;======================= -; Crouching - -crouch_progression: - .word crouch1 - .word crouch2 - -crouch1: - .byte $3,$8 - .byte $aa,$aa,$aa - .byte $9a,$9a,$aa - .byte $bb,$99,$aa - .byte $aa,$0b,$aa - .byte $aa,$bb,$aa - .byte $aa,$bb,$aa - .byte $44,$44,$aa - .byte $5a,$fc,$f4 - -crouch2: - .byte $3,$8 - .byte $aa,$aa,$aa - .byte $aa,$aa,$aa - .byte $9a,$9a,$aa - .byte $bb,$99,$aa - .byte $aa,$0b,$0a - .byte $aa,$bb,$00 - .byte $ba,$4b,$aa - .byte $54,$f4,$f4 - - -;======================= -; Kicking -; note: he needs to be facing left by default -kick1: - .byte $4,$8 - .byte $aa,$9a,$9a,$aa - .byte $aa,$bb,$99,$aa - .byte $aa,$aa,$0b,$aa - .byte $aa,$ba,$0b,$aa - .byte $bb,$ab,$00,$ba - .byte $aa,$aa,$44,$aa - .byte $aa,$44,$a4,$ca - .byte $af,$f4,$5a,$5c + + + diff --git a/ootw/zp.inc b/ootw/zp.inc index 354913bf..3ba6069b 100644 --- a/ootw/zp.inc +++ b/ootw/zp.inc @@ -133,6 +133,8 @@ CURSOR = $9D ; More zero-page addresses ; we try not to conflict with anything DOS, MONITOR or BASIC related +JUMPING = $D0 + LEFT_LIMIT = $E0 RIGHT_LIMIT = $E1 WHICH_SLUG = $E2 @@ -173,12 +175,15 @@ YPOS = $F4 DIRECTION = $F5 GAIT = $F6 TENTACLE_X = $F7 + TENTACLE_PROGRESS = $F8 SLUGDEATH_PROGRESS = $F8 ELEVATOR_CYCLE = $F8 + TENTACLE_GRAB = $F9 SLUGDEATH = $F9 ELEVATOR_COUNT = $F9 + TEMP = $FA TEMPY = $FB INL = $FC