diff --git a/CMakeLists.txt b/CMakeLists.txt
index 435325884e..fccdd91d99 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,8 +57,8 @@ file(GLOB_RECURSE ORCT2_SOURCES "src/*.c" "src/*.cpp" "lib/argparse/*.c" "lib/cu
 
 if (UNIX)
 	# force 32bit build for now and set necessary flags to compile code as is
-	set(CMAKE_C_FLAGS "-m32 -masm=intel -fvar-tracking-assignments -std=gnu99")
-	set(CMAKE_CXX_FLAGS "-m32 -std=gnu++11 -fvar-tracking-assignments -masm=intel")
+	set(CMAKE_C_FLAGS "-m32 -fvar-tracking-assignments -std=gnu99")
+	set(CMAKE_CXX_FLAGS "-m32 -std=gnu++11 -fvar-tracking-assignments")
 	set(CMAKE_SHARED_LINKER_FLAGS "-m32 -Wl,-melf_i386")
 	set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS})
 endif (UNIX)
diff --git a/src/addresses.h b/src/addresses.h
index 19eeb5c03c..1b69c339d4 100644
--- a/src/addresses.h
+++ b/src/addresses.h
@@ -698,23 +698,23 @@ static int RCT2_CALLPROC_X(int address, int _eax, int _ebx, int _ecx, int _edx,
 	#else
 	__asm__ ( "\
 		\n\
-		push ebx \n\
-		push ebp \n\
+		push %%ebx \n\
+		push %%ebp \n\
 		push %[address] 	\n\
-		mov eax, %[_eax] 	\n\
-		mov ebx, %[_ebx] 	\n\
-		mov ecx, %[_ecx] 	\n\
-		mov edx, %[_edx] 	\n\
-		mov esi, %[_esi] 	\n\
-		mov edi, %[_edi] 	\n\
-		mov ebp, %[_ebp] 	\n\
-		call [esp] 	\n\
+		mov %[_eax], %%eax 	\n\
+		mov %[_ebx], %%ebx 	\n\
+		mov %[_ecx], %%ecx 	\n\
+		mov %[_edx], %%edx 	\n\
+		mov %[_esi], %%esi 	\n\
+		mov %[_edi], %%edi 	\n\
+		mov %[_ebp], %%ebp 	\n\
+		call *(%%esp) 	\n\
 		lahf \n\
-		add esp, 4 	\n\
-		pop ebp \n\
-		pop ebx \n\
+		add $4, %%esp 	\n\
+		pop %%ebp \n\
+		pop %%ebx \n\
 		/* Load result with flags */ \n\
-		mov %[result], eax \n\
+		mov %%eax, %[result] \n\
 		" : [address] "+m" (address), [_eax] "+m" (_eax), [_ebx] "+m" (_ebx), [_ecx] "+m" (_ecx), [_edx] "+m" (_edx), [_esi] "+m" (_esi), [_edi] "+m" (_edi), [_ebp] "+m" (_ebp), [result] "+m" (result)
 		:
 		: "eax","ecx","edx","esi","edi"
@@ -817,70 +817,70 @@ static int RCT2_CALLFUNC_X(int address, int *_eax, int *_ebx, int *_ecx, int *_e
 	__asm__ ( "\
 		\n\
 		/* Store C's base pointer*/     \n\
-		push ebp        \n\
-		push ebx        \n\
+		push %%ebp        \n\
+		push %%ebx        \n\
 		\n\
 		/* Store %[address] to call*/   \n\
 		push %[address]         \n\
 		\n\
 		/* Set all registers to the input values*/      \n\
-		mov eax, [%[_eax]]      \n\
-		mov eax, [eax]  \n\
-		mov ebx, [%[_ebx]]      \n\
-		mov ebx, [ebx]  \n\
-		mov ecx, [%[_ecx]]      \n\
-		mov ecx, [ecx]  \n\
-		mov edx, [%[_edx]]      \n\
-		mov edx, [edx]  \n\
-		mov esi, [%[_esi]]      \n\
-		mov esi, [esi]  \n\
-		mov edi, [%[_edi]]      \n\
-		mov edi, [edi]  \n\
-		mov ebp, [%[_ebp]]      \n\
-		mov ebp, [ebp]  \n\
+		mov %[_eax], %%eax      \n\
+		mov (%%eax), %%eax  \n\
+		mov %[_ebx], %%ebx      \n\
+		mov (%%ebx), %%ebx  \n\
+		mov %[_ecx], %%ecx      \n\
+		mov (%%ecx), %%ecx  \n\
+		mov %[_edx], %%edx      \n\
+		mov (%%edx), %%edx  \n\
+		mov %[_esi], %%esi      \n\
+		mov (%%esi), %%esi  \n\
+		mov %[_edi], %%edi      \n\
+		mov (%%edi), %%edi  \n\
+		mov %[_ebp], %%ebp      \n\
+		mov (%%ebp), %%ebp  \n\
 		\n\
 		/* Call function*/      \n\
-		call [esp]      \n\
+		call *(%%esp)      \n\
 		\n\
 		/* Store output eax */ \n\
-		push eax \n\
-		push ebp \n\
-		push ebx \n\
-		mov ebp, [esp + 20] \n\
-		mov ebx, [esp + 16] \n\
+		push %%eax \n\
+		push %%ebp \n\
+		push %%ebx \n\
+		mov 20(%%esp), %%ebp \n\
+		mov 16(%%esp), %%ebx \n\
 		/* Get resulting ecx, edx, esi, edi registers*/       \n\
-		mov eax, [%[_edi]]      \n\
-		mov [eax], edi  \n\
-		mov eax, [%[_esi]]      \n\
-		mov [eax], esi  \n\
-		mov eax, [%[_edx]]      \n\
-		mov [eax], edx  \n\
-		mov eax, [%[_ecx]]      \n\
-		mov [eax], ecx  \n\
+		mov %[_edi], %%eax      \n\
+		mov %%edi, (%%eax)  \n\
+		mov %[_esi], %%eax      \n\
+		mov %%esi, (%%eax)  \n\
+		mov %[_edx], %%eax      \n\
+		mov %%edx, (%%eax)  \n\
+		mov %[_ecx], %%eax      \n\
+		mov %%ecx, (%%eax)  \n\
 		/* Pop ebx reg into ecx*/ \n\
-		pop ecx		\n\
-		mov eax, [%[_ebx]] \n\
-		mov [eax], ecx \n\
+		pop %%ecx		\n\
+		mov %[_ebx], %%eax \n\
+		mov %%ecx, (%%eax) \n\
 		\n\
 		/* Pop ebp reg into ecx */\n\
-		pop ecx \n\
-		mov eax, [%[_ebp]] \n\
-		mov [eax], ecx \n\
+		pop %%ecx \n\
+		mov %[_ebp], %%eax \n\
+		mov %%ecx, (%%eax) \n\
 		\n\
-		pop eax \n\
+		pop %%eax \n\
 		/* Get resulting eax register*/ \n\
-		mov ecx, [%[_eax]] \n\
-		mov [ecx], eax \n\
+		mov %[_eax], %%ecx \n\
+		mov %%eax, (%%ecx) \n\
 		\n\
 		/* Save flags as return in eax*/  \n\
 		lahf \n\
 		/* Pop address*/ \n\
-		pop ebp \n\
+		pop %%ebp \n\
 		\n\
-		pop ebx \n\
-		pop ebp \n\
+		pop %%ebx \n\
+		pop %%ebp \n\
 		/* Load result with flags */ \n\
-		mov %[result], eax \n\
+		mov %%eax, %[result] \n\
 		" : [address] "+m" (address), [_eax] "+m" (_eax), [_ebx] "+m" (_ebx), [_ecx] "+m" (_ecx), [_edx] "+m" (_edx), [_esi] "+m" (_esi), [_edi] "+m" (_edi), [_ebp] "+m" (_ebp), [result] "+m" (result)
 
 		:
diff --git a/src/rct2.c b/src/rct2.c
index 154b1aab9c..560db3ab9a 100644
--- a/src/rct2.c
+++ b/src/rct2.c
@@ -228,8 +228,8 @@ void rct2_update()
 	#else
 	__asm__ ( "\
 	\n\
-		mov eax, 0x009DE564 	\n\
-		mov [eax], esp 	\n\
+		movl $0x009DE564, %%eax 	\n\
+		movl %%esp, (%%eax) 	\n\
 	 " : : : "eax" );
 	#endif