renamed RETURN_OK and RETURN_FAIL for morphos

svn-id: r7319

64 files changed, 106 insertions, 106 deletions

diff --git a/sky/compacts/10comp.h b/sky/compacts/10comp.h
index 2ec2de36de..58deba3cee 100644
--- a/sky/compacts/10comp.h
+++ b/sky/compacts/10comp.h
@@ -541,7 +541,7 @@ uint16 lift_10_close[] = {
 
 uint16 s10_floor_table[] = {
 	ID_S10_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_LEFT_EXIT_10,
 	GT_LEFT_EXIT_10,
 	0,
@@ -1290,7 +1290,7 @@ uint16 linc_10_table[] = {
 	ID_LIFT_10,
 	GT_FLOOR_FROM_CHAIR10,
 	ID_LINC_10,
-	RETURN_OK,
+	RET_OK,
 	65535,
 };
 
diff --git a/sky/compacts/11comp.h b/sky/compacts/11comp.h
index 14cfc6060a..e89f8bf597 100644
--- a/sky/compacts/11comp.h
+++ b/sky/compacts/11comp.h
@@ -707,7 +707,7 @@ Compact soccer_4 = {
 
 uint16 s11_floor_table[] = {
 	ID_S11_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_CABLE_FALL,
 	GT_CABLE_11,
 	ID_LOCKER_11,
diff --git a/sky/compacts/12comp.h b/sky/compacts/12comp.h
index 97f294f4e1..21ac1b3640 100644
--- a/sky/compacts/12comp.h
+++ b/sky/compacts/12comp.h
@@ -220,7 +220,7 @@ uint16 botbelt_seq[] = {
 
 uint16 s12_floor_table[] = {
 	ID_S12_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,
diff --git a/sky/compacts/13comp.h b/sky/compacts/13comp.h
index e5a2b5a97c..756e1cb09e 100644
--- a/sky/compacts/13comp.h
+++ b/sky/compacts/13comp.h
@@ -762,7 +762,7 @@ Compact lite1 = {
 
 uint16 s13_floor_table[] = {
 	ID_S13_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,
diff --git a/sky/compacts/14comp.h b/sky/compacts/14comp.h
index 5da3123b6b..43b4c91ed6 100644
--- a/sky/compacts/14comp.h
+++ b/sky/compacts/14comp.h
@@ -620,7 +620,7 @@ uint16 locker_close_seq[] = {
 
 uint16 s14_floor_table[] = {
 	ID_S14_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,
diff --git a/sky/compacts/15comp.h b/sky/compacts/15comp.h
index 13bb1371df..66f253e104 100644
--- a/sky/compacts/15comp.h
+++ b/sky/compacts/15comp.h
@@ -189,9 +189,9 @@ uint16 flap_seq[] = {
 
 uint16 s15_floor_table[] = {
 	ID_S15_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_NU_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,
diff --git a/sky/compacts/16comp.h b/sky/compacts/16comp.h
index 19e9cc5c86..d1401abb72 100644
--- a/sky/compacts/16comp.h
+++ b/sky/compacts/16comp.h
@@ -250,7 +250,7 @@ uint16 console_16_seq[] = {
 
 uint16 s16_floor_table[] = {
 	ID_S16_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,
diff --git a/sky/compacts/17comp.h b/sky/compacts/17comp.h
index 819c4a95e3..fbb761888f 100644
--- a/sky/compacts/17comp.h
+++ b/sky/compacts/17comp.h
@@ -136,7 +136,7 @@ uint16 pulseb_seq[] = {
 
 uint16 s17_floor_table[] = {
 	ID_S17_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,
diff --git a/sky/compacts/18comp.h b/sky/compacts/18comp.h
index 74f9b60a74..63dc8f7a32 100644
--- a/sky/compacts/18comp.h
+++ b/sky/compacts/18comp.h
@@ -404,7 +404,7 @@ uint16 power_stop_seq[] = {
 
 uint16 s18_floor_table[] = {
 	ID_S18_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,
diff --git a/sky/compacts/19comp.h b/sky/compacts/19comp.h
index 4ca21efea9..0bcbcd3d69 100644
--- a/sky/compacts/19comp.h
+++ b/sky/compacts/19comp.h
@@ -52,7 +52,7 @@ uint16 s19_mouse[] = {
 
 uint16 s19_floor_table[] = {
 	ID_S19_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,
diff --git a/sky/compacts/20comp.h b/sky/compacts/20comp.h
index cfc65e2304..d46fc8814d 100644
--- a/sky/compacts/20comp.h
+++ b/sky/compacts/20comp.h
@@ -597,7 +597,7 @@ uint16 rs_all_28_20[] = {
 
 uint16 s20_floor_table[] = {
 	ID_S20_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,
diff --git a/sky/compacts/21comp.h b/sky/compacts/21comp.h
index 2012e84711..681f4e6f52 100644
--- a/sky/compacts/21comp.h
+++ b/sky/compacts/21comp.h
@@ -346,7 +346,7 @@ uint16 push_dispensor[] = {
 
 uint16 s21_floor_table[] = {
 	ID_S21_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,
diff --git a/sky/compacts/22comp.h b/sky/compacts/22comp.h
index 08737abbd2..3f030361a8 100644
--- a/sky/compacts/22comp.h
+++ b/sky/compacts/22comp.h
@@ -277,7 +277,7 @@ uint16 remove_pillow[] = {
 
 uint16 s22_floor_table[] = {
 	ID_S22_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,
diff --git a/sky/compacts/23comp.h b/sky/compacts/23comp.h
index 5f6e01d433..86437dfb95 100644
--- a/sky/compacts/23comp.h
+++ b/sky/compacts/23comp.h
@@ -635,7 +635,7 @@ Compact left_exit_23 = {
 
 uint16 s23_floor_table[] = {
 	ID_S23_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,
diff --git a/sky/compacts/24comp.h b/sky/compacts/24comp.h
index 67df5b9a22..2448ec6dfb 100644
--- a/sky/compacts/24comp.h
+++ b/sky/compacts/24comp.h
@@ -93,7 +93,7 @@ uint16 trev_read_mag[] = {
 
 uint16 s24_floor_table[] = {
 	ID_S24_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,
diff --git a/sky/compacts/25comp.h b/sky/compacts/25comp.h
index 65a5adca28..929b54d197 100644
--- a/sky/compacts/25comp.h
+++ b/sky/compacts/25comp.h
@@ -993,7 +993,7 @@ Compact lazer_25 = {
 
 uint16 s25_floor_table[] = {
 	ID_S25_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,
diff --git a/sky/compacts/26comp.h b/sky/compacts/26comp.h
index fe0343cf19..db5cbe8fda 100644
--- a/sky/compacts/26comp.h
+++ b/sky/compacts/26comp.h
@@ -81,7 +81,7 @@ Compact plant_26 = {
 
 uint16 s26_floor_table[] = {
 	ID_S26_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,
diff --git a/sky/compacts/27comp.h b/sky/compacts/27comp.h
index f5308a0ba0..73c0ccd7a2 100644
--- a/sky/compacts/27comp.h
+++ b/sky/compacts/27comp.h
@@ -752,7 +752,7 @@ uint16 burke_st_left[] = {
 
 uint16 chair_table[] = {
 	ID_CHAIR_27,
-	RETURN_OK,
+	RET_OK,
 	ID_S27_FLOOR,
 	GT_FLOOR_FROM_CHAIR,
 	ID_RIGHT_EXIT_27,
@@ -1219,7 +1219,7 @@ uint16 operate_seq[] = {
 
 uint16 s27_floor_table[] = {
 	ID_S27_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_RIGHT_EXIT_27,
 	GT_RIGHT_EXIT_27,
 	ID_JOEY_PARK,
diff --git a/sky/compacts/28comp.h b/sky/compacts/28comp.h
index 521fba29f5..ca3cd821c0 100644
--- a/sky/compacts/28comp.h
+++ b/sky/compacts/28comp.h
@@ -46,7 +46,7 @@ uint16 s28_chip_list[] = {
 
 uint16 s28_floor_table[] = {
 	ID_S28_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,
@@ -76,7 +76,7 @@ uint16 s28_floor_table[] = {
 
 uint16 s28_sml_table[] = {
 	ID_S28_SML_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	ID_SMALL_R_28,
diff --git a/sky/compacts/29comp.h b/sky/compacts/29comp.h
index ce6dcd15e9..968031c34b 100644
--- a/sky/compacts/29comp.h
+++ b/sky/compacts/29comp.h
@@ -69,7 +69,7 @@ uint16 rs_joey_7_29[] = {
 
 uint16 s29_floor_table[] = {
 	ID_S29_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	ID_LIFT_29,
@@ -996,7 +996,7 @@ Compact small_r_29 = {
 
 uint16 s29_sml_table[] = {
 	ID_S29_SML_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	ID_SMALL_R_29,
diff --git a/sky/compacts/2compact.h b/sky/compacts/2compact.h
index aab2bd036e..0a0ba1fba1 100644
--- a/sky/compacts/2compact.h
+++ b/sky/compacts/2compact.h
@@ -636,7 +636,7 @@ uint16 loaderb_r_to_l[] = {
 
 uint16 top_lift_table[] = {
 	ID_TOP_LIFT,
-	RETURN_OK,
+	RET_OK,
 	115,
 	LIFT_TO_FLOOR,
 	ID_L_EXIT_S2,
diff --git a/sky/compacts/30comp.h b/sky/compacts/30comp.h
index f724238ed8..c19a988513 100644
--- a/sky/compacts/30comp.h
+++ b/sky/compacts/30comp.h
@@ -984,7 +984,7 @@ uint16 sc42_judge_point[] = {
 
 uint16 sc30_floor_table[] = {
 	ID_SC30_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC30_EXIT_31,
 	GT_SC30_EXIT_31,
 	0,
diff --git a/sky/compacts/31comp.h b/sky/compacts/31comp.h
index 3ef6b226f2..d3c8fb8eb2 100644
--- a/sky/compacts/31comp.h
+++ b/sky/compacts/31comp.h
@@ -1878,7 +1878,7 @@ uint16 sc31_get_plank[] = {
 
 uint16 sc31_floor_table[] = {
 	ID_SC31_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC31_EXIT_30,
 	GT_SC31_EXIT_30,
 	0,
diff --git a/sky/compacts/32comp.h b/sky/compacts/32comp.h
index 29e171db7b..cc519f84a8 100644
--- a/sky/compacts/32comp.h
+++ b/sky/compacts/32comp.h
@@ -762,7 +762,7 @@ Compact sc32_buzzer = {
 
 uint16 sc32_floor_table[] = {
 	ID_SC32_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC32_EXIT_31,
 	GT_SC32_EXIT_31,
 	0,
diff --git a/sky/compacts/33comp.h b/sky/compacts/33comp.h
index bc57cbaa22..45f6437b29 100644
--- a/sky/compacts/33comp.h
+++ b/sky/compacts/33comp.h
@@ -572,7 +572,7 @@ uint16 sc33_logic_list[] = {
 
 uint16 sc33_floor_table[] = {
 	ID_SC33_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC33_EXIT_30,
 	GT_SC33_EXIT_30,
 	0,
diff --git a/sky/compacts/34comp.h b/sky/compacts/34comp.h
index 387b43aeb1..c8e240f17c 100644
--- a/sky/compacts/34comp.h
+++ b/sky/compacts/34comp.h
@@ -256,7 +256,7 @@ uint16 sc34_stairs2[] = {
 
 uint16 sc34_floor_table[] = {
 	ID_SC34_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC34_DOOR,
 	GT_SC34_DOOR,
 	0,
diff --git a/sky/compacts/36comp.h b/sky/compacts/36comp.h
index eafa6d24bd..24331d6d98 100644
--- a/sky/compacts/36comp.h
+++ b/sky/compacts/36comp.h
@@ -1743,7 +1743,7 @@ uint16 sc36_low_floor_table[] = {
 	ID_SC36_FLOOR,
 	GT_SC36_FLOOR,
 	ID_SC36_LOW_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC36_EXIT_30,
 	GT_SC36_FLOOR,
 	ID_SC36_DOOR,
@@ -1796,7 +1796,7 @@ Compact sc36_low_floor = {
 
 uint16 sc36_floor_table[] = {
 	ID_SC36_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC36_LOW_FLOOR,
 	GT_SC36_LOW_FLOOR,
 	ID_SC36_EXIT_30,
diff --git a/sky/compacts/37comp.h b/sky/compacts/37comp.h
index caf4fb5eb3..eac2f1765c 100644
--- a/sky/compacts/37comp.h
+++ b/sky/compacts/37comp.h
@@ -217,7 +217,7 @@ uint16 sc37_grillopen[] = {
 
 uint16 sc37_floor_table[] = {
 	ID_SC37_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC37_DOOR,
 	GT_SC37_DOOR,
 	0,
@@ -491,7 +491,7 @@ uint16 sc37_flimsy_box_table[] = {
 	ID_SC37_GRILL,
 	GT_SC37_GRILL,
 	ID_SC37_FLIMSY_BOX,
-	RETURN_OK,
+	RET_OK,
 	ID_SC37_BIG_BOX,
 	STEP_OFF_BOX,
 	ID_SC37_WINE_RACK,
diff --git a/sky/compacts/38comp.h b/sky/compacts/38comp.h
index f1515999b3..86c74e56ab 100644
--- a/sky/compacts/38comp.h
+++ b/sky/compacts/38comp.h
@@ -1182,7 +1182,7 @@ uint32 *spu = 0;
 
 uint16 sc38_floor_table[] = {
 	ID_SC38_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC38_LIFT,
 	GT_SC38_LIFT,
 	ID_SC38_SOFA,
diff --git a/sky/compacts/39comp.h b/sky/compacts/39comp.h
index bc95fc087b..e507f17910 100644
--- a/sky/compacts/39comp.h
+++ b/sky/compacts/39comp.h
@@ -50,7 +50,7 @@ Compact sc39_exit_31 = {
 
 uint16 sc39_floor_table[] = {
 	ID_SC39_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC39_EXIT_31,
 	GT_SC39_EXIT_31,
 	0,
diff --git a/sky/compacts/3compact.h b/sky/compacts/3compact.h
index 2b30becd9f..0b7f9a62b5 100644
--- a/sky/compacts/3compact.h
+++ b/sky/compacts/3compact.h
@@ -1683,7 +1683,7 @@ uint16 rs_low_lift[] = {
 
 uint16 r3_floor_table[] = {
 	ID_S3_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_FURNACE_DOOR,
 	GET_TO_FURNACE_DOOR,
 	ID_SLOT,
diff --git a/sky/compacts/40comp.h b/sky/compacts/40comp.h
index ca84ba94ac..227a8bd586 100644
--- a/sky/compacts/40comp.h
+++ b/sky/compacts/40comp.h
@@ -619,7 +619,7 @@ Compact sc40_locker_1 = {
 
 uint16 sc40_floor_table[] = {
 	ID_SC40_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC40_EXIT_39,
 	GT_SC40_EXIT_39,
 	ID_SC40_CABINET,
diff --git a/sky/compacts/41comp.h b/sky/compacts/41comp.h
index 3734b93827..c0192ca384 100644
--- a/sky/compacts/41comp.h
+++ b/sky/compacts/41comp.h
@@ -257,7 +257,7 @@ Compact sc41_exit_39 = {
 
 uint16 sc41_floor_table[] = {
 	ID_SC41_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC41_EXIT_39,
 	GT_SC41_EXIT_39,
 	0,
diff --git a/sky/compacts/44comp.h b/sky/compacts/44comp.h
index 99e7d91f79..41f42c7247 100644
--- a/sky/compacts/44comp.h
+++ b/sky/compacts/44comp.h
@@ -91,7 +91,7 @@ Compact sc44_grill = {
 
 uint16 sc44_floor_table[] = {
 	ID_SC44_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC44_RUBBLE,
 	GT_SC44_RUBBLE,
 	ID_SC44_GRILL,
diff --git a/sky/compacts/45comp.h b/sky/compacts/45comp.h
index bc892e8833..68580dabce 100644
--- a/sky/compacts/45comp.h
+++ b/sky/compacts/45comp.h
@@ -47,7 +47,7 @@ uint16 sc45_logic_list[] = {
 
 uint16 sc45_floor_table[] = {
 	ID_SC45_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC45_EXIT_44,
 	GT_SC45_EXIT_44,
 	0,
diff --git a/sky/compacts/46comp.h b/sky/compacts/46comp.h
index 0e88377d8a..123ea9f4a1 100644
--- a/sky/compacts/46comp.h
+++ b/sky/compacts/46comp.h
@@ -29,7 +29,7 @@ namespace SkyCompact {
 
 uint16 sc46_floor_table[] = {
 	ID_SC46_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC46_RUBBLE,
 	GT_SC46_RUBBLE,
 	ID_SC46_EXIT_45,
diff --git a/sky/compacts/47comp.h b/sky/compacts/47comp.h
index edd01bfb98..49814ab64f 100644
--- a/sky/compacts/47comp.h
+++ b/sky/compacts/47comp.h
@@ -512,7 +512,7 @@ uint16 sc47_chip_list[] = {
 
 uint16 sc47_floor_table[] = {
 	ID_SC47_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC47_EXIT_45,
 	GT_SC47_EXIT_45,
 	0,
diff --git a/sky/compacts/48comp.h b/sky/compacts/48comp.h
index ee86574c48..7d2a57b31c 100644
--- a/sky/compacts/48comp.h
+++ b/sky/compacts/48comp.h
@@ -79,7 +79,7 @@ uint16 sc48_chip_list[] = {
 
 uint16 sc48_floor_table[] = {
 	ID_SC48_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC48_EXIT_47,
 	GT_SC48_EXIT_47,
 	0,
diff --git a/sky/compacts/4compact.h b/sky/compacts/4compact.h
index aeed422ae2..58710ff441 100644
--- a/sky/compacts/4compact.h
+++ b/sky/compacts/4compact.h
@@ -112,9 +112,9 @@ uint16 m_jobs_l_to_d[] = {
 
 uint16 s4_talk_table[] = {
 	4106,
-	RETURN_OK,
+	RET_OK,
 	4107,
-	RETURN_OK,
+	RET_OK,
 	ID_S4_FLOOR,
 	STD_ADJOIN_FLOOR,
 	ID_S4_L_EXIT,
@@ -997,7 +997,7 @@ Compact chuck_s4 = {
 
 uint16 r4_floor_table[] = {
 	ID_S4_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_S4_L_EXIT,
 	GET_TO_EL4,
 	ID_CUPBOARD,
diff --git a/sky/compacts/5compact.h b/sky/compacts/5compact.h
index a8a10418e6..9a936bc2e7 100644
--- a/sky/compacts/5compact.h
+++ b/sky/compacts/5compact.h
@@ -388,7 +388,7 @@ uint32 *grid18 = 0;
 
 uint16 s7_floor_table[] = {
 	ID_S7_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,
@@ -2609,7 +2609,7 @@ uint16 jostair2_seq[] = {
 
 uint16 s6_floor_table[] = {
 	ID_S6_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_S6_STAIRS,
 	GET_TO_STAIRS6,
 	ID_JOEY_PARK,
@@ -2782,7 +2782,7 @@ Compact right_exit_s7 = {
 
 uint16 s5_floor_table[] = {
 	ID_S5_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	0,
@@ -2823,7 +2823,7 @@ Compact s5_floor = {
 
 uint16 s8_floor_table[] = {
 	ID_S8_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	0,
 	S8_WALK_ON,
 	ID_WRECK_GUARD,
diff --git a/sky/compacts/65comp.h b/sky/compacts/65comp.h
index 4eca274ee9..2cd36fc1e6 100644
--- a/sky/compacts/65comp.h
+++ b/sky/compacts/65comp.h
@@ -52,7 +52,7 @@ Compact sc65_exit_48 = {
 
 uint16 sc65_floor_table[] = {
 	ID_SC65_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC65_POSTER1,
 	GT_SC65_POSTER1,
 	ID_SC65_POSTER2,
diff --git a/sky/compacts/67comp.h b/sky/compacts/67comp.h
index 54c908fe11..82bab0ba3e 100644
--- a/sky/compacts/67comp.h
+++ b/sky/compacts/67comp.h
@@ -1796,7 +1796,7 @@ Compact sc67_brick = {
 
 uint16 sc67_floor_table[] = {
 	ID_SC67_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC67_BRICKWORK,
 	GT_SC67_BRICKWORK,
 	ID_SC67_DOOR,
diff --git a/sky/compacts/68comp.h b/sky/compacts/68comp.h
index 4d486e6494..549e7dded3 100644
--- a/sky/compacts/68comp.h
+++ b/sky/compacts/68comp.h
@@ -1183,7 +1183,7 @@ uint16 sc68_door_close[] = {
 
 uint16 sc68_floor_table[] = {
 	ID_SC68_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	0,
 	SC68_DOOR_WALK_ON,
 	1,
diff --git a/sky/compacts/69comp.h b/sky/compacts/69comp.h
index 52b8457233..d562954fd2 100644
--- a/sky/compacts/69comp.h
+++ b/sky/compacts/69comp.h
@@ -565,7 +565,7 @@ Compact sc69_pulse2 = {
 
 uint16 sc69_floor_table[] = {
 	ID_SC69_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	0,
 	SC69_EXIT_WALK_ON,
 	1,
diff --git a/sky/compacts/70comp.h b/sky/compacts/70comp.h
index 7b55cd414a..809bdcce78 100644
--- a/sky/compacts/70comp.h
+++ b/sky/compacts/70comp.h
@@ -589,7 +589,7 @@ uint16 sc70_palette[] = {
 
 uint16 sc70_floor_table[] = {
 	ID_SC70_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC70_DOOR,
 	GT_SC70_DOOR,
 	ID_SC70_CONTROL,
diff --git a/sky/compacts/71comp.h b/sky/compacts/71comp.h
index cec3fabad5..3fb4ebf04a 100644
--- a/sky/compacts/71comp.h
+++ b/sky/compacts/71comp.h
@@ -1322,7 +1322,7 @@ uint16 sc71_mon_anim[] = {
 
 uint16 sc71_floor_table[] = {
 	ID_SC71_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	0,
 	SC71_DOOR69_WALK_ON,
 	3,
diff --git a/sky/compacts/72comp.h b/sky/compacts/72comp.h
index b724f8ef10..f2ff31ef2f 100644
--- a/sky/compacts/72comp.h
+++ b/sky/compacts/72comp.h
@@ -327,7 +327,7 @@ uint16 wit_r_to_d[] = {
 
 uint16 sc72_floor_table[] = {
 	ID_SC72_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	0,
 	SC72_DOOR_WALK_ON,
 	1,
diff --git a/sky/compacts/73comp.h b/sky/compacts/73comp.h
index 7482fcc520..08fd4a3d11 100644
--- a/sky/compacts/73comp.h
+++ b/sky/compacts/73comp.h
@@ -875,7 +875,7 @@ uint16 sc73_joey_fight2[] = {
 
 uint16 sc73_floor_table[] = {
 	ID_SC73_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC73_EXIT,
 	GT_SC73_EXIT,
 	0,
diff --git a/sky/compacts/74comp.h b/sky/compacts/74comp.h
index 104c3e43d9..5386994dbe 100644
--- a/sky/compacts/74comp.h
+++ b/sky/compacts/74comp.h
@@ -122,7 +122,7 @@ uint16 sc74_int_table[] = {
 	ID_SC74_RIGHT_TV,
 	GT_SC74_FLOOR,
 	ID_SC74_INTERFACE,
-	RETURN_OK,
+	RET_OK,
 	ID_SC74_INT_SLOT,
 	GT_SC74_FLOOR,
 	ID_SC74_TERMINAL,
@@ -1926,7 +1926,7 @@ Compact sc74_monitor2 = {
 
 uint16 sc74_floor_table[] = {
 	ID_SC74_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC74_DOOR,
 	GT_SC74_DOOR,
 	0,
diff --git a/sky/compacts/75comp.h b/sky/compacts/75comp.h
index 424dd373de..0b7614f90d 100644
--- a/sky/compacts/75comp.h
+++ b/sky/compacts/75comp.h
@@ -29,7 +29,7 @@ namespace SkyCompact {
 
 uint16 sc75_floor_table[] = {
 	ID_SC75_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC75_BIG_DOOR,
 	GT_SC75_BIG_DOOR,
 	0,
diff --git a/sky/compacts/76comp.h b/sky/compacts/76comp.h
index d9d85e031d..686a24ea23 100644
--- a/sky/compacts/76comp.h
+++ b/sky/compacts/76comp.h
@@ -589,7 +589,7 @@ Compact ken = {
 
 uint16 sc76_floor_table[] = {
 	ID_SC76_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC76_DOOR75,
 	GT_SC76_DOOR75,
 	0,
diff --git a/sky/compacts/77comp.h b/sky/compacts/77comp.h
index 31ed1e3d7f..9bd4289060 100644
--- a/sky/compacts/77comp.h
+++ b/sky/compacts/77comp.h
@@ -818,7 +818,7 @@ uint16 sc77_fpushr_2[] = {
 
 uint16 sc77_floor_table[] = {
 	ID_SC77_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC77_DOOR76,
 	GT_SC77_DOOR76,
 	0,
diff --git a/sky/compacts/78comp.h b/sky/compacts/78comp.h
index 109fb6aff9..9f7e1ea601 100644
--- a/sky/compacts/78comp.h
+++ b/sky/compacts/78comp.h
@@ -29,7 +29,7 @@ namespace SkyCompact {
 
 uint16 sc78_ledge_table[] = {
 	ID_SC78_LEDGE,
-	RETURN_OK,
+	RET_OK,
 	ID_SC78_PIPE,
 	GT_SC78_PIPE,
 	ID_SC78_BIG_DOOR,
@@ -626,7 +626,7 @@ uint16 reset_77_78[] = {
 
 uint16 sc78_pipe_table[] = {
 	ID_SC78_PIPE,
-	RETURN_OK,
+	RET_OK,
 	ID_SC78_LEDGE,
 	GT_SC78_LEDGE,
 	ID_SC78_BIG_DOOR,
diff --git a/sky/compacts/79comp.h b/sky/compacts/79comp.h
index 1cba83bd36..dc00a2d16a 100644
--- a/sky/compacts/79comp.h
+++ b/sky/compacts/79comp.h
@@ -1086,7 +1086,7 @@ uint16 sc79_crouch_down[] = {
 
 uint16 sc79_pipe_table[] = {
 	ID_SC79_PIPE,
-	RETURN_OK,
+	RET_OK,
 	ID_SC79_EXIT,
 	GT_SC79_EXIT,
 	0,
diff --git a/sky/compacts/90comp.h b/sky/compacts/90comp.h
index e64a862e1a..3a51a030b3 100644
--- a/sky/compacts/90comp.h
+++ b/sky/compacts/90comp.h
@@ -99,17 +99,17 @@ Compact door_r90 = {
 
 uint16 sc90_floor_table[] = {
 	ID_SC90_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_SC90_SMFLOOR,
-	RETURN_FAIL,
+	RET_FAIL,
 	ID_DOOR_L90,
-	RETURN_FAIL,
+	RET_FAIL,
 	ID_DOOR_R90,
 	GET_TO_DOOR_R90,
 	ID_JOIN_OBJECT,
 	GET_TO_JOIN_OBJECT,
 	ID_OSCILLATOR,
-	RETURN_FAIL,
+	RET_FAIL,
 	ID_EYEBALL_90,
 	GET_TO_EYEBALL_90,
 	65535,
@@ -138,19 +138,19 @@ Compact sc90_floor = {
 
 uint16 sc90_smfloor_table[] = {
 	ID_SC90_FLOOR,
-	RETURN_FAIL,
+	RET_FAIL,
 	ID_SC90_SMFLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_DOOR_L90,
 	GET_TO_DOOR_L90,
 	ID_DOOR_R90,
-	RETURN_FAIL,
+	RET_FAIL,
 	ID_JOIN_OBJECT,
-	RETURN_FAIL,
+	RET_FAIL,
 	ID_OSCILLATOR,
 	GET_TO_OSCILLATOR,
 	ID_EYEBALL_90,
-	RETURN_FAIL,
+	RET_FAIL,
 	65535,
 };
 
diff --git a/sky/compacts/91comp.h b/sky/compacts/91comp.h
index 9ac5159519..c1f840c56a 100644
--- a/sky/compacts/91comp.h
+++ b/sky/compacts/91comp.h
@@ -474,7 +474,7 @@ uint16 chip_list_sc91[] = {
 
 uint16 sc91_floor_table[] = {
 	ID_SC91_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_DOOR_L91,
 	GET_TO_DOOR_L91,
 	ID_DOOR_R91,
diff --git a/sky/compacts/92comp.h b/sky/compacts/92comp.h
index 156fe6e769..52c015377d 100644
--- a/sky/compacts/92comp.h
+++ b/sky/compacts/92comp.h
@@ -99,7 +99,7 @@ uint16 slab8_table[] = {
 	ID_SLAB7,
 	GET_TO_SLAB,
 	ID_SLAB8,
-	RETURN_OK,
+	RET_OK,
 	65535,
 };
 
@@ -142,7 +142,7 @@ uint16 slab3_table[] = {
 	ID_SLAB2,
 	GET_TO_SLAB,
 	ID_SLAB3,
-	RETURN_OK,
+	RET_OK,
 	ID_SLAB6,
 	GET_TO_SLAB,
 	65535,
@@ -156,7 +156,7 @@ uint16 slab2_table[] = {
 	ID_SLAB1,
 	GET_TO_SLAB,
 	ID_SLAB2,
-	RETURN_OK,
+	RET_OK,
 	ID_SLAB3,
 	GET_TO_SLAB,
 	ID_SLAB5,
@@ -172,7 +172,7 @@ uint16 slab4_table[] = {
 	ID_SLAB1,
 	GET_TO_SLAB,
 	ID_SLAB4,
-	RETURN_OK,
+	RET_OK,
 	ID_SLAB5,
 	GET_TO_SLAB,
 	ID_SLAB7,
@@ -369,7 +369,7 @@ uint16 slab6_table[] = {
 	ID_SLAB5,
 	GET_TO_SLAB,
 	ID_SLAB6,
-	RETURN_OK,
+	RET_OK,
 	ID_SLAB9,
 	GET_TO_SLAB,
 	65535,
@@ -507,7 +507,7 @@ uint16 slab7_table[] = {
 	ID_SLAB4,
 	GET_TO_SLAB,
 	ID_SLAB7,
-	RETURN_OK,
+	RET_OK,
 	ID_SLAB8,
 	GET_TO_SLAB,
 	65535,
@@ -715,7 +715,7 @@ uint16 slab9_table[] = {
 	ID_SLAB6,
 	GET_TO_SLAB,
 	ID_SLAB9,
-	RETURN_OK,
+	RET_OK,
 	ID_DOOR_R92,
 	GET_TO_DOOR_R92,
 	65535,
@@ -727,7 +727,7 @@ uint16 slab1_table[] = {
 	ID_RED_CIRCLE,
 	GET_TO_CIRCLE,
 	ID_SLAB1,
-	RETURN_OK,
+	RET_OK,
 	ID_SLAB2,
 	GET_TO_SLAB,
 	ID_SLAB4,
@@ -1419,7 +1419,7 @@ uint16 slab5_table[] = {
 	ID_SLAB4,
 	GET_TO_SLAB,
 	ID_SLAB5,
-	RETURN_OK,
+	RET_OK,
 	ID_SLAB6,
 	GET_TO_SLAB,
 	ID_SLAB8,
diff --git a/sky/compacts/93comp.h b/sky/compacts/93comp.h
index b33075480f..4459aa7d60 100644
--- a/sky/compacts/93comp.h
+++ b/sky/compacts/93comp.h
@@ -121,7 +121,7 @@ Compact adjust_book = {
 
 uint16 sc93_floor_table[] = {
 	ID_SC93_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_DOOR_L93,
 	GET_TO_DOOR_L93,
 	ID_PERSONA,
diff --git a/sky/compacts/94comp.h b/sky/compacts/94comp.h
index 6549b3a889..cba07bcd28 100644
--- a/sky/compacts/94comp.h
+++ b/sky/compacts/94comp.h
@@ -135,7 +135,7 @@ uint16 holo1_a_anim[] = {
 
 uint16 sc94_floor_table[] = {
 	ID_SC94_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_DOOR_L94,
 	GET_TO_DOOR_L94,
 	ID_DOOR_R94,
diff --git a/sky/compacts/95comp.h b/sky/compacts/95comp.h
index cd60685bed..95c8f803c7 100644
--- a/sky/compacts/95comp.h
+++ b/sky/compacts/95comp.h
@@ -115,7 +115,7 @@ uint16 weight_anim[] = {
 
 uint16 sc95_floor_table[] = {
 	ID_SC95_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_DOOR_L95,
 	GET_TO_DOOR_L95,
 	ID_DOOR_R95,
diff --git a/sky/compacts/96comp.h b/sky/compacts/96comp.h
index ee42bbbb1a..9993e938aa 100644
--- a/sky/compacts/96comp.h
+++ b/sky/compacts/96comp.h
@@ -112,7 +112,7 @@ uint16 door_l96f_anim[] = {
 
 uint16 sc96_floor_table[] = {
 	ID_SC96_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_DOOR_L96,
 	GET_TO_DOOR_L96,
 	ID_CRYSTAL,
diff --git a/sky/compacts/9compact.h b/sky/compacts/9compact.h
index f9e076d256..e974a1666f 100644
--- a/sky/compacts/9compact.h
+++ b/sky/compacts/9compact.h
@@ -29,7 +29,7 @@ namespace SkyCompact {
 
 uint16 s9_floor_table[] = {
 	ID_S9_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	ID_JOEY_PARK,
 	GET_TO_JP2,
 	42,
diff --git a/sky/compacts/z_compac.h b/sky/compacts/z_compac.h
index 61cb5e60af..4740e7a415 100644
--- a/sky/compacts/z_compac.h
+++ b/sky/compacts/z_compac.h
@@ -85,7 +85,7 @@ uint16 high_floor_table[] = {
 	90,
 	GET_TO_FEXIT,
 	17,
-	RETURN_OK,
+	RET_OK,
 	ID_NOTICE,
 	GET_TO_NOTICE,
 	0,
@@ -134,9 +134,9 @@ uint16 ljoey_r_to_d[] = {
 
 uint16 s2_talk_table[] = {
 	21,
-	RETURN_OK,
+	RET_OK,
 	22,
-	RETURN_OK,
+	RET_OK,
 	116,
 	GET_TO_EL2,
 	ID_R_EXIT_S2,
@@ -566,9 +566,9 @@ uint16 talk_table[] = {
 	69,
 	STAIRS_FROM_LOW,
 	44,
-	RETURN_OK,
+	RET_OK,
 	45,
-	RETURN_OK,
+	RET_OK,
 	105,
 	GET_TO_SMALL_DOOR,
 	111,
@@ -592,7 +592,7 @@ uint16 low_floor_table[] = {
 	17,
 	STAIRS_FROM_LOW,
 	ID_LOW_FLOOR,
-	RETURN_OK,
+	RET_OK,
 	44,
 	GET_TO_TALK1,
 	45,
@@ -1382,7 +1382,7 @@ uint16 wjoey_st_down[] = {
 
 uint16 r2_floor_table[] = {
 	115,
-	RETURN_OK,
+	RET_OK,
 	ID_L_EXIT_S2,
 	GET_TO_EL2,
 	ID_R_EXIT_S2,
@@ -1578,7 +1578,7 @@ uint16 stair_table[] = {
 	45,
 	GET_TO_TALK2,
 	69,
-	RETURN_OK,
+	RET_OK,
 	105,
 	GET_TO_SMALL_DOOR,
 	111,
@@ -1705,7 +1705,7 @@ uint16 upstair_table[] = {
 	17,
 	STD_ADJOIN_FLOOR,
 	70,
-	RETURN_OK,
+	RET_OK,
 	85,
 	GET_TO_BAR,
 	90,
@@ -1781,7 +1781,7 @@ uint16 bar_table[] = {
 	90,
 	GET_TO_FEXIT,
 	85,
-	RETURN_OK,
+	RET_OK,
 	ID_NOTICE,
 	GET_TO_NOTICE,
 };
@@ -1960,7 +1960,7 @@ uint16 sml_door_table[] = {
 	17,
 	STAIRS_FROM_LOW,
 	105,
-	RETURN_OK,
+	RET_OK,
 	111,
 	GET_TO_ER0,
 	69,
@@ -2601,7 +2601,7 @@ uint16 bfoster_down[] = {
 
 uint16 ledge_table[] = {
 	95,
-	RETURN_OK,
+	RET_OK,
 	97,
 	GET_TO_R1_DOOR,
 	ID_NOTICE2,
diff --git a/sky/skydefs.h b/sky/skydefs.h
index 573828986b..3c4af5454d 100644
--- a/sky/skydefs.h
+++ b/sky/skydefs.h
@@ -221,8 +221,8 @@
 #define STD_MEGA_STOP	(0x0000+0x19)
 #define STD_PLAYER_STOP	(0x0000+0x1a)
 #define STD_MINI_BUMP	(0x0000+0x1b)
-#define RETURN_OK	(0x0000+0x1c)
-#define RETURN_FAIL	(0x0000+0x1d)
+#define RET_OK	(0x0000+0x1c)
+#define RET_FAIL	(0x0000+0x1d)
 #define STD_ADJOIN_FLOOR	(0x0000+0x1e)
 #define FLOOR_ACTION	(0x0000+0x1f)
 #define ANIMATE_LOGIC	(0x0000+0x20)