From df52b51a518049fd0618ff6ddb8e35717fb12fb3 Mon Sep 17 00:00:00 2001
From: frankmilliron <34376619+frankmilliron@users.noreply.github.com>
Date: Sun, 20 Nov 2022 13:44:38 -0800
Subject: [PATCH] fix Apple Invader sound on //gs (#525)

* fix Apple Invader sound on //gs

Uses LDA/BIT $C033 instead of $C030 for some reason.

* typo
---
 src/fx/fx.hgr.radial.common.a | 2 +-
 src/prelaunch/apple.invader.a | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/fx/fx.hgr.radial.common.a b/src/fx/fx.hgr.radial.common.a
index 5e054e2b3..540bb5822 100644
--- a/src/fx/fx.hgr.radial.common.a
+++ b/src/fx/fx.hgr.radial.common.a
@@ -14,7 +14,7 @@ reverse_input  = $FC      ; word
 input          = $FE      ; word
 
          +BUILD_MIRROR_COLS mirror_cols
-         +BUILD_HGR_LOOKUP_TABLES_X hgrlo, hgr1hi
+         +BUILD_HGR_LOOKUP_TABLES hgrlo, hgr1hi
          +BUILD_HGR_MIRROR_LOOKUP_TABLES hgrlomirror, hgr1himirror
          +BUILD_SPARSE_BITMASKS_1BIT
 
diff --git a/src/prelaunch/apple.invader.a b/src/prelaunch/apple.invader.a
index 1f0df3c65..e6cff1e0a 100644
--- a/src/prelaunch/apple.invader.a
+++ b/src/prelaunch/apple.invader.a
@@ -17,6 +17,12 @@
          sta   $6020
          jsr   $6002      ; decompress
 
+         lda   #$30       ; fix sound on //gs
+         sta   $1A35      ; enemy destruct
+         sta   $1D9E      ; player destruct
+         sta   $1C36      ; bonus ship
+         sta   $1CCB      ; kill bonus ship
+
          lda   #$D8       ; move location from $3F2 to $3D8
          sta   $1113      ; (program uses reset vector for storage)
          sta   $1245
@@ -57,6 +63,6 @@
          sta   $7fe       ; overwritten by GS acceleration
          jmp   $5F00
 
-!if * > $1C0 {
+!if * > $1C1 {
   !error "code is too large, ends at ", *
 }