diff --git a/gz.c b/gz.c
index c2d044d2..f9a0ea94 100644
--- a/gz.c
+++ b/gz.c
@@ -317,9 +317,10 @@ ENTRY void _start(void *text_ptr)
       stored_rot[tp_slot] = z64_link_rot;
     }
     if (input_ptr->pad & BUTTON_D_RIGHT) {
-      (*(z64_xyz_t*)0x801DAA38) = stored_pos[tp_slot]; /* secondary position */
       z64_link_pos = stored_pos[tp_slot];
+      (*(z64_xyz_t*)0x801DAA38) = stored_pos[tp_slot]; /* actor position */
       z64_link_rot = stored_rot[tp_slot];
+      (*(uint16_t*)0x801DB25E) = stored_rot[tp_slot].y; /* locked rotation */
       /* (*(uint8_t*)0x801DAADE) = 0xFF; prevents collision with actors */
     }
   }
diff --git a/gz.cbp b/gz.cbp
index e8692d67..997d3338 100644
--- a/gz.cbp
+++ b/gz.cbp
@@ -55,7 +55,7 @@
 		</Unit>
 		<Unit filename="console.h" />
 		<Unit filename="gz.c">
-			<Option compilerVar="CPP" />
+			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="gz.h" />
 		<Unit filename="menu.c">