diff --git a/ootw/ootw_c2_cage.s b/ootw/ootw_c2_cage.s index 406accf4..200be33e 100644 --- a/ootw/ootw_c2_cage.s +++ b/ootw/ootw_c2_cage.s @@ -738,7 +738,7 @@ cage_ending_loop: ;================ ; draw physicist ;================ - ; frame 10 crouching + ; frame 18 crouching ; frame 40 getting up one step? ; frame 60 all stood up ; frame 70 jump -- 90 @@ -746,13 +746,13 @@ cage_ending_loop: ; frame 100 turn right ; frame 120 turn left - lda #19 + lda #20 sta XPOS lda #28 sta YPOS lda FRAMEL - cmp #10 + cmp #18 bcc ce_done_physicist ; blt cmp #120 @@ -799,7 +799,7 @@ ce_jump: ce_stand_right: - lda #29 + lda #28 sta XPOS lda #30 sta YPOS @@ -810,7 +810,7 @@ ce_stand_right: ce_stand_left: - lda #29 + lda #28 sta XPOS lda #30 sta YPOS @@ -831,59 +831,13 @@ ce_draw_physicist_right: ce_done_physicist: - ;=========== - ; draw cage - ;=========== - ; frame 0 .. 10 falling - ; frame 10 - ??? sproinging - ; frame 20 -- permanent - lda FRAMEL - cmp #10 - bcs done_cage_ground ; bge - - lda FRAMEL - asl - clc - adc #2 - -cage_set_ypos: - sta YPOS - - lda #18 - sta XPOS - - ldx #cage_center_sprite - - jmp done_cage_endcage - -done_cage_ground: - - lda #18 - sta XPOS - lda #32 - sta YPOS - - ldx #cage_ground_sprite - -done_cage_endcage: - stx INL - sty INH - jsr put_sprite_crop - - ;================ - ; draw cage parts - ;================ - ; FIXME - ;============ ; draw friend ;============ - ; frame 10 crouching + ; frame 18 crouching ; frame 34 getting up one step? ; frame 38 all stood up (right) ; frame 60 turns @@ -893,13 +847,13 @@ done_cage_endcage: ; frame 90-100 taps ; frame 116 points, my tuba - lda #25 + lda #24 sta XPOS lda #30 sta YPOS lda FRAMEL - cmp #10 + cmp #18 bcc ce_done_friend ; blt cmp #76 @@ -923,6 +877,8 @@ done_cage_endcage: ce_friend_crouch_cage: + lda #22 + sta XPOS ldx #friend_crouch2 @@ -972,6 +928,122 @@ ce_done_friend: + ;=========== + ; draw guard + ;=========== + + ; frame 0-5 : standing + ; frame 6-11 : falling + ; frame 12+ : on ground + + lda FRAMEL + cmp #5 + bcs ce_guard_not_standing ; bge + + lda #21 + sta XPOS + lda #30 + sta YPOS + + ldx #alien_shooting_up_sprite + jmp done_guard_endcage + +ce_guard_not_standing: + + cmp #10 + bcs ce_guard_not_falling ; bge + + lda #19 + sta XPOS + lda #30 + sta YPOS + + ldx #guard_crashing_sprite + jmp done_guard_endcage + +ce_guard_not_falling: + + lda #17 + sta XPOS + lda #42 + sta YPOS + + ldx #guard_dead_sprite + + +done_guard_endcage: + stx INL + sty INH + jsr put_sprite_crop + + + ;=========== + ; draw cage + ;=========== + ; frame 0 .. 9 falling + ; frame 10 - 19 sproinging + ; frame 20 -- permanent + + + lda FRAMEL + cmp #10 + bcs done_cage_ground ; bge + + lda FRAMEL + asl + clc + adc #2 + +cage_set_ypos: + sta YPOS + + lda #17 + sta XPOS + + ldx #cage_center_sprite + + jmp done_cage_endcage + +done_cage_ground: + + lda #17 + sta XPOS + lda #32 + sta YPOS + + lda FRAMEL + cmp #20 + bcs cage_on_ground ; bge + + sec + sbc #10 + and #$fe + tay + + lda cage_sprites,Y + tax + lda cage_sprites+1,Y + tay + + jmp done_cage_endcage + +cage_on_ground: + ldx #cage_ground_sprite + +done_cage_endcage: + stx INL + sty INH + jsr put_sprite_crop + + ;================ + ; draw cage parts + ;================ + ; FIXME ;========================== @@ -982,7 +1054,7 @@ ce_done_friend: ; frame 20- 23 : out2 ; frame 24 : gone - lda #27 + lda #28 sta XPOS lda #34 @@ -1022,56 +1094,6 @@ done_cage_draw_lg: jsr draw_laser - ;=========================== - ; draw guard (if applicable) - ;=========================== - - ; frame 0-10 : standing - ; frame 11-12 : falling - ; frame 13+ : on ground - - lda FRAMEL - cmp #10 - bcs ce_guard_not_standing ; bge - - lda #21 - sta XPOS - lda #28 - sta YPOS - - ldx #alien_shooting_up_sprite - jmp done_guard_endcage - -ce_guard_not_standing: - - cmp #12 - bcs ce_guard_not_falling ; bge - - lda #21 - sta XPOS - lda #28 - sta YPOS - - ldx #guard_crashing_sprite - jmp done_guard_endcage - -ce_guard_not_falling: - - lda #18 - sta XPOS - lda #42 - sta YPOS - - ldx #guard_dead_sprite - - -done_guard_endcage: - stx INL - sty INH - jsr put_sprite_crop @@ -1090,14 +1112,14 @@ done_guard_endcage: ; frame 26 -- left1 (done) 34,44 lda FRAMEL - cmp #10 + cmp #5 bcc ce_done_gun ; blt - cmp #26 + cmp #21 bcs ce_default_gun ; bge sec - sbc #10 + sbc #5 and #$fe tay lda gun_arc,Y @@ -1108,7 +1130,7 @@ done_guard_endcage: jmp ce_draw_gun ce_default_gun: - lda #34 + lda #35 sta XPOS lda #44 sta YPOS @@ -1127,8 +1149,14 @@ ce_done_gun: ;================ ; delay - lda #150 - jsr WAIT +; lda #150 +; jsr WAIT + +wuk: + lda KEYPRESS + bpl wuk + bit KEYRESET + ;================ @@ -1157,35 +1185,79 @@ guard_dead_sprite: guard_crashing_sprite: .byte 7,8 -.byte $AA,$AA,$AA,$AA,$5A,$A5,$AA -.byte $AA,$AA,$AA,$AA,$55,$77,$77 -.byte $AA,$AA,$AA,$AA,$55,$07,$A7 -.byte $AA,$AA,$AA,$0A,$05,$00,$AA -.byte $AA,$AA,$AA,$00,$00,$AA,$AA +.byte $AA,$AA,$AA,$AA,$AA,$AA,$AA +.byte $AA,$AA,$AA,$AA,$AA,$AA,$AA +.byte $AA,$AA,$AA,$AA,$7A,$77,$AA +.byte $AA,$AA,$AA,$00,$07,$57,$55 +.byte $AA,$AA,$AA,$10,$05,$AA,$AA .byte $AA,$AA,$AA,$70,$77,$AA,$AA -.byte $AA,$AA,$07,$A7,$05,$AA,$AA +.byte $AA,$AA,$77,$A7,$05,$AA,$AA .byte $0a,$00,$AA,$0A,$A0,$AA,$AA +cage_sprites: + .word cage_sprite_1 + .word cage_sprite_2 + .word cage_sprite_3 + .word cage_sprite_4 + .word cage_sprite_4 + +cage_sprite_1: +.byte 9,6 +.byte $AA,$AA,$55,$AA,$AA,$55,$AA,$55,$AA +.byte $AA,$55,$AA,$AA,$55,$AA,$AA,$55,$AA +.byte $AA,$55,$AA,$99,$55,$77,$AA,$AA,$55 +.byte $AA,$55,$AA,$00,$55,$00,$55,$AA,$55 +.byte $AA,$55,$AA,$44,$55,$00,$55,$55,$AA +.byte $AA,$85,$8A,$A8,$A8,$A8,$A8,$A8,$AA + +cage_sprite_2: +.byte 9,6 +.byte $AA,$55,$AA,$AA,$AA,$55,$AA,$AA,$AA +.byte $AA,$55,$AA,$AA,$55,$AA,$AA,$55,$AA +.byte $AA,$55,$AA,$9A,$55,$AA,$77,$55,$AA +.byte $AA,$55,$AA,$09,$55,$00,$55,$55,$AA +.byte $AA,$55,$AA,$44,$55,$00,$55,$55,$AA +.byte $AA,$85,$8A,$A8,$A8,$A8,$A8,$A8,$AA + +cage_sprite_3: +.byte 9,6 +.byte $AA,$55,$AA,$AA,$AA,$55,$AA,$AA,$55 +.byte $AA,$55,$AA,$AA,$55,$AA,$AA,$55,$AA +.byte $AA,$55,$AA,$9A,$55,$AA,$77,$55,$AA +.byte $AA,$55,$AA,$09,$55,$00,$55,$55,$AA +.byte $AA,$55,$AA,$44,$55,$00,$55,$55,$AA +.byte $AA,$85,$8A,$A8,$A8,$A8,$A8,$A8,$AA + +cage_sprite_4: +.byte 9,6 +.byte $55,$AA,$AA,$AA,$55,$AA,$AA,$AA,$55 +.byte $AA,$55,$AA,$AA,$55,$AA,$AA,$55,$AA +.byte $AA,$55,$AA,$9A,$55,$AA,$7f,$55,$AA +.byte $AA,$55,$AA,$09,$55,$00,$00,$55,$AA +.byte $AA,$55,$AA,$44,$55,$00,$55,$55,$AA +.byte $AA,$85,$8A,$A8,$A8,$A8,$A8,$A8,$AA + + ; at 18,32 cage_ground_sprite: .byte 9,6 -.byte $55,$AA,$AA,$AA,$55,$AA,$AA,$AA,$55 +.byte $55,$AA,$AA,$AA,$55,$AA,$AA,$AA,$AA .byte $AA,$55,$AA,$AA,$55,$AA,$AA,$55,$AA .byte $AA,$55,$AA,$AA,$55,$AA,$AA,$55,$AA .byte $AA,$55,$AA,$AA,$55,$AA,$AA,$55,$AA .byte $AA,$55,$AA,$AA,$55,$AA,$AA,$55,$AA -.byte $AA,$85,$8A,$A8,$A8,$A8,$A8,$AA,$AA +.byte $AA,$85,$8A,$A8,$A8,$A8,$A8,$A8,$AA gun_arc: .byte 28,36 ; frame 10 -- in air 28,36 - .byte 28,40 ; frame 12 -- lower 28,40 - .byte 29,44 ; frame 14 -- on ground 29,44 - .byte 29,42 ; frame 16 -- bounce 29,42 - .byte 30,44 ; frame 18 -- ground 30,44 - .byte 31,44 ; frame 20 -- left2 31,44 - .byte 32,44 ; frame 22 -- left2 32,44 - .byte 33,44 ; frame 24 -- left1 33,44 + .byte 29,40 ; frame 12 -- lower 28,40 + .byte 30,44 ; frame 14 -- on ground 29,44 + .byte 31,42 ; frame 16 -- bounce 29,42 + .byte 32,44 ; frame 18 -- ground 30,44 + .byte 33,44 ; frame 20 -- left2 31,44 + .byte 34,44 ; frame 22 -- left2 32,44 + .byte 35,44 ; frame 24 -- left1 33,44 diff --git a/ootw/ootw_c2_miners.s b/ootw/ootw_c2_miners.s index 617eb8e6..8e7bf668 100644 --- a/ootw/ootw_c2_miners.s +++ b/ootw/ootw_c2_miners.s @@ -36,7 +36,7 @@ miner2: - lda #15 + lda #14 sta XPOS lda #28 sta YPOS diff --git a/ootw/ootw_graphics/l2cage/Makefile b/ootw/ootw_graphics/l2cage/Makefile index f27d5c38..7e0ea681 100644 --- a/ootw/ootw_graphics/l2cage/Makefile +++ b/ootw/ootw_graphics/l2cage/Makefile @@ -8,9 +8,14 @@ all: ootw_c2_cage.inc ##### ootw_c2_cage.inc: $(PNG2RLE) \ - ootw_c2_nocage.png ootw_c2_cage_fell.png + ootw_c2_nocage.png ootw_c2_cage_fell.png \ + debris1.png debris2.png debris3.png $(PNG2RLE) asm ootw_c2_cage_fell.png cage_fell_rle > ootw_c2_cage.inc $(PNG2RLE) asm ootw_c2_nocage.png cage_rle >> ootw_c2_cage.inc + $(PNG2RLE) asm debris1.png debris1_rle >> ootw_c2_cage.inc + $(PNG2RLE) asm debris2.png debris2_rle >> ootw_c2_cage.inc + $(PNG2RLE) asm debris3.png debris3_rle >> ootw_c2_cage.inc + ##### diff --git a/ootw/ootw_graphics/l2cage/debris1.png b/ootw/ootw_graphics/l2cage/debris1.png new file mode 100644 index 00000000..5b60f172 Binary files /dev/null and b/ootw/ootw_graphics/l2cage/debris1.png differ diff --git a/ootw/ootw_graphics/l2cage/debris2.png b/ootw/ootw_graphics/l2cage/debris2.png new file mode 100644 index 00000000..3385c921 Binary files /dev/null and b/ootw/ootw_graphics/l2cage/debris2.png differ diff --git a/ootw/ootw_graphics/l2cage/debris3.png b/ootw/ootw_graphics/l2cage/debris3.png new file mode 100644 index 00000000..46613506 Binary files /dev/null and b/ootw/ootw_graphics/l2cage/debris3.png differ diff --git a/ootw/ootw_graphics/l2cage/ootw_c2_cage.inc b/ootw/ootw_graphics/l2cage/ootw_c2_cage.inc index 65216923..5d881ff3 100644 --- a/ootw/ootw_graphics/l2cage/ootw_c2_cage.inc +++ b/ootw/ootw_graphics/l2cage/ootw_c2_cage.inc @@ -1,112 +1,130 @@ cage_fell_rle: .byte $28 ; ysize=48 .byte $A5,$22, $A4,$00, $20, $62,$62, $20, $00,$00, $20 .byte $02, $00,$00, $20,$20, $22, $20, $00, $22 - .byte $20, $00, $22, $00, $55, $22, $66,$66 + .byte $20, $00, $22, $00,$00, $55, $22, $66 .byte $A5,$88, $A6,$22, $A5,$00, $A3,$22, $62, $00, $A3,$20 - .byte $00,$00, $06, $66,$66, $22, $20, $66,$66, $A3,$00 - .byte $55, $22, $66,$66, $A6,$88, $A5,$22, $A3,$00, $22 + .byte $00,$00, $06, $66,$66, $22, $20, $66,$66, $A4,$00 + .byte $55, $22, $66, $A6,$88, $A5,$22, $A3,$00, $22 .byte $00,$00, $02,$02, $00,$00, $22,$22, $66,$66, $22,$22, $00 - .byte $A4,$02, $A4,$00, $55, $22, $66,$66, $A6,$88, $A4,$22 + .byte $A4,$02, $A5,$00, $55, $22, $66, $A6,$88, $A4,$22 .byte $A6,$00, $20, $A3,$22, $26, $62,$62, $66,$66, $26 - .byte $22, $A9,$00, $55, $22, $66,$66, $A6,$88, $A4,$22 + .byte $22, $AA,$00, $55, $22, $66, $A6,$88, $A4,$22 .byte $A5,$00, $20, $62, $22, $62, $22,$22, $62 - .byte $A3,$66, $22, $02, $22, $A8,$00, $55, $22 - .byte $66,$66, $A6,$88, $A3,$22, $A6,$00, $02, $26,$26, $66 - .byte $22, $A5,$66, $22, $00, $02, $20, $A7,$00 - .byte $55, $22, $66,$66, $88,$88, $65, $A3,$88, $22,$22 + .byte $A3,$66, $22, $02, $22, $A9,$00, $55, $22 + .byte $66, $A6,$88, $A3,$22, $A6,$00, $02, $26,$26, $66 + .byte $22, $A5,$66, $22, $00, $02, $20, $A8,$00 + .byte $55, $22, $66, $88,$88, $65, $A3,$88, $22,$22 .byte $02, $A7,$00, $22,$22, $66,$66, $22, $A4,$66, $22 - .byte $20,$20, $22, $A4,$00, $02, $00,$00, $55, $22 - .byte $66,$66, $A6,$88, $22,$22, $A8,$00, $22, $A8,$66, $A4,$22 - .byte $00,$00, $22, $A4,$00, $55, $22, $66,$66, $A7,$88 + .byte $20,$20, $22, $A4,$00, $02, $A3,$00, $55, $22 + .byte $66, $A6,$88, $22,$22, $A8,$00, $22, $A8,$66, $A4,$22 + .byte $00,$00, $22, $A5,$00, $55, $22, $66, $A7,$88 .byte $02, $A9,$00, $22, $26, $62, $A5,$66, $22 - .byte $66, $26, $02, $00,$00, $02, $A4,$00, $55 - .byte $22, $66,$66, $A7,$88, $AA,$00, $22, $26, $66 + .byte $66, $26, $02, $00,$00, $02, $A5,$00, $55 + .byte $22, $66, $A7,$88, $AA,$00, $22, $26, $66 .byte $62, $66, $26, $66, $22,$22, $66, $02 - .byte $A6,$00, $22, $00, $55, $22, $66,$66, $A7,$88 + .byte $A6,$00, $22, $00,$00, $55, $22, $66, $A7,$88 .byte $AA,$00, $22,$22, $66,$66, $26, $22, $66, $62 - .byte $66,$66, $20, $A8,$00, $55, $22, $66,$66, $A7,$88 + .byte $66,$66, $20, $A9,$00, $55, $22, $66, $A7,$88 .byte $AB,$00, $22,$22, $26, $A3,$66, $26, $66,$66, $22 - .byte $00, $20, $A3,$00, $22, $00,$00, $55, $22 - .byte $66,$66, $A7,$88, $AC,$00, $22, $02, $26,$26, $22 + .byte $00, $20, $A3,$00, $22, $A3,$00, $55, $22 + .byte $66, $A7,$88, $AC,$00, $22, $02, $26,$26, $22 .byte $02,$02, $22, $62, $22, $62, $00,$00, $22 - .byte $20, $00,$00, $55, $22, $66,$66, $A7,$88, $A9,$00 + .byte $20, $A3,$00, $55, $22, $66, $A7,$88, $A9,$00 .byte $22,$22, $A3,$00, $A3,$22, $00,$00, $02, $66, $62 - .byte $66, $00,$00, $22, $66, $00,$00, $55, $22 - .byte $66,$66, $88, $C8, $88, $C8, $88, $18 + .byte $66, $00,$00, $22, $66, $A3,$00, $55, $22 + .byte $66, $88, $C8, $88, $C8, $88, $18 .byte $88, $A9,$00, $02,$02, $AA,$00, $02, $22, $A3,$00 - .byte $02, $00,$00, $55, $22, $66,$66, $A7,$88, $AB,$00 - .byte $20, $00,$00, $62, $66, $AD,$00, $55, $22 - .byte $66,$66, $A7,$88, $A7,$00, $20,$20, $22, $00, $22,$22 - .byte $20, $66,$66, $22,$22, $55, $A3,$00, $55, $A3,$00 - .byte $55, $00,$00, $22,$22, $66,$66, $A7,$88, $A7,$00, $22 - .byte $66, $26, $00, $22, $26, $22, $26 - .byte $A4,$22, $55, $00,$00, $55, $00,$00, $55, $A3,$00 - .byte $22,$22, $66,$66, $A7,$88, $A7,$00, $22, $66,$66, $00 - .byte $02, $62, $66,$66, $26, $22,$22, $00, $55 - .byte $00,$00, $55, $00,$00, $55, $A3,$00, $22,$22, $66,$66 - .byte $A7,$88, $A5,$00, $22, $00, $02,$02, $06, $00 - .byte $22,$22, $26,$26, $22, $02, $00,$00, $55, $00,$00 - .byte $55, $00,$00, $55, $A3,$00, $22,$22, $66,$66, $A7,$88 - .byte $AB,$00, $22, $02, $A6,$00, $55, $00,$00, $55 - .byte $00,$00, $55, $A3,$00, $22,$22, $66,$66, $A7,$88, $A0,$13,$00 - .byte $85, $80, $08, $18, $08,$08, $76,$76, $A4,$26 - .byte $66,$66, $A7,$88, $60,$60, $A0,$11,$00, $77,$77, $00, $11 - .byte $00, $70, $07, $77, $A5,$62, $66, $A7,$68 - .byte $26, $A0,$11,$00, $06, $56, $06, $56, $06 - .byte $56, $77, $56, $06, $56, $26, $56 - .byte $06, $56, $06, $56, $06, $56, $06 - .byte $56, $06, $56 + .byte $02, $A3,$00, $55, $22, $66, $A7,$88, $AB,$00 + .byte $20, $00,$00, $62, $22, $AE,$00, $55, $22 + .byte $66, $A7,$88, $A7,$00, $20,$20, $22, $00, $22,$22 + .byte $20, $66, $22,$22, $55, $20, $00,$00, $55 + .byte $A8,$00, $22,$22, $66, $A7,$88, $A7,$00, $22, $66 + .byte $26, $00, $22, $26, $22, $26, $A3,$22 + .byte $55, $00,$00, $55, $00,$00, $55, $A5,$00, $22,$22 + .byte $66, $A7,$88, $A7,$00, $22, $66,$66, $00, $02 + .byte $62, $66,$66, $26, $22,$22, $55, $00,$00, $55 + .byte $00,$00, $55, $A5,$00, $22,$22, $66, $A7,$88, $A5,$00 + .byte $22, $00, $02,$02, $06, $00, $22,$22, $26,$26 + .byte $22, $02, $00, $55, $00,$00, $55, $00,$00 + .byte $55, $A5,$00, $22,$22, $66, $A7,$88, $AB,$00, $22 + .byte $02, $A5,$00, $55, $00,$00, $55, $00,$00, $55 + .byte $A5,$00, $22,$22, $66, $A7,$88, $A0,$12,$00, $85, $80 + .byte $08, $18, $08,$08, $78, $76, $A6,$26, $66 + .byte $A7,$88, $60,$60, $A0,$10,$00, $77,$77, $00, $11, $00 + .byte $70, $07, $77, $A6,$62, $66, $A7,$68, $26 + .byte $A0,$11,$00, $06, $56, $06, $56, $06, $77 + .byte $26, $56, $06, $56, $26, $56, $06 + .byte $56, $06, $56, $06, $56, $06, $56 + .byte $06, $56 .byte $A1 cage_rle: .byte $28 ; ysize=48 .byte $A5,$22, $A4,$00, $20, $62,$62, $20, $00,$00, $20 .byte $02, $00,$00, $20,$20, $22, $20, $00, $22 - .byte $20, $00, $22, $00, $55, $22, $66,$66 + .byte $20, $00, $22, $00,$00, $55, $22, $66 .byte $A5,$88, $A6,$22, $A5,$00, $A3,$22, $62, $00, $A3,$20 - .byte $00,$00, $06, $66,$66, $22, $20, $66,$66, $A3,$00 - .byte $55, $22, $66,$66, $A6,$88, $A5,$22, $A3,$00, $22 + .byte $00,$00, $06, $66,$66, $22, $20, $66,$66, $A4,$00 + .byte $55, $22, $66, $A6,$88, $A5,$22, $A3,$00, $22 .byte $00,$00, $02,$02, $00,$00, $22,$22, $66,$66, $22,$22, $00 - .byte $A4,$02, $A4,$00, $55, $22, $66,$66, $A6,$88, $A4,$22 + .byte $A4,$02, $A5,$00, $55, $22, $66, $A6,$88, $A4,$22 .byte $A6,$00, $20, $A3,$22, $26, $62,$62, $66,$66, $26 - .byte $22, $A9,$00, $55, $22, $66,$66, $A6,$88, $A4,$22 + .byte $22, $AA,$00, $55, $22, $66, $A6,$88, $A4,$22 .byte $A5,$00, $20, $62, $22, $62, $22,$22, $62 - .byte $A3,$66, $22, $02, $22, $A8,$00, $55, $22 - .byte $66,$66, $A6,$88, $A3,$22, $A6,$00, $02, $26,$26, $66 - .byte $22, $A5,$66, $22, $00, $02, $20, $A7,$00 - .byte $55, $22, $66,$66, $88,$88, $65, $A3,$88, $22,$22 + .byte $A3,$66, $22, $02, $22, $A9,$00, $55, $22 + .byte $66, $A6,$88, $A3,$22, $A6,$00, $02, $26,$26, $66 + .byte $22, $A5,$66, $22, $00, $02, $20, $A8,$00 + .byte $55, $22, $66, $88,$88, $65, $A3,$88, $22,$22 .byte $02, $A7,$00, $22,$22, $66,$66, $22, $A4,$66, $22 - .byte $20,$20, $22, $A4,$00, $02, $00,$00, $55, $22 - .byte $66,$66, $A6,$88, $22,$22, $A8,$00, $22, $A8,$66, $A4,$22 - .byte $00,$00, $22, $A4,$00, $55, $22, $66,$66, $A7,$88 + .byte $20,$20, $22, $A4,$00, $02, $A3,$00, $55, $22 + .byte $66, $A6,$88, $22,$22, $A8,$00, $22, $A8,$66, $A4,$22 + .byte $00,$00, $22, $A5,$00, $55, $22, $66, $A7,$88 .byte $02, $A9,$00, $22, $26, $62, $A5,$66, $22 - .byte $66, $26, $02, $00,$00, $02, $A4,$00, $55 - .byte $22, $66,$66, $A7,$88, $AA,$00, $22, $26, $66 + .byte $66, $26, $02, $00,$00, $02, $A5,$00, $55 + .byte $22, $66, $A7,$88, $AA,$00, $22, $26, $66 .byte $62, $66, $26, $66, $22,$22, $66, $02 - .byte $A6,$00, $22, $00, $55, $22, $66,$66, $A7,$88 + .byte $A6,$00, $22, $00,$00, $55, $22, $66, $A7,$88 .byte $AA,$00, $22,$22, $66,$66, $26, $22, $66, $62 - .byte $66,$66, $20, $A8,$00, $55, $22, $66,$66, $A7,$88 + .byte $66,$66, $20, $A9,$00, $55, $22, $66, $A7,$88 .byte $AB,$00, $22,$22, $26, $A3,$66, $26, $66,$66, $22 - .byte $00, $20, $A3,$00, $22, $00,$00, $55, $22 - .byte $66,$66, $A7,$88, $AC,$00, $22, $02, $26,$26, $22 + .byte $00, $20, $A3,$00, $22, $A3,$00, $55, $22 + .byte $66, $A7,$88, $AC,$00, $22, $02, $26,$26, $22 .byte $02,$02, $22, $62, $22, $62, $00,$00, $22 - .byte $20, $00,$00, $55, $22, $66,$66, $A7,$88, $A9,$00 + .byte $20, $A3,$00, $55, $22, $66, $A7,$88, $A9,$00 .byte $22,$22, $A3,$00, $A3,$22, $00,$00, $02, $66, $62 - .byte $66, $00,$00, $22, $66, $00,$00, $55, $22 - .byte $66,$66, $88, $C8, $88, $C8, $88, $18 + .byte $66, $00,$00, $22, $66, $A3,$00, $55, $22 + .byte $66, $88, $C8, $88, $C8, $88, $18 .byte $88, $A9,$00, $02,$02, $AA,$00, $02, $22, $A3,$00 - .byte $02, $00,$00, $55, $22, $66,$66, $A7,$88, $AB,$00 - .byte $20, $00,$00, $62, $66, $AD,$00, $55, $22 - .byte $66,$66, $A7,$88, $A7,$00, $20,$20, $22, $00, $22,$22 - .byte $20, $66,$66, $22,$22, $20, $AA,$00, $22,$22, $66,$66 + .byte $02, $A3,$00, $55, $22, $66, $A7,$88, $AB,$00 + .byte $20, $00,$00, $62, $22, $AE,$00, $55, $22 + .byte $66, $A7,$88, $A7,$00, $20,$20, $22, $00, $22,$22 + .byte $20, $66, $A3,$22, $20, $AB,$00, $22,$22, $66 .byte $A7,$88, $A7,$00, $22, $66, $26, $00, $22 - .byte $26, $22, $26, $A4,$22, $AA,$00, $22,$22, $66,$66 + .byte $26, $22, $26, $A4,$22, $AB,$00, $22,$22, $66 .byte $A7,$88, $A7,$00, $22, $66,$66, $00, $02, $62 - .byte $66,$66, $26, $22,$22, $AB,$00, $22,$22, $66,$66, $A7,$88 + .byte $66,$66, $26, $22,$22, $AC,$00, $22,$22, $66, $A7,$88 .byte $A5,$00, $22, $00, $02,$02, $06, $00, $22,$22 - .byte $26,$26, $22, $02, $AC,$00, $22,$22, $66,$66, $A7,$88 - .byte $AB,$00, $22, $02, $A0,$10,$00, $22,$22, $66,$66, $A7,$88 - .byte $A0,$19,$00, $A6,$26, $66,$66, $A7,$88, $60,$60, $A0,$10,$00, $A7,$60 + .byte $26,$26, $22, $02, $AD,$00, $22,$22, $66, $A7,$88 + .byte $AB,$00, $22, $02, $A0,$11,$00, $22,$22, $66, $A7,$88 + .byte $A0,$19,$00, $A7,$26, $66, $A7,$88, $60,$60, $A0,$10,$00, $A7,$60 .byte $A7,$62, $66, $A7,$68, $26, $A0,$11,$00, $06, $56 .byte $06, $56, $06, $56, $26, $56, $06 .byte $56, $26, $56, $06, $56, $06, $56 .byte $06, $56, $06, $56, $06, $56 .byte $A1 +debris1_rle: .byte $28 ; ysize=48 + .byte $A0,$FF,$AA, $A0,$FF,$AA, $A0,$50,$AA, $22, $A0,$26,$AA, $22, $A0,$FF,$AA + .byte $A0,$4B,$AA + .byte $A1 +debris2_rle: .byte $28 ; ysize=48 + .byte $A0,$4F,$AA, $2A, $A0,$24,$AA, $2A,$2A, $22,$22, $A0,$22,$AA, $2A + .byte $A5,$22, $A0,$20,$AA, $2A, $A7,$22, $A0,$1E,$AA, $2A, $A8,$22 + .byte $A0,$01,$A2, $A0,$1D,$AA, $2A, $A7,$22, $A0,$01,$A2, $A0,$1E,$AA, $2A + .byte $A6,$22, $A0,$01,$A2, $A0,$20,$AA, $A0,$01,$A2, $A5,$22, $A0,$01,$A2, $A0,$22,$AA + .byte $A4,$22, $A0,$24,$AA, $22,$22, $A0,$01,$A2, $A0,$25,$AA, $A0,$01,$A2, $A0,$FF,$AA + .byte $A0,$EB,$AA + .byte $A1 +debris3_rle: .byte $28 ; ysize=48 + .byte $A0,$25,$AA, $A3,$22, $A0,$25,$AA, $A3,$22, $A0,$26,$AA, $22,$22, $A0,$26,$AA + .byte $22,$22, $A0,$26,$AA, $22,$22, $A0,$26,$AA, $22,$22, $A0,$26,$AA, $A0,$01,$A2 + .byte $22, $A0,$27,$AA, $22, $A0,$27,$AA, $22, $A0,$FF,$AA, $A0,$FF,$AA + .byte $A0,$5A,$AA + .byte $A1 diff --git a/ootw/ootw_graphics/l2cage/ootw_c2_cage_fell.png b/ootw/ootw_graphics/l2cage/ootw_c2_cage_fell.png index 8d8d087a..b671f005 100644 Binary files a/ootw/ootw_graphics/l2cage/ootw_c2_cage_fell.png and b/ootw/ootw_graphics/l2cage/ootw_c2_cage_fell.png differ diff --git a/ootw/ootw_graphics/l2cage/ootw_c2_nocage.png b/ootw/ootw_graphics/l2cage/ootw_c2_nocage.png index e9fbc217..b38beb68 100644 Binary files a/ootw/ootw_graphics/l2cage/ootw_c2_nocage.png and b/ootw/ootw_graphics/l2cage/ootw_c2_nocage.png differ diff --git a/ootw/ootw_graphics/sprites/sprites_alien.inc b/ootw/ootw_graphics/sprites/sprites_alien.inc index 9d167037..a38fdb84 100644 --- a/ootw/ootw_graphics/sprites/sprites_alien.inc +++ b/ootw/ootw_graphics/sprites/sprites_alien.inc @@ -357,28 +357,27 @@ alien_crouch_progression: .word alien_crouch2 alien_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 + .byte $5,$8 + .byte $AA,$AA,$AA,$AA,$AA + .byte $AA,$7A,$f7,$7f,$aa + .byte $AA,$77,$07,$00,$aa + .byte $AA,$AA,$00,$77,$aa + .byte $AA,$A7,$17,$07,$aa + .byte $AA,$AA,$70,$70,$aa + .byte $AA,$AA,$07,$05,$0a + .byte $AA,$0A,$00,$AA,$00 + alien_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 - - + .byte $5,$8 + .byte $AA,$AA,$AA,$AA,$AA + .byte $AA,$AA,$7A,$fA,$aa + .byte $AA,$77,$7f,$07,$aa + .byte $AA,$A7,$00,$70,$aa + .byte $AA,$7A,$70,$07,$aa + .byte $AA,$AA,$70,$70,$aa + .byte $AA,$AA,$07,$55,$0a + .byte $AA,$0A,$00,$0A,$00 ;===================== ;===================== diff --git a/ootw/ootw_graphics/sprites/sprites_friend.inc b/ootw/ootw_graphics/sprites/sprites_friend.inc index fb887685..1d941653 100644 --- a/ootw/ootw_graphics/sprites/sprites_friend.inc +++ b/ootw/ootw_graphics/sprites/sprites_friend.inc @@ -16,9 +16,9 @@ friend_stand: .byte $aa,$aa,$00,$ff,$aa .byte $aa,$aa,$00,$ff,$aa .byte $aa,$aa,$0f,$00,$aa - .byte $aa,$aa,$ff,$a7,$7a - .byte $aa,$aa,$0f,$aa,$07 - .byte $aa,$0a,$00,$0a,$00 + .byte $aa,$aa,$ff,$77,$aa + .byte $aa,$aa,$0f,$07,$aa + .byte $aa,$0a,$00,$00,$aa ;===================== ;===================== @@ -251,27 +251,26 @@ friend_crouch_progression: .word friend_crouch2 friend_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 + .byte 5,8 + .byte $AA,$AA,$AA,$AA,$AA + .byte $AA,$fA,$7f,$f7,$aa + .byte $AA,$ff,$0f,$0f,$aa + .byte $AA,$AA,$00,$ff,$aa + .byte $AA,$Af,$0f,$0f,$aa + .byte $AA,$AA,$f0,$f0,$aa + .byte $AA,$AA,$0f,$07,$0a + .byte $AA,$0A,$00,$AA,$00 friend_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 - + .byte 5,8 + .byte $AA,$AA,$AA,$AA,$AA + .byte $AA,$AA,$fA,$7A,$aa + .byte $AA,$ff,$f7,$0f,$aa + .byte $AA,$Af,$00,$ff,$aa + .byte $AA,$fA,$f0,$0f,$aa + .byte $AA,$AA,$f0,$f0,$aa + .byte $AA,$AA,$0f,$77,$0a + .byte $AA,$0A,$00,$0A,$00 ;=====================