mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-10 19:20:13 +00:00
Code Issues Projects Releases Wiki Activity

Player Docs: Name actionFunc (#1531)

Browse source 
* progress, going to merge master

* merge master

* finish renmaing functions

* reorder declarations
This commit is contained in:
fig02 2023-09-13 20:34:07 -04:00 committed by GitHub
parent 7145bc346d
commit 823e47a0f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 330 additions and 329 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/z64player.h
View file

@ -586,7 +586,7 @@ typedef struct {
#define PLAYER_STATE3_RESTORE_NAYRUS_LOVE (1 << 6) // Set by ocarina effects actors when destroyed to signal Nayru's Love may be restored (see `ACTOROVL_ALLOC_ABSOLUTE`)
#define PLAYER_STATE3_7 (1 << 7)
typedef void (*PlayerFunc674)(struct Player*, struct PlayState*);
typedef void (*PlayerActionFunc)(struct Player*, struct PlayState*);
typedef s32 (*PlayerFunc82C)(struct Player*, struct PlayState*);
typedef void (*PlayerFuncA74)(struct PlayState*, struct Player*);
@ -659,7 +659,7 @@ typedef struct Player {
/* 0x0668 */ char unk_668[0x004];
/* 0x066C */ s32 unk_66C;
/* 0x0670 */ s32 meleeWeaponEffectIndex;
/* 0x0674 */ PlayerFunc674 func_674;
/* 0x0674 */ PlayerActionFunc actionFunc;
/* 0x0678 */ PlayerAgeProperties* ageProperties;
/* 0x067C */ u32 stateFlags1;
/* 0x0680 */ u32 stateFlags2;

655
src/overlays/actors/ovl_player_actor/z_player.c
View file

File diff suppressed because it is too large Load diff