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

10
src/overlays/actors/ovl_En_Skj/z_en_skj.c
View file

@ -341,21 +341,21 @@ void EnSkj_SetNaviId(EnSkj* this) {
switch (this->actor.params) {
case 0:
if (gSaveContext.itemGetInf[3] & 0x200) {
this->actor.naviEnemyId = 0x41; // Skull kid with skull mask
this->actor.naviEnemyId = NAVI_ENEMY_SKULL_KID_MASK;
} else if (gSaveContext.itemGetInf[1] & 0x40) {
this->actor.naviEnemyId = 0x40; // Skull kid after Saria's song but no mask
this->actor.naviEnemyId = NAVI_ENEMY_SKULL_KID_FRIENDLY;
} else {
this->actor.naviEnemyId = 0x3F; // No Sarias song no skull mask
this->actor.naviEnemyId = NAVI_ENEMY_SKULL_KID; // No Sarias song no skull mask
}
break;
case 1:
case 2:
this->actor.naviEnemyId = 0x3F;
this->actor.naviEnemyId = NAVI_ENEMY_SKULL_KID;
break;
default:
this->actor.naviEnemyId = 0x36; // Skull kid as adult
this->actor.naviEnemyId = NAVI_ENEMY_SKULL_KID_ADULT;
break;
}
}