falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

En_Horse (2 non-matching) (#413) 

* En_Horse

* a

* Warnings

* Warnigns 2

* PR

* Formats

* Fix

* PR

* Merge

* Merge

* Merge
This commit is contained in:
Maide 2022-03-29 22:15:26 +01:00 committed by GitHub
parent 72bae2b6ba
commit 7280d10404
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 5035 additions and 489 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/xml/objects/object_horse_link_child.xml
View File

@ -10,7 +10,9 @@
<DList Name="object_horse_link_child_DL_001568" Offset="0x1568" />
<DList Name="object_horse_link_child_DL_001678" Offset="0x1678" />
<Texture Name="object_horse_link_child_Tex_001728" OutName="tex_001728" Format="rgba16" Width="16" Height="16" Offset="0x1728" />
<!-- <Blob Name="object_horse_link_child_Blob_001928" Size="0x600" Offset="0x1928" /> -->
<Texture Name="object_horse_link_child_Tex_001928" OutName="tex_001928" Format="ci8" Width="32" Height="16" Offset="0x1928" />
<Texture Name="object_horse_link_child_Tex_001B28" OutName="tex_001B28" Format="ci8" Width="32" Height="16" Offset="0x1B28" />
<Texture Name="object_horse_link_child_Tex_001D28" OutName="tex_001D28" Format="ci8" Width="32" Height="16" Offset="0x1D28" />
<Texture Name="object_horse_link_child_Tex_001F28" OutName="tex_001F28" Format="rgba16" Width="4" Height="8" Offset="0x1F28" />
<Texture Name="object_horse_link_child_Tex_001F68" OutName="tex_001F68" Format="rgba16" Width="16" Height="16" Offset="0x1F68" />
<Texture Name="object_horse_link_child_Tex_002168" OutName="tex_002168" Format="rgba16" Width="16" Height="16" Offset="0x2168" />

7
include/functions.h
View File

@ -1488,7 +1488,7 @@ void FireObj_Init(GlobalContext* globalCtx, FireObj* fire, FireObjInitParams* in
void FireObj_Destroy(GlobalContext* globalCtx, FireObj* fire);
void FireObj_SetState2(FireObj* fire, f32 dynamicSizeStep, u8 newState);
void FireObj_Update(GlobalContext* globalCtx, FireObj* fire, Actor* actor);
// void func_800F3940(void);
s32 func_800F3940(GlobalContext* globalCtx);
// 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(GlobalContext* globalCtx);
@ -1496,7 +1496,7 @@ void func_800F3B2C(GlobalContext* globalCtx);
// void func_800F3C44(void);
// void func_800F3ED4(void);
void func_800F40A0(GameState* gameState, Player* player);
// void func_800F415C(void);
void func_800F415C(Actor* actor, Vec3f* arg1, s16 arg2);
UNK_TYPE func_800F41E4(GlobalContext* globalCtx, ActorContext* actorCtx);
void func_800F4A10(GlobalContext* globalCtx);
@ -2408,7 +2408,6 @@ void SkelAnime_UpdateTranslation(SkelAnime* skelAnime, Vec3f* pos, s16 angle);
s32 Animation_OnFrame(SkelAnime* skelAnime, f32 frame);
void SkelAnime_Free(SkelAnime* skelAnime, GlobalContext* globalCtx);
void SkelAnime_CopyFrameTable(SkelAnime* skelAnime, Vec3s* dst, Vec3s* src);
void SkinMatrix_Vec3fMtxFMultXYZW(MtxF* mf, Vec3f* src, Vec3f* xyzDest, f32* wDest);
void SkinMatrix_Vec3fMtxFMultXYZ(MtxF* mf, Vec3f* src, Vec3f* dest);
void SkinMatrix_MtxFMtxFMult(MtxF* mfB, MtxF* mfA, MtxF* dest);
@ -3068,7 +3067,7 @@ s32 Math3D_LineSegVsPlane(f32 nx, f32 ny, f32 nz, f32 originDist, Vec3f* linePoi
void Math3D_TriSetCoords(TriNorm* tri, Vec3f* pointA, Vec3f* pointB, Vec3f* pointC);
u32 Math3D_IsPointInSphere(Sphere16* sphere, Vec3f* point);
s32 Math3D_PointDistToLine2D(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32* arg6, f32* arg7, f32* arg8); // returns boolean
// void func_8017D7C0(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7);
s32 func_8017D7C0(f32 x0, f32 y0, f32 x1, f32 y1, f32 x2, f32 y2, f32* lineLenSq);
// void func_8017D814(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5);
// void func_8017D91C(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5);
// void func_8017DA24(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5);

2
include/variables.h
View File

@ -893,7 +893,7 @@ extern s32 graphNumGameStates;
// extern UNK_TYPE2 D_801BDA7C;
extern s32 D_801BDA9C;
extern UNK_TYPE4 D_801BDAA0;
extern UNK_TYPE4 D_801BDAA4;
extern s32 D_801BDAA4;
// extern UNK_TYPE2 D_801BDAA8;
// extern UNK_TYPE2 D_801BDAAA;
// extern UNK_TYPE2 D_801BDAAC;

5
spec
View File

@ -822,8 +822,11 @@ beginseg
name "ovl_En_Horse"
compress
include "build/src/overlays/actors/ovl_En_Horse/z_en_horse.o"
include "build/data/ovl_En_Horse/ovl_En_Horse.data.o"
#ifdef NON_MATCHING
include "build/src/overlays/actors/ovl_En_Horse/ovl_En_Horse_reloc.o"
#else
include "build/data/ovl_En_Horse/ovl_En_Horse.reloc.o"
#endif
endseg
beginseg

5047
src/overlays/actors/ovl_En_Horse/z_en_horse.c
View File

File diff suppressed because it is too large Load Diff

213
src/overlays/actors/ovl_En_Horse/z_en_horse.h
View File

@ -3,20 +3,217 @@
#include "global.h"
#include "z64skin.h"
#include "overlays/actors/ovl_En_In/z_en_in.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#include "objects/object_ha/object_ha.h"
struct EnHorse;
typedef void (*EnHorseActionFunc)(struct EnHorse*, GlobalContext*);
typedef void (*EnHorsePostdrawFunc)(struct EnHorse*, GlobalContext*);
typedef void (*EnHorseCsFunc)(struct EnHorse*, GlobalContext*, CsCmdActorAction*);
#define ENHORSE_BOOST (1 << 0) /* 0x1 */
#define ENHORSE_BOOST_DECEL (1 << 1) /* 0x2 */
#define ENHORSE_JUMPING (1 << 2) /* 0x4 */
#define ENHORSE_CALC_RIDER_POS (1 << 3) /* 0x8 */
#define ENHORSE_FORCE_REVERSING (1 << 4) /* 0x10 */
#define ENHORSE_FORCE_WALKING (1 << 5) /* 0x20 */
#define ENHORSE_FLAG_6 (1 << 6) /* 0x40 */
#define ENHORSE_FLAG_7 (1 << 7) /* 0x80 */
#define ENHORSE_FLAG_8 (1 << 8) /* 0x100 */
#define ENHORSE_FLAG_9 (1 << 9) /* 0x200 */
#define ENHORSE_STOPPING_NEIGH_SOUND (1 << 10) /* 0x400 */
#define ENHORSE_LAND2_SOUND (1 << 11) /* 0x800 */
#define ENHORSE_SANDDUST_SOUND (1 << 12) /* 0x1000 */
#define ENHORSE_INACTIVE (1 << 13) /* 0x2000 */
#define ENHORSE_OBSTACLE (1 << 14) /* 0x4000 */
#define ENHORSE_TURNING_TO_PLAYER (1 << 15) /* 0x8000 */
#define ENHORSE_UNRIDEABLE (1 << 16) /* 0x10000 */
#define ENHORSE_CANT_JUMP (1 << 17) /* 0x20000 */
#define ENHORSE_FLAG_18 (1 << 18) /* 0x40000 */
#define ENHORSE_FLAG_19 (1 << 19) /* 0x80000 */
#define ENHORSE_FLAG_20 (1 << 20) /* 0x100000 */
#define ENHORSE_FLAG_21 (1 << 21) /* 0x200000 */
#define ENHORSE_FIRST_BOOST_REGEN (1 << 22) /* 0x400000 */
#define ENHORSE_INGO_WON (1 << 23) /* 0x800000 */
#define ENHORSE_FLAG_24 (1 << 24) /* 0x1000000 */
#define ENHORSE_FLAG_25 (1 << 25) /* 0x2000000 */
#define ENHORSE_FLAG_26 (1 << 26) /* 0x4000000 */
#define ENHORSE_DRAW (1 << 27) /* 0x8000000 */
#define ENHORSE_FLAG_28 (1 << 28) /* 0x10000000 */
#define ENHORSE_FLAG_29 (1 << 29) /* 0x20000000 */
#define ENHORSE_FLAG_30 (1 << 30) /* 0x40000000 */
#define ENHORSE_FLAG_31 (1 << 31) /* 0x80000000 */
typedef enum {
/* 0 */ ENHORSE_ACT_FROZEN,
/* 1 */ ENHORSE_ACT_INACTIVE,
/* 2 */ ENHORSE_ACT_IDLE,
/* 3 */ ENHORSE_ACT_FOLLOW_PLAYER,
/* 4 */ ENHORSE_ACT_INGO_RACE,
/* 5 */ ENHORSE_ACT_MOUNTED_IDLE,
/* 6 */ ENHORSE_ACT_MOUNTED_IDLE_WHINNEYING,
/* 7 */ ENHORSE_ACT_MOUNTED_TURN,
/* 8 */ ENHORSE_ACT_MOUNTED_WALK,
/* 9 */ ENHORSE_ACT_MOUNTED_TROT,
/* 10 */ ENHORSE_ACT_MOUNTED_GALLOP,
/* 11 */ ENHORSE_ACT_MOUNTED_REARING,
/* 12 */ ENHORSE_ACT_STOPPING,
/* 13 */ ENHORSE_ACT_REVERSE,
/* 14 */ ENHORSE_ACT_LOW_JUMP,
/* 15 */ ENHORSE_ACT_HIGH_JUMP,
/* 16 */ ENHORSE_ACT_BRIDGE_JUMP,
/* 17 */ ENHORSE_ACT_CS_UPDATE,
/* 18 */ ENHORSE_ACT_HBA,
/* 19 */ ENHORSE_ACT_FLEE_PLAYER,
/* 20 */ ENHORSE_ACT_20,
/* 21 */ ENHORSE_ACT_21,
/* 22 */ ENHORSE_ACT_22,
/* 23 */ ENHORSE_ACT_23,
/* 24 */ ENHORSE_ACT_24,
/* 25 */ ENHORSE_ACT_25,
} EnHorseAction;
typedef enum {
/* 0 */ PLAYER_DIR_FRONT_R,
/* 1 */ PLAYER_DIR_FRONT_L,
/* 2 */ PLAYER_DIR_BACK_R,
/* 3 */ PLAYER_DIR_BACK_L,
/* 4 */ PLAYER_DIR_SIDE_R,
/* 5 */ PLAYER_DIR_SIDE_L
} EnHorsePlayerDir;
typedef enum {
/* 0 */ ENHORSE_ANIM_IDLE,
/* 1 */ ENHORSE_ANIM_WHINNEY,
/* 2 */ ENHORSE_ANIM_STOPPING,
/* 3 */ ENHORSE_ANIM_REARING,
/* 4 */ ENHORSE_ANIM_WALK,
/* 5 */ ENHORSE_ANIM_TROT,
/* 6 */ ENHORSE_ANIM_GALLOP,
/* 7 */ ENHORSE_ANIM_LOW_JUMP,
/* 8 */ ENHORSE_ANIM_HIGH_JUMP
} EnHorseAnimationIndex;
typedef enum {
/* 0 */ HORSE_EPONA,
/* 1 */ HORSE_HNI,
/* 2 */ HORSE_2,
/* 3 */ HORSE_3,
/* 4 */ HORSE_4
} HorseType;
#define ENHORSE_GET_2000(thisx) ((thisx)->params & 0x2000)
#define ENHORSE_GET_4000(thisx) ((thisx)->params & 0x4000)
#define ENHORSE_GET_8000(thisx) ((thisx)->params & 0x8000)
enum {
/* 0 */ ENHORSE_0,
/* 1 */ ENHORSE_1,
/* 2 */ ENHORSE_2,
/* 3 */ ENHORSE_3,
/* 4 */ ENHORSE_4,
/* 5 */ ENHORSE_5,
/* 6 */ ENHORSE_6,
/* 7 */ ENHORSE_7,
/* 8 */ ENHORSE_8,
/* 9 */ ENHORSE_9,
/* 10 */ ENHORSE_10,
/* 11 */ ENHORSE_11,
/* 12 */ ENHORSE_12,
/* 13 */ ENHORSE_13,
/* 14 */ ENHORSE_14,
/* 15 */ ENHORSE_15,
/* 16 */ ENHORSE_16,
/* 17 */ ENHORSE_17,
/* 18 */ ENHORSE_18,
/* 19 */ ENHORSE_19,
/* 20 */ ENHORSE_20,
};
typedef struct EnHorse {
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0xC];
/* 0x150 */ s32 unk_150;
/* 0x154 */ char unk_154[0x98];
/* 0x1EC */ UNK_TYPE4 unk_1EC;
/* 0x1F0 */ char unk_1F0[0x5C];
/* 0x24C */ u32 unk_24C;
/* 0x250 */ char unk_250[0x138];
/* 0x144 */ s32 action;
/* 0x148 */ s32 noInputTimer;
/* 0x14C */ s32 noInputTimerMax;
/* 0x150 */ s32 type;
/* 0x154 */ s8 bankIndex;
/* 0x158 */ Skin skin;
/* 0x1E8 */ s32 stateFlags;
/* 0x1EC */ s32 unk_1EC;
/* 0x1F0 */ Vec3f lastPos;
/* 0x1FC */ s16 lastYaw;
/* 0x200 */ s32 curRaceWaypoint;
/* 0x204 */ s32 boostSpeed;
/* 0x208 */ s32 playerControlled;
/* 0x20C */ s32 animationIdx;
/* 0x210 */ f32 curFrame;
/* 0x214 */ s32 soundTimer;
/* 0x218 */ Vec3f unk_218;
/* 0x224 */ UNK_TYPE1 unk224[0xC];
/* 0x230 */ s32 unk_230;
/* 0x234 */ u8 numBoosts;
/* 0x238 */ s32 boostRegenTime;
/* 0x23C */ s32 boostTimer;
/* 0x240 */ EnHorsePostdrawFunc postDrawFunc;
/* 0x244 */ f32 yFront;
/* 0x248 */ f32 yBack;
/* 0x24C */ s32 unk_24C;
/* 0x250 */ s16 followTimer;
/* 0x254 */ s32 prevAction;
/* 0x258 */ Vec3f riderPos;
/* 0x264 */ Vec2f curStick;
/* 0x26C */ Vec2f lastStick;
/* 0x274 */ f32 jumpStartY;
/* 0x278 */ ColliderCylinder colliderCylinder1;
/* 0x2C4 */ ColliderCylinder colliderCylinder2;
/* 0x310 */ ColliderJntSph colliderJntSph;
/* 0x330 */ ColliderJntSphElement colliderJntSphElements[1];
/* 0x370 */ s32 playerDir;
/* 0x374 */ UNK_TYPE1 unk374[0x2];
/* 0x376 */ s16 angleToPlayer;
/* 0x378 */ s16 followPlayerTurnSpeed;
/* 0x37A */ u8 blinkTimer;
/* 0x37C */ s16 waitTimer;
/* 0x380 */ s32 cutsceneAction;
/* 0x384 */ u16 cutsceneFlags;
/* 0x388 */ s32 inRace;
/* 0x38C */ char unk_38C[0x208];
/* 0x38C */ struct EnIn* rider;
/* 0x390 */ UNK_TYPE1 unk390[0x4];
/* 0x394 */ u16 unk_394;
/* 0x398 */ f32 unk_398;
/* 0x39C */ s32 unk_39C;
/* 0x3A0 */ s32 hbaStarted;
/* 0x3A4 */ s32 hbaFlags;
/* 0x3A8 */ s32 hbaTimer;
/* 0x3AC */ u16 dustFlags;
/* 0x3B0 */ Vec3f frontRightHoof;
/* 0x3BC */ Vec3f frontLeftHoof;
/* 0x3C8 */ Vec3f backRightHoof;
/* 0x3D4 */ Vec3f backLeftHoof;
/* 0x3E0 */ s32 unk_3E0;
/* 0x3E4 */ UNK_TYPE1 unk3E4[0x4];
/* 0x3E8 */ f32 unk_3E8;
/* 0x3EC */ s16 unk_3EC;
/* 0x3EE */ Vec3s jointTable[OBJECT_HA_1_LIMB_MAX];
/* 0x48A */ Vec3s morphTable[OBJECT_HA_1_LIMB_MAX];
/* 0x528 */ f32 unk_528;
/* 0x52C */ s32 unk_52C;
/* 0x530 */ s32 unk_530;
/* 0x534 */ s32 unk_534;
/* 0x538 */ s32 unk_538;
/* 0x53C */ s32 unk_53C;
/* 0x540 */ Vec3f unk_540;
/* 0x54C */ UNK_TYPE1 unk54C[0x4];
/* 0x550 */ s32 unk_550;
/* 0x554 */ UNK_TYPE1 unk554[0x18];
/* 0x56C */ f32 unk_56C;
/* 0x570 */ Vec3f unk_570;
/* 0x57C */ Vec3f unk_57C;
/* 0x588 */ UNK_TYPE1 unk588[0x4];
/* 0x58C */ s32 unk_58C;
/* 0x590 */ s32 unk_590;
} EnHorse; // size = 0x594
extern const ActorInit En_Horse_InitVars;

2
src/overlays/actors/ovl_En_Test4/z_en_test4.c
View File

@ -405,7 +405,7 @@ void func_80A42AB8(EnTest4* this, GlobalContext* globalCtx) {
if (player->stateFlags1 & 0x800000) {
EnHorse* rideActor = (EnHorse*)player->rideActor;
if ((rideActor->unk_150 == 0) || (rideActor->unk_150 == 2)) {
if ((rideActor->type == HORSE_EPONA) || (rideActor->type == HORSE_2)) {
if (CURRENT_DAY < 3) {
D_801BDA9C = 1;
} else {

4
tools/actorfixer.py
View File

@ -505,11 +505,11 @@ animdict = {
"gSaveContext.weekEventReg": "gSaveContext.save.weekEventReg",
"gSaveContext.playerForm": "gSaveContext.save.playerForm",
"gSaveContext.day": "gSaveContext.save.day",
# "gSaveContext.cutscene": "gSaveContext.save.cutscene",
"gSaveContext.cutscene": "gSaveContext.save.cutscene",
"gSaveContext.isNight": "gSaveContext.save.isNight",
"gSaveContext.naviTimer": "gSaveContext.save.playerData.tatlTimer",
"gSaveContext.tatlTimer": "gSaveContext.save.playerData.tatlTimer",
# "gSaveContext.health": "gSaveContext.save.playerData.health",
"gSaveContext.health": "gSaveContext.save.playerData.health",
"gSaveContext.rupees": "gSaveContext.save.playerData.rupees",
"gSaveContext.magicAcquired": "gSaveContext.save.playerData.magicAcquired",
"gSaveContext.doubleMagic": "gSaveContext.save.playerData.doubleMagic",

212
tools/disasm/functions.txt
View File

@ -5206,82 +5206,82 @@
0x8087AF48:("EnFirefly_OverrideLimbDraw",),
0x8087AF98:("EnFirefly_PostLimbDraw",),
0x8087B320:("EnFirefly_Draw",),
0x8087B730:("func_8087B730",),
0x8087B784:("func_8087B784",),
0x8087B730:("EnHorse_RaceWaypointPos",),
0x8087B784:("EnHorse_RotateToPoint",),
0x8087B7C0:("func_8087B7C0",),
0x8087C0AC:("func_8087C0AC",),
0x8087C0AC:("EnHorse_PlayWalkingSound",),
0x8087C178:("func_8087C178",),
0x8087C1C0:("func_8087C1C0",),
0x8087C208:("func_8087C208",),
0x8087C208:("EnHorse_SlopeSpeedMultiplier",),
0x8087C288:("func_8087C288",),
0x8087C2B8:("func_8087C2B8",),
0x8087C38C:("func_8087C38C",),
0x8087C43C:("func_8087C43C",),
0x8087C590:("func_8087C590",),
0x8087C8B8:("func_8087C8B8",),
0x8087C8D0:("func_8087C8D0",),
0x8087C8E0:("func_8087C8E0",),
0x8087C9D4:("func_8087C9D4",),
0x8087C9EC:("func_8087C9EC",),
0x8087C43C:("EnHorse_IdleAnimSounds",),
0x8087C590:("EnHorse_Spawn",),
0x8087C8B8:("EnHorse_ResetCutscene",),
0x8087C8D0:("EnHorse_ResetRace",),
0x8087C8E0:("EnHorse_PlayerCanMove",),
0x8087C9D4:("EnHorse_ResetHorsebackArchery",),
0x8087C9EC:("EnHorse_ClearDustFlags",),
0x8087C9F8:("func_8087C9F8",),
0x8087CA04:("func_8087CA04",),
0x8087CA14:("EnHorse_Init",),
0x8087D540:("func_8087D540",),
0x8087D69C:("EnHorse_Destroy",),
0x8087D70C:("func_8087D70C",),
0x8087D75C:("func_8087D75C",),
0x8087D814:("func_8087D814",),
0x8087D988:("func_8087D988",),
0x8087DDEC:("func_8087DDEC",),
0x8087DE28:("func_8087DE28",),
0x8087DF64:("func_8087DF64",),
0x8087E080:("func_8087E080",),
0x8087E0A4:("func_8087E0A4",),
0x8087E18C:("func_8087E18C",),
0x8087E2A8:("func_8087E2A8",),
0x8087E350:("func_8087E350",),
0x8087E564:("func_8087E564",),
0x8087E5B4:("func_8087E5B4",),
0x8087E5D8:("func_8087E5D8",),
0x8087E684:("func_8087E684",),
0x8087E6D8:("func_8087E6D8",),
0x8087E92C:("func_8087E92C",),
0x8087E9D0:("func_8087E9D0",),
0x8087EA1C:("func_8087EA1C",),
0x8087EB54:("func_8087EB54",),
0x8087EB78:("func_8087EB78",),
0x8087EC20:("func_8087EC20",),
0x8087EC78:("func_8087EC78",),
0x8087ED10:("func_8087ED10",),
0x8087EEC4:("func_8087EEC4",),
0x8087F078:("func_8087F078",),
0x8087F1FC:("func_8087F1FC",),
0x8087F39C:("func_8087F39C",),
0x8087F590:("func_8087F590",),
0x8087F5B4:("func_8087F5B4",),
0x8087F658:("func_8087F658",),
0x8087F9A0:("func_8087F9A0",),
0x8087F9C4:("func_8087F9C4",),
0x8087FB08:("func_8087FB08",),
0x8087FB14:("func_8087FB14",),
0x8087FD94:("func_8087FD94",),
0x8087FDB8:("func_8087FDB8",),
0x8087FF08:("func_8087FF08",),
0x8087FF14:("func_8087FF14",),
0x808801A8:("func_808801A8",),
0x808801F8:("func_808801F8",),
0x808802D0:("func_808802D0",),
0x808804A4:("func_808804A4",),
0x808804CC:("func_808804CC",),
0x80880500:("func_80880500",),
0x80880534:("func_80880534",),
0x808806DC:("func_808806DC",),
0x80880844:("func_80880844",),
0x80880978:("func_80880978",),
0x80880D50:("func_80880D50",),
0x80880DA8:("func_80880DA8",),
0x80880E00:("func_80880E00",),
0x80881128:("func_80881128",),
0x8087D70C:("EnHorse_RotateToPlayer",),
0x8087D75C:("EnHorse_Freeze",),
0x8087D814:("EnHorse_Frozen",),
0x8087D988:("EnHorse_UpdateSpeed",),
0x8087DDEC:("EnHorse_StartMountedIdleResetAnim",),
0x8087DE28:("EnHorse_StartMountedIdle",),
0x8087DF64:("EnHorse_MountedIdle",),
0x8087E080:("EnHorse_MountedIdleAnim",),
0x8087E0A4:("EnHorse_MountedIdleWhinney",),
0x8087E18C:("EnHorse_MountedIdleWhinneying",),
0x8087E2A8:("EnHorse_StartTurning",),
0x8087E350:("EnHorse_MountedTurn",),
0x8087E564:("EnHorse_StartWalkingFromIdle",),
0x8087E5B4:("EnHorse_StartWalkingInterruptable",),
0x8087E5D8:("EnHorse_StartWalking",),
0x8087E684:("EnHorse_MountedWalkingReset",),
0x8087E6D8:("EnHorse_MountedWalk",),
0x8087E92C:("EnHorse_StartTrotting",),
0x8087E9D0:("EnHorse_MountedTrotReset",),
0x8087EA1C:("EnHorse_MountedTrot",),
0x8087EB54:("EnHorse_StartGallopingInterruptable",),
0x8087EB78:("EnHorse_StartGalloping",),
0x8087EC20:("EnHorse_MountedGallopReset",),
0x8087EC78:("EnHorse_JumpLanding",),
0x8087ED10:("EnHorse_MountedGallop",),
0x8087EEC4:("EnHorse_StartRearing",),
0x8087F078:("EnHorse_MountedRearing",),
0x8087F1FC:("EnHorse_StartBraking",),
0x8087F39C:("EnHorse_Stopping",),
0x8087F590:("EnHorse_StartReversingInterruptable",),
0x8087F5B4:("EnHorse_StartReversing",),
0x8087F658:("EnHorse_Reverse",),
0x8087F9A0:("EnHorse_LowJumpInit",),
0x8087F9C4:("EnHorse_StartLowJump",),
0x8087FB08:("EnHorse_Stub1",),
0x8087FB14:("EnHorse_LowJump",),
0x8087FD94:("EnHorse_HighJumpInit",),
0x8087FDB8:("EnHorse_StartHighJump",),
0x8087FF08:("EnHorse_Stub2",),
0x8087FF14:("EnHorse_HighJump",),
0x808801A8:("EnHorse_InitInactive",),
0x808801F8:("EnHorse_Inactive",),
0x808802D0:("EnHorse_PlayIdleAnimation",),
0x808804A4:("EnHorse_ChangeIdleAnimation",),
0x808804CC:("EnHorse_ResetIdleAnimation",),
0x80880500:("EnHorse_StartIdleRidable",),
0x80880534:("EnHorse_Idle",),
0x808806DC:("EnHorse_StartMovingAnimation",),
0x80880844:("EnHorse_SetFollowAnimation",),
0x80880978:("EnHorse_FollowPlayer",),
0x80880D50:("EnHorse_InitIngoHorse",),
0x80880DA8:("EnHorse_SetIngoAnimation",),
0x80880E00:("EnHorse_UpdateIngoHorseAnim",),
0x80881128:("EnHorse_UpdateIngoRace",),
0x8088126C:("func_8088126C",),
0x80881290:("func_80881290",),
0x80881398:("func_80881398",),
@ -5289,26 +5289,26 @@
0x80881634:("func_80881634",),
0x8088168C:("func_8088168C",),
0x808819D8:("func_808819D8",),
0x80881BDC:("func_80881BDC",),
0x80881C54:("func_80881C54",),
0x80881DA4:("func_80881DA4",),
0x80881DC8:("func_80881DC8",),
0x80881F10:("func_80881F10",),
0x80881F48:("func_80881F48",),
0x808821C8:("func_808821C8",),
0x808822CC:("func_808822CC",),
0x8088247C:("func_8088247C",),
0x80882564:("func_80882564",),
0x808826B4:("func_808826B4",),
0x80882820:("func_80882820",),
0x808829D0:("func_808829D0",),
0x808829F4:("func_808829F4",),
0x80882A44:("func_80882A44",),
0x80882B9C:("func_80882B9C",),
0x80882D8C:("func_80882D8C",),
0x80882DC0:("func_80882DC0",),
0x80883104:("func_80883104",),
0x80883308:("func_80883308",),
0x80881BDC:("EnHorse_CsMoveInit",),
0x80881C54:("EnHorse_CsMoveToPoint",),
0x80881DA4:("EnHorse_CsSetAnimHighJump",),
0x80881DC8:("EnHorse_CsPlayHighJumpAnim",),
0x80881F10:("EnHorse_CsJumpInit",),
0x80881F48:("EnHorse_CsJump",),
0x808821C8:("EnHorse_CsRearingInit",),
0x808822CC:("EnHorse_CsRearing",),
0x8088247C:("EnHorse_WarpMoveInit",),
0x80882564:("EnHorse_CsWarpMoveToPoint",),
0x808826B4:("EnHorse_CsWarpRearingInit",),
0x80882820:("EnHorse_CsWarpRearing",),
0x808829D0:("EnHorse_InitCutscene",),
0x808829F4:("EnHorse_GetCutsceneFunctionIndex",),
0x80882A44:("EnHorse_CutsceneUpdate",),
0x80882B9C:("EnHorse_UpdateHbaRaceInfo",),
0x80882D8C:("EnHorse_InitHorsebackArchery",),
0x80882DC0:("EnHorse_UpdateHbaAnim",),
0x80883104:("EnHorse_UpdateHorsebackArchery",),
0x80883308:("EnHorse_FleePlayer",),
0x80883B70:("func_80883B70",),
0x80883BEC:("func_80883BEC",),
0x80883CB0:("func_80883CB0",),
@ -5338,29 +5338,29 @@
0x80884A40:("func_80884A40",),
0x80884D04:("func_80884D04",),
0x80884E0C:("func_80884E0C",),
0x80885060:("func_80885060",),
0x808850DC:("func_808850DC",),
0x80885220:("func_80885220",),
0x808853E0:("func_808853E0",),
0x8088598C:("func_8088598C",),
0x80885A80:("func_80885A80",),
0x80885AF4:("func_80885AF4",),
0x80885B4C:("func_80885B4C",),
0x80885C90:("func_80885C90",),
0x80885DA4:("func_80885DA4",),
0x80885060:("EnHorse_Vec3fOffset",),
0x808850DC:("EnHorse_CalcFloorHeight",),
0x80885220:("EnHorse_ObstructMovement",),
0x808853E0:("EnHorse_CheckFloors",),
0x8088598C:("EnHorse_MountDismount",),
0x80885A80:("EnHorse_StickDirection",),
0x80885AF4:("EnHorse_UpdateStick",),
0x80885B4C:("EnHorse_ResolveCollision",),
0x80885C90:("EnHorse_BgCheckSlowMoving",),
0x80885DA4:("EnHorse_UpdateBgCheckInfo",),
0x80886C00:("func_80886C00",),
0x80886DC4:("func_80886DC4",),
0x80886FA8:("func_80886FA8",),
0x808870A4:("func_808870A4",),
0x808871A0:("func_808871A0",),
0x80887270:("func_80887270",),
0x80886DC4:("EnHorse_RegenBoost",),
0x80886FA8:("EnHorse_UpdatePlayerDir",),
0x808870A4:("EnHorse_TiltBody",),
0x808871A0:("EnHorse_UpdateConveyors",),
0x80887270:("EnHorse_RandInt",),
0x808872A4:("EnHorse_Update",),
0x80887D20:("func_80887D20",),
0x80887D60:("func_80887D60",),
0x80887E64:("func_80887E64",),
0x80887EBC:("func_80887EBC",),
0x80887F58:("func_80887F58",),
0x80888C48:("func_80888C48",),
0x80887D20:("EnHorse_PlayerDirToMountSide",),
0x80887D60:("EnHorse_MountSideCheck",),
0x80887E64:("EnHorse_GetMountSide",),
0x80887EBC:("EnHorse_RandomOffset",),
0x80887F58:("EnHorse_PostDraw",),
0x80888C48:("EnHorse_OverrideLimbDraw",),
0x80888D18:("func_80888D18",),
0x80888D78:("EnHorse_Draw",),
0x8088A240:("EnArrow_Init",),

17
tools/disasm/variables.txt
View File

@ -5896,19 +5896,18 @@
0x8087B538:("D_8087B538","f32","",0x4),
0x80888EC0:("D_80888EC0","UNK_TYPE1","",0x1),
0x80888EE4:("D_80888EE4","UNK_TYPE1","",0x1),
0x80888F08:("D_80888F08","UNK_TYPE1","",0x1),
0x80888F08:("sAnimationHeaders","AnimationHeader*","[5]",0x14),
0x80888F1C:("D_80888F1C","UNK_TYPE1","",0x1),
0x80888F34:("D_80888F34","UNK_TYPE4","",0x4),
0x80888F40:("D_80888F40","UNK_TYPE1","",0x1),
0x80888F40:("sSkeletonHeaders","UNK_TYPE1","",0x1),
0x80888F54:("En_Horse_InitVars","UNK_TYPE1","",0x1),
0x80888F74:("D_80888F74","UNK_TYPE1","",0x1),
0x80888FA0:("D_80888FA0","UNK_TYPE1","",0x1),
0x80888F74:("sCylinderInit1","UNK_TYPE1","",0x1),
0x80888FA0:("sCylinderInit2","UNK_TYPE1","",0x1),
0x80888FCC:("D_80888FCC","UNK_TYPE1","",0x1),
0x80888FF0:("D_80888FF0","UNK_TYPE1","",0x1),
0x80888FFC:("D_80888FFC","UNK_PTR","",0x4),
0x80889000:("D_80889000","UNK_TYPE1","",0x1),
0x80888FF0:("sJntSphInit","UNK_TYPE1","",0x10),
0x80889000:("sColChkInfoInit","UNK_TYPE1","",0x1),
0x80889008:("D_80889008","UNK_TYPE1","",0x1),
0x80889010:("D_80889010","UNK_TYPE1","",0x1),
0x80889010:("sInitChain","UNK_TYPE1","",0x1),
0x80889018:("D_80889018","UNK_TYPE1","",0x1),
0x80889030:("D_80889030","UNK_TYPE1","",0x1),
0x80889048:("D_80889048","UNK_TYPE1","",0x1),
@ -5923,7 +5922,7 @@
0x8088911C:("D_8088911C","UNK_TYPE1","",0x1),
0x80889148:("D_80889148","UNK_TYPE4","",0x4),
0x80889154:("D_80889154","UNK_TYPE4","",0x4),
0x80889160:("D_80889160","UNK_PTR","",0x4),
0x80889160:("sActionFuncs","UNK_PTR","",0x4),
0x808891C8:("D_808891C8","UNK_TYPE4","",0x4),
0x808891D4:("D_808891D4","UNK_TYPE4","",0x4),
0x808891E0:("D_808891E0","UNK_TYPE4","",0x4),

11
undefined_syms.txt
View File

@ -1234,17 +1234,6 @@ D_0600B644 = 0x0600B644;
D_0600F248 = 0x0600F248;
D_06012A58 = 0x06012A58;
// ovl_En_Horse
D_06008C68 = 0x06008C68;
D_0600A8DC = 0x0600A8DC;
D_0600AD08 = 0x0600AD08;
D_0600B3E0 = 0x0600B3E0;
D_0600BDE0 = 0x0600BDE0;
D_0600D178 = 0x0600D178;
D_0600D4E8 = 0x0600D4E8;
D_060150D8 = 0x060150D8;
// ovl_En_Horse_Link_Child
D_06002F98 = 0x06002F98;