mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 14:34:32 +00:00
Code Issues Projects Releases Wiki Activity

Introduce Player csMode enum (#1462)

Browse source 
* player csmode enum

* cleanup

* missed one, player2

* spell out enum name

* use CSMODE_MAX for data
This commit is contained in:
engineer124 2022-12-12 22:22:56 -05:00 • committed by GitHub
parent 0aff024c01
commit aa48c66e10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
63 changed files with 655 additions and 535 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_En_In/z_en_in.c
View file

@ -432,7 +432,7 @@ void func_80A79BAC(EnIn* this, PlayState* play, s32 index, u32 transitionType) {
}
play->transitionType = transitionType;
play->transitionTrigger = TRANS_TRIGGER_START;
func_8002DF54(play, &this->actor, 8);
func_8002DF54(play, &this->actor, PLAYER_CSMODE_8);
Interface_ChangeHudVisibilityMode(HUD_VISIBILITY_NOTHING);
if (index == 0) {
AREG(6) = 0;
@ -856,7 +856,7 @@ void func_80A7ABD4(EnIn* this, PlayState* play) {
void func_80A7AE84(EnIn* this, PlayState* play) {
Play_ChangeCameraStatus(play, this->returnToCamId, CAM_STAT_ACTIVE);
Play_ClearCamera(play, this->subCamId);
func_8002DF54(play, &this->actor, 7);
func_8002DF54(play, &this->actor, PLAYER_CSMODE_7);
Interface_ChangeHudVisibilityMode(HUD_VISIBILITY_ALL);
this->actionFunc = func_80A7AEF0;
}