diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2022-10-15 19:12:01 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-15 19:12:01 -0300 |
| commit | bd373940ac7bb230b4a135a5c5675ca8f42cd700 (patch) | |
| tree | efa23eb003ff945fd8ab1d78b8c357dceda3c39c /src/overlays/actors/ovl_Boss_02 | |
| parent | 638f5062cbf6e9289f624cbdeee918d35642fb3a (diff) | |
`z_player_lib`: Part 2 (#938)
* preparations
* import data
* PLAYER_STATE1
* PLAYER_STATE2
* PLAYER_STATE3
* import bss
* format stuff
* bss cleanup
* more cleaning and some naming
* face
* cleaning up link human object a bit
* Remove PHYSICAL_TO_VIRTUAL2
* Update src/code/z_player_lib.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* review
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* format
* /* CAT */
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
* naming some stuff on objects
* format
* invert flags endian
* review
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* format
* drawmask
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
* naming
* another round of human object naming
* enum renames
* sActionModelGroups and use enum as types
* PlayerAnimType
* PLAYER_MODELTYPE_
* determined ranges of PlayerModelType
* name PLAYER_MODELGROUP_DEFAULT
* format
* sheath
* dlist groups placeholder namse
* PLAYER_MODELGROUP_BOTTLE
* Some fierce deity naming
* Right hands
* zora skel dlists
* deku limb dlists
* left hands
* name most modelgroups
* more hand naming
* regs as dec
* fix in horse
* Use BUTTON_ITEM_EQUIP macro
* review
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* reformat D_801AED58
* Sword sheaths
* swords and shields
* Update src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* playerForm on Player_DrawImpl
* fomat
* Update src/code/z_player_lib.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update assets/xml/objects/gameplay_keep.xml
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* VIRTUAL_TO_PHYSICAL(SEGMENTED_TO_VIRTUAL(gEffBubble1Tex))
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* singular limb enum names
* fix bss
* Update src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* review
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* name goron shielding limbs
* name limb
* Update src/code/z_player_lib.c
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* bss
* bss
* format
* namefixer
* bss
* bss
* bss
* bss
* format
* bss
* review
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* fix bss
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Diffstat (limited to 'src/overlays/actors/ovl_Boss_02')
| -rw-r--r-- | src/overlays/actors/ovl_Boss_02/z_boss_02.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/overlays/actors/ovl_Boss_02/z_boss_02.c b/src/overlays/actors/ovl_Boss_02/z_boss_02.c index 28008a674..1e2db7a60 100644 --- a/src/overlays/actors/ovl_Boss_02/z_boss_02.c +++ b/src/overlays/actors/ovl_Boss_02/z_boss_02.c @@ -1632,7 +1632,7 @@ void func_809DD934(Boss02* this, PlayState* play) { switch (this->unk_1D18) { case 0: - if (player->stateFlags1 & 0x100) { + if (player->stateFlags1 & PLAYER_STATE1_100) { Cutscene_Start(play, &play->csCtx); this->subCamId = Play_CreateSubCamera(play); Play_ChangeCameraStatus(play, CAM_ID_MAIN, CAM_STATUS_WAIT); @@ -1755,7 +1755,7 @@ void func_809DD934(Boss02* this, PlayState* play) { this->subCamId = SUB_CAM_ID_DONE; Cutscene_End(play, &play->csCtx); this->actor.flags |= ACTOR_FLAG_1; - player->stateFlags1 &= ~0x100; + player->stateFlags1 &= ~PLAYER_STATE1_100; this->unk_1D70 = 0.01f; func_80165690(); break; |