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

EnJj and object_jj OK (#741)

Browse source 
* Shift to new branch

* object_jj decomped

* docs

* Documented blinking, various other things

* more naming

* Most stuff in the object named

* implement eye enums

* delete asm

* Changes from Fig's review

* Apply suggestions from code review

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
EllipticEllipsis 2021-03-29 01:02:09 +01:00 • committed by GitHub
parent 1639417327
commit ed4021a6fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 532 additions and 761 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c
View file

@ -350,7 +350,7 @@ void MagicFire_UpdateBeforeCast(Actor* thisx, GlobalContext* globalCtx) {
if (this->actionTimer > 0) {
this->actionTimer--;
} else {
this->actor.update = &MagicFire_Update;
this->actor.update = MagicFire_Update;
func_8002F7DC(&player->actor, NA_SE_PL_MAGIC_FIRE);
}
this->actor.world.pos = player->actor.world.pos;