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/effects | |
| 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/effects')
| -rw-r--r-- | src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c index 5d546a78f..1c6d53e7f 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c +++ b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c @@ -52,7 +52,7 @@ void EffectSsStick_Draw(PlayState* play, u32 index, EffectSs* this) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); func_8012C28C(gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x06, play->objectCtx.status[this->rObjBankIndex].segment); - gSPSegment(POLY_OPA_DISP++, 0x0C, D_801C0850); + gSPSegment(POLY_OPA_DISP++, 0x0C, gCullBackDList); gSPDisplayList(POLY_OPA_DISP++, gDekuStickDL); CLOSE_DISPS(gfxCtx); |