mist: consolidate sounds
have in one central location, so we can toggle more easily
This commit is contained in:
parent
84f07c20f7
commit
2db93b5ca4
|
@ -162,7 +162,7 @@ change_tree_level:
|
|||
|
||||
jsr change_direction
|
||||
|
||||
jsr beep
|
||||
jsr long_beep
|
||||
|
||||
rts
|
||||
|
||||
|
@ -443,6 +443,8 @@ wrong_combination:
|
|||
rts
|
||||
|
||||
safe_buttons:
|
||||
jsr click_speaker
|
||||
|
||||
lda CURSOR_X
|
||||
cmp #13 ; not a button
|
||||
bcc no_button
|
||||
|
|
|
@ -194,6 +194,8 @@ toggle_faucet:
|
|||
; level graphics
|
||||
.include "graphics_channel/channel_graphics.inc"
|
||||
|
||||
; sound
|
||||
.include "simple_sounds.s"
|
||||
|
||||
; puzzles
|
||||
.include "channel_switches.s"
|
||||
|
@ -203,5 +205,4 @@ toggle_faucet:
|
|||
|
||||
; linking books
|
||||
.include "link_book_mist.s"
|
||||
; .include "link_book_channel.s"
|
||||
|
||||
|
|
|
@ -171,7 +171,7 @@ elev1_close_door:
|
|||
|
||||
raise_bridge:
|
||||
|
||||
bit $C030 ; click speaker
|
||||
jsr click_speaker ; click speaker
|
||||
|
||||
; only raise/lower if water is flowing
|
||||
|
||||
|
@ -207,7 +207,7 @@ no_raise_bridge:
|
|||
|
||||
extend_pipe:
|
||||
|
||||
bit $C030 ; click speaker
|
||||
jsr click_speaker ; click speaker
|
||||
|
||||
; toggle state
|
||||
|
||||
|
|
|
@ -403,7 +403,7 @@ bridge_down:
|
|||
bridge_adjust:
|
||||
sta CLOCK_BRIDGE
|
||||
|
||||
bit $C030 ; click speaker
|
||||
jsr click_speaker ; click speaker
|
||||
|
||||
jsr raise_bridge
|
||||
|
||||
|
|
|
@ -326,4 +326,5 @@ lights_are_off:
|
|||
; level data
|
||||
.include "leveldata_dentist.inc"
|
||||
|
||||
|
||||
; sound
|
||||
.include "simple_sounds.s"
|
||||
|
|
|
@ -136,3 +136,6 @@ really_exit:
|
|||
|
||||
; level data
|
||||
.include "leveldata_generator.inc"
|
||||
|
||||
; sound
|
||||
.include "simple_sounds.s"
|
||||
|
|
|
@ -37,7 +37,7 @@ back_to_mist:
|
|||
|
||||
circuit_breaker:
|
||||
|
||||
bit $C030 ; click speaker
|
||||
jsr click_speaker ; click speaker
|
||||
|
||||
lda LOCATION
|
||||
cmp #MIST_TOWER2_TOP
|
||||
|
|
|
@ -34,8 +34,8 @@ click_marker_switch:
|
|||
|
||||
; click
|
||||
|
||||
bit $C030
|
||||
bit $C030
|
||||
jsr click_speaker
|
||||
jsr click_speaker
|
||||
|
||||
eor MARKER_SWITCHES ; toggle switch
|
||||
sta MARKER_SWITCHES
|
||||
|
|
|
@ -274,6 +274,9 @@ no_draw_page:
|
|||
|
||||
.include "graphics_meche/meche_graphics.inc"
|
||||
|
||||
; sound
|
||||
.include "simple_sounds.s"
|
||||
|
||||
; linking books
|
||||
|
||||
.include "link_book_meche.s"
|
||||
|
|
|
@ -51,7 +51,7 @@ enter_red_secret:
|
|||
|
||||
exit_puzzle_button_press:
|
||||
|
||||
bit $c030 ; click speaker
|
||||
jsr click_speaker ; click speaker
|
||||
|
||||
lda CURSOR_Y
|
||||
cmp #40
|
||||
|
|
|
@ -274,7 +274,7 @@ move_the_ship:
|
|||
|
||||
; play noise
|
||||
|
||||
jsr beep
|
||||
jsr long_beep
|
||||
|
||||
; adjust the backgrounds
|
||||
|
||||
|
@ -475,7 +475,7 @@ done_pillar:
|
|||
|
||||
circuit_breaker:
|
||||
|
||||
bit $C030 ; click speaker
|
||||
jsr click_speaker ; click speaker
|
||||
|
||||
lda LOCATION
|
||||
cmp #MIST_TOWER2_TOP
|
||||
|
|
|
@ -477,6 +477,9 @@ done_fireplace_page:
|
|||
; level graphics
|
||||
.include "graphics_octagon/octagon_graphics.inc"
|
||||
|
||||
; sound
|
||||
.include "simple_sounds.s"
|
||||
|
||||
; puzzles
|
||||
.include "brother_books.s"
|
||||
.include "octagon_bookshelf.s"
|
||||
|
|
|
@ -445,7 +445,7 @@ open_bookshelf:
|
|||
cmp #OCTAGON_BOOKSHELF_CLOSE
|
||||
beq actually_open_shelf
|
||||
|
||||
jsr cant_noise
|
||||
jsr short_beep
|
||||
|
||||
rts
|
||||
|
||||
|
@ -522,7 +522,7 @@ close_bookshelf:
|
|||
cmp #OCTAGON_BOOKSHELF_CLOSE
|
||||
bne actually_close_shelf
|
||||
|
||||
jsr cant_noise
|
||||
jsr short_beep
|
||||
|
||||
rts
|
||||
|
||||
|
@ -662,23 +662,6 @@ door_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
|
||||
;=============================
|
||||
|
|
|
@ -11,14 +11,22 @@ click_speaker:
|
|||
done_click:
|
||||
rts
|
||||
|
||||
|
||||
long_beep:
|
||||
ldy #235
|
||||
bne do_beep
|
||||
|
||||
short_beep:
|
||||
ldy #40
|
||||
bne do_beep
|
||||
|
||||
;===========================
|
||||
; BEEP (inlined)
|
||||
;===========================
|
||||
beep:
|
||||
do_beep:
|
||||
lda SOUND_STATUS
|
||||
bmi done_beep
|
||||
|
||||
ldy #235
|
||||
sty tone_smc+1
|
||||
|
||||
; BEEP
|
||||
|
|
Loading…
Reference in New Issue