through DebugMenu_807786C; use macro NAKED instead of __attribute__((naked))

64 files changed, 306 insertions, 532 deletions

diff --git a/data/start_menu_debug.s b/data/start_menu_debug.s
index 26a057b98..f309fc740 100644
--- a/data/start_menu_debug.s
+++ b/data/start_menu_debug.s
@@ -6,37 +6,6 @@
 
 	.section .rodata
 
-	.align 2
-
-Str_839BE4C:: @ 0x839BE4C
-	.string "OFF$"
-
-Str_839BE50:: @ 0x839BE50
-	.string "ON$"
-
-Str_839BE53:: @ 0x839BE53
-	.string "BG0\n"
-	.string "BG1\n"
-	.string "BG2\n"
-	.string "BG3\n"
-	.string "$"
-
-Str_839BE64:: @ 0x839BE64
-	.string "ON$"
-
-Str_839BE67:: @ 0x839BE67
-	.string "OFF$"
-
-Str_839BE6B:: @ 0x839BE6B
-	.string "さいせんかのうトレーナー:{STR_VAR_1}\n"
-	.string "さいせんじょうたいトレーナー:{STR_VAR_2}$"
-
-Str_839BE8D:: @ 0x839BE8D
-	.string "いる$"
-
-Str_839BE90:: @ 0x839BE90
-	.string "いない$"
-
 Str_839BE94:: @ 0x839BE94
 	.string "Max num of steps$"
 
diff --git a/include/gba/defines.h b/include/gba/defines.h
index 7fd429d9e..26e0c873f 100644
--- a/include/gba/defines.h
+++ b/include/gba/defines.h
@@ -8,6 +8,8 @@
 
 #define IWRAM_DATA __attribute__((section("iwram_data")))
 #define EWRAM_DATA __attribute__((section("ewram_data")))
+#define UNUSED __attribute__((unused))
+#define NAKED __attribute__((naked))
 
 #define ALIGNED(n) __attribute__((aligned(n)))
 
diff --git a/src/battle/anim/dark.c b/src/battle/anim/dark.c
index 9a1d0842b..55d500950 100644
--- a/src/battle/anim/dark.c
+++ b/src/battle/anim/dark.c
@@ -611,7 +611,7 @@ static void sub_80E0620(u8 taskId)
 //     }
 // }
 
