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

Actor Struct Changes (and a few related things) (#617)

Browse source 
* reformat header

* type -> category

* done for now i think

* some more stuff

* first -> head

* focus

* flag comment

* ground -> floor

* remove asm, name wrapper funcs

* name func, format

* review

* targetPriority, format

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "0305ec2c2"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "0305ec2c2"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* comment

* review

* feet flags

* horse shadow
This commit is contained in:
fig02 2021-01-18 16:04:04 -05:00 • committed by GitHub
parent 20206fba0d
commit 00a5edea71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
697 changed files with 8157 additions and 7942 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/overlays/actors/ovl_En_Rl/z_en_rl.c
View file

@ -63,7 +63,7 @@ void func_80AE7358(EnRl* this) {
this->drawConfig = 0;
this->alpha = 0;
this->lightBallSpawned = 0;
this->actor.shape.unk_14 = 0;
this->actor.shape.shadowAlpha = 0;
this->unk_19C = 0.0f;
}
@ -83,7 +83,7 @@ void func_80AE73D8(EnRl* this, GlobalContext* globalCtx) {
}
void func_80AE744C(EnRl* this, GlobalContext* globalCtx) {
func_8002E4B4(globalCtx, &this->actor, 75.0f, 30.0f, 30.0f, 5);
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 75.0f, 30.0f, 30.0f, 5);
}
s32 func_80AE7494(EnRl* this) {
@ -128,9 +128,9 @@ void func_80AE7590(EnRl* this, GlobalContext* globalCtx) {
globalCtx->csCtx.npcActions[6] != NULL && globalCtx->csCtx.npcActions[6]->action == 2 &&
!this->lightMedallionGiven) {
player = PLAYER;
pos.x = player->actor.posRot.pos.x;
pos.y = player->actor.posRot.pos.y + 80.0f;
pos.z = player->actor.posRot.pos.z;
pos.x = player->actor.world.pos.x;
pos.y = player->actor.world.pos.y + 80.0f;
pos.z = player->actor.world.pos.z;
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_DEMO_EFFECT, pos.x, pos.y, pos.z, 0, 0, 0, 0xE);
Item_Give(globalCtx, ITEM_MEDALLION_LIGHT);
this->lightMedallionGiven = 1;
@ -142,7 +142,7 @@ void func_80AE7668(EnRl* this, GlobalContext* globalCtx) {
this->drawConfig = 1;
this->action = 1;
player->actor.posRot.rot.y = player->actor.shape.rot.y = this->actor.posRot.rot.y + 0x8000;
player->actor.world.rot.y = player->actor.shape.rot.y = this->actor.world.rot.y + 0x8000;
}
void func_80AE7698(EnRl* this, GlobalContext* globalCtx) {
@ -196,12 +196,12 @@ void func_80AE7838(EnRl* this, GlobalContext* globalCtx) {
void func_80AE7878(EnRl* this, GlobalContext* globalCtx) {
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06007B38, &D_06000A3C, NULL, NULL, 0);
this->action = 4;
this->actor.shape.unk_14 = 0;
this->actor.shape.shadowAlpha = 0;
}
void func_80AE78D4(EnRl* this, GlobalContext* globalCtx) {
Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_6K, this->actor.posRot.pos.x,
kREG(18) + 22.0f + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 5);
Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_6K, this->actor.world.pos.x,
kREG(18) + 22.0f + this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 5);
}
void func_80AE7954(EnRl* this, GlobalContext* globalCtx) {
@ -209,7 +209,7 @@ void func_80AE7954(EnRl* this, GlobalContext* globalCtx) {
this->action = 5;
this->drawConfig = 2;
this->alpha = 0;
this->actor.shape.unk_14 = 0;
this->actor.shape.shadowAlpha = 0;
this->unk_19C = 0.0f;
}
}
@ -225,7 +225,7 @@ void func_80AE79A4(EnRl* this, GlobalContext* globalCtx) {
this->drawConfig = 1;
*unk_19C = kREG(5) + 10.0f;
this->alpha = alpha;
this->actor.shape.unk_14 = alpha;
this->actor.shape.shadowAlpha = alpha;
return;
}
} else {
@ -235,13 +235,13 @@ void func_80AE79A4(EnRl* this, GlobalContext* globalCtx) {
this->drawConfig = 0;
*unk_19C = 0.0f;
this->alpha = 0;
this->actor.shape.unk_14 = 0;
this->actor.shape.shadowAlpha = 0;
return;
}
}
alpha = (*unk_19C / (kREG(5) + 10.0f)) * 255.0f;
this->alpha = alpha;
this->actor.shape.unk_14 = alpha;
this->actor.shape.shadowAlpha = alpha;
}
void func_80AE7AF8(EnRl* this, GlobalContext* globalCtx) {
@ -258,7 +258,7 @@ void func_80AE7AF8(EnRl* this, GlobalContext* globalCtx) {
func_80AE78D4(this, globalCtx);
this->lightBallSpawned = 1;
}
this->actor.shape.unk_14 = 0xFF;
this->actor.shape.shadowAlpha = 0xFF;
}
}
@ -340,7 +340,7 @@ void EnRl_Update(Actor* thisx, GlobalContext* globalCtx) {
void EnRl_Init(Actor* thisx, GlobalContext* globalCtx) {
EnRl* this = THIS;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 50.0f);
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 50.0f);
if (this->actor.params == 2) {
func_80AE7878(this, globalCtx);
} else {
@ -388,7 +388,7 @@ void EnRl_Draw(Actor* thisx, GlobalContext* globalCtx) {
const ActorInit En_Rl_InitVars = {
ACTOR_EN_RL,
ACTORTYPE_NPC,
ACTORCAT_NPC,
FLAGS,
OBJECT_RL,
sizeof(EnRl),