mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-07-10 05:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

z_horse.c OK (#1245)

Browse Source 
* 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>
This commit is contained in:
Anghelo Carvajal
2023-06-01 15:11:11 -04:00
committed by GitHub
parent 64959177d9
commit eb24680be3
22 changed files with 341 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
-11
View File
@@ -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);
include/variables.h
+1 -19
View File
@@ -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;
include/z64horse.h
+21
View File
@@ -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