mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-08-06 18:12:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

[docs] Upstream updates 1 (#1955)

Browse Source 
* First round of upstream updates and commenting patternss

* Renames from z64player

* Renames from z64save

* Undo changes to legacy save struct

* Add missing reference from entrance rando

* Fixes from stat tracker

* More tweaks
This commit is contained in:
Garrett Cox
2022-11-29 17:28:57 -06:00
committed by GitHub
parent 8064ad9dfe
commit d7c3522142
69 changed files with 1721 additions and 1040 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/src/code/z_actor.c
+3 -3
View File
@@ -1423,7 +1423,7 @@ s32 func_8002DF38(PlayState* play, Actor* actor, u8 csMode) {
player->csMode = csMode;
player->unk_448 = actor;
player->unk_46A = 0;
player->doorBgCamIndex = 0;
return true;
}
@@ -1432,7 +1432,7 @@ s32 func_8002DF54(PlayState* play, Actor* actor, u8 csMode) {
Player* player = GET_PLAYER(play);
func_8002DF38(play, actor, csMode);
player->unk_46A = 1;
player->doorBgCamIndex = 1;
return true;
}
@@ -4529,7 +4529,7 @@ void func_800355B8(PlayState* play, Vec3f* pos) {
u8 func_800355E4(PlayState* play, Collider* collider) {
Player* player = GET_PLAYER(play);
if ((collider->acFlags & AC_TYPE_PLAYER) && (player->swordState != 0) && (player->swordAnimation == 0x16)) {
if ((collider->acFlags & AC_TYPE_PLAYER) && (player->swordState != 0) && (player->meleeWeaponAnimation == 0x16)) {
return true;
} else {
return false;