diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2023-03-09 14:35:23 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-09 12:35:23 -0500 |
| commit | c833969ea79ba31c3103e25e94ef88098c0287de (patch) | |
| tree | bc60d4135593ee06a17dff9972ef80b794c89982 /docs/tutorial/introduction.md | |
| parent | 496b4928ea8bdf310949a88bbe221d91c2d3ebff (diff) | |
`z_actor` documentation pass (#1154)
* ActorContext_unk_1F4
* a
* ACTOR_FLAG_IGNORE_QUAKE
* ACTOR_FLAG_TALK_REQUESTED and ACTOR_FLAG_CANT_LOCK_ON
* actorCtx->unkC => ctorCtx->halfDaysBit
* HALFDAYBIT defines
* actor.halfDaysBits
* format
* Actor_InitHalfDaysBit
* Name actor-killing functions
* cleanup variables.h a bit
* DAWN
* bss
* Actor_RequestRumble and Actor_GetArrowDmgFlags
* name vars of func_800BC620
* format
* fix missing PLAYER_IA
* Actor_OfferGetItem
* Actor_SetClosestSecretDistance
* freezeCategoryPlayerFlags1
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* DROPFLAG_
* a
* COLORFILTER
* format
* sCategoryFreezeMasks
* Actor_OfferCarry
* review
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* change hex to dec
* COLORFILTER_INTENSITY_FLAG
* format
* review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* shiftedHalfDaysBit
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* cleanup
* Undo Actor_RequestRumble
* Undo ACTOR_FLAG_IGNORE_QUAKE
* format
* Remove COLORFILTER_GET_BUFFLAG
* Undo Actor_KillAllFromUnloadedRooms
* format
* Update Actor_OfferGetItem comment
* Update Actor_OfferGetItem description
* diving
* bss
* namefixer
* format
* speed
* review
---------
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Diffstat (limited to 'docs/tutorial/introduction.md')
| -rw-r--r-- | docs/tutorial/introduction.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/tutorial/introduction.md b/docs/tutorial/introduction.md index 2115faace..aba8beede 100644 --- a/docs/tutorial/introduction.md +++ b/docs/tutorial/introduction.md @@ -27,7 +27,7 @@ glabel func_809529AC /* 0003D8 809529F8 C484009C */ lwc1 $f4, 0x9c($a0) /* 0003DC 809529FC 8C870098 */ lw $a3, 0x98($a0) /* 0003E0 80952A00 24060035 */ addiu $a2, $zero, 0x35 -/* 0003E4 80952A04 0C02E287 */ jal Actor_PickUp +/* 0003E4 80952A04 0C02E287 */ jal Actor_OfferGetItem /* 0003E8 80952A08 E7A40010 */ swc1 $f4, 0x10($sp) .L80952A0C: /* 0003EC 80952A0C 8FBF001C */ lw $ra, 0x1c($sp) @@ -46,7 +46,7 @@ void func_809529AC(EnMs* this, PlayState* play) { func_800B8500(&this->actor, play, this->actor.xzDistToPlayer, this->actor.playerHeightRel, 0); this->actionFunc = func_80952A1C; } else { - Actor_PickUp(&this->actor, play, 0x35, this->actor.xzDistToPlayer, this->actor.playerHeightRel); + Actor_OfferGetItem(&this->actor, play, 0x35, this->actor.xzDistToPlayer, this->actor.playerHeightRel); } } ``` |