mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-20 22:11:16 +00:00
Code Issues Projects Releases Wiki Activity

document most navi enemies as enum type (#1110)

Browse source 
* document most navi enemies as enum type

* enum value auto increments, add enemy default for 0

* also define and comment navi enemy tektite blue

* Update include/z64actor.h

Co-authored-by: mzxrules <mzxrules@gmail.com>

* Update include/z64actor.h

Co-authored-by: mzxrules <mzxrules@gmail.com>

* Update include/z64actor.h

Co-authored-by: mzxrules <mzxrules@gmail.com>

* Update include/z64actor.h

Co-authored-by: mzxrules <mzxrules@gmail.com>

* Update include/z64actor.h

Co-authored-by: mzxrules <mzxrules@gmail.com>

* Update include/z64actor.h

Co-authored-by: mzxrules <mzxrules@gmail.com>

* apply navi enemy updates accepted so far

* update names

* review

* review

* freezzard -> freezard

Co-authored-by: mzxrules <mzxrules@gmail.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
This commit is contained in:
playerskel 2022-04-19 00:23:12 +02:00 • committed by GitHub
parent 38bcbdb0b9
commit 32e66c2da8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
71 changed files with 215 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_En_Rd/z_en_rd.c
View file

@ -144,11 +144,11 @@ void EnRd_Init(Actor* thisx, GlobalContext* globalCtx) {
if (thisx->params >= -1) {
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_rd_Skel_00E778, &object_rd_Anim_0087D0,
this->jointTable, this->morphTable, 26);
thisx->naviEnemyId = 0x2A;
thisx->naviEnemyId = NAVI_ENEMY_REDEAD;
} else {
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_rd_Skel_003DD8, &object_rd_Anim_0087D0,
this->jointTable, this->morphTable, 26);
thisx->naviEnemyId = 0x2D;
thisx->naviEnemyId = NAVI_ENEMY_GIBDO;
}
Collider_InitCylinder(globalCtx, &this->collider);