diff --git a/ootw/Makefile b/ootw/Makefile index 64e83691..ba487ab5 100644 --- a/ootw/Makefile +++ b/ootw/Makefile @@ -79,8 +79,9 @@ OOTW_C3: ootw_c3.o ootw_c3.o: ootw_c3.s \ gr_copy.s gr_copy_offset.s gr_fast_clear.s gr_pageflip.s gr_unrle.s \ gr_putsprite.s gr_putsprite_flipped.s gr_putsprite_crop.s \ - keyboard.s gr_run_sequence.s physicist.s \ - ootw_graphics/sprites/physicist.inc \ + keyboard.s \ + ootw_c3_vent.s \ + ootw_graphics/sprites/physicist_rolling.inc \ ootw_graphics/l3vent/ootw_c3_vent.inc ca65 -o ootw_c3.o ootw_c3.s -l ootw_c3.lst diff --git a/ootw/ootw_c3.s b/ootw/ootw_c3.s index 9356e2ed..c770c6dd 100644 --- a/ootw/ootw_c3.s +++ b/ootw/ootw_c3.s @@ -69,7 +69,6 @@ end_message: .byte 11,20,"ACCESS CODE: VENT",0 .include "ootw_c3_vent.s" -;.include "physicist.s" .include "text_print.s" .include "gr_pageflip.s" .include "gr_unrle.s" @@ -89,5 +88,5 @@ end_message: ; room backgrounds .include "ootw_graphics/l3vent/ootw_c3_vent.inc" ; sprites -;.include "ootw_graphics/sprites/sprites_physicist.inc" +.include "ootw_graphics/sprites/physicist_rolling.inc" diff --git a/ootw/ootw_c3_vent.s b/ootw/ootw_c3_vent.s index e14ce1ea..a9a7d134 100644 --- a/ootw/ootw_c3_vent.s +++ b/ootw/ootw_c3_vent.s @@ -141,3 +141,46 @@ done_vent: rts + +puff_sprite_start1: + .byte 3,2 + .byte $AA,$A5,$AA + .byte $AA,$AA,$AA + +puff_sprite_start2: + .byte 3,2 + .byte $AA,$55,$AA + .byte $AA,$AA,$AA + + +puff_sprite_cycle1: + .byte 3,2 + .byte $AA,$55,$AA + .byte $AA,$A5,$AA + +puff_sprite_cycle2: + .byte 3,2 + .byte $AA,$55,$AA + .byte $A5,$A5,$A5 + +puff_sprite_cycle3: + .byte 3,2 + .byte $5A,$55,$5A + .byte $A5,$A5,$A5 + +puff_sprite_cycle4: + .byte 3,2 + .byte $A5,$55,$A5 + .byte $A5,$A5,$A5 + + +puff_sprite_end1: + .byte 3,2 + .byte $AA,$AA,$AA + .byte $A5,$AA,$5A + +puff_sprite_end2: + .byte 3,2 + .byte $A5,$AA,$A5 + .byte $AA,$AA,$AA + diff --git a/ootw/ootw_graphics/sprites/physicist_rolling.inc b/ootw/ootw_graphics/sprites/physicist_rolling.inc new file mode 100644 index 00000000..0f102b2d --- /dev/null +++ b/ootw/ootw_graphics/sprites/physicist_rolling.inc @@ -0,0 +1,123 @@ +; They see me rolling... + +rolling_progression: +.word rolling1 +.word rolling2 +.word rolling3 +.word rolling4 +.word rolling5 +.word rolling6 +.word rolling7 +.word rolling8 + +rolling1: +.byte 5,2 +.byte $AA,$AA,$9B,$9B,$B4 +.byte $AA,$AA,$99,$99,$AB + +rolling2: +.byte 5,2 +.byte $AA,$44,$9B,$9B,$BA +.byte $AA,$AB,$99,$99,$AB + +rolling3: +.byte 5,2 +.byte $AA,$44,$9B,$BA,$AA +.byte $AA,$AB,$99,$99,$AA + +rolling4: +.byte 5,2 +.byte $55,$44,$9B,$9B,$AA +.byte $AA,$AB,$A9,$99,$AA + +rolling5: +.byte 5,2 +.byte $4A,$4B,$99,$99,$AA +.byte $A4,$AB,$B9,$A9,$AA + +rolling6: +.byte 5,2 +.byte $AA,$04,$99,$99,$AA +.byte $AA,$AB,$B9,$B9,$AA + +rolling7: +.byte 5,2 +.byte $AA,$04,$99,$99,$04 +.byte $AA,$BB,$B9,$B9,$BB + +rolling8: +.byte 5,2 +.byte $AA,$AA,$99,$99,$B4 +.byte $AA,$AA,$99,$99,$BB + + +poisoned1: +.byte 8,2 +.byte $AA,$AA,$AA,$88,$88,$44,$DA,$AA +.byte $AA,$AA,$DD,$88,$88,$DD,$AA,$AA + +poisoned2: +.byte 8,2 +.byte $AA,$AA,$AA,$88,$88,$44,$DA,$AA +.byte $AA,$DD,$DA,$88,$88,$D4,$DD,$AA + +poisoned3: +.byte 8,2 +.byte $AA,$AA,$AA,$88,$88,$44,$AA,$AA +.byte $DA,$DA,$DA,$88,$88,$D4,$DA,$DA + + +rolling_falling1: +.byte 2,5 +.byte $9B,$9B +.byte $99,$99 +.byte $AA,$AA +.byte $AA,$AA +.byte $AA,$AA + +rolling_falling2: +.byte 2,5 +.byte $B4,$b4 +.byte $99,$99 +.byte $A9,$A9 +.byte $AA,$AA +.byte $AA,$AA + +rolling_falling3: +.byte 2,5 +.byte $44,$44 +.byte $b4,$0B +.byte $99,$99 +.byte $A9,$A9 +.byte $AA,$AA + +rolling_falling4: +.byte 2,5 +.byte $45,$45 +.byte $44,$44 +.byte $bb,$00 +.byte $9b,$90 +.byte $99,$99 + +rolling_splat1: +.byte 4,4 +.byte $AA,$A5,$45,$4A +.byte $AA,$BA,$94,$94 +.byte $AA,$AA,$99,$99 +.byte $AA,$AA,$AA,$AA + +rolling_splat2: +.byte 4,4 +.byte $AA,$45,$45,$AA +.byte $AA,$BA,$04,$04 +.byte $AA,$AB,$99,$99 +.byte $AA,$A1,$AA,$AA + +rolling_splat3: +.byte 4,4 +.byte $AA,$4A,$4A,$4A +.byte $AA,$A4,$04,$04 +.byte $BA,$BA,$99,$99 +.byte $A1,$A1,$AA,$AA + +