diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2023-06-01 15:11:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-01 15:11:11 -0400 |
| commit | eb24680be36616c36009e17e1e09608db17560b8 (patch) | |
| tree | eb75033e198852c8bbac91489b2493ea04360f33 /include | |
| parent | 64959177d90f158e2e39ca3a6b728f915bf084b5 (diff) | |
`z_horse.c` OK (#1245)
* func_800F3940
* func_800F3B2C, func_800F415C and func_800F41E4
* func_800F40A0
* func_800F3ED4
* func_800F3C44
* func_800F3B68 NON_MATCHING
* func_800F3A64 kinda
* func_800F39B4
* cleanups
* import data
* fix fake match
* format
* Scene enum
* minor cleanup on data usage
* Horse_RotateToPoint and ENHORSE_PARAMS
* scene setup index
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
* fix merge
* z64horse.h
* Renames
* and even more renames
* format
* fix
* review
* Horse_IsActive
* review
* bss
* fix
* remove comments
* Update src/code/z_horse.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* review
* Update src/code/z_horse.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* review
---------
Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.h | 11 | ||||
| -rw-r--r-- | include/variables.h | 20 | ||||
| -rw-r--r-- | include/z64horse.h | 21 |
3 files changed, 22 insertions, 30 deletions
diff --git a/include/functions.h b/include/functions.h index 530cedd86..5774ca3c6 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1069,17 +1069,6 @@ u16 QuestHint_GetTatlTextId(PlayState* play); u16 Text_GetFaceReaction(PlayState* play, u32 reactionSet); -s32 func_800F3940(PlayState* play); -// void func_800F39B4(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5); -// void func_800F3A64(void); -void func_800F3B2C(PlayState* play); -// void func_800F3B68(void); -// void func_800F3C44(void); -// void func_800F3ED4(void); -void func_800F40A0(GameState* gameState, Player* player); -void func_800F415C(Actor* actor, Vec3f* arg1, s16 arg2); -UNK_TYPE func_800F41E4(PlayState* play, ActorContext* actorCtx); - void func_800F4A10(PlayState* play); void KaleidoSetup_Update(PlayState* play); void KaleidoSetup_Init(PlayState* play); diff --git a/include/variables.h b/include/variables.h index 61ac8824b..24030fd99 100644 --- a/include/variables.h +++ b/include/variables.h @@ -419,21 +419,7 @@ extern u8 gOpeningEntranceIndex; extern ActorCutscene sGlobalCutsceneList[8]; extern GameStateOverlay gGameStateOverlayTable[]; extern s32 gGraphNumGameStates; -// extern UNK_TYPE2 D_801BDA70; -// extern UNK_TYPE2 D_801BDA74; -// extern UNK_TYPE2 D_801BDA78; -// extern UNK_TYPE2 D_801BDA7C; -extern s32 D_801BDA9C; -extern UNK_TYPE4 D_801BDAA0; -extern s32 D_801BDAA4; -// extern UNK_TYPE2 D_801BDAA8; -// extern UNK_TYPE2 D_801BDAAA; -// extern UNK_TYPE2 D_801BDAAC; -// extern UNK_TYPE2 D_801BDAAE; -// extern UNK_TYPE2 D_801BDAB0; -// extern UNK_TYPE2 D_801BDAB2; -// extern UNK_TYPE2 D_801BDAB4; -// extern UNK_TYPE2 D_801BDAB6; + // extern UNK_TYPE4 D_801BDAC0; // extern UNK_TYPE4 D_801BDAC4; // extern UNK_TYPE4 D_801BDAC8; @@ -1605,10 +1591,6 @@ extern f32 D_801DD774; extern f32 D_801DD780; extern f32 D_801DD7B0; extern f32 D_801DD7C0; -extern f32 D_801DD7E0; -extern f32 D_801DD7E4; -extern f32 D_801DD7E8; -extern f32 D_801DD7EC; // extern UNK_TYPE2 D_801DD880; // extern UNK_TYPE1 D_801DD8E0; // extern UNK_TYPE4 D_801DD900; diff --git a/include/z64horse.h b/include/z64horse.h new file mode 100644 index 000000000..bae439868 --- /dev/null +++ b/include/z64horse.h @@ -0,0 +1,21 @@ +#ifndef Z64_HORSE_H +#define Z64_HORSE_H + +#include "ultra64.h" +#include "z64.h" + + +s32 Horse_GetJumpingFencePathIndex(PlayState* play); +s32 Horse_CopyPointFromPathList(PlayState* play, s32 pathIndex, s32 pointIndex, Vec3s* dst, s16* arg4); +s32 Horse_IsValidSpawn(s16 sceneId); +void Horse_ResetHorseData(PlayState* play); +void Horse_Spawn(PlayState* play, Player* player); +void Horse_RotateToPoint(Actor* actor, Vec3f* pos, s16 turnYaw); +s32 Horse_IsActive(PlayState* play, ActorContext* actorCtx); + + +extern s32 gHorseIsMounted; +extern s32 D_801BDAA0; +extern s32 gHorsePlayedEponasSong; + +#endif |
