izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix EnHorseAction enum (#1022)

Browse Source 
* Fix enum

* Fix some constants

* ENHORSE_ACT_MOUNTED_IDLE_WHINNYING

* ACT -> ACTION
This commit is contained in:
Anghelo Carvajal
2022-08-15 15:01:07 -04:00
committed by GitHub
parent c5254084c2
commit 0f130c173d
3 changed files with 144 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_Horse/z_en_horse.c
+101 -115
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Horse/z_en_horse.h
+42 -29
View File
@@ -46,33 +46,33 @@ typedef void (*EnHorseCsFunc)(struct EnHorse*, PlayState*, CsCmdActorAction*);
#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_WHINNYING,
/* 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,
typedef enum EnHorseAction {
/* 0 */ ENHORSE_ACTION_FROZEN,
/* 1 */ ENHORSE_ACTION_INACTIVE,
/* 2 */ ENHORSE_ACTION_IDLE,
/* 3 */ ENHORSE_ACTION_FOLLOW_PLAYER,
/* 4 */ ENHORSE_ACTION_INGO_RACE,
/* 5 */ ENHORSE_ACTION_5,
/* 6 */ ENHORSE_ACTION_6,
/* 7 */ ENHORSE_ACTION_MOUNTED_IDLE,
/* 8 */ ENHORSE_ACTION_MOUNTED_IDLE_WHINNYING,
/* 9 */ ENHORSE_ACTION_MOUNTED_TURN,
/* 10 */ ENHORSE_ACTION_MOUNTED_WALK,
/* 11 */ ENHORSE_ACTION_MOUNTED_TROT,
/* 12 */ ENHORSE_ACTION_MOUNTED_GALLOP,
/* 13 */ ENHORSE_ACTION_MOUNTED_REARING,
/* 14 */ ENHORSE_ACTION_STOPPING,
/* 15 */ ENHORSE_ACTION_REVERSE,
/* 16 */ ENHORSE_ACTION_LOW_JUMP,
/* 17 */ ENHORSE_ACTION_HIGH_JUMP,
/* 18 */ ENHORSE_ACTION_CS_UPDATE,
/* 19 */ ENHORSE_ACTION_HBA,
/* 20 */ ENHORSE_ACTION_FLEE_PLAYER,
/* 21 */ ENHORSE_ACTION_21,
/* 22 */ ENHORSE_ACTION_22,
/* 23 */ ENHORSE_ACTION_23,
/* 24 */ ENHORSE_ACTION_24,
/* 25 */ ENHORSE_ACTION_25
} EnHorseAction;
typedef enum {
@@ -132,7 +132,7 @@ typedef enum {
typedef struct EnHorse {
/* 0x000 */ Actor actor;
/* 0x144 */ s32 action;
/* 0x144 */ EnHorseAction action;
/* 0x148 */ s32 noInputTimer;
/* 0x14C */ s32 noInputTimerMax;
/* 0x150 */ s32 type;
@@ -220,6 +220,19 @@ typedef struct EnHorse {
/* 0x590 */ s32 unk_590;
} EnHorse; // size = 0x594
extern const ActorInit En_Horse_InitVars;
#define EN_HORSE_CHECK_1(horseActor) (((horseActor)->stateFlags & ENHORSE_FLAG_6) ? true : false)
#define EN_HORSE_CHECK_2(horseActor) (((horseActor)->stateFlags & ENHORSE_FLAG_8) ? true : false)
#define EN_HORSE_CHECK_3(horseActor) (((horseActor)->stateFlags & ENHORSE_FLAG_9) ? true : false)
#define EN_HORSE_CHECK_4(horseActor) \
(((((horseActor)->action == ENHORSE_ACTION_MOUNTED_IDLE) || ((horseActor)->action == ENHORSE_ACTION_FROZEN) || \
((horseActor)->action == ENHORSE_ACTION_MOUNTED_IDLE_WHINNYING)) && \
!((horseActor)->stateFlags & ENHORSE_FLAG_19) && !((horseActor)->stateFlags & ENHORSE_FLAG_25)) \
? true \
: false)
#define EN_HORSE_CHECK_JUMPING(horseActor) (((horseActor)->stateFlags & ENHORSE_JUMPING) ? true : false)
#endif // Z_EN_HORSE_H
tools/disasm/functions.txt
+1 -1
View File
@@ -5237,7 +5237,7 @@
0x8087DF64:("EnHorse_MountedIdle",),
0x8087E080:("EnHorse_MountedIdleAnim",),
0x8087E0A4:("EnHorse_MountedIdleWhinney",),
0x8087E18C:("EnHorse_MountedIdleWhinneying",),
0x8087E18C:("EnHorse_MountedIdleWhinnying",),
0x8087E2A8:("EnHorse_StartTurning",),
0x8087E350:("EnHorse_MountedTurn",),
0x8087E564:("EnHorse_StartWalkingFromIdle",),