diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2023-11-27 21:02:28 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-27 21:02:28 +1100 |
| commit | 702f3cf44e7a6972801150a6d13d6fbb2283f230 (patch) | |
| tree | 759a31b35a4cb8876d93ebdf0bf13da16e8bc5b4 /src/overlays/actors/ovl_En_Test3/z_en_test3.c | |
| parent | c04aaab6a1d0bdaf6071fadc649385fd3e71e774 (diff) | |
Document Actor Category Change (#1518)
* Actor Category Change
* cleanup
* comments
* adj comment
* revert small cleanup for libc64 PR
* adjust comments
Diffstat (limited to 'src/overlays/actors/ovl_En_Test3/z_en_test3.c')
| -rw-r--r-- | src/overlays/actors/ovl_En_Test3/z_en_test3.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/overlays/actors/ovl_En_Test3/z_en_test3.c b/src/overlays/actors/ovl_En_Test3/z_en_test3.c index 6fedf9d41..c2f51dd92 100644 --- a/src/overlays/actors/ovl_En_Test3/z_en_test3.c +++ b/src/overlays/actors/ovl_En_Test3/z_en_test3.c @@ -525,8 +525,8 @@ s32 func_80A3F09C(EnTest3* this, PlayState* play) { } void func_80A3F0B0(EnTest3* this, PlayState* play) { - func_800BC154(play, &play->actorCtx, &this->unk_D90->actor, 2); - func_800BC154(play, &play->actorCtx, &this->player.actor, 4); + Actor_ChangeCategory(play, &play->actorCtx, &this->unk_D90->actor, ACTORCAT_PLAYER); + Actor_ChangeCategory(play, &play->actorCtx, &this->player.actor, ACTORCAT_NPC); this->unk_D90->stateFlags1 &= ~PLAYER_STATE1_20; } @@ -669,8 +669,8 @@ s32 func_80A3F73C(EnTest3* this, PlayState* play) { play->actorCtx.flags &= ~ACTORCTX_FLAG_4; this->player.stateFlags2 &= ~PLAYER_STATE2_40000; this->unk_D90->stateFlags1 |= PLAYER_STATE1_20; - func_800BC154(play, &play->actorCtx, &this->unk_D90->actor, 4); - func_800BC154(play, &play->actorCtx, &this->player.actor, 2); + Actor_ChangeCategory(play, &play->actorCtx, &this->unk_D90->actor, ACTORCAT_NPC); + Actor_ChangeCategory(play, &play->actorCtx, &this->player.actor, ACTORCAT_PLAYER); CutsceneManager_SetReturnCamera(this->subCamId); play->tryPlayerCsAction(play, &this->player, PLAYER_CSACTION_WAIT); } |