diff options
| author | fig02 <fig02srl@gmail.com> | 2024-12-06 07:49:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-06 07:49:00 -0500 |
| commit | a96ada0bbaeb1926c6c08d945d2df71aef7a7ba4 (patch) | |
| tree | acd45a256523fa9c6b02008d10d96f7f8979b67d /src | |
| parent | b2d3c0523d92f9fcc3f85bb6a4643aea0fb2062b (diff) | |
ru2 fixes (#2323)
Diffstat (limited to 'src')
| -rw-r--r-- | src/overlays/actors/ovl_En_Ru2/z_en_ru2.c | 7 | ||||
| -rw-r--r-- | src/overlays/actors/ovl_En_Ru2/z_en_ru2.h | 3 |
2 files changed, 5 insertions, 5 deletions
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 c3515bf68..15fab2fa1 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 e7b9512fa..12333051b 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*); |