Apple-2-SW/dos33fsprogs
1
0
Fork 0
mirror of https://github.com/deater/dos33fsprogs.git synced 2024-06-26 00:29:29 +00:00
Code Issues Projects Releases Wiki Activity

mist: consolidate sounds

Browse Source 
have in one central location, so we can toggle more easily
This commit is contained in:
Vince Weaver 2020-07-17 09:39:27 -04:00
parent 84f07c20f7
commit 2db93b5ca4
14 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mist/cabin_boiler_puzzle.s
View File

@ -162,7 +162,7 @@ change_tree_level:
jsr change_direction jsr change_direction
jsr beep jsr long_beep
rts rts
@ -443,6 +443,8 @@ wrong_combination:
rts rts
safe_buttons: safe_buttons:
jsr click_speaker
lda CURSOR_X lda CURSOR_X
cmp #13 ; not a button cmp #13 ; not a button
bcc no_button bcc no_button

3
mist/channel.s
View File

@ -194,6 +194,8 @@ toggle_faucet:
; level graphics ; level graphics
.include "graphics_channel/channel_graphics.inc" .include "graphics_channel/channel_graphics.inc"
; sound
.include "simple_sounds.s"
; puzzles ; puzzles
.include "channel_switches.s" .include "channel_switches.s"
@ -203,5 +205,4 @@ toggle_faucet:
; linking books ; linking books
.include "link_book_mist.s" .include "link_book_mist.s"
; .include "link_book_channel.s"

4
mist/channel_switches.s
View File

@ -171,7 +171,7 @@ elev1_close_door:
raise_bridge: raise_bridge:
bit $C030 ; click speaker jsr click_speaker ; click speaker
; only raise/lower if water is flowing ; only raise/lower if water is flowing
@ -207,7 +207,7 @@ no_raise_bridge:
extend_pipe: extend_pipe:
bit $C030 ; click speaker jsr click_speaker ; click speaker
; toggle state ; toggle state

2
mist/clock_bridge_puzzle.s
View File

@ -403,7 +403,7 @@ bridge_down:
bridge_adjust: bridge_adjust:
sta CLOCK_BRIDGE sta CLOCK_BRIDGE
bit $C030 ; click speaker jsr click_speaker ; click speaker
jsr raise_bridge jsr raise_bridge

3
mist/dentist.s
View File

@ -326,4 +326,5 @@ lights_are_off:
; level data ; level data
.include "leveldata_dentist.inc" .include "leveldata_dentist.inc"
; sound
.include "simple_sounds.s"

3
mist/generator.s
View File

@ -136,3 +136,6 @@ really_exit:
; level data ; level data
.include "leveldata_generator.inc" .include "leveldata_generator.inc"
; sound
.include "simple_sounds.s"

2
mist/generator_puzzle.s
View File

@ -37,7 +37,7 @@ back_to_mist:
circuit_breaker: circuit_breaker:
bit $C030 ; click speaker jsr click_speaker ; click speaker
lda LOCATION lda LOCATION
cmp #MIST_TOWER2_TOP cmp #MIST_TOWER2_TOP

4
mist/marker_switch.s
View File

@ -34,8 +34,8 @@ click_marker_switch:
; click ; click
bit $C030 jsr click_speaker
bit $C030 jsr click_speaker
eor MARKER_SWITCHES ; toggle switch eor MARKER_SWITCHES ; toggle switch
sta MARKER_SWITCHES sta MARKER_SWITCHES

3
mist/meche.s
View File

@ -274,6 +274,9 @@ no_draw_page:
.include "graphics_meche/meche_graphics.inc" .include "graphics_meche/meche_graphics.inc"
; sound
.include "simple_sounds.s"
; linking books ; linking books
.include "link_book_meche.s" .include "link_book_meche.s"

2
mist/meche_rotation.s
View File

@ -51,7 +51,7 @@ enter_red_secret:
exit_puzzle_button_press: exit_puzzle_button_press:
bit $c030 ; click speaker jsr click_speaker ; click speaker
lda CURSOR_Y lda CURSOR_Y
cmp #40 cmp #40

4
mist/mist_puzzles.s
View File

@ -274,7 +274,7 @@ move_the_ship:
; play noise ; play noise
jsr beep jsr long_beep
; adjust the backgrounds ; adjust the backgrounds
@ -475,7 +475,7 @@ done_pillar:
circuit_breaker: circuit_breaker:
bit $C030 ; click speaker jsr click_speaker ; click speaker
lda LOCATION lda LOCATION
cmp #MIST_TOWER2_TOP cmp #MIST_TOWER2_TOP

3
mist/octagon.s
View File

@ -477,6 +477,9 @@ done_fireplace_page:
; level graphics ; level graphics
.include "graphics_octagon/octagon_graphics.inc" .include "graphics_octagon/octagon_graphics.inc"
; sound
.include "simple_sounds.s"
; puzzles ; puzzles
.include "brother_books.s" .include "brother_books.s"
.include "octagon_bookshelf.s" .include "octagon_bookshelf.s"

21
mist/octagon_bookshelf.s
View File

@ -445,7 +445,7 @@ open_bookshelf:
cmp #OCTAGON_BOOKSHELF_CLOSE cmp #OCTAGON_BOOKSHELF_CLOSE
beq actually_open_shelf beq actually_open_shelf
jsr cant_noise jsr short_beep
rts rts
@ -522,7 +522,7 @@ close_bookshelf:
cmp #OCTAGON_BOOKSHELF_CLOSE cmp #OCTAGON_BOOKSHELF_CLOSE
bne actually_close_shelf bne actually_close_shelf
jsr cant_noise jsr short_beep
rts rts
@ -662,23 +662,6 @@ door_swirl:
jmp advance_swirl jmp advance_swirl
cant_noise:
ldx #$ff
cant_noise_loop:
bit $c030
nop
nop
nop
bit $c030
nop
nop
nop
dex
bne cant_noise_loop
rts
;============================= ;=============================
; animate_shelf_open ; animate_shelf_open
;============================= ;=============================

12
mist/simple_sounds.s
View File

@ -11,14 +11,22 @@ click_speaker:
done_click: done_click:
rts rts
long_beep:
ldy #235
bne do_beep
short_beep:
ldy #40
bne do_beep
;=========================== ;===========================
; BEEP (inlined) ; BEEP (inlined)
;=========================== ;===========================
beep: do_beep:
lda SOUND_STATUS lda SOUND_STATUS
bmi done_beep bmi done_beep
ldy #235
sty tone_smc+1 sty tone_smc+1
; BEEP ; BEEP