diff --git a/Makefile.wii b/Makefile.wii index 73ed609..8cc0e8d 100644 --- a/Makefile.wii +++ b/Makefile.wii @@ -119,7 +119,7 @@ COMMON_FLAGS := -g -O3 -G8 -mrvl -Wall -D__inline__=__inline__ $(MACHDEP) INCLUDES := -Isrc/md-generic/ -Isrc/include -Isrc -I$(DEVKITPRO)/libogc/include -I$(DEVKITPRO)/libogc/include/SDL DEFINES := -DOS_WITHOUT_MEMORY_MANAGEMENT -DSAVESTATE -DUSE_SDL -DSUPPORT_THREADS -DCPUEMU_0 -DCPUEMU_5 -DCPUEMU_6 \ -DFPUEMU -DAGA -DAUTOCONFIG -DFILESYS \ - -DTD_START_HEIGHT=32 + -DTD_START_HEIGHT=16 CFLAGS := $(COMMON_FLAGS) $(INCLUDES) $(DEFINES) #unused defines; -DFDI2RAW diff --git a/src/gui-sdl/gui-sdl.c b/src/gui-sdl/gui-sdl.c index 4a38354..8bc4734 100644 --- a/src/gui-sdl/gui-sdl.c +++ b/src/gui-sdl/gui-sdl.c @@ -82,7 +82,7 @@ static const char *cpu_chipset_messages[] = { static const char *options_messages[] = { /*00*/ "CPU to chipset speed", - /*01*/ "^|max|real|0%|25%|50%|100% Chipset", + /*01*/ "^|max|0%|34%|51%|68%|84%|100% Chipset", /*02*/ "Floppy speed", /*03*/ "^|normal|turbo|400%|800%", /*04*/ "Leds", @@ -298,7 +298,6 @@ static int get_cpu_to_chipset_speed(void) case 5: return 4; case 10: return 5; case 15: return 6; - case 20: return 7; default: break; /* max */ } return 0; @@ -306,7 +305,7 @@ static int get_cpu_to_chipset_speed(void) static void set_cpu_to_chipset_speed(int which) { - int table[] = {-1,0,1024,2048,3072,4096}; + int table[] = {-1,512,2560,5120,7168,8704,10240}; changed_prefs.m68k_speed = table[which]; }