summaryrefslogtreecommitdiff
path: root/src/battle
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle')
-rw-r--r--src/battle/anim/dark.c2
-rw-r--r--src/battle/anim/psychic.c2
-rw-r--r--src/battle/anim/shadow_minimize.c2
-rw-r--r--src/battle/anim/unused_9.c2
-rw-r--r--src/battle/anim/water.c2
-rw-r--r--src/battle/battle_2.c4
-rw-r--r--src/battle/battle_4.c30
-rw-r--r--src/battle/battle_ai.c2
-rwxr-xr-xsrc/battle/battle_ai_switch_items.c2
-rw-r--r--src/battle/battle_anim.c2
-rw-r--r--src/battle/battle_controller_opponent.c4
-rw-r--r--src/battle/battle_controller_player.c2
-rw-r--r--src/battle/battle_interface.c8
-rw-r--r--src/battle/contest_link_80C857C.c2
14 files changed, 33 insertions, 33 deletions
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"
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-01 22:11:19 +0000