summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-07-02 09:42:18 +0800
committerjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-07-02 09:42:18 +0800
commit062238aa12cb4f54f70b73459ff5b5d775f69a54 (patch)
treefd3f6b7cb65e8c7471a1203982a00af9bc69aba4
parent5384fd020c0e390a677cecfe544529f55d0f0c9f (diff)
fixed another macro expansion
-rw-r--r--include/fldeff.h2
-rw-r--r--src/fldeff_rocksmash.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/include/fldeff.h b/include/fldeff.h
index 38a2b2a5e..e5e7e5f7d 100644
--- a/include/fldeff.h
+++ b/include/fldeff.h
@@ -1,6 +1,8 @@
#ifndef GUARD_FLDEFF_H
#define GUARD_FLDEFF_H
+#define FLDEFF_CALL_FUNC_IN_DATA() ((void (*)(void))(((u16)gTasks[taskId].data[8] << 16) | (u16)gTasks[taskId].data[9]))();
+
#define FLDEFF_SET_FUNC_TO_DATA(func) \
gTasks[taskId].data[8] = (u32)func >> 16; \
gTasks[taskId].data[9] = (u32)func;
diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c
index 1d69b772f..517f3479a 100644
--- a/src/fldeff_rocksmash.c
+++ b/src/fldeff_rocksmash.c
@@ -98,7 +98,7 @@ static void sub_80C98FC(u8 taskId)
static void sub_80C99A0(u8 taskId)
{
- ((void (*)(void))(((u16)gTasks[taskId].data[8] << 16) | (u16)gTasks[taskId].data[9]))();
+ FLDEFF_CALL_FUNC_IN_DATA();
gPlayerAvatar.unk6 = FALSE;
DestroyTask(taskId);
}