diff --git a/src/ReDIVA/data_initialize.cpp b/src/ReDIVA/data_initialize.cpp
index 52e07a08..f4371fa2 100644
--- a/src/ReDIVA/data_initialize.cpp
+++ b/src/ReDIVA/data_initialize.cpp
@@ -19,6 +19,16 @@
 
 extern uint32_t dbg_set_id;
 
+extern uint32_t aet_gam_loadsc_set_id;
+extern uint32_t spr_gam_loadsc_set_id;
+
+extern uint32_t aet_cmn_all_set_id;
+extern uint32_t spr_cmn_all_set_id;
+
+extern uint32_t spr_fnt_24_set_id;
+extern uint32_t spr_fnt_bold24_set_id;
+extern uint32_t spr_fnt_cmn_set_id;
+
 TaskDataInit task_data_init;
 
 TaskDataInit::TaskDataInit() : state(), field_6C() {
@@ -45,16 +55,16 @@ bool TaskDataInit::ctrl() {
     case 0: {
         // Fucks up scaling
         //sprite_manager_reset_res_data();
-        sprite_manager_read_file(4, "", aft_data, aft_spr_db);
-        sprite_manager_read_file(472, "", aft_data, aft_spr_db);
-        sprite_manager_read_file(43, "", aft_data, aft_spr_db);
+        sprite_manager_read_file(spr_fnt_24_set_id, "", aft_data, aft_spr_db);
+        sprite_manager_read_file(spr_fnt_bold24_set_id, "", aft_data, aft_spr_db);
+        sprite_manager_read_file(spr_fnt_cmn_set_id, "", aft_data, aft_spr_db);
         fontmap_data_read_file();
         state = 1;
     } break;
     case 1:
-        if (!sprite_manager_load_file(4, aft_spr_db)
-            && !sprite_manager_load_file(472, aft_spr_db)
-            && !sprite_manager_load_file(43, aft_spr_db)
+        if (!sprite_manager_load_file(spr_fnt_24_set_id, aft_spr_db)
+            && !sprite_manager_load_file(spr_fnt_bold24_set_id, aft_spr_db)
+            && !sprite_manager_load_file(spr_fnt_cmn_set_id, aft_spr_db)
             && !fontmap_data_load_file())
             state = field_6C ? 2 : 4;
         break;
@@ -67,17 +77,17 @@ bool TaskDataInit::ctrl() {
             state = 4;
         break;
     case 4: {
-        sprite_manager_read_file(32, "", aft_data, aft_spr_db);
-        aet_manager_read_file(26, "", aft_data, aft_aet_db);
-        sprite_manager_read_file(34, "", aft_data, aft_spr_db);
-        aet_manager_read_file(35, "", aft_data, aft_aet_db);
+        sprite_manager_read_file(spr_gam_loadsc_set_id, "", aft_data, aft_spr_db);
+        aet_manager_read_file(aet_gam_loadsc_set_id, "", aft_data, aft_aet_db);
+        sprite_manager_read_file(spr_cmn_all_set_id, "", aft_data, aft_spr_db);
+        aet_manager_read_file(aet_cmn_all_set_id, "", aft_data, aft_aet_db);
         state = 5;
     } break;
     case 5:
-        if (sprite_manager_load_file(32, aft_spr_db)
-            || aet_manager_load_file(26, aft_aet_db)
-            || sprite_manager_load_file(34, aft_spr_db)
-            || aet_manager_load_file(35, aft_aet_db))
+        if (sprite_manager_load_file(spr_gam_loadsc_set_id, aft_spr_db)
+            || aet_manager_load_file(aet_gam_loadsc_set_id, aft_aet_db)
+            || sprite_manager_load_file(spr_cmn_all_set_id, aft_spr_db)
+            || aet_manager_load_file(aet_cmn_all_set_id, aft_aet_db))
             break;
 
         state = 6;
diff --git a/src/ReDIVA/pv_game/pv_game_play_data.cpp b/src/ReDIVA/pv_game/pv_game_play_data.cpp
index d94cee56..252349cd 100644
--- a/src/ReDIVA/pv_game/pv_game_play_data.cpp
+++ b/src/ReDIVA/pv_game/pv_game_play_data.cpp
@@ -386,6 +386,9 @@ const char* spr_white_fade[] = {
     "white_fade",
 };
 
+extern uint32_t aet_gam_cmn_set_id;
+extern uint32_t spr_gam_cmn_set_id;
+
 static void sub_14013AAE0(float_t pos_x, float_t pos_y, spr::SprPrio prio,
     const char* str, bool h_center, color4u8 color, rectangle* clip_rect = 0);
 
@@ -1582,8 +1585,8 @@ void pv_game_play_data::read_auth_2d_data() {
     aet_database* aft_aet_db = &aft_data->data_ft.aet_db;
     sprite_database* aft_spr_db = &aft_data->data_ft.spr_db;
 
-    sprite_manager_read_file(9, "", aft_data, aft_spr_db);
-    aet_manager_read_file(3, "", aft_data, aft_aet_db);
+    sprite_manager_read_file(spr_gam_cmn_set_id, "", aft_data, aft_spr_db);
+    aet_manager_read_file(aet_gam_cmn_set_id, "", aft_data, aft_aet_db);
 
     if (pv_set) {
         std::string mdata_dir;
@@ -1957,8 +1960,8 @@ void pv_game_play_data::unload_auth_2d() {
             aet_manager_unload_set(pv_aet_set_id, aft_aet_db);
     }
 
-    sprite_manager_unload_set(9, aft_spr_db);
-    aet_manager_unload_set(3, aft_aet_db);
+    sprite_manager_unload_set(spr_gam_cmn_set_id, aft_spr_db);
+    aet_manager_unload_set(aet_gam_cmn_set_id, aft_aet_db);
 
     //game_skin_get()->unload_skin();
 }
diff --git a/src/ReDIVA/render.cpp b/src/ReDIVA/render.cpp
index 96793eb8..2b830774 100644
--- a/src/ReDIVA/render.cpp
+++ b/src/ReDIVA/render.cpp
@@ -178,8 +178,21 @@ static const int32_t fast_loader_speed = 60;
 bool light_chara_ambient;
 vec4 npr_cloth_spec_color = 1.0f;
 
-uint32_t cmn_set_id;
-uint32_t dbg_set_id;
+uint32_t cmn_set_id;            // 2
+uint32_t dbg_set_id;            // 2
+
+uint32_t aet_gam_loadsc_set_id; // 26
+uint32_t spr_gam_loadsc_set_id; // 32
+
+uint32_t aet_cmn_all_set_id;    // 35
+uint32_t spr_cmn_all_set_id;    // 34
+
+uint32_t aet_gam_cmn_set_id;    // 3
+uint32_t spr_gam_cmn_set_id;    // 9
+
+uint32_t spr_fnt_24_set_id;     // 4
+uint32_t spr_fnt_bold24_set_id; // 472
+uint32_t spr_fnt_cmn_set_id;    // 43
 
 static bool render_init(render_init_struct* ris);
 static void render_main_loop(render_context* rctx);
@@ -937,6 +950,19 @@ static render_context* render_context_load() {
     cmn_set_id = aft_mot_db->get_motion_set_id("CMN");
     dbg_set_id = aft_obj_db->get_object_set_id("DBG");
 
+    aet_gam_loadsc_set_id = aft_aet_db->get_aet_set_id_by_name("AET_GAM_LOADSC");
+    spr_gam_loadsc_set_id = aft_spr_db->get_spr_set_id_by_name("SPR_GAM_LOADSC");
+
+    aet_cmn_all_set_id = aft_aet_db->get_aet_set_id_by_name("AET_CMN_ALL");
+    spr_cmn_all_set_id = aft_spr_db->get_spr_set_id_by_name("SPR_CMN_ALL");
+
+    aet_gam_cmn_set_id = aft_aet_db->get_aet_set_id_by_name("AET_GAM_CMN");
+    spr_gam_cmn_set_id = aft_spr_db->get_spr_set_id_by_name("SPR_GAM_CMN");
+
+    spr_fnt_24_set_id = aft_spr_db->get_spr_set_id_by_name("SPR_FNT_24");
+    spr_fnt_bold24_set_id = aft_spr_db->get_spr_set_id_by_name("SPR_FNT_BOLD24");
+    spr_fnt_cmn_set_id = aft_spr_db->get_spr_set_id_by_name("SPR_FNT_CMN");
+
     hand_item_handler_data_init();
     module_table_handler_data_init();
     module_data_handler_data_init();
@@ -1228,13 +1254,13 @@ static void render_context_dispose(render_context* rctx) {
     sprite_database* aft_spr_db = &aft_data->data_ft.spr_db;
 
     object_storage_unload_set(dbg_set_id);
-    aet_manager_unload_set(26, aft_aet_db);
-    sprite_manager_unload_set(32, aft_spr_db);
-    aet_manager_unload_set(35, aft_aet_db);
-    sprite_manager_unload_set(34, aft_spr_db);
-    sprite_manager_unload_set(4, aft_spr_db);
-    sprite_manager_unload_set(472, aft_spr_db);
-    sprite_manager_unload_set(43, aft_spr_db);
+    aet_manager_unload_set(aet_gam_loadsc_set_id, aft_aet_db);
+    sprite_manager_unload_set(spr_gam_loadsc_set_id, aft_spr_db);
+    aet_manager_unload_set(aet_cmn_all_set_id, aft_aet_db);
+    sprite_manager_unload_set(spr_cmn_all_set_id, aft_spr_db);
+    sprite_manager_unload_set(spr_fnt_24_set_id, aft_spr_db);
+    sprite_manager_unload_set(spr_fnt_bold24_set_id, aft_spr_db);
+    sprite_manager_unload_set(spr_fnt_cmn_set_id, aft_spr_db);
 
     sprite_manager_remove_spr_sets(aft_spr_db);
     aet_manager_remove_aet_sets(aft_aet_db);