Properly kill SFX
This commit is contained in:
		
							parent
							
								
									c5dd424e03
								
							
						
					
					
						commit
						8eba0dd290
					
				
							
								
								
									
										14
									
								
								src/sfx.asm
								
								
								
								
							
							
						
						
									
										14
									
								
								src/sfx.asm
								
								
								
								
							| 
						 | 
					@ -1242,6 +1242,20 @@ SFXEnqueue::
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
SFXKill::
 | 
					SFXKill::
 | 
				
			||||||
 | 
					    ; Kill all sound without pops.
 | 
				
			||||||
 | 
					    ld a, %00111111
 | 
				
			||||||
 | 
					    ldh [rNR11], a
 | 
				
			||||||
 | 
					    ldh [rNR21], a
 | 
				
			||||||
 | 
					    ld a, $FF
 | 
				
			||||||
 | 
					    ldh [rNR31], a
 | 
				
			||||||
 | 
					    ldh [rNR41], a
 | 
				
			||||||
 | 
					    ld a, %01000000
 | 
				
			||||||
 | 
					    ldh [rNR14], a
 | 
				
			||||||
 | 
					    ldh [rNR24], a
 | 
				
			||||||
 | 
					    ldh [rNR34], a
 | 
				
			||||||
 | 
					    ldh [rNR44], a
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    ; Clear the queue.
 | 
				
			||||||
    ld a, $FF
 | 
					    ld a, $FF
 | 
				
			||||||
    ldh [hPlayQueue], a
 | 
					    ldh [hPlayQueue], a
 | 
				
			||||||
    ldh [hPlayQueue+1], a
 | 
					    ldh [hPlayQueue+1], a
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
#Emulicious settings file
 | 
					#Emulicious settings file
 | 
				
			||||||
#Sat Oct 21 15:13:26 CEST 2023
 | 
					#Sat Oct 21 15:24:27 CEST 2023
 | 
				
			||||||
WindowProfilerWindowOpen=false
 | 
					WindowProfilerWindowOpen=false
 | 
				
			||||||
WindowEventViewerWindowHeight=1416
 | 
					WindowEventViewerWindowHeight=1416
 | 
				
			||||||
WindowEventViewerWindowDivider=876
 | 
					WindowEventViewerWindowDivider=876
 | 
				
			||||||
| 
						 | 
					@ -7,7 +7,7 @@ WindowMemoryTracerWindowY=631
 | 
				
			||||||
WindowMemoryTracerWindowX=383
 | 
					WindowMemoryTracerWindowX=383
 | 
				
			||||||
Update=2
 | 
					Update=2
 | 
				
			||||||
AudioSync=false
 | 
					AudioSync=false
 | 
				
			||||||
DebuggerMemoryTabVisibleRect=0,0,687,128
 | 
					DebuggerMemoryTabVisibleRect=0,0,0,0
 | 
				
			||||||
WindowProfilerWindowWidth=1073
 | 
					WindowProfilerWindowWidth=1073
 | 
				
			||||||
UninitializedMemoryBreakpointSuspend=true
 | 
					UninitializedMemoryBreakpointSuspend=true
 | 
				
			||||||
GameBoyErrorBreakpointEnabled32=false
 | 
					GameBoyErrorBreakpointEnabled32=false
 | 
				
			||||||
| 
						 | 
					@ -92,7 +92,7 @@ GameBoyErrorBreakpointSuspend2=true
 | 
				
			||||||
GameBoyErrorBreakpointSuspend1=true
 | 
					GameBoyErrorBreakpointSuspend1=true
 | 
				
			||||||
GameBoyErrorBreakpointSuspend0=true
 | 
					GameBoyErrorBreakpointSuspend0=true
 | 
				
			||||||
DebuggerConsoleLogBreakpoints=true
 | 
					DebuggerConsoleLogBreakpoints=true
 | 
				
			||||||
WindowDebuggerOpen=true
 | 
					WindowDebuggerOpen=false
 | 
				
			||||||
Gamepad1Key37=-1
 | 
					Gamepad1Key37=-1
 | 
				
			||||||
Gamepad1Key36=-1
 | 
					Gamepad1Key36=-1
 | 
				
			||||||
Gamepad1Key35=-1
 | 
					Gamepad1Key35=-1
 | 
				
			||||||
| 
						 | 
					@ -287,8 +287,8 @@ SouthPanelHeight=1064
 | 
				
			||||||
SMSbuttonsKeyboard=false
 | 
					SMSbuttonsKeyboard=false
 | 
				
			||||||
StackSplitLocation=534
 | 
					StackSplitLocation=534
 | 
				
			||||||
WindowMemoryEditorHeight=534
 | 
					WindowMemoryEditorHeight=534
 | 
				
			||||||
WindowTilemapViewerWidth=404
 | 
					 | 
				
			||||||
GBGamepadKeyboard=false
 | 
					GBGamepadKeyboard=false
 | 
				
			||||||
 | 
					WindowTilemapViewerWidth=404
 | 
				
			||||||
UninitializedMemoryBreakpointCondition=
 | 
					UninitializedMemoryBreakpointCondition=
 | 
				
			||||||
GameBoyErrorBreakpointSuspend19=true
 | 
					GameBoyErrorBreakpointSuspend19=true
 | 
				
			||||||
GameBoyErrorBreakpointSuspend18=true
 | 
					GameBoyErrorBreakpointSuspend18=true
 | 
				
			||||||
| 
						 | 
					@ -300,5 +300,5 @@ WindowSpriteViewerOpen=false
 | 
				
			||||||
WindowProfilerWindowY=639
 | 
					WindowProfilerWindowY=639
 | 
				
			||||||
WindowProfilerWindowX=461
 | 
					WindowProfilerWindowX=461
 | 
				
			||||||
Scale=5.0
 | 
					Scale=5.0
 | 
				
			||||||
KeyboardRequireWindowFocus=true
 | 
					 | 
				
			||||||
WindowProfilerWindowProcedureProfiler=true
 | 
					WindowProfilerWindowProcedureProfiler=true
 | 
				
			||||||
 | 
					KeyboardRequireWindowFocus=true
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue