mirror of
https://github.com/coop-deluxe/sm64coopdx.git
synced 2024-11-26 05:55:15 +00:00
Merge pull request #32 from coltongit/patch-4
Port fixes from fdsfgsfds' fork
This commit is contained in:
commit
b4626bf3b4
2 changed files with 3 additions and 3 deletions
2
Makefile
2
Makefile
|
@ -647,7 +647,7 @@ $(SOUND_BIN_DIR)/sequences.bin.c: $(SOUND_BIN_DIR)/sequences.bin
|
||||||
echo "};" >> $@
|
echo "};" >> $@
|
||||||
|
|
||||||
$(SOUND_BIN_DIR)/bank_sets.c: $(SOUND_BIN_DIR)/bank_sets
|
$(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,"' $< >> $@
|
hexdump -v -e '1/1 "0x%X,"' $< >> $@
|
||||||
echo "};" >> $@
|
echo "};" >> $@
|
||||||
|
|
||||||
|
|
|
@ -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++) {
|
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_nonextended[i][0]] = inverted_scancode_table[scancode_rmapping_nonextended[i][1]];
|
||||||
inverted_scancode_table[scancode_rmapping_extended[i][1]] += 0x100;
|
inverted_scancode_table[scancode_rmapping_nonextended[i][1]] += 0x100;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue