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

14
src/overlays/actors/ovl_En_GirlA/z_en_girla.c
View file

@ -71,7 +71,7 @@ void func_80A3BC6C(GlobalContext* globalCtx, EnGirlA* this);
const ActorInit En_GirlA_InitVars = {
ACTOR_EN_GIRLA,
ACTORTYPE_PROP,
ACTORCAT_PROP,
FLAGS,
OBJECT_GAMEPLAY_KEEP,
sizeof(EnGirlA),
@ -963,9 +963,9 @@ void func_80A3BFE4(EnGirlA* this, GlobalContext* globalCtx) {
osSyncPrintf("%s(%2d)\n", D_80A3C590[params], params);
this->actor.flags &= ~1;
Actor_SetScale(&this->actor, 0.25f);
this->actor.shape.unk_08 = 24.0f;
this->actor.shape.unk_10 = 4.0f;
this->actor.groundY = this->actor.initPosRot.pos.y;
this->actor.shape.yOffset = 24.0f;
this->actor.shape.shadowScale = 4.0f;
this->actor.floorHeight = this->actor.home.pos.y;
this->actor.gravity = 0.0f;
func_80A3A750(this, func_80A3BD80);
this->unk_19C = 1;
@ -978,11 +978,11 @@ void func_80A3BFE4(EnGirlA* this, GlobalContext* globalCtx) {
void func_80A3C3BC(EnGirlA* this, GlobalContext* globalCtx) {
Actor_SetScale(&this->actor, 0.25f);
this->actor.shape.unk_08 = 24.0f;
this->actor.shape.unk_10 = 4.0f;
this->actor.shape.yOffset = 24.0f;
this->actor.shape.shadowScale = 4.0f;
func_80A3BF54(this, globalCtx);
this->actionFunc(this, globalCtx);
Actor_SetHeight(&this->actor, 5.0f);
Actor_SetFocus(&this->actor, 5.0f);
this->actor.shape.rot.x = 0.0f;
if (this->actor.params != 38) {
if (this->unk_1B4 != 0) {