diff --git a/src/include/commands.h b/src/include/commands.h
index a7c6eab38..17682d823 100644
--- a/src/include/commands.h
+++ b/src/include/commands.h
@@ -4334,11 +4334,11 @@
  * Gets the distance from chr to pad, but only if they are on the same floor
  * (ie. Y difference is less than 150).
  */
-#define if_chr_same_floor_distance_to_pad_lt(chr, pad, distance, label) \
+#define if_chr_same_floor_distance_to_pad_lt(chr, distance, pad, label) \
 	mkshort(0x01df), \
 	chr, \
-	mkshort(pad), \
 	mkshort(distance / 10), \
+	mkshort(pad), \
 	label,
 
 /**
diff --git a/src/setups/setupame.c b/src/setups/setupame.c
index 887aa5aed..0e952d4c4 100644
--- a/src/setups/setupame.c
+++ b/src/setups/setupame.c
@@ -1600,14 +1600,14 @@ u8 func0414_programmer[] = {
 	beginloop(0x91)
 #if VERSION >= VERSION_NTSC_1_0
 		set_target_chr(CHR_BOND)
-		if_chr_same_floor_distance_to_pad_lt(CHR_TARGET, 80, 1240, /*goto*/ 0x06)
+		if_chr_same_floor_distance_to_pad_lt(CHR_TARGET, 800, PAD_AME_007C, /*goto*/ 0x06)
 		set_target_chr(CHR_COOP)
-		if_chr_same_floor_distance_to_pad_lt(CHR_TARGET, 80, 1240, /*goto*/ 0x06)
+		if_chr_same_floor_distance_to_pad_lt(CHR_TARGET, 800, PAD_AME_007C, /*goto*/ 0x06)
 #else
 		set_target_chr(CHR_BOND)
-		if_chr_distance_to_pad_lt(CHR_TARGET, 800, 124, /*goto*/ 0x06)
+		if_chr_distance_to_pad_lt(CHR_TARGET, 800, PAD_AME_007C, /*goto*/ 0x06)
 		set_target_chr(CHR_COOP)
-		if_chr_distance_to_pad_lt(CHR_TARGET, 800, 124, /*goto*/ 0x06)
+		if_chr_distance_to_pad_lt(CHR_TARGET, 800, PAD_AME_007C, /*goto*/ 0x06)
 #endif
 	endloop(0x91)
 
@@ -1623,14 +1623,14 @@ u8 func0414_programmer[] = {
 	beginloop(0x92)
 #if VERSION >= VERSION_NTSC_1_0
 		set_target_chr(CHR_BOND)
-		if_chr_same_floor_distance_to_pad_lt(CHR_TARGET, PAD_AME_0014, 1240, /*goto*/ 0x06)
+		if_chr_same_floor_distance_to_pad_lt(CHR_TARGET, 200, PAD_AME_007C, /*goto*/ 0x06)
 		set_target_chr(CHR_COOP)
-		if_chr_same_floor_distance_to_pad_lt(CHR_TARGET, PAD_AME_0014, 1240, /*goto*/ 0x06)
+		if_chr_same_floor_distance_to_pad_lt(CHR_TARGET, 200, PAD_AME_007C, /*goto*/ 0x06)
 #else
 		set_target_chr(CHR_BOND)
-		if_chr_distance_to_pad_lt(CHR_TARGET, 200, 124, /*goto*/ 0x06)
+		if_chr_distance_to_pad_lt(CHR_TARGET, 200, PAD_AME_007C, /*goto*/ 0x06)
 		set_target_chr(CHR_COOP)
-		if_chr_distance_to_pad_lt(CHR_TARGET, 200, 124, /*goto*/ 0x06)
+		if_chr_distance_to_pad_lt(CHR_TARGET, 200, PAD_AME_007C, /*goto*/ 0x06)
 #endif
 	endloop(0x92)