diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/variables.h | 2 | ||||
| -rw-r--r-- | include/z64scene.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/variables.h b/include/variables.h index 922a3c15f..58104dc90 100644 --- a/include/variables.h +++ b/include/variables.h @@ -85,7 +85,7 @@ extern u32 gGsFlagsMasks[4]; extern u32 gGsFlagsShifts[4]; extern void* gItemIcons[0x82]; extern u8 gItemSlots[56]; -extern void (*gSceneCmdHandlers[SCENE_CMD_ID_MAX])(PlayState*, SceneCmd*); +extern SceneCmdHandlerFunc gSceneCmdHandlers[SCENE_CMD_ID_MAX]; extern s16 gLinkObjectIds[2]; extern u32 gObjectTableSize; extern RomFile gObjectTable[OBJECT_ID_MAX]; diff --git a/include/z64scene.h b/include/z64scene.h index a08d438bd..7cb48e0bb 100644 --- a/include/z64scene.h +++ b/include/z64scene.h @@ -344,6 +344,8 @@ typedef union { SCmdAltHeaders altHeaders; } SceneCmd; // size = 0x8 +typedef BAD_RETURN(s32) (*SceneCmdHandlerFunc)(struct PlayState*, SceneCmd*); + #define DEFINE_SCENE(_0, _1, enum, _3, _4, _5) enum, typedef enum { |