diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c index c3515bf68a..15fab2fa1d 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -9,9 +9,6 @@ #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" #include "terminal.h" -#define ENRU2_GET_SWITCH_FLAG(thisx) PARAMS_GET_U(thisx->actor.params, 8, 8) -#define ENRU2_GET_TYPE(thisx) PARAMS_GET_U(thisx->actor.params, 0, 8) - #define FLAGS ACTOR_FLAG_4 void EnRu2_Init(Actor* thisx, PlayState* play); @@ -66,13 +63,13 @@ typedef enum { /* 16 */ ENRU2_WATER_TEMPLE_ENCOUNTER_BEGINNING, /* 17 */ ENRU2_WATER_TEMPLE_ENCOUNTER_DIALOG, /* 18 */ ENRU2_WATER_TEMPLE_ENCOUNTER_END, - /* 19 */ ENRU2_WATER_TEMPLE_SWIMMING_UP, + /* 19 */ ENRU2_WATER_TEMPLE_SWIMMING_UP } EnRu2Action; typedef enum { /* 00 */ ENRU2_DRAW_NOTHING, /* 01 */ ENRU2_DRAW_OPA, - /* 02 */ ENRU2_DRAW_XLU, + /* 02 */ ENRU2_DRAW_XLU } EnRu2DrawConfig; static ColliderCylinderInitType1 sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h index e7b9512fa6..12333051b6 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h @@ -4,6 +4,9 @@ #include "ultra64.h" #include "global.h" +#define ENRU2_GET_SWITCH_FLAG(thisx) PARAMS_GET_U(thisx->actor.params, 8, 8) +#define ENRU2_GET_TYPE(thisx) PARAMS_GET_U(thisx->actor.params, 0, 8) + struct EnRu2; typedef void (*EnRu2ActionFunc)(struct EnRu2*, PlayState*);