falso
/
oot
mirror of https://github.com/zeldaret/oot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add type enum and getter macros

This commit is contained in:
JordanLongstaff 2025-06-04 11:17:17 -04:00
parent 9adae93e65
commit 338de1b4ce
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
View File

@ -32,6 +32,9 @@
#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_CAN_PRESS_SWITCHES) #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_CAN_PRESS_SWITCHES)
#define ENRU1_SWITCH_FLAG(thisx) PARAMS_GET_U(thisx->params, 8, 8)
#define ENRU1_TYPE(thisx) PARAMS_GET_U(thisx->params, 0, 8)
void EnRu1_Init(Actor* thisx, PlayState* play); void EnRu1_Init(Actor* thisx, PlayState* play);
void EnRu1_Destroy(Actor* thisx, PlayState* play); void EnRu1_Destroy(Actor* thisx, PlayState* play);
void EnRu1_Update(Actor* thisx, PlayState* play); void EnRu1_Update(Actor* thisx, PlayState* play);
@ -90,6 +93,19 @@ void EnRu1_DrawNothing(EnRu1* this, PlayState* play);
void EnRu1_DrawOpa(EnRu1* this, PlayState* play); void EnRu1_DrawOpa(EnRu1* this, PlayState* play);
void EnRu1_DrawXlu(EnRu1* this, PlayState* play); void EnRu1_DrawXlu(EnRu1* this, PlayState* play);
typedef enum EnRu1ActorType {
ENRU1_BOSS_ROOM,
ENRU1_FOUNTAIN,
ENRU1_HOLES_ROOM,
ENRU1_BASEMENT,
ENRU1_SAPPHIRE_ROOM,
ENRU1_BESIDE_KZ,
ENRU1_BESIDE_DOOR_SWITCH,
#if DEBUG_FEATURES
ENRU1_DEBUG = 10,
#endif
} EnRu1ActorType;
static ColliderCylinderInitType1 sCylinderInit1 = { static ColliderCylinderInitType1 sCylinderInit1 = {
{ {
COL_MATERIAL_HIT0, COL_MATERIAL_HIT0,
@ -210,13 +226,13 @@ void func_80AEADD8(EnRu1* this) {
} }
u8 EnRu1_GetSwitchFlag(EnRu1* this) { u8 EnRu1_GetSwitchFlag(EnRu1* this) {
u8 switchFlag = PARAMS_GET_U(this->actor.params, 8, 8); u8 switchFlag = ENRU1_SWITCH_FLAG(this);
return switchFlag; return switchFlag;
} }
u8 EnRu1_GetType(EnRu1* this) { u8 EnRu1_GetType(EnRu1* this) {
u8 type = PARAMS_GET_U(this->actor.params, 0, 8); u8 type = ENRU1_TYPE(this);
return type; return type;
} }
@ -2286,29 +2302,29 @@ void EnRu1_Init(Actor* thisx, PlayState* play) {
SkelAnime_InitFlex(play, &this->skelAnime, &gRutoChildSkel, NULL, this->jointTable, this->morphTable, 17); SkelAnime_InitFlex(play, &this->skelAnime, &gRutoChildSkel, NULL, this->jointTable, this->morphTable, 17);
func_80AEAD20(&this->actor, play); func_80AEAD20(&this->actor, play);
switch (EnRu1_GetType(this)) { switch (EnRu1_GetType(this)) {
case 0: case ENRU1_BOSS_ROOM:
EnRu1_InitInBossRoom(this, play); EnRu1_InitInBossRoom(this, play);
break; break;
case 1: case ENRU1_FOUNTAIN:
EnRu1_InitOutsideJabuJabu(this, play); EnRu1_InitOutsideJabuJabu(this, play);
break; break;
case 2: case ENRU1_HOLES_ROOM:
EnRu1_InitInJabuJabuHolesRoom(this, play); EnRu1_InitInJabuJabuHolesRoom(this, play);
break; break;
case 3: case ENRU1_BASEMENT:
EnRu1_InitInJabuJabuBasement(this, play); EnRu1_InitInJabuJabuBasement(this, play);
break; break;
case 4: case ENRU1_SAPPHIRE_ROOM:
EnRu1_InitInSapphireRoom(this, play); EnRu1_InitInSapphireRoom(this, play);
break; break;
case 5: case ENRU1_BESIDE_KZ:
EnRu1_InitBesideKingZora(this, play); EnRu1_InitBesideKingZora(this, play);
break; break;
case 6: case ENRU1_BESIDE_DOOR_SWITCH:
EnRu1_InitBesideDoorSwitch(this, play); EnRu1_InitBesideDoorSwitch(this, play);
break; break;
#if DEBUG_FEATURES #if DEBUG_FEATURES
case 10: case ENRU1_DEBUG:
func_80AF0050(this, play); func_80AF0050(this, play);
break; break;
#endif #endif