From 83bb25e7af1837d41177d84f1b03d83b42b9478c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 7 Apr 2018 22:49:37 -0400 Subject: through DebugMenu_807786C; use macro NAKED instead of __attribute__((naked)) --- src/script_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/script_menu.c') diff --git a/src/script_menu.c b/src/script_menu.c index 9d901a03c..615004be3 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -930,7 +930,7 @@ void ScriptMenu_CreatePCMenu(void) StartScriptMenuTask(0, 0, width + 2, 2 * numChoices + 1, 0, numChoices); } #elif GERMAN -__attribute__((naked)) +NAKED void ScriptMenu_CreatePCMenu(void) { asm(".syntax unified\n\ push {r4-r7,lr}\n\ -- cgit v1.2.3 From 2e80477ea11c265e69658b852c57097fd8a21492 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 10 Jun 2018 11:01:29 -0500 Subject: Label move_tutor_menu.c --- src/script_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/script_menu.c') diff --git a/src/script_menu.c b/src/script_menu.c index 615004be3..1a7489c82 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -622,7 +622,7 @@ bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 multichoiceId, u8 ig static u16 GetStringWidthInTilesForScriptMenu(const u8 *str) { // each tile on screen is 8x8, so it needs the number of tiles and not pixels, hence the division by 8. - return (Text_GetStringWidthFromWindowTemplate((struct WindowTemplate *)&gWindowTemplate_81E6CE4, str) + 7) / 8; + return (Text_GetStringWidthFromWindowTemplate((struct WindowTemplate *)&gMenuTextWindowTemplate, str) + 7) / 8; } static void DrawMultichoiceMenu(u8 left, u8 top, u8 count, const struct MenuAction *list, u8 ignoreBPress, u8 cursorPos) -- cgit v1.2.3