summaryrefslogtreecommitdiff
path: root/src/field_effect.c
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2018-05-11 17:24:32 -0500
committerDiegoisawesome <diego@domoreaweso.me>2018-05-11 17:24:32 -0500
commit23b050a99e9603d038743dc14a36c808a822423f (patch)
tree7463de4a9c999351a3e07a24edbc4555d2c0d592 /src/field_effect.c
parent4e2886db8179072badaad0a3ff131b95dd0a7e94 (diff)
Update naked attribute and ASM_DIRECT to NAKED macro
Diffstat (limited to 'src/field_effect.c')
-rw-r--r--src/field_effect.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/field_effect.c b/src/field_effect.c
index 6783473eb..692090779 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -566,7 +566,7 @@ u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y)
return spriteId;
}
#else
-ASM_DIRECT
+NAKED
u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y)
{
asm_unified("push {r4,r5,lr}\n\
@@ -669,7 +669,7 @@ void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b)
gPlttBufferFaded[i] = RGB(curRed, curGreen, curBlue);
}
#else
-ASM_DIRECT
+NAKED
void MultiplyInvertedPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b)
{
asm(".syntax unified\n"
@@ -744,7 +744,7 @@ void MultiplyInvertedPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b)
".syntax divided");
}
-ASM_DIRECT
+NAKED
void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b)
{
asm(".syntax unified\n"
@@ -2684,7 +2684,7 @@ bool8 sub_80B8B38(struct Task *task)
return FALSE;
}
#else
-ASM_DIRECT
+NAKED
bool8 sub_80B8B38(struct Task *task)
{
asm_unified("\tpush {r4-r7,lr}\n"
@@ -2997,7 +2997,7 @@ u8 sub_80B8F98(void)
return spriteId;
}
#else
-ASM_DIRECT
+NAKED
u8 sub_80B8F98(void)
{
asm_unified("push {r4-r7,lr}\n\