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

Document some z_actor.c functions (#1091)

Browse source
This commit is contained in:
hatal175 2022-01-31 11:36:58 +02:00 • committed by GitHub
parent 82cedcc3ef
commit aecd883bbc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 60 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_player_actor/z_player.c
View file

@ -2770,7 +2770,7 @@ void func_80835F44(GlobalContext* globalCtx, Player* this, s32 item) {
(actionParam >= PLAYER_AP_BOTTLE_FISH)) {
if (!func_8008E9C4(this) ||
((actionParam >= PLAYER_AP_BOTTLE_POTION_RED) && (actionParam <= PLAYER_AP_BOTTLE_FAIRY))) {
func_8002D53C(globalCtx, &globalCtx->actorCtx.titleCtx);
TitleCard_Clear(globalCtx, &globalCtx->actorCtx.titleCtx);
this->unk_6AD = 4;
this->itemActionParam = actionParam;
}
@ -5890,7 +5890,7 @@ s32 func_8083E5A8(Player* this, GlobalContext* globalCtx) {
Actor* interactedActor;
if (iREG(67) || (((interactedActor = this->interactRangeActor) != NULL) &&
func_8002D53C(globalCtx, &globalCtx->actorCtx.titleCtx))) {
TitleCard_Clear(globalCtx, &globalCtx->actorCtx.titleCtx))) {
if (iREG(67) || (this->getItemId > GI_NONE)) {
if (iREG(67)) {
this->getItemId = iREG(68);