diff --git a/.gitmodules b/.gitmodules
index 10cb8021..6c69fe14 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "third_party/elfio"]
 	path = third_party/elfio
 	url = https://github.com/serge1/ELFIO
-[submodule "third_party/dynarmic"]
-	path = third_party/dynarmic
-	url = https://github.com/merryhime/dynarmic
 [submodule "third_party/SDL2"]
 	path = third_party/SDL2
 	url = https://github.com/libsdl-org/SDL
@@ -61,3 +58,6 @@
 [submodule "third_party/boost"]
 	path = third_party/boost
 	url = https://github.com/Panda3DS-emu/ext-boost
+[submodule "third_party/dynarmic"]
+	path = third_party/dynarmic
+	url = https://github.com/Panda3DS-emu/dynarmic
diff --git a/include/PICA/dynapica/shader_rec_emitter_arm64.hpp b/include/PICA/dynapica/shader_rec_emitter_arm64.hpp
index bb716d91..7a4a6350 100644
--- a/include/PICA/dynapica/shader_rec_emitter_arm64.hpp
+++ b/include/PICA/dynapica/shader_rec_emitter_arm64.hpp
@@ -42,6 +42,12 @@ class ShaderEmitter : private oaknut::CodeBlock, public oaknut::CodeGenerator {
 	oaknut::Label emitLog2Func();
 	oaknut::Label emitExp2Func();
 
+	template <typename T>
+	T getLabelPointer(const oaknut::Label& label) {
+		auto pointer = reinterpret_cast<u8*>(oaknut::CodeBlock::ptr()) + label.offset();
+		return reinterpret_cast<T>(pointer);
+	}
+
 	// Compile all instructions from [current recompiler PC, end)
 	void compileUntil(const PICAShader& shaderUnit, u32 endPC);
 	// Compile instruction "instr"
@@ -118,13 +124,11 @@ class ShaderEmitter : private oaknut::CodeBlock, public oaknut::CodeGenerator {
 
 	// PC must be a valid entrypoint here. It doesn't have that much overhead in this case, so we use std::array<>::at() to assert it does
 	InstructionCallback getInstructionCallback(u32 pc) {
-		// Cast away the constness because casting to a function pointer is hard otherwise. Legal as long as we don't write to *ptr
-		uint8_t* ptr = instructionLabels.at(pc).ptr<u8*>();
-		return reinterpret_cast<InstructionCallback>(ptr);
+		return getLabelPointer<InstructionCallback>(instructionLabels.at(pc));
 	}
 
 	PrologueCallback getPrologueCallback() { return prologueCb; }
 	void compile(const PICAShader& shaderUnit);
 };
 
-#endif  // arm64 recompiler check
\ No newline at end of file
+#endif  // arm64 recompiler check
diff --git a/src/core/PICA/dynapica/shader_rec_emitter_arm64.cpp b/src/core/PICA/dynapica/shader_rec_emitter_arm64.cpp
index e2ff59f5..6a3fbfee 100644
--- a/src/core/PICA/dynapica/shader_rec_emitter_arm64.cpp
+++ b/src/core/PICA/dynapica/shader_rec_emitter_arm64.cpp
@@ -39,7 +39,7 @@ void ShaderEmitter::compile(const PICAShader& shaderUnit) {
 	align(16);
 
 	l(prologueLabel);
-	prologueCb = prologueLabel.ptr<PrologueCallback>();
+	prologueCb = getLabelPointer<PrologueCallback>(prologueLabel);
 
 	// Set state pointer to the proper pointer
 	// state pointer is volatile, no need to preserve it
@@ -407,8 +407,9 @@ void ShaderEmitter::storeRegister(QReg source, const PICAShader& shader, u32 des
 	if (writeMask == 0xf) {  // No lanes are masked, just use STR
 		STR(source, statePointer, offset);
 	} else {
-		LDR(scratch1, statePointer, offset);                    // Load current value
-		LDR(scratch2, blendMasks.ptr<u8*>() + writeMask * 16);  // Load write mask for blending
+		u8* blendMaskPointer = getLabelPointer<u8*>(blendMasks);
+		LDR(scratch1, statePointer, offset);               // Load current value
+		LDR(scratch2, blendMaskPointer + writeMask * 16);  // Load write mask for blending
 
 		BSL(scratch2.B16(), source.B16(), scratch1.B16());  // Scratch2 = (Source & mask) | (original & ~mask)
 		STR(scratch2, statePointer, offset);                // Write it back
diff --git a/third_party/dynarmic b/third_party/dynarmic
index 96e17946..a41c3802 160000
--- a/third_party/dynarmic
+++ b/third_party/dynarmic
@@ -1 +1 @@
-Subproject commit 96e179465884be74987d5847d6741cdabdfe1b48
+Subproject commit a41c380246d3d9f9874f0f792d234dc0cc17c180
diff --git a/third_party/oaknut b/third_party/oaknut
index 1d51f551..94c726ce 160000
--- a/third_party/oaknut
+++ b/third_party/oaknut
@@ -1 +1 @@
-Subproject commit 1d51f551294897ab4c8001c5259c8c5dee7e2a85
+Subproject commit 94c726ce0338b054eb8cb5ea91de8fe6c19f4392