mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-05-23 06:54:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Player Docs: Zora Boomerang (#1739)

Browse Source 
* zora boomerang

* missed some

* more docs

* cleanup docs

* more cleanup

* Player_IsUsingZoraBoomerang
This commit is contained in:
engineer124
2024-11-18 11:37:11 +11:00
committed by GitHub
parent a957342583
commit 00bafced8e
9 changed files with 98 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/z64player.h
+10 -10
View File
@@ -81,7 +81,7 @@ typedef enum PlayerItemAction {
/* 0x05 */ PLAYER_IA_SWORD_GILDED,
/* 0x06 */ PLAYER_IA_SWORD_TWO_HANDED,
/* 0x07 */ PLAYER_IA_DEKU_STICK,
/* 0x08 */ PLAYER_IA_ZORA_FINS,
/* 0x08 */ PLAYER_IA_ZORA_BOOMERANG,
/* 0x09 */ PLAYER_IA_BOW,
/* 0x0A */ PLAYER_IA_BOW_FIRE,
/* 0x0B */ PLAYER_IA_BOW_ICE,
@@ -185,7 +185,7 @@ typedef enum PlayerMeleeWeapon {
/* 3 */ PLAYER_MELEEWEAPON_SWORD_GILDED = GET_MELEE_WEAPON_FROM_IA(PLAYER_IA_SWORD_GILDED),
/* 4 */ PLAYER_MELEEWEAPON_SWORD_TWO_HANDED = GET_MELEE_WEAPON_FROM_IA(PLAYER_IA_SWORD_TWO_HANDED),
/* 5 */ PLAYER_MELEEWEAPON_DEKU_STICK = GET_MELEE_WEAPON_FROM_IA(PLAYER_IA_DEKU_STICK),
/* 6 */ PLAYER_MELEEWEAPON_ZORA_FINS = GET_MELEE_WEAPON_FROM_IA(PLAYER_IA_ZORA_FINS),
/* 6 */ PLAYER_MELEEWEAPON_ZORA_BOOMERANG = GET_MELEE_WEAPON_FROM_IA(PLAYER_IA_ZORA_BOOMERANG),
/* 7 */ PLAYER_MELEEWEAPON_MAX
} PlayerMeleeWeapon;
@@ -444,7 +444,7 @@ typedef enum PlayerModelGroup {
/* 11 */ PLAYER_MODELGROUP_INSTRUMENT,
/* 12 */ PLAYER_MODELGROUP_BOTTLE,
/* 13 */ PLAYER_MODELGROUP_13,
/* 14 */ PLAYER_MODELGROUP_ZORA_FINS,
/* 14 */ PLAYER_MODELGROUP_ZORA_BOOMERANG,
/* 15 */ PLAYER_MODELGROUP_MAX
} PlayerModelGroup;
@@ -917,10 +917,10 @@ typedef enum PlayerCueId {
#define PLAYER_STATE1_400000 (1 << 22)
//
#define PLAYER_STATE1_800000 (1 << 23)
//
#define PLAYER_STATE1_1000000 (1 << 24)
//
#define PLAYER_STATE1_2000000 (1 << 25)
// Currently using the zora boomerang. This includes all phases (aiming, throwing, and catching).
#define PLAYER_STATE1_USING_ZORA_BOOMERANG (1 << 24)
// Zora boomerang has been thrown and is flying in the air
#define PLAYER_STATE1_ZORA_BOOMERANG_THROWN (1 << 25)
//
#define PLAYER_STATE1_4000000 (1 << 26)
// Swimming?
@@ -1047,8 +1047,8 @@ typedef enum PlayerCueId {
#define PLAYER_STATE3_200000 (1 << 21)
//
#define PLAYER_STATE3_400000 (1 << 22)
//
#define PLAYER_STATE3_800000 (1 << 23)
// A Zora boomerang has been caught this frame
#define PLAYER_STATE3_ZORA_BOOMERANG_CAUGHT (1 << 23)
//
#define PLAYER_STATE3_1000000 (1 << 24)
//
@@ -1215,7 +1215,7 @@ typedef struct Player {
/* 0xA70 */ u32 stateFlags2;
/* 0xA74 */ u32 stateFlags3;
/* 0xA78 */ Actor* autoLockOnActor; // Actor that is locked onto automatically without player input; see `Player_SetAutoLockOnActor`
/* 0xA7C */ Actor* boomerangActor;
/* 0xA7C */ Actor* zoraBoomerangActor; // Defaults to the left zora boomerang, but will switch to right if only the left boomerang is caught.
/* 0xA80 */ Actor* tatlActor;
/* 0xA84 */ s16 tatlTextId;
/* 0xA86 */ s8 csId;