diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2024-06-14 21:35:22 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-14 21:35:22 -0700 |
| commit | 0b375cadb0af6f2d95844cc674f84be0b148ae10 (patch) | |
| tree | 7e8a3262a549c45fe24d5a78ea66ad9407b79d4f /src/code/z_player_lib.c | |
| parent | bd596f9869179f36dad57b1e17360b6532b842ca (diff) | |
Msgevent OK (#1637)
* Decompiled, some commands still unnamed
* Use full weekevent reg names
* Fix func_8094E69C
* Fix Player_GetMask
* Eventinf, mask worn, and item action argument formatting
* decimal rupees
* Times (day, hours, minutes) as decimal
* msgEventScriptPos
* Callbacks
* Name final commands
* Enum
* Arrays
* functions
* Small cleanups
* Clean up actors
* Remove event from some variable names to make them shorter
* Some more function renames
* newline
* Missed a few unks in commands
* Update functions.txt
* PlayerMask
* MSGMODE_PAUSED
* Script time macros
* EnSob1_GetWelcome default
* Whole bunch of renames
* Format
* Add CMD to commands
* Update code_functions
* structs for size
* z64scripts.h
* MsgEventCallback -> MsgScriptCallback
* format
* MsgEvent_RunScript stop
* Remove cmd handler comment
* cmd -> script in MsgEvent_RunScript
---------
Co-authored-by: Thar0 <17233964+Thar0@users.noreply.github.com>
Diffstat (limited to 'src/code/z_player_lib.c')
| -rw-r--r-- | src/code/z_player_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index f08a1f4b5..d4ab77899 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -1383,7 +1383,7 @@ u8 Player_GetStrength(void) { return sPlayerStrengths[GET_PLAYER_FORM]; } -u8 Player_GetMask(PlayState* play) { +PlayerMask Player_GetMask(PlayState* play) { Player* player = GET_PLAYER(play); return player->currentMask; |