mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 22:30:15 +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

20
src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c
View file

@ -25,7 +25,7 @@ void ItemOcarina_DoNothing(ItemOcarina* this, GlobalContext* globalCtx);
const ActorInit Item_Ocarina_InitVars = {
ACTOR_ITEM_OCARINA,
ACTORTYPE_ITEMACTION,
ACTORCAT_ITEMACTION,
FLAGS,
OBJECT_GI_OCARINA,
sizeof(ItemOcarina),
@ -94,17 +94,17 @@ void ItemOcarina_Fly(ItemOcarina* this, GlobalContext* globalCtx) {
}
if (globalCtx->csCtx.frames == 881) {
this->actor.posRot.pos.x = 250.0f;
this->actor.posRot.pos.y = 60.0f;
this->actor.posRot.pos.z = 1075.0f;
this->actor.world.pos.x = 250.0f;
this->actor.world.pos.y = 60.0f;
this->actor.world.pos.z = 1075.0f;
this->actor.velocity.x = 1.0f;
this->actor.velocity.y = -5.0f;
this->actor.velocity.z = -7.0f;
}
if (globalCtx->csCtx.frames == 897) {
EffectSsGRipple_Spawn(globalCtx, &this->actor.posRot.pos, 100, 500, 0);
EffectSsGSplash_Spawn(globalCtx, &this->actor.posRot.pos, 0, 0, 1, 0);
EffectSsGRipple_Spawn(globalCtx, &this->actor.world.pos, 100, 500, 0);
EffectSsGSplash_Spawn(globalCtx, &this->actor.world.pos, 0, 0, 1, 0);
this->actor.velocity.x = 0.0f;
this->actor.velocity.y = 0.0f;
this->actor.velocity.z = 0.0f;
@ -146,9 +146,9 @@ void func_80B864EC(ItemOcarina* this, GlobalContext* globalCtx) {
}
if (globalCtx->csCtx.frames == 220) {
this->actor.posRot.pos.x = 144.0f;
this->actor.posRot.pos.y = 80.0f;
this->actor.posRot.pos.z = 1686.0f;
this->actor.world.pos.x = 144.0f;
this->actor.world.pos.y = 80.0f;
this->actor.world.pos.z = 1686.0f;
this->actor.velocity.x = 1.0f;
this->actor.velocity.y = 2.0f;
this->actor.velocity.z = -7.0f;
@ -186,7 +186,7 @@ void ItemOcarina_WaitInWater(ItemOcarina* this, GlobalContext* globalCtx) {
func_8002F434(&this->actor, globalCtx, GI_OCARINA_OOT, 30.0f, 50.0f);
if ((globalCtx->gameplayFrames & 13) == 0) {
EffectSsBubble_Spawn(globalCtx, &this->actor.posRot.pos, 0.0f, 0.0f, 10.0f, 0.13f);
EffectSsBubble_Spawn(globalCtx, &this->actor.world.pos, 0.0f, 0.0f, 10.0f, 0.13f);
}
}
}