Merge branch 'master' into minmod

This commit is contained in:
tildearrow 2024-03-17 15:44:38 -05:00
commit 11e492c897
29 changed files with 2369 additions and 401 deletions

View file

@ -1014,7 +1014,8 @@ void FurnaceGUI::doAction(int what) {
i==DIV_INS_GA20 ||
i==DIV_INS_K053260 ||
i==DIV_INS_C140 ||
i==DIV_INS_C219) {
i==DIV_INS_C219 ||
i==DIV_INS_NDS) {
makeInsTypeList.push_back(i);
}
}
@ -1541,6 +1542,7 @@ void FurnaceGUI::doAction(int what) {
i==DIV_INS_K053260 ||
i==DIV_INS_C140 ||
i==DIV_INS_C219 ||
i==DIV_INS_NDS ||
i==DIV_INS_GBA_DMA ||
i==DIV_INS_GBA_MINMOD) {
makeInsTypeList.push_back(i);