diff --git a/th01/hiscore/regist.cpp b/th01/hiscore/regist.cpp
index 3d69b375..9f579b7a 100644
--- a/th01/hiscore/regist.cpp
+++ b/th01/hiscore/regist.cpp
@@ -433,13 +433,13 @@ int regist_on_shot(
 	return 0;
 }
 
-#pragma option -b
 enum regist_input_ret_t {
 	RI_REGULAR = 0,
 	RI_ENTER = 1,
-	RI_NONE = 2
+	RI_NONE = 2,
+
+	_regist_input_ret_t_FORCE_INT16 = 0x7FFF
 };
-#pragma option -b.
 
 regist_input_ret_t regist_on_input(
 	screen_x_t &left, screen_y_t &top,
diff --git a/th01/main/player/orb.hpp b/th01/main/player/orb.hpp
index f8816f97..37d239b6 100644
--- a/th01/main/player/orb.hpp
+++ b/th01/main/player/orb.hpp
@@ -17,13 +17,14 @@ extern bool16 orb_in_portal;
 
 /// Physics
 /// -------
-#pragma option -b
 enum orb_velocity_x_t {
 	OVX_0 = 0,
 	OVX_4_LEFT = 1,
 	OVX_4_RIGHT = 2,
 	OVX_8_LEFT = 3,
 	OVX_8_RIGHT = 4,
+
+	_orb_velocity_x_t_FORCE_INT16 = 0x7FFF
 };
 
 enum orb_force_t {
@@ -31,8 +32,9 @@ enum orb_force_t {
 	OF_BOUNCE_FROM_TOP = 1,
 	OF_SHOT = 2,
 	OF_IMMEDIATE = 3, // new force passed directly in [immediate]
+
+	_orb_force_t_FORCE_INT16 = 0x7FFF
 };
-#pragma option -b.
 
 // Initial value of the current force acting on the orb
 extern double orb_force;