mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 06:21:16 +00:00
Code Issues Projects Releases Wiki Activity

Dekunut Salesman Docs (#1493)

Browse source 
* Dekunut Salesman Docs

* Update src/overlays/actors/ovl_En_Dns/z_en_dns.c

Remove extra param from debug logging

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* * Full Deku/Potion name usage
* Dialog -> CanBuy
* Revert debug logging symbols
* Proper declaration spacing
* Fix en_shopnuts header doc
* Biz -> Business

* Fix missed deku prefix's

* Synchronize CanBuy sticks and nuts

* Fix enum naming

* Clarified CanBuy success values

* anon review

* fig review

* macro changes

* fix macro usage

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
This commit is contained in:
Billy 2023-09-20 01:41:42 +00:00 • committed by GitHub
parent da3f4718f0
commit 107c0288cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 363 additions and 263 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c
View file

@ -69,7 +69,7 @@ void EnNutsball_Init(Actor* thisx, PlayState* play) {
ActorShape_Init(&this->actor.shape, 400.0f, ActorShadow_DrawCircle, 13.0f);
Collider_InitCylinder(play, &this->collider);
Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
this->requiredObjectSlot = Object_GetSlot(&play->objectCtx, sObjectIds[this->actor.params]);
this->requiredObjectSlot = Object_GetSlot(&play->objectCtx, sObjectIds[NUTSBALL_GET_TYPE(&this->actor)]);
if (this->requiredObjectSlot < 0) {
Actor_Kill(&this->actor);
@ -165,16 +165,16 @@ void EnNutsball_Update(Actor* thisx, PlayState* play) {
}
void EnNutsball_Draw(Actor* thisx, PlayState* play) {
s32 pad;
EnNutsball* this = (EnNutsball*)thisx;
OPEN_DISPS(play->state.gfxCtx, "../z_en_nutsball.c", 327);
Gfx_SetupDL_25Opa(play->state.gfxCtx);
Matrix_Mult(&play->billboardMtxF, MTXMODE_APPLY);
Matrix_RotateZ(thisx->home.rot.z * 9.58738e-05f, MTXMODE_APPLY);
Matrix_RotateZ(this->actor.home.rot.z * 9.58738e-05f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, "../z_en_nutsball.c", 333),
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_OPA_DISP++, sDLists[thisx->params]);
gSPDisplayList(POLY_OPA_DISP++, sDLists[NUTSBALL_GET_TYPE(&this->actor)]);
CLOSE_DISPS(play->state.gfxCtx, "../z_en_nutsball.c", 337);
}

10
src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h
View file

@ -4,6 +4,16 @@
#include "ultra64.h"
#include "global.h"
#define NUTSBALL_GET_TYPE(thisx) ((thisx)->params)
typedef enum {
/* 0 */ EN_NUTSBALL_TYPE_DEKUNUTS,
/* 1 */ EN_NUTSBALL_TYPE_HINTNUTS,
/* 2 */ EN_NUTSBALL_TYPE_SHOPNUTS,
/* 3 */ EN_NUTSBALL_TYPE_DNS,
/* 4 */ EN_NUTSBALL_TYPE_DNK
} EnNutsballType;
struct EnNutsball;
typedef void (*EnNutsballActionFunc)(struct EnNutsball*, PlayState*);