summaryrefslogtreecommitdiff
path: root/src/d
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2023-10-13 19:22:57 -0700
committerJasper St. Pierre <jstpierre@mecheye.net>2023-10-13 19:22:57 -0700
commita5641b0ba9e6222749fbc78307943b83db618c93 (patch)
tree07331d4fe4f335491c3a6423fc9a9793e033ec61 /src/d
parentccad35b7c2701850e4db3de78f393c6a2e560f58 (diff)
f_op_overlap cleanup, d_ovlp_fade progress
remove a bunch of externs
Diffstat (limited to 'src/d')
-rw-r--r--src/d/actor/d_a_agbsw0.cpp2
-rw-r--r--src/d/actor/d_a_alldie.cpp2
-rw-r--r--src/d/actor/d_a_am.cpp2
-rw-r--r--src/d/actor/d_a_andsw0.cpp2
-rw-r--r--src/d/actor/d_a_andsw2.cpp2
-rw-r--r--src/d/actor/d_a_arrow.cpp2
-rw-r--r--src/d/actor/d_a_bomb.cpp2
-rw-r--r--src/d/actor/d_a_bomb2.cpp2
-rw-r--r--src/d/actor/d_a_boss_item.cpp2
-rw-r--r--src/d/actor/d_a_branch.cpp2
-rw-r--r--src/d/actor/d_a_disappear.cpp2
-rw-r--r--src/d/actor/d_a_item.cpp2
-rw-r--r--src/d/actor/d_a_kaji.cpp2
-rw-r--r--src/d/actor/d_a_kytag04.cpp2
-rw-r--r--src/d/actor/d_a_kytag05.cpp2
-rw-r--r--src/d/actor/d_a_kytag06.cpp2
-rw-r--r--src/d/actor/d_a_magma.cpp2
-rw-r--r--src/d/actor/d_a_mbdoor.cpp2
-rw-r--r--src/d/actor/d_a_mozo.cpp2
-rw-r--r--src/d/actor/d_a_nh.cpp2
-rw-r--r--src/d/actor/d_a_obj_Ygush00.cpp2
-rw-r--r--src/d/actor/d_a_obj_barrier.cpp2
-rw-r--r--src/d/actor/d_a_obj_hole.cpp2
-rw-r--r--src/d/actor/d_a_obj_mknjd.cpp2
-rw-r--r--src/d/actor/d_a_obj_movebox.cpp2
-rw-r--r--src/d/actor/d_a_obj_paper.cpp2
-rw-r--r--src/d/actor/d_a_obj_toripost.cpp2
-rw-r--r--src/d/actor/d_a_rectangle.cpp2
-rw-r--r--src/d/actor/d_a_scene_change.cpp2
-rw-r--r--src/d/actor/d_a_seatag.cpp2
-rw-r--r--src/d/actor/d_a_shop_item.cpp2
-rw-r--r--src/d/actor/d_a_swc00.cpp2
-rw-r--r--src/d/actor/d_a_tag_kb_item.cpp2
-rw-r--r--src/d/actor/d_a_tag_msg.cpp2
-rw-r--r--src/d/actor/d_a_tag_ret.cpp2
-rw-r--r--src/d/d_ovlp_fade.cpp160
-rw-r--r--src/d/d_s_open.cpp4
37 files changed, 179 insertions, 55 deletions
diff --git a/src/d/actor/d_a_agbsw0.cpp b/src/d/actor/d_a_agbsw0.cpp
index fe64b5b4..31ba2f2a 100644
--- a/src/d/actor/d_a_agbsw0.cpp
+++ b/src/d/actor/d_a_agbsw0.cpp
@@ -2514,7 +2514,7 @@ static actor_method_class l_daAgbsw0_Method = {
(process_method_func)daAgbsw0_Draw,
};
-extern actor_process_profile_definition g_profile_AGBSW0 = {
+actor_process_profile_definition g_profile_AGBSW0 = {
fpcLy_CURRENT_e,
7,
fpcPi_CURRENT_e,
diff --git a/src/d/actor/d_a_alldie.cpp b/src/d/actor/d_a_alldie.cpp
index 49995f02..67ceaf20 100644
--- a/src/d/actor/d_a_alldie.cpp
+++ b/src/d/actor/d_a_alldie.cpp
@@ -131,7 +131,7 @@ static actor_method_class l_daAlldie_Method = {
(process_method_func)daAlldie_Draw,
};
-extern actor_process_profile_definition g_profile_ALLDIE = {
+actor_process_profile_definition g_profile_ALLDIE = {
fpcLy_CURRENT_e,
2,
fpcPi_CURRENT_e,
diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp
index 8145a7ec..0f2cad96 100644
--- a/src/d/actor/d_a_am.cpp
+++ b/src/d/actor/d_a_am.cpp
@@ -1445,7 +1445,7 @@ static actor_method_class l_daAM_Method = {
(process_method_func)daAM_Draw,
};
-extern actor_process_profile_definition g_profile_AM = {
+actor_process_profile_definition g_profile_AM = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 7,
/* ListPrio */ fpcPi_CURRENT_e,
diff --git a/src/d/actor/d_a_andsw0.cpp b/src/d/actor/d_a_andsw0.cpp
index 81983cea..d232c938 100644
--- a/src/d/actor/d_a_andsw0.cpp
+++ b/src/d/actor/d_a_andsw0.cpp
@@ -354,7 +354,7 @@ static actor_method_class l_daAndsw0_Method = {
(process_method_func)daAndsw0_Draw,
};
-extern actor_process_profile_definition g_profile_ANDSW0 = {
+actor_process_profile_definition g_profile_ANDSW0 = {
fpcLy_CURRENT_e,
7,
fpcPi_CURRENT_e,
diff --git a/src/d/actor/d_a_andsw2.cpp b/src/d/actor/d_a_andsw2.cpp
index 8d7c9e11..a1263bf2 100644
--- a/src/d/actor/d_a_andsw2.cpp
+++ b/src/d/actor/d_a_andsw2.cpp
@@ -282,7 +282,7 @@ static actor_method_class l_daAndsw2_Method = {
(process_method_func)daAndsw2_Draw,
};
-extern actor_process_profile_definition g_profile_ANDSW2 = {
+actor_process_profile_definition g_profile_ANDSW2 = {
fpcLy_CURRENT_e,
7,
fpcPi_CURRENT_e,
diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp
index f219d67a..8ef003d0 100644
--- a/src/d/actor/d_a_arrow.cpp
+++ b/src/d/actor/d_a_arrow.cpp
@@ -1290,7 +1290,7 @@ actor_method_class daArrowMethodTable = {
(process_method_func)daArrowDraw,
};
-extern actor_process_profile_definition g_profile_ARROW = {
+actor_process_profile_definition g_profile_ARROW = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 9,
/* ListPrio */ fpcLy_CURRENT_e,
diff --git a/src/d/actor/d_a_bomb.cpp b/src/d/actor/d_a_bomb.cpp
index 858a8d8b..227e5d79 100644
--- a/src/d/actor/d_a_bomb.cpp
+++ b/src/d/actor/d_a_bomb.cpp
@@ -1308,7 +1308,7 @@ actor_method_class l_daBomb_Method = {
(process_method_func)daBomb_Draw,
};
-extern actor_process_profile_definition g_profile_BOMB = {
+actor_process_profile_definition g_profile_BOMB = {
fpcLy_CURRENT_e,
7,
fpcPi_CURRENT_e,
diff --git a/src/d/actor/d_a_bomb2.cpp b/src/d/actor/d_a_bomb2.cpp
index 0aaff5ab..ab2f9297 100644
--- a/src/d/actor/d_a_bomb2.cpp
+++ b/src/d/actor/d_a_bomb2.cpp
@@ -1074,7 +1074,7 @@ namespace daBomb2 {
}
}
-extern actor_process_profile_definition g_profile_Bomb2 = {
+actor_process_profile_definition g_profile_Bomb2 = {
fpcLy_CURRENT_e,
7,
fpcPi_CURRENT_e,
diff --git a/src/d/actor/d_a_boss_item.cpp b/src/d/actor/d_a_boss_item.cpp
index 3b8d4453..a290204a 100644
--- a/src/d/actor/d_a_boss_item.cpp
+++ b/src/d/actor/d_a_boss_item.cpp
@@ -58,7 +58,7 @@ static actor_method_class daBossItem_METHODS = {
(process_method_func)0,
};
-extern actor_process_profile_definition g_profile_BOSSITEM = {
+actor_process_profile_definition g_profile_BOSSITEM = {
fpcLy_CURRENT_e,
7,
fpcLy_CURRENT_e,
diff --git a/src/d/actor/d_a_branch.cpp b/src/d/actor/d_a_branch.cpp
index ce516706..afba6596 100644
--- a/src/d/actor/d_a_branch.cpp
+++ b/src/d/actor/d_a_branch.cpp
@@ -259,7 +259,7 @@ static actor_method_class l_daBranch_Method = {
(process_method_func)daBranch_Draw,
};
-extern actor_process_profile_definition g_profile_BRANCH = {
+actor_process_profile_definition g_profile_BRANCH = {
fpcLy_CURRENT_e,
7,
fpcLy_CURRENT_e,
diff --git a/src/d/actor/d_a_disappear.cpp b/src/d/actor/d_a_disappear.cpp
index ab911114..f6770815 100644
--- a/src/d/actor/d_a_disappear.cpp
+++ b/src/d/actor/d_a_disappear.cpp
@@ -130,7 +130,7 @@ actor_method_class l_daDisappear_Method = {
(process_method_func)daDisappear_Draw,
};
-extern actor_process_profile_definition g_profile_DISAPPEAR = {
+actor_process_profile_definition g_profile_DISAPPEAR = {
fpcLy_CURRENT_e,
7,
fpcLy_CURRENT_e,
diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp
index aabef656..37fc302a 100644
--- a/src/d/actor/d_a_item.cpp
+++ b/src/d/actor/d_a_item.cpp
@@ -1071,7 +1071,7 @@ static actor_method_class l_daItem_Method = {
(process_method_func)daItem_Draw,
};
-extern actor_process_profile_definition g_profile_ITEM = {
+actor_process_profile_definition g_profile_ITEM = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 7,
/* ListPrio */ fpcPi_CURRENT_e,
diff --git a/src/d/actor/d_a_kaji.cpp b/src/d/actor/d_a_kaji.cpp
index cf1cd76c..7ba25f45 100644
--- a/src/d/actor/d_a_kaji.cpp
+++ b/src/d/actor/d_a_kaji.cpp
@@ -152,7 +152,7 @@ static actor_method_class daKajiMethodTable = {
(process_method_func)daKajiDraw,
};
-extern actor_process_profile_definition g_profile_Kaji = {
+actor_process_profile_definition g_profile_Kaji = {
fpcLy_CURRENT_e,
3,
fpcLy_CURRENT_e,
diff --git a/src/d/actor/d_a_kytag04.cpp b/src/d/actor/d_a_kytag04.cpp
index 2d875e55..086e5175 100644
--- a/src/d/actor/d_a_kytag04.cpp
+++ b/src/d/actor/d_a_kytag04.cpp
@@ -77,7 +77,7 @@ static actor_method_class l_daKytag04_Method = {
(process_method_func)daKytag04_Draw,
};
-extern actor_process_profile_definition g_profile_KYTAG04 = {
+actor_process_profile_definition g_profile_KYTAG04 = {
fpcLy_CURRENT_e,
7,
fpcLy_CURRENT_e,
diff --git a/src/d/actor/d_a_kytag05.cpp b/src/d/actor/d_a_kytag05.cpp
index b4bdb72d..5765d20b 100644
--- a/src/d/actor/d_a_kytag05.cpp
+++ b/src/d/actor/d_a_kytag05.cpp
@@ -154,7 +154,7 @@ static actor_method_class l_daKytag05_Method = {
(process_method_func)daKytag05_Draw,
};
-extern actor_process_profile_definition g_profile_KYTAG05 = {
+actor_process_profile_definition g_profile_KYTAG05 = {
fpcLy_CURRENT_e,
7,
fpcLy_CURRENT_e,
diff --git a/src/d/actor/d_a_kytag06.cpp b/src/d/actor/d_a_kytag06.cpp
index 1743abcf..3550298a 100644
--- a/src/d/actor/d_a_kytag06.cpp
+++ b/src/d/actor/d_a_kytag06.cpp
@@ -81,7 +81,7 @@ static actor_method_class l_daKytag06_Method = {
(process_method_func)daKytag06_Draw,
};
-extern actor_process_profile_definition g_profile_KYTAG06 = {
+actor_process_profile_definition g_profile_KYTAG06 = {
fpcLy_CURRENT_e,
7,
fpcLy_CURRENT_e,
diff --git a/src/d/actor/d_a_magma.cpp b/src/d/actor/d_a_magma.cpp
index b26e2144..b41a43f5 100644
--- a/src/d/actor/d_a_magma.cpp
+++ b/src/d/actor/d_a_magma.cpp
@@ -62,7 +62,7 @@ static actor_method_class l_daMagma_Method = {
(process_method_func)0,
};
-extern actor_process_profile_definition g_profile_MAGMA = {
+actor_process_profile_definition g_profile_MAGMA = {
fpcLy_CURRENT_e,
7,
fpcPi_CURRENT_e,
diff --git a/src/d/actor/d_a_mbdoor.cpp b/src/d/actor/d_a_mbdoor.cpp
index 0db41691..48c2ec8a 100644
--- a/src/d/actor/d_a_mbdoor.cpp
+++ b/src/d/actor/d_a_mbdoor.cpp
@@ -622,7 +622,7 @@ static actor_method_class l_daMbdoor_Method = {
(process_method_func)daMbdoor_Draw,
};
-extern actor_process_profile_definition g_profile_MBDOOR = {
+actor_process_profile_definition g_profile_MBDOOR = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 3,
/* ListPrio */ fpcPi_CURRENT_e,
diff --git a/src/d/actor/d_a_mozo.cpp b/src/d/actor/d_a_mozo.cpp
index 925abd1f..2d4b4e10 100644
--- a/src/d/actor/d_a_mozo.cpp
+++ b/src/d/actor/d_a_mozo.cpp
@@ -360,7 +360,7 @@ static actor_method_class l_daMozo_Method = {
(process_method_func)daMozo_Draw,
};
-extern actor_process_profile_definition g_profile_MOZO = {
+actor_process_profile_definition g_profile_MOZO = {
fpcLy_CURRENT_e,
7,
fpcPi_CURRENT_e,
diff --git a/src/d/actor/d_a_nh.cpp b/src/d/actor/d_a_nh.cpp
index 11fff8b6..7f0f2f99 100644
--- a/src/d/actor/d_a_nh.cpp
+++ b/src/d/actor/d_a_nh.cpp
@@ -616,7 +616,7 @@ actor_method_class l_daNh_Method = {
(process_method_func)daNh_Draw,
};
-extern actor_process_profile_definition g_profile_NH = {
+actor_process_profile_definition g_profile_NH = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 7,
/* ListPrio */ fpcLy_CURRENT_e,
diff --git a/src/d/actor/d_a_obj_Ygush00.cpp b/src/d/actor/d_a_obj_Ygush00.cpp
index 5ddf2d63..f3b5a32c 100644
--- a/src/d/actor/d_a_obj_Ygush00.cpp
+++ b/src/d/actor/d_a_obj_Ygush00.cpp
@@ -185,7 +185,7 @@ static actor_method_class l_daObjYgush00_Method = {
(process_method_func)daObjYgush00_Draw,
};
-extern actor_process_profile_definition g_profile_Obj_Ygush00 = {
+actor_process_profile_definition g_profile_Obj_Ygush00 = {
fpcLy_CURRENT_e,
3,
fpcPi_CURRENT_e,
diff --git a/src/d/actor/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp
index 4557ad11..0f85bb63 100644
--- a/src/d/actor/d_a_obj_barrier.cpp
+++ b/src/d/actor/d_a_obj_barrier.cpp
@@ -715,7 +715,7 @@ static actor_method_class l_daObjBarrier_Method = {
(process_method_func)daObjBarrier_Draw,
};
-extern actor_process_profile_definition g_profile_Obj_Barrier = {
+actor_process_profile_definition g_profile_Obj_Barrier = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 7,
/* ListPrio */ fpcPi_CURRENT_e,
diff --git a/src/d/actor/d_a_obj_hole.cpp b/src/d/actor/d_a_obj_hole.cpp
index 37ad6ed3..b5692162 100644
--- a/src/d/actor/d_a_obj_hole.cpp
+++ b/src/d/actor/d_a_obj_hole.cpp
@@ -370,7 +370,7 @@ static actor_method_class daObj_HoleMethodTable = {
(process_method_func)daObj_HoleDraw,
};
-extern actor_process_profile_definition g_profile_OBJ_HOLE = {
+actor_process_profile_definition g_profile_OBJ_HOLE = {
fpcLy_CURRENT_e,
3,
fpcPi_CURRENT_e,
diff --git a/src/d/actor/d_a_obj_mknjd.cpp b/src/d/actor/d_a_obj_mknjd.cpp
index b777baef..500dee0f 100644
--- a/src/d/actor/d_a_obj_mknjd.cpp
+++ b/src/d/actor/d_a_obj_mknjd.cpp
@@ -1119,7 +1119,7 @@ namespace daObjMknjD {
}
}
-extern actor_process_profile_definition g_profile_Obj_MknjD = {
+actor_process_profile_definition g_profile_Obj_MknjD = {
fpcLy_CURRENT_e,
3,
fpcPi_CURRENT_e,
diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp
index b4077adb..7d5edd47 100644
--- a/src/d/actor/d_a_obj_movebox.cpp
+++ b/src/d/actor/d_a_obj_movebox.cpp
@@ -858,7 +858,7 @@ namespace daObjMovebox {
}
}
-extern actor_process_profile_definition g_profile_Obj_Movebox = {
+actor_process_profile_definition g_profile_Obj_Movebox = {
fpcLy_CURRENT_e,
3,
fpcLy_CURRENT_e,
diff --git a/src/d/actor/d_a_obj_paper.cpp b/src/d/actor/d_a_obj_paper.cpp
index fcd838a3..a3328e99 100644
--- a/src/d/actor/d_a_obj_paper.cpp
+++ b/src/d/actor/d_a_obj_paper.cpp
@@ -390,7 +390,7 @@ namespace daObjPaper {
};
}
- extern actor_process_profile_definition g_profile_Obj_Paper = {
+ actor_process_profile_definition g_profile_Obj_Paper = {
fpcLy_CURRENT_e,
7,
fpcLy_CURRENT_e,
diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp
index 9b7c22cc..c1d9ef78 100644
--- a/src/d/actor/d_a_obj_toripost.cpp
+++ b/src/d/actor/d_a_obj_toripost.cpp
@@ -1092,7 +1092,7 @@ static actor_method_class daObjTpostMethodTable = {
(process_method_func)daObjTpostDraw,
};
-extern actor_process_profile_definition g_profile_OBJ_TORIPOST = {
+actor_process_profile_definition g_profile_OBJ_TORIPOST = {
fpcLy_CURRENT_e,
3,
fpcPi_CURRENT_e,
diff --git a/src/d/actor/d_a_rectangle.cpp b/src/d/actor/d_a_rectangle.cpp
index 02519502..5154cf6d 100644
--- a/src/d/actor/d_a_rectangle.cpp
+++ b/src/d/actor/d_a_rectangle.cpp
@@ -40,7 +40,7 @@ static actor_method_class l_daRct_Method = {
(process_method_func)daRct_Draw,
};
-extern actor_process_profile_definition g_profile_RECTANGLE = {
+actor_process_profile_definition g_profile_RECTANGLE = {
fpcLy_CURRENT_e,
7,
fpcLy_CURRENT_e,
diff --git a/src/d/actor/d_a_scene_change.cpp b/src/d/actor/d_a_scene_change.cpp
index 96654528..d2b721b0 100644
--- a/src/d/actor/d_a_scene_change.cpp
+++ b/src/d/actor/d_a_scene_change.cpp
@@ -81,7 +81,7 @@ static actor_method_class daSceneChgMethodTable = {
(process_method_func)daSceneChgDraw,
};
-extern actor_process_profile_definition g_profile_SCENECHG = {
+actor_process_profile_definition g_profile_SCENECHG = {
fpcLy_CURRENT_e,
3,
fpcLy_CURRENT_e,
diff --git a/src/d/actor/d_a_seatag.cpp b/src/d/actor/d_a_seatag.cpp
index d5ddd8b6..6d4fa490 100644
--- a/src/d/actor/d_a_seatag.cpp
+++ b/src/d/actor/d_a_seatag.cpp
@@ -40,7 +40,7 @@ static actor_method_class l_daSeatag_Method = {
(process_method_func)daSeatag_Draw,
};
-extern actor_process_profile_definition g_profile_SEATAG = {
+actor_process_profile_definition g_profile_SEATAG = {
fpcLy_CURRENT_e,
2,
fpcLy_CURRENT_e,
diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp
index e989a1f4..8d8762b8 100644
--- a/src/d/actor/d_a_shop_item.cpp
+++ b/src/d/actor/d_a_shop_item.cpp
@@ -249,7 +249,7 @@ static actor_method_class daShopItemMethodTable = {
(process_method_func)daShopItem_Draw,
};
-extern actor_process_profile_definition g_profile_ShopItem = {
+actor_process_profile_definition g_profile_ShopItem = {
fpcLy_CURRENT_e,
7,
fpcPi_CURRENT_e,
diff --git a/src/d/actor/d_a_swc00.cpp b/src/d/actor/d_a_swc00.cpp
index 846e41bc..5bc8dd58 100644
--- a/src/d/actor/d_a_swc00.cpp
+++ b/src/d/actor/d_a_swc00.cpp
@@ -75,7 +75,7 @@ static actor_method_class l_daSwc00_Method = {
(process_method_func)0,
};
-extern actor_process_profile_definition g_profile_SWC00 = {
+actor_process_profile_definition g_profile_SWC00 = {
fpcLy_CURRENT_e,
7,
fpcPi_CURRENT_e,
diff --git a/src/d/actor/d_a_tag_kb_item.cpp b/src/d/actor/d_a_tag_kb_item.cpp
index 076c64a0..1d6dac61 100644
--- a/src/d/actor/d_a_tag_kb_item.cpp
+++ b/src/d/actor/d_a_tag_kb_item.cpp
@@ -113,7 +113,7 @@ static actor_method_class daTagKbItemMethodTable = {
(process_method_func)daTagKbItem_Draw,
};
-extern actor_process_profile_definition g_profile_TAG_KB_ITEM = {
+actor_process_profile_definition g_profile_TAG_KB_ITEM = {
fpcLy_CURRENT_e,
7,
fpcLy_CURRENT_e,
diff --git a/src/d/actor/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp
index c1a75cf9..566131ab 100644
--- a/src/d/actor/d_a_tag_msg.cpp
+++ b/src/d/actor/d_a_tag_msg.cpp
@@ -309,7 +309,7 @@ static actor_method_class l_daTag_Msg_Method = {
(process_method_func)daTag_Msg_Draw,
};
-extern actor_process_profile_definition g_profile_TAG_MSG = {
+actor_process_profile_definition g_profile_TAG_MSG = {
fpcLy_CURRENT_e,
7,
fpcPi_CURRENT_e,
diff --git a/src/d/actor/d_a_tag_ret.cpp b/src/d/actor/d_a_tag_ret.cpp
index 46666de6..1dad1805 100644
--- a/src/d/actor/d_a_tag_ret.cpp
+++ b/src/d/actor/d_a_tag_ret.cpp
@@ -146,7 +146,7 @@ namespace daTagRet {
};
};
-extern actor_process_profile_definition g_profile_Tag_Ret = {
+actor_process_profile_definition g_profile_Tag_Ret = {
/* LayerID */ fpcLy_CURRENT_e,
/* ListID */ 3,
/* ListPrio */ fpcLy_CURRENT_e,
diff --git a/src/d/d_ovlp_fade.cpp b/src/d/d_ovlp_fade.cpp
index 10b5a441..b94b879f 100644
--- a/src/d/d_ovlp_fade.cpp
+++ b/src/d/d_ovlp_fade.cpp
@@ -3,46 +3,170 @@
// Translation Unit: d_ovlp_fade.cpp
//
-#include "d_ovlp_fade.h"
-#include "dolphin/types.h"
+#include "f_op/f_op_overlap.h"
+#include "f_op/f_op_overlap_mng.h"
+#include "f_pc/f_pc_manager.h"
+#include "d/d_procname.h"
+#include "m_Do/m_Do_graphic.h"
+
+class overlap1_class : public overlap_task_class {
+public:
+ /* 0xCC */ s32 mFadeOutTime;
+ /* 0xD0 */ s32 mFadeInTime;
+};
+
+BOOL (*dOvlpFd_execute_f)(overlap1_class*);
/* 802235CC-802235D4 .text dOvlpFd_Draw__FP14overlap1_class */
-void dOvlpFd_Draw(overlap1_class*) {
- /* Nonmatching */
+BOOL dOvlpFd_Draw(overlap1_class* i_this) {
+ return TRUE;
}
/* 802235D4-802236AC .text dOvlpFd_FadeOut__FP14overlap1_class */
-void dOvlpFd_FadeOut(overlap1_class*) {
- /* Nonmatching */
+BOOL dOvlpFd_FadeOut(overlap1_class* i_this) {
+ /* Nonmatching - extra comparisons */
+ if (i_this->mFadeOutTime == 0) {
+ if (fpcM_GetProfName(i_this) != PROC_OVERLAP6) {
+ if (!mDoGph_gInf_c::startFadeIn(26))
+ return TRUE;
+ i_this->mFadeOutTime = 26;
+ } else {
+ if (mDoGph_gInf_c::startFadeIn(0))
+ return TRUE;
+ i_this->mFadeOutTime = 1;
+ }
+ }
+
+ fopOvlpM_SceneIsStart();
+ if (--i_this->mFadeOutTime == 0) {
+ fopOvlpM_Done(i_this);
+ i_this->mFadeOutTime++;
+ }
+
+ return TRUE;
}
/* 802236AC-802236E4 .text dOvlpFd_Wait__FP14overlap1_class */
-void dOvlpFd_Wait(overlap1_class*) {
- /* Nonmatching */
+BOOL dOvlpFd_Wait(overlap1_class* i_this) {
+ if (fopOvlpM_IsOutReq(i_this))
+ dOvlpFd_execute_f = dOvlpFd_FadeOut;
+ return TRUE;
}
/* 802236E4-802237A4 .text dOvlpFd_FadeIn__FP14overlap1_class */
-void dOvlpFd_FadeIn(overlap1_class*) {
- /* Nonmatching */
+BOOL dOvlpFd_FadeIn(overlap1_class* i_this) {
+ if (i_this->mFadeInTime == 0) {
+ i_this->mFadeInTime = 26;
+ if (fpcM_GetProfName(i_this) == PROC_OVERLAP0 || fpcM_GetProfName(i_this) == PROC_OVERLAP7) {
+ mDoGph_gInf_c::startFadeOut(26);
+ }
+ }
+
+ if (--i_this->mFadeInTime == 0) {
+ dOvlpFd_execute_f = dOvlpFd_Wait;
+ mDoGph_gInf_c::startFadeOut(0);
+ fopOvlpM_Done(i_this);
+ }
+
+ return TRUE;
}
/* 802237A4-802237D0 .text dOvlpFd_Execute__FP14overlap1_class */
-void dOvlpFd_Execute(overlap1_class*) {
- /* Nonmatching */
+BOOL dOvlpFd_Execute(overlap1_class* i_this) {
+ dOvlpFd_execute_f(i_this);
+ return TRUE;
}
/* 802237D0-802237D8 .text dOvlpFd_IsDelete__FP14overlap1_class */
-void dOvlpFd_IsDelete(overlap1_class*) {
- /* Nonmatching */
+BOOL dOvlpFd_IsDelete(overlap1_class* i_this) {
+ return TRUE;
}
/* 802237D8-802237E0 .text dOvlpFd_Delete__FP14overlap1_class */
-void dOvlpFd_Delete(overlap1_class*) {
- /* Nonmatching */
+BOOL dOvlpFd_Delete(overlap1_class* i_this) {
+ return TRUE;
}
/* 802237E0-802237F4 .text dOvlpFd_Create__FPv */
-void dOvlpFd_Create(void*) {
- /* Nonmatching */
+BOOL dOvlpFd_Create(void* i_this) {
+ dOvlpFd_execute_f = dOvlpFd_FadeIn;
+ return cPhs_COMPLEATE_e;
}
+overlap_method_class l_dOvlpFd_Method = {
+ (process_method_func)dOvlpFd_Create,
+ (process_method_func)dOvlpFd_Delete,
+ (process_method_func)dOvlpFd_Execute,
+ (process_method_func)dOvlpFd_IsDelete,
+ (process_method_func)dOvlpFd_Draw,
+};
+
+overlap_process_profile_definition g_profile_OVERLAP0 = {
+ fpcLy_ROOT_e,
+ 0,
+ fpcPi_CURRENT_e,
+ PROC_OVERLAP0,
+ &g_fpcLf_Method.mBase,
+ sizeof(overlap1_class),
+ 0,
+ 0,
+ &g_fopOvlp_Method,
+ 0x1E1,
+ &l_dOvlpFd_Method,
+};
+
+overlap_process_profile_definition g_profile_OVERLAP1 = {
+ fpcLy_ROOT_e,
+ 0,
+ fpcPi_CURRENT_e,
+ PROC_OVERLAP1,
+ &g_fpcLf_Method.mBase,
+ sizeof(overlap1_class),
+ 0,
+ 0,
+ &g_fopOvlp_Method,
+ 0x1E2,
+ &l_dOvlpFd_Method,
+};
+
+overlap_process_profile_definition g_profile_OVERLAP6 = {
+ fpcLy_ROOT_e,
+ 0,
+ fpcPi_CURRENT_e,
+ PROC_OVERLAP6,
+ &g_fpcLf_Method.mBase,
+ sizeof(overlap1_class),
+ 0,
+ 0,
+ &g_fopOvlp_Method,
+ 0x1E7,
+ &l_dOvlpFd_Method,
+};
+
+overlap_process_profile_definition g_profile_OVERLAP7 = {
+ fpcLy_ROOT_e,
+ 0,
+ fpcPi_CURRENT_e,
+ PROC_OVERLAP7,
+ &g_fpcLf_Method.mBase,
+ sizeof(overlap1_class),
+ 0,
+ 0,
+ &g_fopOvlp_Method,
+ 0x1E8,
+ &l_dOvlpFd_Method,
+};
+
+overlap_process_profile_definition g_profile_OVERLAP8 = {
+ fpcLy_ROOT_e,
+ 0,
+ fpcPi_CURRENT_e,
+ PROC_OVERLAP8,
+ &g_fpcLf_Method.mBase,
+ sizeof(overlap1_class),
+ 0,
+ 0,
+ &g_fopOvlp_Method,
+ 0x1E9,
+ &l_dOvlpFd_Method,
+};
diff --git a/src/d/d_s_open.cpp b/src/d/d_s_open.cpp
index 76f97a8d..9d2d46a2 100644
--- a/src/d/d_s_open.cpp
+++ b/src/d/d_s_open.cpp
@@ -155,7 +155,7 @@ scene_method_class l_dScnOpen_Method = {
(process_method_func)dScnOpen_Draw,
};
-extern scene_process_profile_definition g_profile_OPEN_SCENE = {
+scene_process_profile_definition g_profile_OPEN_SCENE = {
fpcLy_ROOT_e,
1,
fpcPi_CURRENT_e,
@@ -169,7 +169,7 @@ extern scene_process_profile_definition g_profile_OPEN_SCENE = {
NULL,
};
-extern scene_process_profile_definition g_profile_OPEN2_SCENE = {
+scene_process_profile_definition g_profile_OPEN2_SCENE = {
fpcLy_ROOT_e,
1,
fpcPi_CURRENT_e,