diff --git a/misc/ds/Makefile.arm9 b/misc/ds/Makefile.arm9 index 1a5b340cc..33b0c7ba5 100644 --- a/misc/ds/Makefile.arm9 +++ b/misc/ds/Makefile.arm9 @@ -60,7 +60,7 @@ ASFLAGS += -x assembler-with-cpp $(DEFINES) $(INCLUDEFLAGS) \ CFLAGS += -std=gnu17 $(WARNFLAGS) $(DEFINES) $(INCLUDEFLAGS) \ $(ARCH) -O2 -ffunction-sections -fdata-sections \ - -specs=$(SPECS) + -specs=$(SPECS) -Wstack-usage=10000 LDFLAGS := $(ARCH) $(LIBDIRSFLAGS) -Wl,-Map,$(MAP) $(DEFINES) \ -Wl,--start-group $(LIBS) -Wl,--end-group -specs=$(SPECS) diff --git a/src/MenuOptions.c b/src/MenuOptions.c index 3a2f5a266..23a6771f0 100644 --- a/src/MenuOptions.c +++ b/src/MenuOptions.c @@ -471,8 +471,7 @@ static void MenuOptionsScreen_Render(void* screen, float delta) { } static void MenuOptionsScreen_Free(void* screen) { - struct MenuOptionsScreen* s = (struct MenuOptionsScreen*)screen; - Event_Unregister_(&UserEvents.HackPermsChanged, screen, MenuOptionsScreen_OnHacksChanged); + Event_Unregister_(&UserEvents.HackPermsChanged, screen, MenuOptionsScreen_OnHacksChanged); Event_Unregister_(&WorldEvents.LightingModeChanged, screen, MenuOptionsScreen_OnLightingModeServerChanged); MenuInputOverlay_Close(false); } diff --git a/src/Platform_NDS.c b/src/Platform_NDS.c index 14fe340c4..64376f426 100644 --- a/src/Platform_NDS.c +++ b/src/Platform_NDS.c @@ -76,13 +76,7 @@ cc_uint64 Stopwatch_Measure(void) { static void LogNocash(const char* msg, int len) { // Can only be up to 120 bytes total - char buffer[120]; - len = min(len, 118); - - Mem_Copy(buffer, msg, len); - buffer[len + 0] = '\n'; - buffer[len + 1] = '\0'; - nocashWrite(buffer, len + 2); + nocashWrite(msg, min(len, 120)); } extern void Console_Clear(void); diff --git a/src/TouchUI.c b/src/TouchUI.c index a5f7421f2..eeb7d0570 100644 --- a/src/TouchUI.c +++ b/src/TouchUI.c @@ -532,10 +532,9 @@ static void TouchScreen_TabClick(void* s, void* w) { } static void TouchScreen_BindClick(void* screen, void* widget) { - struct TouchScreen* s = (struct TouchScreen*)screen; - struct ButtonWidget* btn = (struct ButtonWidget*)widget; - + struct ButtonWidget* btn = (struct ButtonWidget*)widget; struct TouchButtonDesc* desc = (struct TouchButtonDesc*)btn->meta.ptr; + if (!Bind_OnTriggered[desc->bind]) return; Bind_OnTriggered[desc->bind](0, &TouchDevice); }