Merge branch 'tildearrow:master' into sysmgrtooltip_syschaninfo

This commit is contained in:
Eknous 2024-03-22 13:44:42 +04:00 committed by GitHub
commit aa99375eda
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 74 additions and 24 deletions

View file

@ -3575,7 +3575,7 @@ void FurnaceGUI::drawSettings() {
UI_COLOR_CONFIG(GUI_COLOR_INSTR_POWERNOISE,"PowerNoise (noise)");
UI_COLOR_CONFIG(GUI_COLOR_INSTR_POWERNOISE_SLOPE,"PowerNoise (slope)");
UI_COLOR_CONFIG(GUI_COLOR_INSTR_DAVE,"Dave");
UI_COLOR_CONFIG(GUI_COLOR_INSTR_NDS,"NDS");
UI_COLOR_CONFIG(GUI_COLOR_INSTR_NDS,"Nintendo DS");
UI_COLOR_CONFIG(GUI_COLOR_INSTR_GBA_DMA,"GBA DMA");
UI_COLOR_CONFIG(GUI_COLOR_INSTR_GBA_MINMOD,"GBA MinMod");
UI_COLOR_CONFIG(GUI_COLOR_INSTR_UNKNOWN,"Other/Unknown");