From 7114611555eef2179cf64657a8fd2ee6bb81ee6d Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Thu, 23 Jan 2025 11:12:32 -0600
Subject: [PATCH] fixup dyna switches

---
 worlds/kss/client.py                  |   5 +++++
 worlds/kss/data/kss_basepatch.bsdiff4 | Bin 1392 -> 1392 bytes
 worlds/kss/src/kss_basepatch.asm      |   3 +++
 3 files changed, 8 insertions(+)

diff --git a/worlds/kss/client.py b/worlds/kss/client.py
index e8d1fcb981a0..029ccee2b6a2 100644
--- a/worlds/kss/client.py
+++ b/worlds/kss/client.py
@@ -111,6 +111,11 @@ async def game_watcher(self, ctx: "SNIContext") -> None:
                 unlocked_planets = int.from_bytes(await snes_read(ctx, KSS_RECEIVED_PLANETS, 2), "little")
                 unlocked_planets |= (1 << planet)
                 snes_buffered_write(ctx, KSS_RECEIVED_PLANETS, unlocked_planets.to_bytes(2, "little"))
+            elif item.item & 0x800 != 0:
+                switch = item.item & 0xFF
+                unlocked_switches = int.from_bytes(await snes_read(ctx, KSS_DYNA_SWITCHES, 1), "little")
+                unlocked_switches |= (1 << switch)
+                snes_buffered_write(ctx, KSS_DYNA_SWITCHES, unlocked_switches.to_bytes(1, "little"))
             else:
                 pass
 
diff --git a/worlds/kss/data/kss_basepatch.bsdiff4 b/worlds/kss/data/kss_basepatch.bsdiff4
index d1b2ea92ccb1b74b51ff15b0e0e01f91d7be3414..d0d8ba44dc34e29b43dec07a625b20cb829ef44b 100644
GIT binary patch
delta 395
zcmV;60d)TG3h)Y$sDJTOCWZh2TYvxk87VfD=w>n=5lD_I0OcUlK*#_jQ=5)JpCLQ=
z{h~dv0T@7PB|k!GG#*IPH3lFah%^R(06ic*N2oN>y(#KuQ%@S9!$33u8UsLR000J>
zG|&b>00Tyu1`$e=KpFr50000000000002`)_t@aZ3@UQK1b>(SA_aWm04U*5>4jRD
zQ9?{AEW7|nfk2S}xv(gMy8wzHZ@>x&P(X+%PQa)DiP=6S6bOQV154v0`XzaVhMb?O
z8-KX7l`+fBfh}I$J+mWDrZWk}UT&=W2vwJp`KCt70-ihew6)V&(vQ;XN^Sbbd+%zr
zGbiKrxa84wu78^tvf6@0n6pabK3Dc<FD}|fXu}Q9d+##9{I7>yf{H5CDcvWfrOF{J
zOf^W#OiJQ{6B@Z+RL4~yA2cVAdkEw3q`MvND7xn}1Qa(GcwStBN(2B9fB*m=(sf5}
pN;OcA@pmLsg$WN8GH75zT4*&fL0KkKS-%iJ?*IW*f3qb5O9Oc<osa+k

delta 395
zcmV;60d)TG3h)Y$sDEJU$2|Z5TmS$487Vdt=w>z^5eSYd0L38FK*#_jQ=5)NpCLQ=
z{h~dv0T@7PBSgw%(dq`Cp{9U6Muvf=A)qwV)EOEcp`q%2rl+)~o)kFH(9qBg0f-s{
zAOH<C05k(2000<8DO1v5XaE2J00000000000+;Gd=@$M!(0_@^01}}9h!ygL0HTFM
zq7`Z2MF~&>vk(C!3Ivd&mkNkGa44b%><S=+{0M@C^a_9oopQh^U=S1l8czv7VqcI@
zXv+Dawfc)0fBrs8<o2h~-!zn3ort6~@pfQmu0^uWr_O;alnZ<}b~h!iNu_RARq9Ut
zpL&!NCpT)-4}bbtZy9!x8tgfm@t1OHe+eh3Y#VMT;#3`PYnLC)knKxL>&TvWSSUeZ
zTD0>kF(;J>F}Mn^>7A627nFh6t6@4GDIbde95!+?kcMflaeaaa*#rQD0002~j>JyK
pLX47si@744C`d4MW1fIQT4*&fL0KkKS-%iJ?*IW*f3qb5O9K@dp<n<2

diff --git a/worlds/kss/src/kss_basepatch.asm b/worlds/kss/src/kss_basepatch.asm
index 65d2a40866c4..ddad24131fd2 100644
--- a/worlds/kss/src/kss_basepatch.asm
+++ b/worlds/kss/src/kss_basepatch.asm
@@ -113,6 +113,9 @@ org $02A34B
     JML hook_copy_ability
     NOP
 
+org $07DF3E
+    NOP #3 ; Dyna Blade initialization, just need to preserve switch state
+
 org $07DF95
     JSL load_game
     NOP #14 ; TGCO initialization