diff --git a/Assets/dll/dsda.wbx.zst b/Assets/dll/dsda.wbx.zst index 1d899737a6..443598d45d 100644 Binary files a/Assets/dll/dsda.wbx.zst and b/Assets/dll/dsda.wbx.zst differ diff --git a/waterbox/dsda/.vscode/settings.json b/waterbox/dsda/.vscode/settings.json index d55f33b231..02407897a1 100644 --- a/waterbox/dsda/.vscode/settings.json +++ b/waterbox/dsda/.vscode/settings.json @@ -1,14 +1,6 @@ { "editor.tabSize": 2, "files.associations": { - "f_wipe.h": "c", - "bizhawkinterface.h": "c", - "emulibc.h": "c", - "d_main.h": "c", - "m_fixed.h": "c", - "d_event.h": "c", - "doomtype.h": "c", - "g_game.h": "c", - "d_player.h": "c" + "*.*": "c" } } \ No newline at end of file diff --git a/waterbox/dsda/BizhawkInterface.c b/waterbox/dsda/BizhawkInterface.c index 4cabacfefc..cb542b6e74 100644 --- a/waterbox/dsda/BizhawkInterface.c +++ b/waterbox/dsda/BizhawkInterface.c @@ -151,7 +151,7 @@ ECL_EXPORT void dsda_get_video(int *w, int *h, int *pitch, uint8_t **buffer, int *pitch = headlessGetVideoPitch(); *paletteSize = PALETTE_SIZE; - uint32_t *palette = headlessGetPallette(); + uint32_t *palette = headlessGetPallette() + PALETTE_SIZE * currentPaletteIndex; for (size_t i = 0; i < PALETTE_SIZE; i++) { uint8_t *srcColor = (uint8_t *)&palette[i]; diff --git a/waterbox/dsda/BizhawkInterface.h b/waterbox/dsda/BizhawkInterface.h index c1d425e7f2..332f028e59 100644 --- a/waterbox/dsda/BizhawkInterface.h +++ b/waterbox/dsda/BizhawkInterface.h @@ -37,6 +37,7 @@ extern int headlessGetVideoHeight(); extern void headlessEnableVideoRendering(); extern void headlessDisableVideoRendering(); extern uint32_t* headlessGetPallette(); +extern int currentPaletteIndex; // Audio extern void headlessUpdateSounds(); diff --git a/waterbox/dsda/core b/waterbox/dsda/core index 44fcb8a3cb..a7a3e7de03 160000 --- a/waterbox/dsda/core +++ b/waterbox/dsda/core @@ -1 +1 @@ -Subproject commit 44fcb8a3cb7025ec54b80217ca6e6d71607ab914 +Subproject commit a7a3e7de03fd96e79ef340995cf12b04216f3382