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

6
src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c
View file

@ -19,7 +19,7 @@ void func_808A8BAC(BgPushbox* this, GlobalContext* globalCtx);
const ActorInit Bg_Pushbox_InitVars = {
ACTOR_BG_PUSHBOX,
ACTORTYPE_BG,
ACTORCAT_BG,
FLAGS,
OBJECT_GAMEPLAY_DANGEON_KEEP,
sizeof(BgPushbox),
@ -66,9 +66,9 @@ void func_808A8BAC(BgPushbox* this, GlobalContext* globalCtx) {
thisx->speedXZ += this->dyna.unk_150 * 0.2f;
thisx->speedXZ = (thisx->speedXZ < -1.0f) ? -1.0f : ((thisx->speedXZ > 1.0f) ? 1.0f : thisx->speedXZ);
Math_StepToF(&thisx->speedXZ, 0.0f, 0.2f);
thisx->posRot.rot.y = this->dyna.unk_158;
thisx->world.rot.y = this->dyna.unk_158;
Actor_MoveForward(thisx);
func_8002E4B4(globalCtx, thisx, 20.0f, 40.0f, 40.0f, 0x1D);
Actor_UpdateBgCheckInfo(globalCtx, thisx, 20.0f, 40.0f, 40.0f, 0x1D);
}
void BgPushbox_Update(Actor* thisx, GlobalContext* globalCtx) {