diff --git a/src/DivaGL/hook.cpp b/src/DivaGL/hook.cpp
index 73d4717..275c1d0 100644
--- a/src/DivaGL/hook.cpp
+++ b/src/DivaGL/hook.cpp
@@ -47,11 +47,12 @@ HOOK(int32_t, FASTCALL, data_init, 0x0000000140192FF0) {
     auth_3d_patch();
     camera_patch();
     mdl::disp_manager_patch();
+    effect_patch();
     render_manager_patch();
     rob_patch();
     sprite_patch();
     stage_patch();
-    effect_patch();
+    texture_patch();
     Glitter::Patch();
 
     rctx = new render_context;
diff --git a/src/DivaGL/texture.cpp b/src/DivaGL/texture.cpp
index f83520a..418eca5 100644
--- a/src/DivaGL/texture.cpp
+++ b/src/DivaGL/texture.cpp
@@ -284,30 +284,23 @@ void texture_params_restore(texture_param* tex_0_param,
         gl_state_active_bind_texture_2d(i, 0);
 }
 
-bool texture_txp_set_load(txp_set* t, texture*** texs, uint32_t* ids) {
-    if (!t || !texs || !ids)
-        return false;
-
-    size_t count = t->textures.size();
-    *texs = force_malloc<texture*>(count + 1);
-    texture** tex = *texs;
-    for (size_t i = 0; i < count; i++)
-        tex[i] = texture_txp_load(&t->textures[i], texture_id(0, ids[i]));
-    tex[count] = 0;
-    return true;
+HOOK(texture*, FASTCALL, texture_load_tex_cube_map, 0x000000014069B860,
+    texture_id id, GLenum internal_format, int32_t width, int32_t height,
+    int32_t max_mipmap_level, void** data_ptr) {
+    return texture_load_tex(id, GL_TEXTURE_CUBE_MAP, internal_format,
+        width, height, max_mipmap_level, data_ptr, false);
 }
 
-bool texture_txp_set_load(txp_set* t, texture*** texs, texture_id* ids) {
-    if (!t || !texs || !ids)
-        return false;
+HOOK(texture*, FASTCALL, texture_load_tex_2d, 0x000000014069B8E0, 
+    texture_id id, GLenum internal_format, int32_t width, int32_t height,
+    int32_t max_mipmap_level, void** data_ptr, bool use_high_anisotropy) {
+    return texture_load_tex(id, GL_TEXTURE_2D, internal_format,
+        width, height, max_mipmap_level, data_ptr, use_high_anisotropy);
+}
 
-    size_t count = t->textures.size();
-    *texs = force_malloc<texture*>(count + 1);
-    texture** tex = *texs;
-    for (size_t i = 0; i < count; i++)
-        tex[i] = texture_txp_load(&t->textures[i], ids[i]);
-    tex[count] = 0;
-    return true;
+void texture_patch() {
+    INSTALL_HOOK(texture_load_tex_cube_map);
+    INSTALL_HOOK(texture_load_tex_2d);
 }
 
 inline static void texture_bind(GLenum target, GLuint texture) {
diff --git a/src/DivaGL/texture.hpp b/src/DivaGL/texture.hpp
index f3c0394..eec372a 100644
--- a/src/DivaGL/texture.hpp
+++ b/src/DivaGL/texture.hpp
@@ -98,3 +98,5 @@ extern void texture_params_get(GLuint tex_0 = 0, texture_param* tex_0_param = 0,
     GLuint tex_1 = 0, texture_param* tex_1_param = 0, GLuint tex_2 = 0, texture_param* tex_2_param = 0);
 extern void texture_params_restore(texture_param* tex_0_param = 0,
     texture_param* tex_1_param = 0, texture_param* tex_2_param = 0);
+
+extern void texture_patch();