diff --git a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c
index 5031473492..5e6981fc03 100644
--- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c
+++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c
@@ -38,8 +38,8 @@ static s16 sActorIds[] = {
 static s16 sActorParams[] = {
     DRAGONFLY_PARAMS(DRAGONFLY_TYPE_GROWS_WHEN_SPAWNED),     // EN_ENCOUNT1_GRASSHOPPER
     WALLMASTER_PARAMS(WALLMASTER_TYPE_TIMER_ONLY, 0, false), // EN_ENCOUNT1_WALLMASTER
-    ENPR2_PARAMS(1, 0),                                      // EN_ENCOUNT1_SKULLFISH_RESPAWNING
-    ENPR2_PARAMS(3, 0)                                       // EN_ENCOUNT1_SKULLFISH_PATHING
+    ENPR2_PARAMS(PR2_TYPE_SPAWNED, 0),                       // EN_ENCOUNT1_SKULLFISH_RESPAWNING
+    ENPR2_PARAMS(PR2_TYPE_PATHING, 0)                        // EN_ENCOUNT1_SKULLFISH_PATHING
 };
 
 void EnEncount1_Init(Actor* thisx, PlayState* play) {
diff --git a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.h b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.h
index 711dba2b19..bc4882cc83 100644
--- a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.h
+++ b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.h
@@ -24,7 +24,7 @@ typedef void (*EnPr2ActionFunc)(struct EnPr2*, PlayState*);
 #define ENPR2_GETZ_PARENT_AGRO_DISTANCE(parent) ((parent)->world.rot.z)
 
 #define ENPR2_PATH_INDEX_NONE 0x3F
-#define ENPR2_PARAMS(paramF, paramFF0) (((paramF) & 0xF) | (((paramFF0) << 4) & 0xFF0))
+#define ENPR2_PARAMS(type, agroDistance) (((type) & 0xF) | (((agroDistance) << 4) & 0xFF0))
 
 typedef enum EnPr2Type {
     /* 00 */ PR2_TYPE_PASSIVE,   // does not attack, used as a hazard around the cape heartpiece likelike