diff options
| author | fig02 <fig02srl@gmail.com> | 2024-02-01 03:29:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-01 09:29:02 +0100 |
| commit | 593a86014c7eece92b0b60e7ff4311c38eb8b723 (patch) | |
| tree | 5593e8c27716333f0e450dffbc079e61e51d559d /include | |
| parent | 5e8e01f1109a7fc1c5353c0ff5f1ee8807757667 (diff) | |
Retail z_scene matching (#1677)
* one left
* cursed match for Scene_CommandObjectList
* format
* revert printf modification for permuter
* more bad-returns
* format
* typedef scene command func
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 { |