summaryrefslogtreecommitdiff
path: root/src/battle/anim
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-04-09 11:14:37 -0700
committerGitHub <noreply@github.com>2018-04-09 11:14:37 -0700
commit84c5825c8ecc9804313ec3b1a8dcc0271ee4c2cc (patch)
treec90f705e43f2b1728ed1e0400312b7d6c5c81c21 /src/battle/anim
parent562dcc4bcdc14d5b6c0bb2a638410156945cdd41 (diff)
parent91f869d1e6ed1ef12ad4b2255d3762e3b1b51429 (diff)
Merge pull request #589 from PikalaxALT/unk_debug_menu_3
Unk Debug Menu 3 and Start Menu Debug
Diffstat (limited to 'src/battle/anim')
-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
5 files changed, 5 insertions, 5 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\