diff options
| -rw-r--r-- | include/fldeff.h | 2 | ||||
| -rw-r--r-- | src/fldeff_rocksmash.c | 2 |
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); } |