From 8e2e2f49f0e9cb0def8b34bd43a0c1c2ff41ccba Mon Sep 17 00:00:00 2001 From: "Colton G. Rushton" Date: Sun, 10 May 2020 00:03:14 -0300 Subject: [PATCH 1/2] Port fixes from fdsfgsfds' fork see https://github.com/fgsfdsfgs/sm64pc/commit/63bed21d26cfa2aad7fd5b9339a1770f7b293978 for details --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9b829f36..6102eab7 100644 --- a/Makefile +++ b/Makefile @@ -647,7 +647,7 @@ $(SOUND_BIN_DIR)/sequences.bin.c: $(SOUND_BIN_DIR)/sequences.bin echo "};" >> $@ $(SOUND_BIN_DIR)/bank_sets.c: $(SOUND_BIN_DIR)/bank_sets - echo "unsigned char gBankSetsData[] = {" > $@ + echo "unsigned char gBankSetsData[0x100] = {" > $@ hexdump -v -e '1/1 "0x%X,"' $< >> $@ echo "};" >> $@ From ad89f663f3fd3c19bf373c6a312f3caadea49843 Mon Sep 17 00:00:00 2001 From: "Colton G. Rushton" Date: Sun, 10 May 2020 00:05:33 -0300 Subject: [PATCH 2/2] More fixes ported from fdsfgsfds' fork --- src/pc/gfx/gfx_sdl2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pc/gfx/gfx_sdl2.c b/src/pc/gfx/gfx_sdl2.c index 309c19a2..fb7f6a07 100644 --- a/src/pc/gfx/gfx_sdl2.c +++ b/src/pc/gfx/gfx_sdl2.c @@ -131,8 +131,8 @@ static void gfx_sdl_init(void) { } for (size_t i = 0; i < sizeof(scancode_rmapping_nonextended) / sizeof(scancode_rmapping_nonextended[0]); i++) { - inverted_scancode_table[scancode_rmapping_extended[i][0]] = inverted_scancode_table[scancode_rmapping_extended[i][1]]; - inverted_scancode_table[scancode_rmapping_extended[i][1]] += 0x100; + inverted_scancode_table[scancode_rmapping_nonextended[i][0]] = inverted_scancode_table[scancode_rmapping_nonextended[i][1]]; + inverted_scancode_table[scancode_rmapping_nonextended[i][1]] += 0x100; } }