From 285a1d1193cf398559e6babc45ba9b03d3d12665 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Fri, 19 Jul 2019 17:19:34 -0400 Subject: [PATCH] ootw: move around graphics --- ootw/ootw_c2_jail.s | 4 +- .../alien_shooting-20190718-170845.piskel | 1 + .../alien_takeoff-20190715-160513.piskel | 1 + .../alien_turning-20190718-150134.piskel | 1 + .../alien_walking-20190718-145743.piskel | 1 + .../alien_walking_gun-20190718-160427.piskel | 1 + .../alien_yelling-20190718-165913.piskel | 1 + .../{ => piskel}/beast-20190126-142310.piskel | 0 .../friend_walking-20190719-162844.piskel | 1 + .../ootw_jumping-20190315-162115.piskel | 0 .../ootw_running-20190309-163912.piskel | 0 .../ootw_walking-20190309-154332.piskel | 0 .../ootw_walking-20190310-011534.piskel | 0 ootw/ootw_graphics/sprites/sprites_alien.inc | 129 +++--- ootw/ootw_graphics/sprites/sprites_friend.inc | 130 +++--- .../sprites/sprites_physicist.inc.orig | 389 ------------------ 16 files changed, 139 insertions(+), 520 deletions(-) create mode 100644 ootw/ootw_graphics/sprites/piskel/alien_shooting-20190718-170845.piskel create mode 100644 ootw/ootw_graphics/sprites/piskel/alien_takeoff-20190715-160513.piskel create mode 100644 ootw/ootw_graphics/sprites/piskel/alien_turning-20190718-150134.piskel create mode 100644 ootw/ootw_graphics/sprites/piskel/alien_walking-20190718-145743.piskel create mode 100644 ootw/ootw_graphics/sprites/piskel/alien_walking_gun-20190718-160427.piskel create mode 100644 ootw/ootw_graphics/sprites/piskel/alien_yelling-20190718-165913.piskel rename ootw/ootw_graphics/sprites/{ => piskel}/beast-20190126-142310.piskel (100%) create mode 100644 ootw/ootw_graphics/sprites/piskel/friend_walking-20190719-162844.piskel rename ootw/ootw_graphics/sprites/{ => piskel}/ootw_jumping-20190315-162115.piskel (100%) rename ootw/ootw_graphics/sprites/{ => piskel}/ootw_running-20190309-163912.piskel (100%) rename ootw/ootw_graphics/sprites/{ => piskel}/ootw_walking-20190309-154332.piskel (100%) rename ootw/ootw_graphics/sprites/{ => piskel}/ootw_walking-20190310-011534.piskel (100%) delete mode 100644 ootw/ootw_graphics/sprites/sprites_physicist.inc.orig diff --git a/ootw/ootw_c2_jail.s b/ootw/ootw_c2_jail.s index ca12ec50..fd3ea16b 100644 --- a/ootw/ootw_c2_jail.s +++ b/ootw/ootw_c2_jail.s @@ -14,9 +14,11 @@ ootw_jail_init: sta JAIL_POWER_ON sta GUN_OUT sta friend_out - sta friend_state sta friend_direction + lda #F_RUNNING + sta friend_state + lda #39 sta DUDE_X lda #$FA diff --git a/ootw/ootw_graphics/sprites/piskel/alien_shooting-20190718-170845.piskel b/ootw/ootw_graphics/sprites/piskel/alien_shooting-20190718-170845.piskel new file mode 100644 index 00000000..10db40aa --- /dev/null +++ b/ootw/ootw_graphics/sprites/piskel/alien_shooting-20190718-170845.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"alien_shooting_up","description":"","fps":2,"height":32,"width":32,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAgUlEQVRYhe3UsQ3AIAwEwB8idWZjMHsaBgg7MEf0qZzCUppIGJT4JReufAIMkMlkVs52nBxVCUhAAl4DABDA3bdKtkqKCEUkDuAHWx8OsPInEwawPgzg79qDvg/wkGkAVaWqsu+FfS/xAKvwLXjaimmA8I8oAcu9gWkAP3gI4Be5AJlatcO/6CG5AAAAAElFTkSuQmCC\"}]}"],"hiddenFrames":[""]}} \ No newline at end of file diff --git a/ootw/ootw_graphics/sprites/piskel/alien_takeoff-20190715-160513.piskel b/ootw/ootw_graphics/sprites/piskel/alien_takeoff-20190715-160513.piskel new file mode 100644 index 00000000..017811b5 --- /dev/null +++ b/ootw/ootw_graphics/sprites/piskel/alien_takeoff-20190715-160513.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"takeoff","description":"","fps":2,"height":32,"width":32,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":14,\"chunks\":[{\"layout\":[[0],[1],[2],[3],[4],[5],[6],[7],[8],[9],[10],[11],[12],[13]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAcAAAAAgCAYAAACFFqhFAAACeUlEQVR4nO3bwXGkMBAFUILYs0NyDBMYhLInB2Dn4Di22Is5rMraAQNqQb9fpYvLU6/FSGrDjIdBRERERERERERERERERERERERERERERETk+vn1/mc+a/D5fD6f36sfXgCfz+fz+RF+eAF8Pp/P50f44QXw+Xw+nx/hhxfA5/P5fH6EH14An8/nfzcer7//O/j39lusv/AC+Hw+/7tRO2hbN4BhGP4Zrf3o+Uf5LdbfpgKGrwXQagPw+T34H2/z/PE2z+M4zuM4pvWX0cpfDtrSb90AevGX9z+L32L9rypgKP4Car0BS39tHXedP7+tH9UAsvu9NSB+W7/F+uv6ACrdrXVc3X9WB7/tBszqb3WP8nt5BBntl+9/Fr+2/o9cf10fQDU3ix99/bP7Nbf1/Gv13H3+2f2fvu/89b4DyPy7nX+0H339+bn9ZZx5B7Rl/0U9gj/Tv8QCyOpHX/9ov5frv3z4ns2vPXpd+2UE/j6/Vsea15yx/zTAZAdgdr/m8nP40Q0gu1+rY81r+Dd4BMqP9WsuP4cf3QCy+2Udny+P+fPl8fT3+ev9rg9gfm6/5vI1wEh/zZ45c//xj/O7PgD5+xbC1edfelv/IZa/z//puuPzr+J3fQDy9y2Eq8+/dKIaULS/DA0wp1/eiUZ/Bnknv+sDkL9vI57lT9M0T9N0ul/Oc9kI/DZ+7Vt3Uf7QeP1Fz79WB/84/xININqv1dHaj7oDiPLL68xv69caQJS/XI8s86/VwXcHmLIB8nP5pRPtP/s5/5z1V3r84/xLNKBov1YHn39nv+bw79MAsvuXaEB8Pr+9X3P4bf3a4O/3RURERERE5E75CxcOWh1tsFBnAAAAAElFTkSuQmCC\"}]}"],"hiddenFrames":[""]}} \ No newline at end of file diff --git a/ootw/ootw_graphics/sprites/piskel/alien_turning-20190718-150134.piskel b/ootw/ootw_graphics/sprites/piskel/alien_turning-20190718-150134.piskel new file mode 100644 index 00000000..e6feae13 --- /dev/null +++ b/ootw/ootw_graphics/sprites/piskel/alien_turning-20190718-150134.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"alien_turning","description":"","fps":1,"height":32,"width":32,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":2,\"chunks\":[{\"layout\":[[0],[1]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAYAAACinX6EAAAA2ElEQVRoge2WwQ3DIAxF/xA9Z7YMZk+TAZodMkflnpAqq1SkwXy1+EscuOR9PTAKkMlkMplM5l1u94dFrV/g0wuw+fQCbD69AJtPL8Dm0wuw+fQCbH5TgX0z2zczETERGS4gkv+xgAeX/WgBhU8TUBYAA0ATEMFvElDAowV47tkelwX4IqNHoHYAraNwWYC/eilgVgHHstqxrPMJePkQ5QZ4Pl0AGl/faAE9+fQ/MTb/VIGyV1VT1XkF9JzBCG53AXCz5/dRAr7ldhOAyuMzjYCaiL8SkJkgT/cBZAQWg6kcAAAAAElFTkSuQmCC\"}]}"],"hiddenFrames":[""]}} \ No newline at end of file diff --git a/ootw/ootw_graphics/sprites/piskel/alien_walking-20190718-145743.piskel b/ootw/ootw_graphics/sprites/piskel/alien_walking-20190718-145743.piskel new file mode 100644 index 00000000..bc92689b --- /dev/null +++ b/ootw/ootw_graphics/sprites/piskel/alien_walking-20190718-145743.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"alien_walking","description":"","fps":4,"height":32,"width":32,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":8,\"chunks\":[{\"layout\":[[0],[1],[2],[3],[4],[5],[6],[7]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQAAAAAgCAYAAAD9qabkAAABuUlEQVR4nO3awa3CMBBF0Snir6mNwuxqKAB6oI4vs5oFlkB2lPEz9n1SFlmdyWTiJBAzQgghhBBCCCGEEEIIIYQQQshO+bv/l6gNHx9/bl9eAD4+vs6XF4CPj6/z5QXg4+PrfHkB+Pj4Ol9eAD4+vs6XF4CPj6/zmwp43Ep53EpJKZWU0vAG4OPjx/hfC6hh3x/VAHx8/Fi/qQDfzKyY2fAG4OPjx/hNBTisagA+Pn6M3/QO4vDoRyB8fPxY/2sB/u6xcgPw8Xf2f2IBqN+FVL73AX+v82+7LwDPy7U8L9fhDah//fQ6VAOIP4efcy4552G+ev5rv7WOFl++AvUMgG12B9zhR6gj/R+9AJho/usn8N46WvyuBphoAPDx8YX/AviKs+KXUL/gqz5EwX8//ysef1cDfH/0I5j6AlT7qgvAXZXvc1b7Zz4Cz9z/Ef6hBaD1QljNN9EjoGoA/XhVd8BPNxr1AqD2z+x/1zvIp/3oBszi15vKP3MAIvoe5avPv8qP7H/TCVA3oK5D5c9y/GcOQMR5j/Jn6b/aP7P/UzfgqBvlt7qrHP+IAezs51bzN6L/hBBCCFk1L+8hI209wOW/AAAAAElFTkSuQmCC\"}]}"],"hiddenFrames":[""]}} \ No newline at end of file diff --git a/ootw/ootw_graphics/sprites/piskel/alien_walking_gun-20190718-160427.piskel b/ootw/ootw_graphics/sprites/piskel/alien_walking_gun-20190718-160427.piskel new file mode 100644 index 00000000..640d44d6 --- /dev/null +++ b/ootw/ootw_graphics/sprites/piskel/alien_walking_gun-20190718-160427.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"alien_walking_gun","description":"","fps":4,"height":32,"width":32,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":8,\"chunks\":[{\"layout\":[[0],[1],[2],[3],[4],[5],[6],[7]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQAAAAAgCAYAAAD9qabkAAABw0lEQVR4nO3azW3DMAyGYQ7Rc2bLYNI0GaDZIXMU6omHCk0gByY/RXo/wAefHpqiZefHjBBCCCGEEEIIIYQQQgghhBCyU76+f1rUgY+PP7cvLwAfH1/nywvAx8fX+fIC8PHxdb68AHx8fJ0vLwAfH1/nywvAx8fX+UMF3G+t3W+tlVJaKSW9Afj4+DH+ywJ62M+zGoCPjx/rDxXgh5k1M0tvAD4+fow/VIDDqgbg4+PH+P8W0EN+nv0KhK/xTbz+al/d/0z/ZQH+2SO7Abb5AKp99fqrfXX/M335DjQyAP1nIZXfL8zqvh+z+LtsQJn+0AI8Ltf2uFxlr0Dueh34+Jm+ev57f7SOEX/qN4B+AGyzJ+AOX0LN3P9Z5r/vv2wDUC8APj5+4s+AfviOs+I/oT7BV/0RBf/v+q94/Yca4Oe11lZr3eYGVPuqG8Bdle9z9u6XwZ/e/wz/rQ1g9EZYzTfRK6BqAP16VU/AZw8a9Qag9s/s/6HPIM/Ooxswi98fKv/MAYjoe5SvXn+VH9n/oQVQN6CvQ+XPcv1nDkDEukf5s/Rf7Z/Z/6kb8K4b5Y+6q1x/xgAe7OdW85fRf0IIIYSsml8xdAVhg3/PgwAAAABJRU5ErkJggg==\"}]}"],"hiddenFrames":[""]}} \ No newline at end of file diff --git a/ootw/ootw_graphics/sprites/piskel/alien_yelling-20190718-165913.piskel b/ootw/ootw_graphics/sprites/piskel/alien_yelling-20190718-165913.piskel new file mode 100644 index 00000000..8baf11da --- /dev/null +++ b/ootw/ootw_graphics/sprites/piskel/alien_yelling-20190718-165913.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"alien_yelling","description":"","fps":2,"height":32,"width":32,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAgUlEQVRYhe3UsQ3AIAwEwB8idWZjMHsaBgg7MEf0qZzCUppIGJT4JReufAIMkMlkVs52nBxVCUhAAl4DABDA3bdKtkqKCEUkDuAHWx8OsPInEwawPgzg79qDvg/wkGkAVaWqsu+FfS/xAKvwLXjaimmA8I8oAcu9gWkAP3gI4Be5AJlatcO/6CG5AAAAAElFTkSuQmCC\"}]}"],"hiddenFrames":[""]}} \ No newline at end of file diff --git a/ootw/ootw_graphics/sprites/beast-20190126-142310.piskel b/ootw/ootw_graphics/sprites/piskel/beast-20190126-142310.piskel similarity index 100% rename from ootw/ootw_graphics/sprites/beast-20190126-142310.piskel rename to ootw/ootw_graphics/sprites/piskel/beast-20190126-142310.piskel diff --git a/ootw/ootw_graphics/sprites/piskel/friend_walking-20190719-162844.piskel b/ootw/ootw_graphics/sprites/piskel/friend_walking-20190719-162844.piskel new file mode 100644 index 00000000..75a59dca --- /dev/null +++ b/ootw/ootw_graphics/sprites/piskel/friend_walking-20190719-162844.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"friend_walking","description":"","fps":4,"height":32,"width":32,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":8,\"chunks\":[{\"layout\":[[0],[1],[2],[3],[4],[5],[6],[7]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQAAAAAgCAYAAAD9qabkAAABkklEQVR4nO3aQW4CMQyFYR+C6+c0PQC9UEUXKAsiDXJQ7GeS/0mzYPV5XkLKFMwIIYQQQgghhBBCCCGEEEIIISfldv97RF34+Pi1ffkA+Pj4Ol8+AD4+vs6XD4CPj6/z5QPg4+PrfPkA+Pj4Ol8+AD4+vs53DdDz+/O8sgvAx8eP8d8OcJWsAsYbx8fHP/AAwMfHj/FdA5jZy5VdAD4+fozvegbpcPYJiI+PH+u/HaA/e+xcAD7+yf5XHABjVH7vAf+s9TcOAE0B438/7fA3AP7T934dtso38f4ffe8cHr90AVU3YJY/uqf5V3OcegDMzuHxpwow0QbAx8cXfgvQs+Mvob7BV/0QBf91/Xe8/6kC+uvW2qO1dswbUO2r3gDdreav/Ahcuf8M/6MDIPsZrIpvoo+Aqg3Y71f1F/BqndUHgNpf2f/UM8jV6+gCqvjjpfJXboCI3qN89fqr/Mj+XQugLmCcQ+VXuf+VGyBi3aP8Kv2r/ZX9ly7gUzfK97q73H/GBpzs86j9l9E/IYQQQnbNP5uH5a0kiZDFAAAAAElFTkSuQmCC\"}]}"],"hiddenFrames":[""]}} \ No newline at end of file diff --git a/ootw/ootw_graphics/sprites/ootw_jumping-20190315-162115.piskel b/ootw/ootw_graphics/sprites/piskel/ootw_jumping-20190315-162115.piskel similarity index 100% rename from ootw/ootw_graphics/sprites/ootw_jumping-20190315-162115.piskel rename to ootw/ootw_graphics/sprites/piskel/ootw_jumping-20190315-162115.piskel diff --git a/ootw/ootw_graphics/sprites/ootw_running-20190309-163912.piskel b/ootw/ootw_graphics/sprites/piskel/ootw_running-20190309-163912.piskel similarity index 100% rename from ootw/ootw_graphics/sprites/ootw_running-20190309-163912.piskel rename to ootw/ootw_graphics/sprites/piskel/ootw_running-20190309-163912.piskel diff --git a/ootw/ootw_graphics/sprites/ootw_walking-20190309-154332.piskel b/ootw/ootw_graphics/sprites/piskel/ootw_walking-20190309-154332.piskel similarity index 100% rename from ootw/ootw_graphics/sprites/ootw_walking-20190309-154332.piskel rename to ootw/ootw_graphics/sprites/piskel/ootw_walking-20190309-154332.piskel diff --git a/ootw/ootw_graphics/sprites/ootw_walking-20190310-011534.piskel b/ootw/ootw_graphics/sprites/piskel/ootw_walking-20190310-011534.piskel similarity index 100% rename from ootw/ootw_graphics/sprites/ootw_walking-20190310-011534.piskel rename to ootw/ootw_graphics/sprites/piskel/ootw_walking-20190310-011534.piskel diff --git a/ootw/ootw_graphics/sprites/sprites_alien.inc b/ootw/ootw_graphics/sprites/sprites_alien.inc index af147b50..9d167037 100644 --- a/ootw/ootw_graphics/sprites/sprites_alien.inc +++ b/ootw/ootw_graphics/sprites/sprites_alien.inc @@ -252,94 +252,93 @@ alien_run_progression: .word alien_run_left7 .word alien_run_left8 - alien_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,$77 - .byte $aa,$fa,$f4,$aa,$aa + .byte $aa,$7a,$f7,$7f,$aa + .byte $aa,$77,$07,$00,$aa + .byte $aa,$5a,$00,$77,$aa + .byte $aa,$55,$10,$77,$aa + .byte $aa,$aa,$00,$07,$aa + .byte $aa,$aa,$77,$a5,$5a + .byte $aa,$aa,$07,$aa,$05 + .byte $aa,$a0,$00,$0a,$00 alien_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 + .byte $aa,$7a,$f7,$7f,$aa + .byte $aa,$77,$07,$00,$aa + .byte $aa,$aa,$00,$77,$aa + .byte $aa,$5a,$77,$17,$aa + .byte $aa,$aa,$07,$00,$aa + .byte $aa,$aa,$77,$55,$aa + .byte $aa,$aa,$07,$aa,$05 + .byte $aa,$0a,$00,$00,$a0 alien_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 $a7,$a7,$fa,$af,$aa + .byte $aa,$7a,$f7,$7f,$aa + .byte $aa,$77,$07,$00,$aa + .byte $aa,$aa,$00,$77,$aa + .byte $aa,$aa,$77,$10,$aa + .byte $aa,$aa,$07,$00,$aa + .byte $aa,$aa,$77,$55,$aa + .byte $aa,$aa,$07,$00,$0a + .byte $aa,$0a,$00,$aa,$a0 alien_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 $7a,$a7,$aa,$fa,$af + .byte $aa,$7a,$f7,$7f,$aa + .byte $aa,$77,$07,$00,$aa + .byte $aa,$aa,$00,$77,$aa + .byte $aa,$aa,$77,$10,$aa + .byte $aa,$a7,$00,$00,$aa + .byte $aa,$aa,$77,$55,$aa + .byte $aa,$aa,$07,$05,$aa + .byte $aa,$0a,$00,$00,$aa alien_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 $7a,$7c,$aa,$aa,$aa + .byte $aa,$7a,$f7,$7f,$aa + .byte $aa,$77,$07,$00,$aa + .byte $aa,$aa,$00,$77,$aa + .byte $aa,$aa,$77,$10,$aa + .byte $aa,$a7,$00,$00,$aa + .byte $aa,$5a,$55,$77,$aa + .byte $aa,$00,$a7,$07,$aa + .byte $a0,$a0,$0a,$00,$aa alien_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,$7a,$7c,$aa,$aa + .byte $aa,$7a,$f7,$7f,$aa + .byte $aa,$77,$07,$00,$aa + .byte $aa,$aa,$00,$77,$aa + .byte $aa,$aa,$77,$17,$5a + .byte $aa,$aa,$07,$00,$a5 + .byte $aa,$5a,$55,$77,$7a + .byte $aa,$05,$aa,$aa,$07 + .byte $a0,$a0,$aa,$0a,$00 alien_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,$7a,$7c,$aa,$aa + .byte $aa,$7a,$f7,$7f,$aa + .byte $aa,$77,$07,$00,$aa + .byte $aa,$aa,$00,$77,$aa + .byte $aa,$aa,$10,$77,$aa + .byte $aa,$aa,$00,$07,$aa + .byte $aa,$aa,$57,$77,$aa + .byte $aa,$aa,$05,$a7,$07 + .byte $aa,$0a,$00,$00,$a0 alien_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,$7a,$7c,$aa + .byte $aa,$7a,$f7,$7f,$aa + .byte $aa,$77,$07,$00,$aa + .byte $aa,$aa,$00,$77,$aa + .byte $aa,$5a,$10,$77,$7a + .byte $aa,$a5,$00,$00,$a7 + .byte $aa,$aa,$55,$77,$aa + .byte $aa,$aa,$a5,$07,$aa + .byte $aa,$aa,$00,$00,$aa ;===================== ;===================== diff --git a/ootw/ootw_graphics/sprites/sprites_friend.inc b/ootw/ootw_graphics/sprites/sprites_friend.inc index 40562e7b..fb887685 100644 --- a/ootw/ootw_graphics/sprites/sprites_friend.inc +++ b/ootw/ootw_graphics/sprites/sprites_friend.inc @@ -145,94 +145,94 @@ friend_run_progression: .word friend_run_left7 .word friend_run_left8 - friend_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,$77 - .byte $aa,$fa,$f4,$aa,$aa + .byte $aa,$fa,$7f,$f7,$aa + .byte $aa,$ff,$0f,$0f,$aa + .byte $aa,$7a,$00,$ff,$aa + .byte $aa,$77,$00,$ff,$aa + .byte $aa,$aa,$00,$0f,$aa + .byte $aa,$aa,$ff,$a7,$7a + .byte $aa,$aa,$0f,$aa,$07 + .byte $aa,$a0,$00,$0a,$00 friend_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 + .byte $aa,$fa,$7f,$f7,$aa + .byte $aa,$ff,$0f,$0f,$aa + .byte $aa,$aa,$00,$ff,$aa + .byte $aa,$7a,$ff,$0f,$aa + .byte $aa,$aa,$0f,$00,$aa + .byte $aa,$aa,$ff,$77,$aa + .byte $aa,$aa,$0f,$aa,$07 + .byte $aa,$0a,$00,$00,$a0 friend_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 $a7,$a7,$fa,$af,$aa + .byte $aa,$fa,$7f,$f7,$aa + .byte $aa,$ff,$0f,$0f,$aa + .byte $aa,$aa,$00,$ff,$aa + .byte $aa,$aa,$ff,$00,$aa + .byte $aa,$aa,$0f,$00,$aa + .byte $aa,$aa,$ff,$77,$aa + .byte $aa,$aa,$0f,$00,$0a + .byte $aa,$0a,$00,$aa,$a0 friend_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 $7a,$a7,$aa,$fa,$af + .byte $aa,$fa,$7f,$f7,$aa + .byte $aa,$ff,$0f,$0f,$aa + .byte $aa,$aa,$00,$ff,$aa + .byte $aa,$aa,$ff,$00,$aa + .byte $aa,$af,$00,$00,$aa + .byte $aa,$aa,$ff,$77,$aa + .byte $aa,$aa,$0f,$07,$aa + .byte $aa,$0a,$00,$00,$aa friend_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 $7a,$7c,$aa,$aa,$aa + .byte $aa,$fa,$7f,$f7,$aa + .byte $aa,$ff,$0f,$0f,$aa + .byte $aa,$aa,$00,$ff,$aa + .byte $aa,$aa,$ff,$00,$aa + .byte $aa,$af,$00,$00,$aa + .byte $aa,$7a,$77,$ff,$aa + .byte $aa,$00,$af,$0f,$aa + .byte $a0,$a0,$0a,$00,$aa friend_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,$7a,$7c,$aa,$aa + .byte $aa,$fa,$7f,$f7,$aa + .byte $aa,$ff,$0f,$0f,$aa + .byte $aa,$aa,$00,$ff,$aa + .byte $aa,$aa,$ff,$0f,$7a + .byte $aa,$aa,$0f,$00,$a7 + .byte $aa,$7a,$77,$ff,$fa + .byte $aa,$07,$aa,$aa,$0f + .byte $a0,$a0,$aa,$0a,$00 friend_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,$7a,$7c,$aa,$aa + .byte $aa,$fa,$7f,$f7,$aa + .byte $aa,$ff,$0f,$0f,$aa + .byte $aa,$aa,$00,$ff,$aa + .byte $aa,$aa,$00,$ff,$aa + .byte $aa,$aa,$00,$0f,$aa + .byte $aa,$aa,$7f,$ff,$aa + .byte $aa,$aa,$07,$af,$0f + .byte $aa,$0a,$00,$00,$a0 friend_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,$7a,$7c,$aa + .byte $aa,$fa,$7f,$f7,$aa + .byte $aa,$ff,$0f,$0f,$aa + .byte $aa,$aa,$00,$ff,$aa + .byte $aa,$7a,$00,$ff,$fa + .byte $aa,$a7,$00,$00,$af + .byte $aa,$aa,$77,$ff,$aa + .byte $aa,$aa,$a7,$0f,$aa + .byte $aa,$aa,$00,$00,$aa + ;===================== ;===================== diff --git a/ootw/ootw_graphics/sprites/sprites_physicist.inc.orig b/ootw/ootw_graphics/sprites/sprites_physicist.inc.orig deleted file mode 100644 index 5f056cd0..00000000 --- a/ootw/ootw_graphics/sprites/sprites_physicist.inc.orig +++ /dev/null @@ -1,389 +0,0 @@ -; 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 - .word phys_walk_left2 - .word phys_walk_left3 - .word phys_walk_left4 - .word phys_walk_left5 - .word phys_walk_left6 - .word phys_walk_left7 - - - -phys_walk_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,$cc,$44,$aa,$aa - .byte $aa,$fa,$f4,$a5,$aa - -phys_walk_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,$ba,$aa - .byte $aa,$aa,$44,$aa,$aa - .byte $aa,$cc,$44,$4a,$aa - .byte $aa,$a5,$fc,$f4,$aa - -phys_walk_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 $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 $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 $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 $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 $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 - -;===================== -;===================== -; 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 - .word collapse2 - .word collapse3 - .word collapse4 - .word collapse5 - .word collapse5 ; 6 - .word collapse5 ; 7 - .word collapse5 ; 8 - .word collapse5 ; 9 - -collapse1: - .byte $4,$8 - .byte $aa,$aa,$9a,$9a - .byte $aa,$aa,$99,$ab - .byte $aa,$aa,$0b,$aa - .byte $aa,$aa,$bb,$aa - .byte $aa,$aa,$bb,$aa - .byte $aa,$aa,$44,$aa - .byte $aa,$4a,$a4,$aa - .byte $aa,$f4,$fa,$aa - -collapse2: - .byte $5,$8 - .byte $aa,$aa,$aa,$aa,$aa - .byte $aa,$aa,$aa,$99,$b9 - .byte $aa,$aa,$aa,$b9,$ab - .byte $aa,$aa,$aa,$b0,$aa - .byte $aa,$aa,$00,$bb,$aa - .byte $aa,$4a,$44,$bb,$aa - .byte $4a,$a4,$aa,$ab,$aa - .byte $f4,$fa,$aa,$aa,$aa - -collapse3: - .byte $6,$8 - .byte $aa,$aa,$aa,$aa,$aa,$aa - .byte $aa,$aa,$aa,$aa,$aa,$aa - .byte $aa,$aa,$aa,$aa,$9a,$9a - .byte $aa,$aa,$aa,$aa,$99,$bb - .byte $aa,$aa,$aa,$0a,$0b,$aa - .byte $aa,$aa,$4a,$00,$bb,$aa - .byte $fa,$44,$44,$a0,$bb,$aa - .byte $ff,$a4,$aa,$aa,$ab,$aa - -collapse4: - .byte $7,$8 - .byte $aa,$aa,$aa,$aa,$aa,$aa,$aa - .byte $aa,$aa,$aa,$aa,$aa,$aa,$aa - .byte $aa,$aa,$aa,$aa,$aa,$aa,$aa - .byte $aa,$aa,$aa,$aa,$aa,$aa,$aa - .byte $aa,$aa,$aa,$aa,$aa,$9a,$9a - .byte $aa,$aa,$aa,$0a,$00,$bb,$99 - .byte $fa,$4a,$44,$00,$bb,$aa,$aa - .byte $ff,$a4,$aa,$bb,$aa,$aa,$aa - -collapse5: - .byte $8,$8 - .byte $aa,$aa,$aa,$aa,$aa,$aa,$aa,$aa - .byte $aa,$aa,$aa,$aa,$aa,$aa,$aa,$aa - .byte $aa,$aa,$aa,$aa,$aa,$aa,$aa,$aa - .byte $aa,$aa,$aa,$aa,$aa,$aa,$aa,$aa - .byte $aa,$aa,$aa,$aa,$aa,$aa,$aa,$aa - .byte $aa,$aa,$aa,$aa,$aa,$aa,$aa,$aa - .byte $aa,$4a,$bb,$00,$b0,$00,$b9,$99 - .byte $ff,$44,$b4,$bb,$aa,$aa,$ab,$a9 - - - - - - - -