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

9
src/overlays/actors/ovl_En_Bb/z_en_bb.c
View file

@ -339,7 +339,7 @@ void EnBb_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetScale(thisx, 0.01f);
switch (thisx->params) {
case ENBB_BLUE:
thisx->naviEnemyId = 0x1C;
thisx->naviEnemyId = NAVI_ENEMY_BLUE_BUBBLE;
thisx->colChkInfo.damageTable = &sDamageTableBlueGreen;
this->flamePrimBlue = this->flameEnvColor.b = 255;
thisx->world.pos.y += 50.0f;
@ -347,14 +347,14 @@ void EnBb_Init(Actor* thisx, GlobalContext* globalCtx) {
thisx->flags |= ACTOR_FLAG_14;
break;
case ENBB_RED:
thisx->naviEnemyId = 0x24;
thisx->naviEnemyId = NAVI_ENEMY_RED_BUBBLE;
thisx->colChkInfo.damageTable = &sDamageTableRed;
this->flameEnvColor.r = 255;
this->collider.elements[0].info.toucher.effect = 1;
EnBb_SetupRed(globalCtx, this);
break;
case ENBB_WHITE:
thisx->naviEnemyId = 0x1D;
thisx->naviEnemyId = NAVI_ENEMY_WHITE_BUBBLE;
thisx->colChkInfo.damageTable = &sDamageTableWhite;
this->path = this->actionState;
blureInit.p1StartColor[0] = blureInit.p1StartColor[1] = blureInit.p1StartColor[2] =
@ -379,8 +379,9 @@ void EnBb_Init(Actor* thisx, GlobalContext* globalCtx) {
this->path = this->actionState >> 4;
this->collider.elements[0].dim.modelSphere.radius = 0x16;
Actor_SetScale(thisx, 0.03f);
// fallthrough
case ENBB_GREEN:
thisx->naviEnemyId = 0x1E;
thisx->naviEnemyId = NAVI_ENEMY_GREEN_BUBBLE;
this->bobSize = (this->actionState & 0xF) * 20.0f;
thisx->colChkInfo.damageTable = &sDamageTableBlueGreen;
this->flameEnvColor.g = 255;