-__attribute__((naked))
+NAKED
 static void sub_80E079C(struct Task *task)
 {
     asm(".syntax unified\n\
diff --git a/src/battle/anim/psychic.c b/src/battle/anim/psychic.c
index 4a48d1ecf..7babb3a19 100644
--- a/src/battle/anim/psychic.c
+++ b/src/battle/anim/psychic.c
@@ -690,7 +690,7 @@ void sub_80DC4F4(u8 taskId)
     task->func = sub_80DC5F4;
 }
 #else
-__attribute__((naked))
+NAKED
 void sub_80DC4F4(u8 taskId)
 {
     asm(".syntax unified\n\
diff --git a/src/battle/anim/shadow_minimize.c b/src/battle/anim/shadow_minimize.c
index b4e18eb51..be033ae6d 100644
--- a/src/battle/anim/shadow_minimize.c
+++ b/src/battle/anim/shadow_minimize.c
@@ -129,7 +129,7 @@ void sub_80D0614(struct Task* task, u8 taskId)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 void sub_80D0614(struct Task* task, u8 taskId)
 {
     asm(".syntax unified\n\
diff --git a/src/battle/anim/unused_9.c b/src/battle/anim/unused_9.c
index 6e0d0321b..8e3f0a8b7 100644
--- a/src/battle/anim/unused_9.c
+++ b/src/battle/anim/unused_9.c
@@ -45,7 +45,7 @@ void sub_80CFE2C(struct Sprite* sprite)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 void sub_80CFE2C(struct Sprite* sprite)
 {
     asm(".syntax unified\n\
diff --git a/src/battle/anim/water.c b/src/battle/anim/water.c
index 2700bfd27..a7e1883f3 100644
--- a/src/battle/anim/water.c
+++ b/src/battle/anim/water.c
@@ -51,7 +51,7 @@ static void sub_80D3874(struct Sprite *sprite)
     }
 }
 
-__attribute__((naked))
+NAKED
 void sub_80D38BC(u8 taskId)
 {
     asm(".syntax unified\n\
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index 096bd878f..005dee32d 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -4470,7 +4470,7 @@ void sub_8012324(void)
     }
 }
 */
-__attribute__((naked))
+NAKED
 void sub_8012324(void)
 {
     asm(".syntax unified\n\
@@ -6839,7 +6839,7 @@ void HandleAction_UseItem(void)
     gCurrentActionFuncId = ACTION_RUN_BATTLESCRIPT;
 }
 #else
-__attribute__((naked))
+NAKED
 void HandleAction_UseItem(void)
 {
     asm(".syntax unified\n\
diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c
index 8f5ea7cae..6646d6bae 100644
--- a/src/battle/battle_4.c
+++ b/src/battle/battle_4.c
@@ -2850,7 +2850,7 @@ void SetMoveEffect(bool8 primary, u8 certainArg)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 void SetMoveEffect(bool8 primary, u8 certainArg)
 {
     asm(".syntax unified\n\
@@ -5694,7 +5694,7 @@ static void atk24(void)
 
 }
 #else
-__attribute__((naked))
+NAKED
 static void atk24(void)
 {
     asm(".syntax unified\n\
@@ -6484,7 +6484,7 @@ static void atk48_playstatchangeanimation(void)
 }
 
 #else
-__attribute__((naked))
+NAKED
 static void atk48_playstatchangeanimation(void)
 {
     asm(".syntax unified\n\
@@ -6892,7 +6892,7 @@ static void atk49_moveend(void)
     } while (effect == 0)
 }
 #else
-__attribute__((naked))
+NAKED
 void atk49_moveend(void)
 {
     asm(".syntax unified\n\
@@ -8498,7 +8498,7 @@ static void atk50_openpartyscreen(void)
 }
 */
 
-__attribute__((naked))
+NAKED
 static void atk50_openpartyscreen(void)
 {
     asm(".syntax unified\n\
@@ -9965,7 +9965,7 @@ static void atk5D_getmoneyreward(void)
     gBattlescriptCurrInstr += 1;
 }
 #else
-__attribute__((naked))
+NAKED
 static void atk5D_getmoneyreward(void)
 {
     asm(".syntax unified\n\
@@ -10508,7 +10508,7 @@ static void atk6C_drawlvlupbox(void)
 }
 
 #else
-__attribute__((naked))
+NAKED
 static void atk6C_drawlvlupbox(void)
 {
     asm(".syntax unified\n\
@@ -12631,7 +12631,7 @@ static void atk9D_mimicattackcopy(void)
 }
 
 #if DEBUG
-__attribute__((naked))
+NAKED
 static void atk9E_metronome(void)
 {
     asm("\
@@ -12834,7 +12834,7 @@ static void atk9E_metronome(void)
 }
 
 #else
-__attribute__((naked))
+NAKED
 static void atk9E_metronome(void)
 {
     asm(".syntax unified\n\
@@ -13097,7 +13097,7 @@ static void atkA6_settypetorandomresistance(void)
 }
 
 #else
-__attribute__((naked))
+NAKED
 static void atkA6_settypetorandomresistance(void)
 {
     asm(".syntax unified\n\
@@ -13997,7 +13997,7 @@ static void atkC0_recoverbasedonsunlight(void)
     }
 }
 
-__attribute__((naked))
+NAKED
 static void atkC1_hiddenpowercalc(void)
 {
     asm(".syntax unified\n\
@@ -14231,7 +14231,7 @@ static void atkC4_trydobeatup(void)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 static void atkC4_trydobeatup(void)
 {
     asm(".syntax unified\n\
@@ -14655,7 +14655,7 @@ static void atkD2_tryswapitems(void)
 }
 
 #else
-__attribute__((naked))
+NAKED
 static void atkD2_tryswapitems(void)
 {
     asm(".syntax unified\n\
@@ -15210,7 +15210,7 @@ static void atkDE_asistattackselect(void)
 }
 
 #else
-__attribute__((naked))
+NAKED
 static void atkDE_asistattackselect(void)
 {
     asm(".syntax unified\n\
@@ -15875,7 +15875,7 @@ static void atkF2_displaydexinfo(void)
     }
 }
 
-__attribute__((naked))
+NAKED
 void sub_802BBD4(u8 r0, u8 r1, u8 r2, u8 r3, u8 sp0)
 {
     asm(".syntax unified\n\
diff --git a/src/battle/battle_ai.c b/src/battle/battle_ai.c
index 134f6c18b..447909091 100644
--- a/src/battle/battle_ai.c
+++ b/src/battle/battle_ai.c
@@ -1008,7 +1008,7 @@ static void BattleAICmd_is_most_powerful_move(void)
     gAIScriptPtr += 1;
 }
 #else
-__attribute__((naked))
+NAKED
 static void BattleAICmd_is_most_powerful_move(void)
 {
     asm(".syntax unified\n\
diff --git a/src/battle/battle_ai_switch_items.c b/src/battle/battle_ai_switch_items.c
index e01c7b729..4dd7614bf 100755
--- a/src/battle/battle_ai_switch_items.c
+++ b/src/battle/battle_ai_switch_items.c
@@ -107,7 +107,7 @@ static bool8 ShouldSwitchIfWonderGuard(void)
     return FALSE; // at this point there is not a single pokemon in the party that has a super effective move against a pokemon with wonder guard
 }
 #else
-__attribute__((naked))
+NAKED
 static bool8 ShouldSwitchIfWonderGuard(void)
 {
     asm(".syntax unified\n\
diff --git a/src/battle/battle_anim.c b/src/battle/battle_anim.c
index a3360096a..2f57bcd97 100644
--- a/src/battle/battle_anim.c
+++ b/src/battle/battle_anim.c
@@ -2528,7 +2528,7 @@ s8 BattleAnimAdjustPanning(s8 a)
     //_0807706E
 }
 */
-__attribute__((naked))
+NAKED
 s8 BattleAnimAdjustPanning(s8 a)
 {
     asm(".syntax unified\n\
diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c
index 583690c27..d6e7ed4a7 100644
--- a/src/battle/battle_controller_opponent.c
+++ b/src/battle/battle_controller_opponent.c
@@ -1438,7 +1438,7 @@ void OpponentHandlecmd19(void)
 }
 
 #if DEBUG
-__attribute__((naked))
+NAKED
 void OpponentHandlecmd20(void)
 {
     asm("\
@@ -1812,7 +1812,7 @@ void OpponentHandlecmd20(void)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 void OpponentHandlecmd20(void)
 {
     asm(".syntax unified\n\
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c
index 50ab1eb7e..881ec72fc 100644
--- a/src/battle/battle_controller_player.c
+++ b/src/battle/battle_controller_player.c
@@ -1459,7 +1459,7 @@ void sub_802DB6C(u8 taskId)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 void sub_802DB6C(u8 taskId)
 {
     asm_unified("push {r4-r7,lr}\n\
diff --git a/src/battle/battle_interface.c b/src/battle/battle_interface.c
index bd954ae8d..b7c0dce4e 100644
--- a/src/battle/battle_interface.c
+++ b/src/battle/battle_interface.c
@@ -539,7 +539,7 @@ void sub_8043740(s16 a, u16 *b, u8 c)
     asm(""::"r"(r9));
 }
 #else
-__attribute__((naked))
+NAKED
 void sub_8043740(s16 a, u16 *b, u8 c)
 {
     asm(".syntax unified\n\
@@ -1123,7 +1123,7 @@ void sub_80440EC(u8 a, s16 b, u8 c)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 void sub_80440EC(u8 a, s16 b, u8 c)
 {
     asm(".syntax unified\n\
@@ -1380,7 +1380,7 @@ void sub_8044338(u8 a, struct Pokemon *pkmn)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 void sub_8044338(u8 a, struct Pokemon *pkmn)
 {
     asm(".syntax unified\n\
@@ -1925,7 +1925,7 @@ u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d)
     return taskId;
 }
 #else
-__attribute__((naked))
+NAKED
 u8 sub_8044804(u8 a, const struct BattleInterfaceStruct2 *b, u8 c, u8 d)
 {
     asm(".syntax unified\n\
diff --git a/src/battle/contest_link_80C857C.c b/src/battle/contest_link_80C857C.c
index 4fb236294..94454e45c 100644
--- a/src/battle/contest_link_80C857C.c
+++ b/src/battle/contest_link_80C857C.c
@@ -107,7 +107,7 @@ u8 sub_80C86A0(const u8 *string)
     return language;
 }
 #else
-__attribute__((naked)) u8 sub_80C86A0(const u8 *string)
+NAKED u8 sub_80C86A0(const u8 *string)
 {
     asm_unified("\tpush {r4,r5,lr}\n"
                     "\tadds r4, r0, 0\n"
diff --git a/src/battle_tower.c b/src/battle_tower.c
index 8c44b71a3..8659f202f 100644
--- a/src/battle_tower.c
+++ b/src/battle_tower.c
@@ -514,7 +514,7 @@ bool8 sub_81346F4(void)
 //     }
 // }
 
-__attribute__((naked))
+NAKED
 void sub_81347F8(void)
 {
     asm(".syntax unified\n\
@@ -906,7 +906,7 @@ void SetEReaderTrainerGfxId(void)
 
 //     gSaveBlock2.battleTower.records[var2[(Random() % l)]] = *record;
 // }
-__attribute__((naked))
+NAKED
 void sub_8134AC0(struct BattleTowerRecord *record)
 {
     asm(".syntax unified\n\
diff --git a/src/contest.c b/src/contest.c
index 031cf768f..f7436c51c 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -3891,7 +3891,7 @@ void sub_80B0748(u8 taskId)
     #undef i
 }
 #else
-__attribute__((naked))
+NAKED
 void sub_80B0748(u8 taskId)
 {
     asm(".syntax unified\n\
diff --git a/src/contest_effect.c b/src/contest_effect.c
index 2932d8e6e..a5615851f 100644
--- a/src/contest_effect.c
+++ b/src/contest_effect.c
@@ -646,7 +646,7 @@ static void ContestEffect_BetterIfSameType(void)
     }
 }
 #else
-__attribute__((naked)) void ContestEffect_BetterIfSameType(void)
+NAKED void ContestEffect_BetterIfSameType(void)
 {
     asm_unified("\tpush {r4-r7,lr}\n"
                 "\tldr r1, _080B8940 @ =gSharedMem + 0x192D0\n"
diff --git a/src/contest_painting.c b/src/contest_painting.c
index e90391469..28dd3def7 100644
--- a/src/contest_painting.c
+++ b/src/contest_painting.c
@@ -104,7 +104,7 @@ static void VBlankCB_ContestPainting(void);
 void sub_8106B90();  //should be static
 static void sub_8107090(u8 arg0, u8 arg1);
 
-__attribute__((naked))
+NAKED
 void sub_8106630(u32 arg0)
 {
     asm(".syntax unified\n\
@@ -364,7 +364,7 @@ static void sub_8106AC4(u16 species, u8 arg1)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 static void sub_8106AC4(u16 arg0, u8 arg2)
 {
     asm(".syntax unified\n\
@@ -497,7 +497,7 @@ void sub_8106B90(u8 a[][8][8][4], u16 b[], u16 c[][8][8][8])
     }
 }
 #else
-__attribute__((naked))
+NAKED
 void sub_8106B90()
 {
     asm(".syntax unified\n\
diff --git a/src/daycare.c b/src/daycare.c
index e26db531f..a77b6c5f5 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -592,7 +592,7 @@ void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, struct BoxP
     }
 }
 #else
-__attribute__((naked))
+NAKED
 void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, struct BoxPokemon *mother)
 {
     asm_unified("\tpush {r4-r7,lr}\n"
@@ -1119,7 +1119,7 @@ static bool8 _ShouldEggHatch(struct DayCare *daycare)
     return FALSE;
 }
 #else
-__attribute__((naked))
+NAKED
 static bool8 _ShouldEggHatch(struct DayCare *daycare)
 {
     asm_unified("\tpush {r4-r7,lr}\n"
@@ -1398,7 +1398,7 @@ static u8 GetDaycareCompatibilityScore(struct DayCare *daycare)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 static u8 GetDaycareCompatibilityScore(struct DayCare *daycare)
 {
     asm_unified("\tpush {r4-r7,lr}\n"
diff --git a/src/de_rom_8040FE0.c b/src/de_rom_8040FE0.c
index c93ef74cd..24e0fa51b 100644
--- a/src/de_rom_8040FE0.c
+++ b/src/de_rom_8040FE0.c
@@ -89,7 +89,7 @@ u8 *de_sub_8041024(s32 arg0, u32 arg1)
 }
 #else
 
-__attribute__((naked))
+NAKED
 void de_sub_8041024(void) {
     asm(".syntax unified\n\
     push {r4-r6,lr}\n\
diff --git a/src/debug/nakamura_debug_menu.c b/src/debug/nakamura_debug_menu.c
index 3880c7b7b..f40d5556a 100644
--- a/src/debug/nakamura_debug_menu.c
+++ b/src/debug/nakamura_debug_menu.c
@@ -1335,7 +1335,7 @@ static u8 SetPokeblock_CalcColor(u8 * dest, struct Pokeblock * pokeblock)
     return 0; // PBLOCK_CLR_UNKNOWN
 }
 #else
-__attribute__((naked))
+NAKED
 static u8 SetPokeblock_CalcColor(u8 * dest, struct Pokeblock * pokeblock)
 {
     asm("\tpush\t{r4, r5, r6, r7, lr}\n"
diff --git a/src/debug/start_menu_debug.c b/src/debug/start_menu_debug.c
index efabbe30e..0328565c6 100644
--- a/src/debug/start_menu_debug.c
+++ b/src/debug/start_menu_debug.c
@@ -300,12 +300,12 @@ const u8 Str_839BD7D[] = _("へんかんが　しゅうりょう　しました�
 extern const u8 Str_839BD2C[];
 extern const u8 Str_839BD4C[];
 
-__attribute__((unused)) static u8 gUnknown_030006B8[4];
-__attribute__((unused)) static u8 gUnknown_030006BC[4];
-__attribute__((unused)) static u8 gUnknown_030006C0;
-__attribute__((unused)) static u8 gUnknown_030006C1;
+static u8 gUnknown_030006B8;
+UNUSED static u32 gUnknown_030006BC;
+static u8 gUnknown_030006C0;
+static u8 gUnknown_030006C1;
 static const u8 *gUnknown_030006C4;
-__attribute__((unused)) static u8 gUnknown_030006C8;
+static u8 gUnknown_030006C8;
 
 void debug_sub_8076AC8(u8 a)
 {
@@ -997,285 +997,83 @@ u8 DebugMenu_EditPKMN(void)
     return FALSE;
 }
 
-__attribute__((naked))
-void DebugMenu_80776B4()
+void DebugMenu_80776B4(u8 bgNum)
 {
-    asm(
-        "	push	{r4, r5, lr}\n"
-        "	add	sp, sp, #0xfffffff8\n"
-        "	add	r4, r0, #0\n"
-        "	lsl	r4, r4, #0x18\n"
-        "	lsr	r4, r4, #0x18\n"
-        "	ldr	r1, ._183       @ Str_839BE4C\n"
-        "	mov	r0, sp\n"
-        "	mov	r2, #0x7\n"
-        "	bl	memcpy\n"
-        "	lsl	r3, r4, #0x1\n"
-        "	lsl	r5, r4, #0x19\n"
-        "	lsr	r5, r5, #0x18\n"
-        "	add	r3, r3, #0x1\n"
-        "	lsl	r3, r3, #0x18\n"
-        "	lsr	r3, r3, #0x18\n"
-        "	mov	r0, #0x19\n"
-        "	add	r1, r5, #0\n"
-        "	mov	r2, #0x1d\n"
-        "	bl	Menu_BlankWindowRect\n"
-        "	ldr	r0, ._183 + 4   @ gUnknown_030006C8\n"
-        "	ldrb	r0, [r0]\n"
-        "	ASR	r0, r4\n"
-        "	mov	r1, #0x1\n"
-        "	and	r0, r0, r1\n"
-        "	lsl	r0, r0, #0x2\n"
-        "	add r0, r0, sp\n"
-        "	mov	r1, #0x19\n"
-        "	add	r2, r5, #0\n"
-        "	bl	Menu_PrintText\n"
-        "	add	sp, sp, #0x8\n"
-        "	pop	{r4, r5}\n"
-        "	pop	{r0}\n"
-        "	bx	r0\n"
-        "._184:\n"
-        "	.align	2, 0\n"
-        "._183:\n"
-        "	.word	Str_839BE4C\n"
-        "	.word	gUnknown_030006C8 \n"
-        "\n"
-    );
+    u8 sp00[] = __("OFF$"
+                   "ON$");
+    Menu_BlankWindowRect(25, bgNum * 2, 29, bgNum * 2 + 1);
+    Menu_PrintText(sp00 + 4 * ((gUnknown_030006C8 >> bgNum) & 1), 25, bgNum * 2);
 }
 
-__attribute__((naked))
-void DebugMenu_8077704()
+void DebugMenu_8077704(void)
 {
-    asm(
-        "	push	{lr}\n"
-        "	add	sp, sp, #0xffffffec\n"
-        "	ldr	r1, ._185       @ Str_839BE53\n"
-        "	mov	r0, sp\n"
-        "	mov	r2, #0x11\n"
-        "	bl	memcpy\n"
-        "	mov	r0, #0x13\n"
-        "	mov	r1, #0x0\n"
-        "	mov	r2, #0x1d\n"
-        "	mov	r3, #0x8\n"
-        "	bl	Menu_BlankWindowRect\n"
-        "	mov	r0, sp\n"
-        "	mov	r1, #0x15\n"
-        "	mov	r2, #0x0\n"
-        "	bl	Menu_PrintText\n"
-        "	ldr	r2, ._185 + 4   @ gUnknown_030006C8\n"
-        "	mov	r0, #0x80\n"
-        "	lsl	r0, r0, #0x13\n"
-        "	ldrh	r0, [r0]\n"
-        "	lsr	r0, r0, #0x8\n"
-        "	mov	r1, #0xf\n"
-        "	and	r0, r0, r1\n"
-        "	strb	r0, [r2]\n"
-        "	mov	r0, #0x0\n"
-        "	bl	DebugMenu_80776B4\n"
-        "	mov	r0, #0x1\n"
-        "	bl	DebugMenu_80776B4\n"
-        "	mov	r0, #0x2\n"
-        "	bl	DebugMenu_80776B4\n"
-        "	mov	r0, #0x3\n"
-        "	bl	DebugMenu_80776B4\n"
-        "	add	sp, sp, #0x14\n"
-        "	pop	{r0}\n"
-        "	bx	r0\n"
-        "._186:\n"
-        "	.align	2, 0\n"
-        "._185:\n"
-        "	.word	Str_839BE53\n"
-        "	.word	gUnknown_030006C8 \n"
-        "\n"
-    );
+    u8 sp00[] = _("BG0\n"
+                  "BG1\n"
+                  "BG2\n"
+                  "BG3\n");
+    Menu_BlankWindowRect(19, 0, 29, 8);
+    Menu_PrintText(sp00, 21, 0);
+    gUnknown_030006C8 = (REG_DISPCNT >> 8) & 0x0F;
+    DebugMenu_80776B4(0);
+    DebugMenu_80776B4(1);
+    DebugMenu_80776B4(2);
+    DebugMenu_80776B4(3);
 }
 
-__attribute__((naked))
-u8 DebugMenu_8077760()
+u8 DebugMenu_8077760(void)
 {
-    asm(
-        "	push	{r4, r5, lr}\n"
-        "	ldr	r2, ._190       @ gMain\n"
-        "	ldrh	r1, [r2, #0x2e]\n"
-        "	mov	r0, #0x40\n"
-        "	and	r0, r0, r1\n"
-        "	add	r5, r2, #0\n"
-        "	cmp	r0, #0\n"
-        "	beq	._187	@cond_branch\n"
-        "	mov	r0, #0x5\n"
-        "	bl	PlaySE\n"
-        "	mov	r0, #0x1\n"
-        "	neg	r0, r0\n"
-        "	bl	Menu_MoveCursor\n"
-        "	ldr	r1, ._190 + 4   @ gUnknown_030006B8\n"
-        "	ldrb	r0, [r1]\n"
-        "	cmp	r0, #0\n"
-        "	beq	._188	@cond_branch\n"
-        "	sub	r0, r0, #0x1\n"
-        "	b	._189\n"
-        "._191:\n"
-        "	.align	2, 0\n"
-        "._190:\n"
-        "	.word	gMain\n"
-        "	.word	gUnknown_030006B8 \n"
-        "._188:\n"
-        "	mov	r0, #0x3\n"
-        "._189:\n"
-        "	strb	r0, [r1]\n"
-        "._187:\n"
-        "	ldrh	r1, [r5, #0x2e]\n"
-        "	mov	r0, #0x80\n"
-        "	and	r0, r0, r1\n"
-        "	cmp	r0, #0\n"
-        "	beq	._192	@cond_branch\n"
-        "	mov	r0, #0x5\n"
-        "	bl	PlaySE\n"
-        "	mov	r0, #0x1\n"
-        "	bl	Menu_MoveCursor\n"
-        "	ldr	r1, ._195       @ gUnknown_030006B8\n"
-        "	ldrb	r0, [r1]\n"
-        "	cmp	r0, #0x3\n"
-        "	beq	._193	@cond_branch\n"
-        "	add	r0, r0, #0x1\n"
-        "	b	._194\n"
-        "._196:\n"
-        "	.align	2, 0\n"
-        "._195:\n"
-        "	.word	gUnknown_030006B8 \n"
-        "._193:\n"
-        "	mov	r0, #0x0\n"
-        "._194:\n"
-        "	strb	r0, [r1]\n"
-        "._192:\n"
-        "	ldrh	r1, [r5, #0x2e]\n"
-        "	mov	r0, #0x30\n"
-        "	and	r0, r0, r1\n"
-        "	cmp	r0, #0\n"
-        "	beq	._197	@cond_branch\n"
-        "	mov	r0, #0x5\n"
-        "	bl	PlaySE\n"
-        "	ldr	r4, ._201       @ gUnknown_030006C8\n"
-        "	bl	Menu_GetCursorPos\n"
-        "	lsl	r0, r0, #0x18\n"
-        "	lsr	r0, r0, #0x18\n"
-        "	mov	r1, #0x1\n"
-        "	LSL	r1, r0\n"
-        "	ldrb	r0, [r4]\n"
-        "	eor	r1, r1, r0\n"
-        "	strb	r1, [r4]\n"
-        "	bl	Menu_GetCursorPos\n"
-        "	lsl	r0, r0, #0x18\n"
-        "	lsr	r0, r0, #0x18\n"
-        "	bl	DebugMenu_80776B4\n"
-        "._197:\n"
-        "	ldrh	r2, [r5, #0x2e]\n"
-        "	mov	r0, #0x1\n"
-        "	and	r0, r0, r2\n"
-        "	cmp	r0, #0\n"
-        "	bne	._198	@cond_branch\n"
-        "	mov	r0, #0x2\n"
-        "	and	r0, r0, r2\n"
-        "	cmp	r0, #0\n"
-        "	beq	._199	@cond_branch\n"
-        "._198:\n"
-        "	mov	r2, #0x80\n"
-        "	lsl	r2, r2, #0x13\n"
-        "	ldrh	r0, [r2]\n"
-        "	ldr	r1, ._201 + 4   @ 0xf0ff\n"
-        "	and	r1, r1, r0\n"
-        "	ldr	r0, ._201       @ gUnknown_030006C8\n"
-        "	ldrb	r0, [r0]\n"
-        "	lsl	r0, r0, #0x8\n"
-        "	add	r1, r1, r0\n"
-        "	strh	r1, [r2]\n"
-        "	bl	CloseMenu\n"
-        "	mov	r0, #0x1\n"
-        "	b	._200\n"
-        "._202:\n"
-        "	.align	2, 0\n"
-        "._201:\n"
-        "	.word	gUnknown_030006C8 \n"
-        "	.word	0xf0ff\n"
-        "._199:\n"
-        "	mov	r0, #0x0\n"
-        "._200:\n"
-        "	pop	{r4, r5}\n"
-        "	pop	{r1}\n"
-        "	bx	r1\n"
-        "\n"
-    );
+    if (gMain.newKeys & DPAD_UP)
+    {
+        PlaySE(SE_SELECT);
+        Menu_MoveCursor(-1);
+        if (gUnknown_030006B8 != 0)
+            gUnknown_030006B8--;
+        else
+            gUnknown_030006B8 = 3;
+    }
+    if (gMain.newKeys & DPAD_DOWN)
+    {
+        PlaySE(SE_SELECT);
+        Menu_MoveCursor(+1);
+        if (gUnknown_030006B8 != 3)
+            gUnknown_030006B8++;
+        else
+            gUnknown_030006B8 = 0;
+    }
+    if (gMain.newKeys & (DPAD_LEFT | DPAD_RIGHT))
+    {
+        PlaySE(SE_SELECT);
+        gUnknown_030006C8 ^= (1 << Menu_GetCursorPos());
+        DebugMenu_80776B4(Menu_GetCursorPos());
+    }
+    if (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON)
+    {
+        REG_DISPCNT = (REG_DISPCNT & 0xF0FF) + (gUnknown_030006C8 << 8);
+        CloseMenu();
+        return TRUE;
+    }
+    return FALSE;
 }
 
-__attribute__((naked))
-u8 DebugMenu_SwitchBG()
+u8 DebugMenu_SwitchBG(void)
 {
-    asm(
-        "	push	{lr}\n"
-        "	add	sp, sp, #0xfffffff8\n"
-        "	bl	Menu_EraseScreen\n"
-        "	bl	DebugMenu_8077704\n"
-        "	mov	r0, #0x0\n"
-        "	str	r0, [sp]\n"
-        "	mov	r0, #0x6\n"
-        "	str	r0, [sp, #0x4]\n"
-        "	mov	r0, #0x0\n"
-        "	mov	r1, #0x14\n"
-        "	mov	r2, #0x0\n"
-        "	mov	r3, #0x4\n"
-        "	bl	InitMenu\n"
-        "	ldr	r1, ._203       @ gMenuCallback\n"
-        "	ldr	r0, ._203 + 4   @ DebugMenu_8077760\n"
-        "	str	r0, [r1]\n"
-        "	mov	r0, #0x0\n"
-        "	add	sp, sp, #0x8\n"
-        "	pop	{r1}\n"
-        "	bx	r1\n"
-        "._204:\n"
-        "	.align	2, 0\n"
-        "._203:\n"
-        "	.word	gMenuCallback\n"
-        "	.word	DebugMenu_8077760+1\n"
-        "\n"
-    );
+    Menu_EraseScreen();
+    DebugMenu_8077704();
+    InitMenu(0, 20, 0, 4, 0, 6);
+    gMenuCallback = DebugMenu_8077760;
+    return FALSE;
 }
 
-__attribute__((naked))
-void DebugMenu_807786C()
+void DebugMenu_807786C(u8 a0)
 {
-    asm(
-        "	push	{r4, lr}\n"
-        "	add	sp, sp, #0xfffffff8\n"
-        "	add	r4, r0, #0\n"
-        "	lsl	r4, r4, #0x18\n"
-        "	lsr	r4, r4, #0x18\n"
-        "	ldr	r1, ._205       @ Str_839BE64\n"
-        "	mov	r0, sp\n"
-        "	mov	r2, #0x7\n"
-        "	bl	memcpy\n"
-        "	mov	r0, #0x19\n"
-        "	mov	r1, #0x0\n"
-        "	mov	r2, #0x1d\n"
-        "	mov	r3, #0x3\n"
-        "	bl	Menu_DrawStdWindowFrame\n"
-        "	lsl	r0, r4, #0x1\n"
-        "	add	r0, r0, r4\n"
-        "	add r0, r0, sp\n"
-        "	mov	r1, #0x1a\n"
-        "	mov	r2, #0x1\n"
-        "	bl	Menu_PrintText\n"
-        "	add	sp, sp, #0x8\n"
-        "	pop	{r4}\n"
-        "	pop	{r0}\n"
-        "	bx	r0\n"
-        "._206:\n"
-        "	.align	2, 0\n"
-        "._205:\n"
-        "	.word	Str_839BE64\n"
-        "\n"
-    );
+    u8 sp00[] = __("ON$"
+                   "OFF$");
+
+    Menu_DrawStdWindowFrame(25, 0, 29, 3);
+    Menu_PrintText(sp00 + 3 * a0, 26, 1);
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_80778A8()
 {
     asm(
@@ -1324,7 +1122,7 @@ void DebugMenu_80778A8()
     );
 }
 
-__attribute__((naked))
+NAKED
 u8 DebugMenu_ControlEncounter()
 {
     asm(
@@ -1349,7 +1147,7 @@ u8 DebugMenu_ControlEncounter()
     );
 }
 
-__attribute__((naked))
+NAKED
 u8 DebugMenu_UseHM()
 {
     asm(
@@ -1367,7 +1165,7 @@ u8 DebugMenu_UseHM()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8077934()
 {
     asm(
@@ -1393,7 +1191,7 @@ void DebugMenu_8077934()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8077954()
 {
     asm(
@@ -1419,7 +1217,12 @@ void DebugMenu_8077954()
     );
 }
 
-__attribute__((naked))
+const u8 Str_839BE6B[] = _("さいせんかのうトレーナー:{STR_VAR_1}\n"
+                           "さいせんじょうたいトレーナー:{STR_VAR_2}");
+const u8 Str_839BE8D[] = _("いる");
+const u8 Str_839BE90[] = _("いない");
+
+NAKED
 void DebugMenu_8077974()
 {
     asm(
@@ -1503,7 +1306,7 @@ void DebugMenu_8077974()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8077A20()
 {
     asm(
@@ -1526,7 +1329,7 @@ void DebugMenu_8077A20()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8077A40()
 {
     asm(
@@ -1549,7 +1352,7 @@ void DebugMenu_8077A40()
     );
 }
 
-__attribute__((naked))
+NAKED
 u8 DebugMenu_8077A60()
 {
     asm(
@@ -1568,7 +1371,7 @@ u8 DebugMenu_8077A60()
     );
 }
 
-__attribute__((naked))
+NAKED
 u8 DebugMenu_RematchTrainers()
 {
     asm(
@@ -1594,7 +1397,7 @@ u8 DebugMenu_RematchTrainers()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8077A9C()
 {
     asm(
@@ -1614,7 +1417,7 @@ void DebugMenu_8077A9C()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8077AB4()
 {
     asm(
@@ -1634,7 +1437,7 @@ void DebugMenu_8077AB4()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8077ACC()
 {
     asm(
@@ -1656,7 +1459,7 @@ void DebugMenu_8077ACC()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8077AE8()
 {
     asm(
@@ -1676,7 +1479,7 @@ void DebugMenu_8077AE8()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8077B00()
 {
     asm(
@@ -1712,7 +1515,7 @@ void DebugMenu_8077B00()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8077B3C()
 {
     asm(
@@ -1731,7 +1534,7 @@ void DebugMenu_8077B3C()
     );
 }
 
-__attribute__((naked))
+NAKED
 u8 DebugMenu_Safari()
 {
     asm(
@@ -1779,7 +1582,7 @@ u8 DebugMenu_Safari()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8077BB4()
 {
     asm(
@@ -1792,7 +1595,7 @@ void DebugMenu_8077BB4()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8077BC0()
 {
     asm(
@@ -1805,7 +1608,7 @@ void DebugMenu_8077BC0()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8077BCC()
 {
     asm(
@@ -1818,7 +1621,7 @@ void DebugMenu_8077BCC()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8077BD8()
 {
     asm(
@@ -1831,7 +1634,7 @@ void DebugMenu_8077BD8()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8077BE4()
 {
     asm(
@@ -1845,7 +1648,7 @@ void DebugMenu_8077BE4()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8077BF4()
 {
     asm(
@@ -1858,7 +1661,7 @@ void DebugMenu_8077BF4()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8077C00()
 {
     asm(
@@ -1877,7 +1680,7 @@ void DebugMenu_8077C00()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8077C14()
 {
     asm(
@@ -1903,7 +1706,7 @@ void DebugMenu_8077C14()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8077C3C()
 {
     asm(
@@ -2006,7 +1809,7 @@ void DebugMenu_8077C3C()
     );
 }
 
-__attribute__((naked))
+NAKED
 void debug_sub_8077CF4()
 {
     asm(
@@ -2037,7 +1840,7 @@ void debug_sub_8077CF4()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8077D24(const struct MenuAction *menuAction, u8 a1, u8 a2)
 {
     asm(
@@ -2082,7 +1885,7 @@ void DebugMenu_8077D24(const struct MenuAction *menuAction, u8 a1, u8 a2)
     );
 }
 
-__attribute__((naked))
+NAKED
 u8 DebugMenu_8077D78(const struct MenuAction *menuActions)
 {
     asm(
@@ -2122,7 +1925,7 @@ u8 DebugMenu_8077D78(const struct MenuAction *menuActions)
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8077DB4()
 {
     asm(
@@ -2149,7 +1952,7 @@ void DebugMenu_8077DB4()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8077DD8()
 {
     asm(
@@ -2216,7 +2019,7 @@ void DebugMenu_8077DD8()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8077E40()
 {
     asm(
@@ -2269,7 +2072,7 @@ void DebugMenu_8077E40()
     );
 }
 
-__attribute__((naked))
+NAKED
 u8 DebugMenu_MakeItems()
 {
     asm(
@@ -2284,7 +2087,7 @@ u8 DebugMenu_MakeItems()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8077EAC()
 {
     asm(
@@ -2316,7 +2119,7 @@ void DebugMenu_8077EAC()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8077EE0()
 {
     asm(
@@ -2367,7 +2170,7 @@ void DebugMenu_8077EE0()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8077F40()
 {
     asm(
@@ -2402,7 +2205,7 @@ void DebugMenu_8077F40()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8077F7C()
 {
     asm(
@@ -2471,7 +2274,7 @@ void DebugMenu_8077F7C()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8077FFC()
 {
     asm(
@@ -2537,7 +2340,7 @@ void DebugMenu_8077FFC()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_807806C()
 {
     asm(
@@ -2557,7 +2360,7 @@ void DebugMenu_807806C()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_807808C()
 {
     asm(
@@ -2677,7 +2480,7 @@ void DebugMenu_807808C()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_807817C()
 {
     asm(
@@ -2706,7 +2509,7 @@ void DebugMenu_807817C()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_80781A8()
 {
     asm(
@@ -2788,7 +2591,7 @@ void DebugMenu_80781A8()
     );
 }
 
-__attribute__((naked))
+NAKED
 u8 DebugMenu_ViewPortraits()
 {
     asm(
@@ -2809,7 +2612,7 @@ u8 DebugMenu_ViewPortraits()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8078254()
 {
     asm(
@@ -2821,7 +2624,7 @@ void DebugMenu_8078254()
     );
 }
 
-__attribute__((naked))
+NAKED
 u8 DebugMenu_AllBadges()
 {
     asm(
@@ -2861,7 +2664,7 @@ u8 DebugMenu_AllBadges()
     );
 }
 
-__attribute__((naked))
+NAKED
 u8 DebugMenu_TimeRecords()
 {
     asm(
@@ -2882,7 +2685,7 @@ u8 DebugMenu_TimeRecords()
     );
 }
 
-__attribute__((naked))
+NAKED
 u8 DebugMenu_SetTime()
 {
     asm(
@@ -2897,7 +2700,7 @@ u8 DebugMenu_SetTime()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_80782EC()
 {
     asm(
@@ -2922,7 +2725,7 @@ void DebugMenu_80782EC()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8078310()
 {
     asm(
@@ -3010,7 +2813,7 @@ void DebugMenu_8078310()
     );
 }
 
-__attribute__((naked))
+NAKED
 u8 DebugMenu_MiragaIslandRND()
 {
     asm(
@@ -3031,7 +2834,7 @@ u8 DebugMenu_MiragaIslandRND()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_80783C8()
 {
     asm(
@@ -3094,7 +2897,7 @@ void DebugMenu_80783C8()
     );
 }
 
-__attribute__((naked))
+NAKED
 u8 DebugMenu_ToggleClearFlag()
 {
     asm(
@@ -3123,7 +2926,7 @@ u8 DebugMenu_ToggleClearFlag()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8078464()
 {
     asm(
@@ -3173,7 +2976,7 @@ void DebugMenu_8078464()
     );
 }
 
-__attribute__((naked))
+NAKED
 u8 DebugMenu_OpenWeatherEvents()
 {
     asm(
@@ -3205,7 +3008,7 @@ u8 DebugMenu_OpenWeatherEvents()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_80784E8()
 {
     asm(
@@ -3244,7 +3047,7 @@ void DebugMenu_80784E8()
     );
 }
 
-__attribute__((naked))
+NAKED
 u8 DebugMenu_OpenMysteryEvent()
 {
     asm(
@@ -3273,7 +3076,7 @@ u8 DebugMenu_OpenMysteryEvent()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8078550()
 {
     asm(
@@ -3367,7 +3170,7 @@ void DebugMenu_8078550()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_807860C()
 {
     asm(
@@ -3472,7 +3275,7 @@ void DebugMenu_807860C()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_80786C0()
 {
     asm(
@@ -3486,7 +3289,7 @@ void DebugMenu_80786C0()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_80786D0()
 {
     asm(
@@ -3527,7 +3330,7 @@ void DebugMenu_80786D0()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8078714()
 {
     asm(
@@ -3568,7 +3371,7 @@ void DebugMenu_8078714()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8078758()
 {
     asm(
@@ -3587,7 +3390,7 @@ void DebugMenu_8078758()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8078774()
 {
     asm(
@@ -3606,7 +3409,7 @@ void DebugMenu_8078774()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8078788()
 {
     asm(
@@ -3625,7 +3428,7 @@ void DebugMenu_8078788()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_807879C()
 {
     asm(
@@ -3644,7 +3447,7 @@ void DebugMenu_807879C()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_80787B0()
 {
     asm(
@@ -3663,7 +3466,7 @@ void DebugMenu_80787B0()
     );
 }
 
-__attribute__((naked))
+NAKED
 u8 DebugMenu_OpenLegendsRecord()
 {
     asm(
@@ -3689,7 +3492,7 @@ u8 DebugMenu_OpenLegendsRecord()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_80787EC()
 {
     asm(
@@ -3759,7 +3562,7 @@ void DebugMenu_80787EC()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8078880()
 {
     asm(
@@ -3828,7 +3631,7 @@ void DebugMenu_8078880()
     );
 }
 
-__attribute__((naked))
+NAKED
 u8 DebugMenu_CellInfo()
 {
     asm(
@@ -3850,7 +3653,7 @@ u8 DebugMenu_CellInfo()
     );
 }
 
-__attribute__((naked))
+NAKED
 u8 DebugMenu_OpenBerryInfo()
 {
     asm(
@@ -3889,7 +3692,7 @@ u8 DebugMenu_OpenBerryInfo()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8078950()
 {
     asm(
@@ -3909,7 +3712,7 @@ void DebugMenu_8078950()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8078968()
 {
     asm(
@@ -3948,7 +3751,7 @@ void DebugMenu_8078968()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_80789A4()
 {
     asm(
@@ -3976,7 +3779,7 @@ void DebugMenu_80789A4()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_80789CC()
 {
     asm(
@@ -4016,7 +3819,7 @@ void DebugMenu_80789CC()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8078A14()
 {
     asm(
@@ -4100,7 +3903,7 @@ void DebugMenu_8078A14()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8078AA4()
 {
     asm(
@@ -4183,7 +3986,7 @@ void DebugMenu_8078AA4()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8078B38()
 {
     asm(
@@ -4202,7 +4005,7 @@ void DebugMenu_8078B38()
     );
 }
 
-__attribute__((naked))
+NAKED
 u8 DebugMenu_BattleTowerStages()
 {
     asm(
@@ -4223,7 +4026,7 @@ u8 DebugMenu_BattleTowerStages()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8078B70()
 {
     asm(
@@ -4248,7 +4051,7 @@ void DebugMenu_8078B70()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8078B94()
 {
     asm(
@@ -4291,7 +4094,7 @@ void DebugMenu_8078B94()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8078BD4()
 {
     asm(
@@ -4367,7 +4170,7 @@ void DebugMenu_8078BD4()
     );
 }
 
-__attribute__((naked))
+NAKED
 u8 DebugMenu_CheckPKBLCK()
 {
     asm(
@@ -4388,7 +4191,7 @@ u8 DebugMenu_CheckPKBLCK()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8078C80()
 {
     asm(
@@ -4414,7 +4217,7 @@ void DebugMenu_8078C80()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8078CA8()
 {
     asm(
@@ -4453,7 +4256,7 @@ void DebugMenu_8078CA8()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8078CE4()
 {
     asm(
@@ -4497,7 +4300,7 @@ void DebugMenu_8078CE4()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8078D30()
 {
     asm(
@@ -4539,7 +4342,7 @@ void DebugMenu_8078D30()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8078D7C()
 {
     asm(
@@ -4565,7 +4368,7 @@ void DebugMenu_8078D7C()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8078DA4()
 {
     asm(
@@ -4592,7 +4395,7 @@ void DebugMenu_8078DA4()
     );
 }
 
-__attribute__((naked))
+NAKED
 u8 DebugMenu_MeTooBackupMan()
 {
     asm(
@@ -4618,7 +4421,7 @@ u8 DebugMenu_MeTooBackupMan()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8078DF0()
 {
     asm(
@@ -4637,7 +4440,7 @@ void DebugMenu_8078DF0()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8078E04()
 {
     asm(
@@ -4680,7 +4483,7 @@ void DebugMenu_8078E04()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8078E40()
 {
     asm(
@@ -4705,7 +4508,7 @@ void DebugMenu_8078E40()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8078E68()
 {
     asm(
@@ -4724,7 +4527,7 @@ void DebugMenu_8078E68()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8078E80()
 {
     asm(
@@ -4755,7 +4558,7 @@ void DebugMenu_8078E80()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8078EB0()
 {
     asm(
@@ -4811,7 +4614,7 @@ void DebugMenu_8078EB0()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8078F1C()
 {
     asm(
@@ -4854,7 +4657,7 @@ void DebugMenu_8078F1C()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8078F68()
 {
     asm(
@@ -4959,7 +4762,7 @@ void DebugMenu_8078F68()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8079020()
 {
     asm(
@@ -4978,7 +4781,7 @@ void DebugMenu_8079020()
     );
 }
 
-__attribute__((naked))
+NAKED
 u8 DebugMenu_PTime()
 {
     asm(
@@ -4999,7 +4802,7 @@ u8 DebugMenu_PTime()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8079058()
 {
     asm(
@@ -5093,7 +4896,7 @@ void DebugMenu_8079058()
     );
 }
 
-__attribute__((naked))
+NAKED
 u8 DebugMenu_OpenMurakawa()
 {
     asm(
@@ -5114,7 +4917,7 @@ u8 DebugMenu_OpenMurakawa()
     );
 }
 
-__attribute__((naked))
+NAKED
 void DebugMenu_8079110()
 {
     asm(
@@ -5187,7 +4990,7 @@ void DebugMenu_8079110()
     );
 }
 
-__attribute__((naked))
+NAKED
 u8 DebugMenu_OpenKiwa()
 {
     asm(
diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c
index 3d4637746..40df600fa 100644
--- a/src/debug/tomomichi_debug_menu.c
+++ b/src/debug/tomomichi_debug_menu.c
@@ -4161,7 +4161,7 @@ static void PicTest_Redraw(u8 a0)
     }
 }
 #else
-__attribute__((naked)) void PicTest_Redraw(u8 a0)
+NAKED void PicTest_Redraw(u8 a0)
 {
     asm("\tpush\t{r4, r5, r6, r7, lr}\n"
         "\tmov\tr7, r8\n"
diff --git a/src/decoration.c b/src/decoration.c
index 477414993..b00a51ef0 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -1856,7 +1856,7 @@ void sub_80FECE0(u8 decoCat)
     sub_8072AB0(gDecorations[gUnknown_020388D0[decoCat]].description, 0x80, 0x68, 0x68, 0x30, 0x1);
 }
 #elif GERMAN
-__attribute__((naked))
+NAKED
 void sub_80FECE0(u8 decoCat)
 {
     asm(".syntax unified\n\
@@ -2575,7 +2575,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration)
     return TRUE;
 }
 #else
-__attribute__((naked))
+NAKED
 bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration)
 {
     asm(".syntax unified\n"
@@ -4036,7 +4036,7 @@ void sub_8101460(u8 taskId)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 void sub_8101460(u8 taskId)
 {
     asm(".syntax unified\n"
diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c
index ed6a97ba2..01290daba 100644
--- a/src/easy_chat_2.c
+++ b/src/easy_chat_2.c
@@ -2133,7 +2133,7 @@ u16 sub_80EAE88(u8 group)
 }
 
 #if GERMAN
-__attribute__((naked))
+NAKED
 void sub_80EAECC(void)
 {
     asm(".syntax unified\n\
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 5bba69f86..43dfa6864 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -317,7 +317,7 @@ static bool8 sub_8042ABC(void* a, u8 b)
 }
 
 #else
-__attribute__((naked))
+NAKED
 static bool8 sub_8042ABC(void* a, u8 b)
 {
     asm(".syntax unified\n\
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 155ce33f5..3fb611433 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -8145,7 +8145,7 @@ void sub_80634E8(struct MapObject *mapObject, struct Sprite *sprite)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 void sub_80634E8(struct MapObject *mapObject, struct Sprite *sprite) {
     asm(".syntax unified\n\
     push {r4-r6,lr}\n\
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index a3a5dbcec..4fdbeb60f 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -1511,7 +1511,7 @@ void unref_sub_8113B50(u8 *a, u8 *b)
 #undef sp4
 }
 */
-__attribute__((naked))
+NAKED
 void unref_sub_8113B50()
 {
     asm(".syntax unified\n\
@@ -2436,7 +2436,7 @@ void sub_811430C(u32 a, u32 b)
     sEvoInfo.unk90C4[b][a] = r7 * 16;
 }
 
-__attribute__((naked))
+NAKED
 void unref_sub_81143CC()
 {
     asm(".syntax unified\n\
@@ -3688,7 +3688,7 @@ void sub_8114DF0(u32 a, u8 b)
     }
 }
 
-__attribute__((naked))
+NAKED
 void sub_8114E48()
 {
     asm(".syntax unified\n\
diff --git a/src/field_effect.c b/src/field_effect.c
index f85bc520e..ae0acf1a0 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -601,7 +601,7 @@ void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b)
     gPlttBufferFaded[i] = RGB(curRed, curGreen, curBlue);
 }
 #else
-__attribute__((naked))
+NAKED
 void MultiplyInvertedPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b)
 {
     asm(".syntax unified\n"
@@ -676,7 +676,7 @@ void MultiplyInvertedPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b)
     ".syntax divided");
 }
 
-__attribute__((naked))
+NAKED
 void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b)
 {
     asm(".syntax unified\n"
@@ -2607,7 +2607,7 @@ bool8 sub_8088708(struct Task *task)
     return FALSE;
 }
 #else
-__attribute__((naked))
+NAKED
 bool8 sub_8088708(struct Task *task)
 {
     asm_unified("\tpush {r4-r7,lr}\n"
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index bc4a1770e..216f39d62 100644
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -1024,7 +1024,7 @@ static void sub_812800C(struct MapObject *mapObject, struct Sprite *sprite)
     }
 }
 #else
-__attribute__((naked)) static void sub_812800C(struct MapObject *mapObject, struct Sprite *sprite)
+NAKED static void sub_812800C(struct MapObject *mapObject, struct Sprite *sprite)
 {
     asm_unified("\tpush {r4-r7,lr}\n"
                     "\tmov r7, r8\n"
@@ -1496,7 +1496,7 @@ static void sub_812882C(struct Sprite *sprite /*r6*/, u8 z, u8 offset)
     }
 }
 #else
-__attribute__((naked)) static void sub_812882C(struct Sprite *sprite /*r6*/, u8 z, u8 offset)
+NAKED static void sub_812882C(struct Sprite *sprite /*r6*/, u8 z, u8 offset)
 {
     asm_unified("\tpush {r4-r7,lr}\n"
                     "\tadds r6, r0, 0\n"
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c
index a7087be0f..4a4122641 100644
--- a/src/field_fadetransition.c
+++ b/src/field_fadetransition.c
@@ -512,7 +512,7 @@ void sub_80810DC(void)
 
 #if DEBUG
 
-__attribute__((naked))
+NAKED
 void debug_sub_80888D8()
 {
     asm("\
diff --git a/src/field_specials.c b/src/field_specials.c
index 715086f00..eff623548 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -1172,7 +1172,7 @@ bool8 sub_810EAC8(u8 prevMenuPos, u8 dpadInput)
     return flag;
 }
 #else
-__attribute__((naked))
+NAKED
 bool8 sub_810EAC8(u8 prevMenuPos, u8 dpadInput)
 {
     asm_unified("\tpush {r4-r7,lr}\n"
@@ -1630,7 +1630,7 @@ bool8 sub_810F1F4(u8 prevCursorPos, u8 dpadInput)
     return flag;
 }
 #else
-__attribute__((naked))
+NAKED
 bool8 sub_810F1F4(u8 prevCursorPos, u8 dpadInput)
 {
     asm_unified("\tpush {r4-r7,lr}\n"
diff --git a/src/field_tasks.c b/src/field_tasks.c
index ce5fc6c0e..e4f1aadf2 100644
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -213,7 +213,7 @@ void sub_8069638(const struct MetatileOffset offsets[][2], s16 x, s16 y, bool32
     }
 }
 #else
-__attribute__((naked))
+NAKED
 void sub_8069638(const struct MetatileOffset offsets[][2], s16 x, s16 y, bool32 flag)
 {
     asm_unified("\tpush {r4-r7,lr}\n"
diff --git a/src/item.c b/src/item.c
index 41cbb7a1e..e6294884b 100644
--- a/src/item.c
+++ b/src/item.c
@@ -239,7 +239,7 @@ bool8 AddBagItem(u16 itemId, u16 count)
     return TRUE;
 }
 //#else
-//__attribute__((naked))
+//NAKED
 //bool8 AddBagItem(u16 itemId, u16 count)
 //{
 //    asm(".syntax unified\n\
diff --git a/src/item_menu.c b/src/item_menu.c
index 981f42282..a5748cdab 100644
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -1278,7 +1278,7 @@ static void sub_80A4548(u16 a, int b, int c, int d)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 static void sub_80A4548(u16 a, int b, int c, int d)
 {
     asm(".syntax unified\n\
@@ -2102,7 +2102,7 @@ static void sub_80A5414(u8 taskId)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 static void sub_80A5414(u8 taskId)
 {
     asm(".syntax unified\n\
@@ -2337,7 +2337,7 @@ _080A55FA:\n\
 }
 #endif
 
-__attribute__((naked))
+NAKED
 static void sub_80A5600(u8 taskId)
 {
     asm(".syntax unified\n\
diff --git a/src/item_use.c b/src/item_use.c
index a14abbe3e..19c298850 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -439,7 +439,7 @@ void sub_80C9720(u8 taskId)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 void sub_80C9720(u8 taskId)
 {
     asm(".syntax unified\n\
diff --git a/src/mauville_man.c b/src/mauville_man.c
index a68d5071d..088085851 100644
--- a/src/mauville_man.c
+++ b/src/mauville_man.c
@@ -557,7 +557,7 @@ static const u16 gUnknown_083E53C8[][2] =
     {0x15, 0},
 };
 
-__attribute__((naked))
+NAKED
 static void sub_80F7DC0(void)
 {
     asm(".syntax unified\n\
diff --git a/src/menu.c b/src/menu.c
index 0e615a6d2..9abcf66d1 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -644,7 +644,7 @@ int sub_8072AB0(const u8 *str, u8 left, u16 top, u8 width, u8 height, u32 a6)
         Menu_BlankWindowRect(left, top + 2 * newlineCount, left + width - 1, height + top - 1);
 }
 #elif GERMAN
-__attribute__((naked))
+NAKED
 int sub_8072AB0(const u8 *str, u8 left, u16 top, u8 width, u8 height, u32 a6)
 {
     asm(".syntax unified\n\
diff --git a/src/menu_cursor.c b/src/menu_cursor.c
index f2eb31f16..32578d1a4 100644
--- a/src/menu_cursor.c
+++ b/src/menu_cursor.c
@@ -236,7 +236,7 @@ void sub_814A958(u8 a)
         SetSubspriteTables(&gSprites[gUnknown_0203A3D1], gSubspriteTables_842F5C0 + r7);
 }
 #else
-__attribute__((naked))
+NAKED
 void sub_814A958(u8 a1)
 {
     asm(".syntax unified\n\
@@ -419,7 +419,7 @@ _0814AAB8: .4byte gUnknown_0203A3D1\n\
 }
 #endif
 #elif GERMAN
-__attribute__((naked))
+NAKED
 void sub_814A958(u8 a1)
 {
     asm(".syntax unified\n\
diff --git a/src/money.c b/src/money.c
index 3b7268dbc..1081d5063 100644
--- a/src/money.c
+++ b/src/money.c
@@ -176,7 +176,7 @@ void sub_80B7AEC(u32 arg0, u8 left, u8 top)
 #endif
 }
 
-__attribute__((naked))
+NAKED
 void Draw10000Sprite(u8 var1, u8 var2, int var3)
 {
     asm(".syntax unified\n\
diff --git a/src/option_menu.c b/src/option_menu.c
index a2d32ffb6..8a46e48d9 100644
--- a/src/option_menu.c
+++ b/src/option_menu.c
@@ -463,7 +463,7 @@ static void FrameType_DrawChoices(u8 selection)
     Menu_PrintText(text, 18, 15);
 }
 #elif GERMAN
-__attribute__((naked))
+NAKED
 static void FrameType_DrawChoices(u8 selection)
 {
     asm(".syntax unified\n\
diff --git a/src/party_menu.c b/src/party_menu.c
index 9caaa05b9..b9d3796f1 100644
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -1007,7 +1007,7 @@ void sub_806B908(void)
     ewram1B000.unk261 = 2;
 }
 #else
-__attribute__((naked))
+NAKED
 void sub_806B908(void)
 {
     asm(".syntax unified\n\
@@ -1326,7 +1326,7 @@ u16 HandleDefaultPartyMenuInput(u8 taskId)
     return gMain.newAndRepeatedKeys;
 }
 #else
-__attribute__((naked))
+NAKED
 u16 HandleDefaultPartyMenuInput(u8 taskId)
 {
     asm(".syntax unified\n\
@@ -1810,7 +1810,7 @@ void ChangeLinkDoubleBattlePartyMenuSelection(u8 spriteId, u8 menuIndex, s8 dire
 }
 
 #else
-__attribute__((naked))
+NAKED
 void ChangeLinkDoubleBattlePartyMenuSelection(u8 spriteId, u8 menuIndex, s8 directionPressed)
 {
     asm(".syntax unified\n\
@@ -2408,7 +2408,7 @@ void sub_806CF04(void)
     gSprites[ewram01000.unk4].callback = SpriteCB_sub_806D37C;
 }
 #else
-__attribute__((naked))
+NAKED
 void sub_806CF04(void)
 {
     asm(".syntax unified\n\
@@ -2986,7 +2986,7 @@ void CreateHeldItemIcon_806DCD4(u8 taskId, u8 monIndex, u16 item)
     gSprites[heldItemSpriteId].callback(&gSprites[heldItemSpriteId]);
 }
 #else
-__attribute__((naked))
+NAKED
 void CreateHeldItemIcon_806DCD4(u8 taskId, u8 monIndex, u16 item)
 {
     asm(".syntax unified\n\
@@ -3172,7 +3172,7 @@ void SetHeldItemIconVisibility(u8 taskId, u8 monIndex)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 void SetHeldItemIconVisibility(u8 a, u8 monIndex)
 {
     asm(".syntax unified\n\
@@ -5111,7 +5111,7 @@ u8 GetItemEffectType(u16 item)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 u8 GetItemEffectType(u16 item)
 {
     asm(".syntax unified\n\
diff --git a/src/pokedex.c b/src/pokedex.c
index d90b73178..61f2bfbba 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -3522,7 +3522,7 @@ static void sub_8090584(u8 a, u16 b)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 static void sub_8090584(u8 a, u16 b)
 {
     asm(".syntax unified\n\
@@ -3666,7 +3666,7 @@ static void sub_8090644(u8 a, u16 b)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 static void sub_8090644(u8 a, u16 b)
 {
     asm(".syntax unified\n\
@@ -5120,7 +5120,7 @@ void sub_8092810(u8 a, u8 b, u8 c, u8 d)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 void sub_8092810(u8 a, u8 b, u8 c, u8 d)
 {
     asm(".syntax unified\n\
diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c
index 1ea8bc205..770b69813 100644
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@@ -405,7 +405,7 @@ void ResetPokemonStorageSystem(void)
 }
 
 #if DEBUG
-__attribute__((naked))
+NAKED
 void debug_sub_80A3904(void)
 {
 	asm("\
diff --git a/src/pokemon_storage_system_2.c b/src/pokemon_storage_system_2.c
index 0331abf3e..0905c185b 100644
--- a/src/pokemon_storage_system_2.c
+++ b/src/pokemon_storage_system_2.c
@@ -1564,7 +1564,7 @@ const struct SpriteTemplate gSpriteTemplate_83B6DDC = {
     0x0002, 0xdac7, &gOamData_83B6EAC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 };
 
-__attribute__((naked)) void sub_80980D4(void)
+NAKED void sub_80980D4(void)
 {
     asm_unified("\tpush {r4,r5,lr}\n"
                     "\tsub sp, 0x28\n"
diff --git a/src/pokemon_storage_system_4.c b/src/pokemon_storage_system_4.c
index 2f9f79a54..2383ac46c 100644
--- a/src/pokemon_storage_system_4.c
+++ b/src/pokemon_storage_system_4.c
@@ -519,7 +519,7 @@ void sub_8099F58(u16 *vdest, const u16 *src, s8 a2, u8 a3)
     }
 }
 #else
-__attribute__((naked)) void sub_8099F58(u16 *vdest, const u16 *src, s8 a2, u8 a3)
+NAKED void sub_8099F58(u16 *vdest, const u16 *src, s8 a2, u8 a3)
 {
     asm_unified("\tpush {r4-r7,lr}\n"
                     "\tmov r7, r10\n"
@@ -808,7 +808,7 @@ void sub_809A14C(u16 *vdest)
     }
 }
 #else
-__attribute__((naked)) void sub_809A14C(u16 *vdest)
+NAKED void sub_809A14C(u16 *vdest)
 {
     asm_unified("\tpush {r4-r6,lr}\n"
                     "\tadds r2, r0, 0\n"
@@ -2214,7 +2214,7 @@ u8 sub_809C464(void)
     return r9;
 }
 #else
-__attribute__((naked)) u8 sub_809C464(void)
+NAKED u8 sub_809C464(void)
 {
     asm_unified("\tpush {r4-r7,lr}\n"
                     "\tmov r7, r9\n"
@@ -2584,7 +2584,7 @@ u8 sub_809C664(void)
     return r8;
 }
 #else
-__attribute__((naked)) u8 sub_809C664(void)
+NAKED u8 sub_809C664(void)
 {
     asm_unified("\tpush {r4-r7,lr}\n"
                     "\tmov r7, r10\n"
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index 75ddb52d0..f8f075296 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -1227,7 +1227,7 @@ static void sub_809E83C(u8 taskId, s8 b)
     sub_80A2078(taskId);
 }
 
-__attribute__((naked))
+NAKED
 static void sub_809E8F0(/*u8 taskId, s8 direction, u8 *c*/)
 {
     asm(".syntax unified\n\
@@ -1766,7 +1766,7 @@ static void SummaryScreenHandleUpDownInput(u8 taskId, s8 direction)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 static void SummaryScreenHandleUpDownInput(u8 taskId, s8 direction)
 {
     asm(".syntax unified\n\
@@ -1897,7 +1897,7 @@ s8 sub_809F284(s8 a)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 s8 sub_809F284(s8 a)
 {
     asm(".syntax unified\n\
@@ -2316,7 +2316,7 @@ u8 sub_809FA30(void)
 //     vramAddr[(d * 32) + c] = (b * 0x1000) + (a * 2) + 0x200 + 0x80;
 //     vramAddr[(d * 32) + c + 32] = (b * 0x1000) + (a * 2) + 0x200 + 0x81;
 // }
-__attribute__((naked))
+NAKED
 void GetStringCenterAlignXOffsetWithLetterSpacing(u8 a, u8 b, u8 c, u8 d)
 {
     asm(".syntax unified\n\
@@ -2840,7 +2840,7 @@ static void sub_80A057C(u16 move)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 static void sub_80A057C(u16 move)
 {
     asm(".syntax unified\n\
@@ -3463,7 +3463,7 @@ static void DrawSummaryScreenNavigationDots(void)
     DmaCopy16Defvars(3, arr, (void *)(VRAM + 0xE056), 16);
 }
 #else
-__attribute__((naked))
+NAKED
 static void DrawSummaryScreenNavigationDots(void)
 {
     asm(".syntax unified\n\
@@ -3646,7 +3646,7 @@ _080A1044: .4byte 0x0600e056\n\
 }
 #endif // NONMATCHING
 
-__attribute__((naked))
+NAKED
 void sub_80A1048(u8 taskId)
 {
     asm(".syntax unified\n\
@@ -4049,7 +4049,7 @@ static void sub_80A12D0(s8 a)
 //         DestroyTask(taskId);
 //     }
 // }
-__attribute__((naked))
+NAKED
 static void sub_80A1334(u8 taskId)
 {
     asm(".syntax unified\n\
@@ -4245,7 +4245,7 @@ static void sub_80A1488(s8 a, u8 b)
     gTasks[taskId].data[3] = b;
 }
 
-__attribute__((naked))
+NAKED
 static void sub_80A1500(u8 taskId)
 {
     asm(".syntax unified\n\
@@ -4487,7 +4487,7 @@ static void sub_80A16CC(u8 a)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 static void sub_80A16CC(u8 a)
 {
     asm(".syntax unified\n\
@@ -4884,7 +4884,7 @@ void sub_80A1D18(void)
     StartSpriteAnim(&gSprites[ewram1A000[29]], statusAndPkrs2);
 }
 #else
-__attribute__((naked))
+NAKED
 void sub_80A1D18(void)
 {
     asm(".syntax unified\n\
diff --git a/src/pokenav_before.c b/src/pokenav_before.c
index 55cf05790..8684f2155 100644
--- a/src/pokenav_before.c
+++ b/src/pokenav_before.c
@@ -1793,7 +1793,7 @@ label2:
 }
 #else
 #if DEBUG
-__attribute__((naked))
+NAKED
 void sub_80ED858()
 {
     asm("\
@@ -2216,7 +2216,7 @@ void sub_80ED858()
 	.word	0xfbd");
 }
 #else
-__attribute__((naked))
+NAKED
 void sub_80ED858()
 {
     asm_unified("push {r4,r5,lr}\n\
@@ -3277,7 +3277,7 @@ bool8 sub_80EEA0C() {
     }
 }
 #else
-__attribute__((naked))
+NAKED
 bool8 sub_80EEA0C() {
     asm_unified(
     "push {r4,lr}\n\
@@ -3969,7 +3969,7 @@ void sub_80EF624(const u16 *a, const u16 *b, u8 c, u8 d, u16 *palettes)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 void sub_80EF624(const u16 *a, const u16 *b, u8 c, u8 d, u16 *palettes)
 {
     asm(".syntax unified\n\
@@ -4713,7 +4713,7 @@ bool8 sub_80F02A0(void)
     return TRUE;
 }
 #else
-__attribute__((naked))
+NAKED
 bool8 sub_80F02A0(void)
 {
     asm(".syntax unified\n\
diff --git a/src/record_mixing.c b/src/record_mixing.c
index a2660bf82..0eb13899e 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -635,7 +635,7 @@ void sub_80B9C6C(u8 *a, u32 b, u8 c, void *d)
     SeedRng(sp40);
 }
 #else
-__attribute__((naked))
+NAKED
 void sub_80B9C6C(u8 *a, u32 b, u8 c, void *d)
 {
     asm(".syntax unified\n\
diff --git a/src/rotating_gate.c b/src/rotating_gate.c
index 69f655a65..f5e8fa99a 100644
--- a/src/rotating_gate.c
+++ b/src/rotating_gate.c
@@ -923,7 +923,7 @@ static int RotatingGate_CanRotate(u8 gateId, int rotationDirection)
     return 1;
 }
 #else
-__attribute__((naked))
+NAKED
 static int RotatingGate_CanRotate(u8 a, int puzzleType)
 {
     asm(".syntax unified\n\
diff --git a/src/roulette.c b/src/roulette.c
index 5e7517d79..b278521b1 100644
--- a/src/roulette.c
+++ b/src/roulette.c
@@ -2733,7 +2733,7 @@ void sub_811952C(struct Sprite *sprite)
     sprite->callback = sub_8118CEC;
 }
 #else
-__attribute__((naked))
+NAKED
 void sub_811952C(struct Sprite *sprite)
 {
     asm_unified("push {r4-r7,lr}\n"
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\
diff --git a/src/secret_base.c b/src/secret_base.c
index 210d49835..3c4028dca 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -694,7 +694,7 @@ void sub_80BC300(void)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 void sub_80BC300(void)
 {
     asm(".syntax unified\n\
diff --git a/src/shop.c b/src/shop.c
index 42cda5e2e..96b417b68 100644
--- a/src/shop.c
+++ b/src/shop.c
@@ -811,7 +811,7 @@ static void Shop_MoveItemListUp(void)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 static void Shop_MoveItemListUp(void)
 {
     asm(".syntax unified\n\
@@ -950,7 +950,7 @@ static void Shop_MoveItemListDown(void)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 static void Shop_MoveItemListDown(void)
 {
     asm(".syntax unified\n\
diff --git a/src/starter_choose.c b/src/starter_choose.c
index 418488774..ff8c706b8 100644
--- a/src/starter_choose.c
+++ b/src/starter_choose.c
@@ -548,7 +548,7 @@ static void CreateStarterPokemonLabel(u8 prevSelection, u8 selection)
     REG_WIN0V = WIN_RANGE(labelTop, labelBottom);
 }
 #elif GERMAN
-__attribute__((naked))
+NAKED
 static void CreateStarterPokemonLabel(u8 prevSelection, u8 selection)
 {
     asm(".syntax unified\n\
diff --git a/src/title_screen.c b/src/title_screen.c
index a1c8e081d..30ba7191e 100644
--- a/src/title_screen.c
+++ b/src/title_screen.c
@@ -437,7 +437,7 @@ static void CreatePressStartBanner(s16 x, s16 y)
     }
 }
 #elif GERMAN
-__attribute__((naked))
+NAKED
 static void CreatePressStartBanner(s16 x, s16 y)
 {
     asm(".syntax unified\n\
diff --git a/src/trade.c b/src/trade.c
index a05bddee4..3245ec5b0 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -1492,7 +1492,7 @@ static void sub_8048B0C(u8 a0)
 #pragma pop_macro("BLOCKSIZE")
 #else
 asm(".include \"constants/gba_constants.inc\"");
-__attribute__((naked))
+NAKED
 static void sub_8048B0C(u8 a0)
 {
     asm_unified("\tpush {r4-r7,lr}\n"
@@ -2488,7 +2488,7 @@ static void sub_8049ED4(u8 a0)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 static void sub_8049ED4(u8 a0)
 {
     asm_unified("\tpush {r4-r7,lr}\n"
@@ -3055,7 +3055,7 @@ static void sub_804A41C(u8 whichParty)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 static void sub_804A41C(u8 whichParty)
 {
     asm_unified("\tpush {r4-r7,lr}\n"
@@ -3250,7 +3250,7 @@ static void sub_804A6DC(u8 whichParty)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 static void sub_804A6DC(u8 whichParty)
 {
     asm_unified("\tpush {r4-r7,lr}\n"
@@ -3561,7 +3561,7 @@ static void sub_804ACF4(u8 who)
     }
 }
 #else
-static __attribute__((naked)) void sub_804ACF4(u8 who)
+static NAKED void sub_804ACF4(u8 who)
 {
     asm_unified("\tpush {r4-r7,lr}\n"
                     "\tmov r7, r9\n"
@@ -3869,7 +3869,7 @@ static void sub_804B1BC(void)
     }
 }
 #else
-__attribute__((naked)) static void sub_804B1BC(void)
+NAKED static void sub_804B1BC(void)
 {
     asm_unified("\tpush {lr}\n"
                     "\tldr r1, _0804B1FC @ =REG_BG1VOFS\n"
@@ -4113,7 +4113,7 @@ static void sub_804B41C(void)
     UpdatePaletteFade();
 }
 #else
-static __attribute__((naked)) void sub_804B41C(void)
+static NAKED void sub_804B41C(void)
 {
     asm_unified("\tpush {r4-r6,lr}\n"
                     "\tsub sp, 0x4\n"
diff --git a/src/trainer_card.c b/src/trainer_card.c
index 8d16aa9bf..599479f16 100644
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -864,7 +864,7 @@ bool8 TrainerCard_ScaleDownFlipAnimation(struct Task *task)
 }
 */
 
-__attribute__((naked))
+NAKED
 bool8 TrainerCard_ScaleDownFlipAnimation(struct Task *task)
 {
     asm(".syntax unified\n\
@@ -1028,7 +1028,7 @@ bool8 TrainerCard_SwitchToNewSide(struct Task *task)
     return TRUE;
 }
 
-__attribute__((naked))
+NAKED
 bool8 TrainerCard_ScaleUpFlipAnimation(struct Task *task)
 {
     asm(".syntax unified\n\
diff --git a/src/tv.c b/src/tv.c
index 6c24170ae..b195c1e99 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -2435,7 +2435,7 @@ void sub_80C01D4(void)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 void sub_80C01D4(void) {
     asm(".syntax unified\n\
     push {r4-r6,lr}\n\
diff --git a/src/unk_text_8095904.c b/src/unk_text_8095904.c
index 4b190bdaa..df0a35e7c 100644
--- a/src/unk_text_8095904.c
+++ b/src/unk_text_8095904.c
@@ -64,7 +64,7 @@ void sub_8095904(const u8 *src, u8 *dest, u8 bgOverride, u16 width, u8 bg, u8 *b
     }
 }
 #else
-__attribute__((naked)) void sub_8095904(const u8 *src, u8 *dest, u8 bgOverride, u16 width, u8 bg, u8 *buffer)
+NAKED void sub_8095904(const u8 *src, u8 *dest, u8 bgOverride, u16 width, u8 bg, u8 *buffer)
 {
     asm_unified("\tpush {r4-r7,lr}\n"
                     "\tmov r7, r10\n"
diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index 8ea93aab8..8205f4f70 100644
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -697,7 +697,7 @@ static void Pokeblock_BufferEnhancedStatText(u8 *dest, u8 statID, s16 a2)
     }
 }
 #else
-__attribute__((naked))
+NAKED
 static void Pokeblock_BufferEnhancedStatText(u8 *dest, u8 a1, s16 a2)
 {
     asm_unified("\tpush {r4,lr}\n"
diff --git a/src/util.c b/src/util.c
index e14665a03..2e76cf4de 100644
--- a/src/util.c
+++ b/src/util.c
@@ -231,7 +231,7 @@ void CopySpriteTiles(u8 shape, u8 size, u8 *tiles, u16 *tilemap, u8 *output)
 
 #else
 
-__attribute__((naked)) void CopySpriteTiles(u8 shape, u8 size, u8 *tiles, u16 *tilemap, u8 *output)
+NAKED void CopySpriteTiles(u8 shape, u8 size, u8 *tiles, u16 *tilemap, u8 *output)
 {
     asm("\n"
     "    .syntax unified\n"