fix regressions

Author: TakaRikka

configure.py

@@ -525,8 +525,8 @@ def RevolutionLib(lib_name: str, objects: List[Object], extra_cflags=[]) -> Dict
 
 # Helper function for REL script objects
 def Rel(lib_name: str, objects: List[Object], isInDol=False) -> Dict[str, Any]:
-    if (config.version == "ShieldD" or config.version == "Shield") and isInDol:
-        # For Shield version, some RELs were moved into the DOL
+    if (config.version == "ShieldD") and isInDol:
+        # For Shield Debug version, some RELs were moved into the DOL
         return {
             "lib": lib_name,
             "mw_version": MWVersion(config.version),
@@ -2329,7 +2329,7 @@ def MatchingFor(*versions) -> bool:
     ActorRel(MatchingFor(ALL_GCN), "d_a_obj_swpush5"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_obj_yobikusa"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_scene_exit2"),
-    ActorRel(MatchingFor(ALL_GCN), "d_a_shop_item"),
+    ActorRel(MatchingFor(ALL_GCN), "d_a_shop_item", [], True),
     ActorRel(MatchingFor(ALL_GCN), "d_a_sq"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_swc00", [], True),
     ActorRel(MatchingFor(ALL_GCN), "d_a_tag_CstaSw"), # debug weak func order
@@ -2953,7 +2953,7 @@ def MatchingFor(*versions) -> bool:
     ActorRel(MatchingFor(ALL_GCN, ALL_WII, "Shield"), "d_a_tag_setBall"), # debug weak func order
     ActorRel(MatchingFor(ALL_GCN), "d_a_tag_setrestart"), # debug weak func order
     ActorRel(MatchingFor(ALL_GCN), "d_a_tag_shop_camera"), # debug weak func order
-    ActorRel(MatchingFor(ALL_GCN), "d_a_tag_shop_item", [], True), # debug weak func order
+    ActorRel(MatchingFor(ALL_GCN), "d_a_tag_shop_item"), # debug weak func order
     ActorRel(MatchingFor(ALL_GCN), "d_a_tag_smk_emt"), # debug weak func order
     ActorRel(MatchingFor(ALL_GCN), "d_a_tag_spinner"), # debug weak func order
     ActorRel(MatchingFor(ALL_GCN), "d_a_tag_sppath"), # debug weak func order

include/d/d_drawlist.h

@@ -67,12 +67,7 @@ class dDlst_blo_c : public dDlst_base_c {
 
     }
 
-    void setBlackColor(u64 i_tag, JUtility::TColor i_color) {
-        J2DPicture* picture = getPicture(i_tag);
-        JUT_ASSERT(1570, picture != NULL);
-
-        picture->setBlack(i_color);
-    }
+    void setBlackColor(u64 i_tag, JUtility::TColor i_color);
 
     class anm_c {
     public:

src/c/c_dylink.cpp

@@ -99,7 +99,7 @@ static DynamicNameTableEntry const DynamicNameTable[] = {
     {PROC_Obj_BkDoor, "d_a_obj_bkdoor"},
     {PROC_Obj_Cboard, "d_a_obj_cboard"},
     {PROC_Obj_MGate, "d_a_obj_mgate"},
-    #if !PLATFORM_SHIELD
+    #if VERSION != VERSION_SHIELD_DEBUG
     {PROC_Obj_Ikada, "d_a_obj_ikada"},
     #endif
     {PROC_Obj_Ice_l, "d_a_obj_ice_l"},
@@ -540,7 +540,7 @@ static DynamicNameTableEntry const DynamicNameTable[] = {
     {PROC_Obj_LifeContainer, "d_a_obj_life_container"},
     {PROC_Obj_Shield, "d_a_obj_shield"},
     {PROC_Demo_Item, "d_a_demo_item"},
-    #if !PLATFORM_SHIELD
+    #if VERSION != VERSION_SHIELD_DEBUG
     {PROC_ShopItem, "d_a_shop_item"},
     #endif
     {PROC_Obj_Drop, "d_a_obj_drop"},
@@ -549,7 +549,7 @@ static DynamicNameTableEntry const DynamicNameTable[] = {
     {PROC_TAG_CSW, "d_a_tag_csw"},
     {PROC_TAG_QS, "d_a_tag_qs"},
     {PROC_HOZELDA, "d_a_hozelda"},
-    #if !PLATFORM_SHIELD
+    #if VERSION != VERSION_SHIELD_DEBUG
     {PROC_SWC00, "d_a_swc00"},
     #endif
     {PROC_KNOB20, "d_a_door_knob00"},
@@ -563,7 +563,7 @@ static DynamicNameTableEntry const DynamicNameTable[] = {
     {PROC_Tag_ChgRestart, "d_a_tag_chgrestart"},
     {PROC_Tag_Restart, "d_a_tag_setrestart"},
     {PROC_ANDSW, "d_a_andsw"},
-    #if !PLATFORM_SHIELD
+    #if VERSION != VERSION_SHIELD_DEBUG
     {PROC_ANDSW2, "d_a_andsw2"},
     #endif
     {PROC_MYNA, "d_a_myna"},
@@ -684,12 +684,12 @@ static DynamicNameTableEntry const DynamicNameTable[] = {
     {PROC_NPC_CHIN, "d_a_npc_chin"},
     {PROC_NPC_INS, "d_a_npc_ins"},
     {PROC_NPC_SHOP0, "d_a_npc_shop0"},
-    #if !PLATFORM_SHIELD
+    #if VERSION != VERSION_SHIELD_DEBUG
     {PROC_NPC_MK, "d_a_npc_mk"},
     #endif
     {PROC_NPC_P2, "d_a_npc_p2"},
     {PROC_KYTAG00, "d_a_kytag00"},
-    #if !PLATFORM_SHIELD
+    #if VERSION != VERSION_SHIELD_DEBUG
     {PROC_KYTAG01, "d_a_kytag01"},
     #endif
     {PROC_KYTAG02, "d_a_kytag02"},
@@ -729,13 +729,13 @@ static DynamicNameTableEntry const DynamicNameTable[] = {
     {PROC_DEMO00, "d_a_demo00"},
     {PROC_TAG_CAMERA, "d_a_tag_camera"},
     {PROC_TAG_CHKPOINT, "d_a_tag_chkpoint"},
-    #if !PLATFORM_SHIELD
+    #if VERSION != VERSION_SHIELD_DEBUG
     {PROC_TAG_EVENT, "d_a_tag_event"},
     #endif
     {PROC_TAG_EVT, "d_a_tag_evt"},
     {PROC_TAG_TELOP, "d_a_tag_telop"},
     {PROC_TAG_HOWL, "d_a_tag_howl"},
-    #if !PLATFORM_SHIELD
+    #if VERSION != VERSION_SHIELD_DEBUG
     {PROC_TAG_MSG, "d_a_tag_msg"},
     #endif
     {PROC_TAG_LANTERN, "d_a_tag_lantern"},
@@ -748,7 +748,7 @@ static DynamicNameTableEntry const DynamicNameTable[] = {
     {PROC_BG_OBJ, "d_a_bg_obj"},
     {PROC_MIRROR, "d_a_mirror"},
     {PROC_MOVIE_PLAYER, "d_a_movie_player"},
-    #if !PLATFORM_SHIELD
+    #if VERSION != VERSION_SHIELD_DEBUG
     {PROC_TITLE, "d_a_title"},
     #endif
     {PROC_FR, "d_a_fr"},
@@ -793,7 +793,7 @@ static DynamicNameTableEntry const DynamicNameTable[] = {
     {PROC_Obj_Timer, "d_a_obj_timer"},
     {PROC_SCENE_EXIT, "d_a_scene_exit"},
     {PROC_SUSPEND, "d_a_suspend"},
-    #if !PLATFORM_SHIELD
+    #if VERSION != VERSION_SHIELD_DEBUG
     {PROC_GRASS, "d_a_grass"},
     #endif
     {-1, NULL},

src/d/d_camera.cpp

@@ -11209,7 +11209,7 @@ camera_process_profile_definition g_profile_CAMERA = {
     fpcPi_CURRENT_e,
     PROC_CAMERA,
     &g_fpcLf_Method.base,
-    sizeof(camera_class),
+    sizeof(camera_process_class),
     0,
     0,
     &g_fopVw_Method,
@@ -11230,7 +11230,7 @@ camera_process_profile_definition g_profile_CAMERA2 = {
     fpcPi_CURRENT_e,
     PROC_CAMERA2,
     &g_fpcLf_Method.base,
-    sizeof(camera_class),
+    sizeof(camera_process_class),
     0,
     0,
     &g_fopVw_Method,