diff --git a/asm/d/s/d_s_play.s b/asm/d/s/d_s_play.s index dd05f7bd95c..5cc2c14e46d 100644 --- a/asm/d/s/d_s_play.s +++ b/asm/d/s/d_s_play.s @@ -682,7 +682,7 @@ lbl_80259D64: lbl_80259DA8: /* 80259DA8 00256CE8 38 00 FF FF */ li r0, -1 lbl_80259DAC: -/* 80259DAC 00256CEC 90 0D 87 E0 */ stw r0, lbl_80450D60-_SDA_BASE_(r13) +/* 80259DAC 00256CEC 90 0D 87 E0 */ stw r0, _mProcID-_SDA_BASE_(r13) /* 80259DB0 00256CF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80259DB4 00256CF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80259DB8 00256CF8 3B E3 0F 38 */ addi r31, r3, 0xf38 diff --git a/asm/d/s/d_s_room.s b/asm/d/s/d_s_room.s index 5e184ffcb19..ec7f14b96d2 100644 --- a/asm/d/s/d_s_room.s +++ b/asm/d/s/d_s_room.s @@ -463,7 +463,7 @@ lbl_8025B3F0: lbl_8025B45C: /* 8025B45C 0025839C 2C 04 00 00 */ cmpwi r4, 0 /* 8025B460 002583A0 41 82 00 B8 */ beq lbl_8025B518 -/* 8025B464 002583A4 80 6D 87 C0 */ lwz r3, lbl_80450D40-_SDA_BASE_(r13) +/* 8025B464 002583A4 80 6D 87 C0 */ lwz r3, g_fpcNd_type-_SDA_BASE_(r13) /* 8025B468 002583A8 80 9D 00 B4 */ lwz r4, 0xb4(r29) /* 8025B46C 002583AC 4B DC 51 E1 */ bl fpcBs_Is_JustOfType__Fii /* 8025B470 002583B0 2C 03 00 00 */ cmpwi r3, 0 @@ -584,7 +584,7 @@ lbl_8025B5D8: /* 8025B60C 0025854C 7C 00 07 74 */ extsb r0, r0 /* 8025B610 00258550 7C 03 00 00 */ cmpw r3, r0 /* 8025B614 00258554 40 82 00 44 */ bne lbl_8025B658 -/* 8025B618 00258558 80 6D 87 C0 */ lwz r3, lbl_80450D40-_SDA_BASE_(r13) +/* 8025B618 00258558 80 6D 87 C0 */ lwz r3, g_fpcNd_type-_SDA_BASE_(r13) /* 8025B61C 0025855C 80 9F 00 B4 */ lwz r4, 0xb4(r31) /* 8025B620 00258560 4B DC 50 2D */ bl fpcBs_Is_JustOfType__Fii /* 8025B624 00258564 2C 03 00 00 */ cmpwi r3, 0 diff --git a/asm/sbss.s b/asm/sbss.s index fc270c8953f..c6ddcc2b36f 100644 --- a/asm/sbss.s +++ b/asm/sbss.s @@ -410,8 +410,8 @@ lbl_80450D38: .global lbl_80450D39 lbl_80450D39: .skip 0x7 -.global lbl_80450D40 -lbl_80450D40: +.global g_fpcNd_type +g_fpcNd_type: .skip 0x8 .global lbl_80450D48 lbl_80450D48: @@ -425,8 +425,8 @@ lbl_80450D50: .global lbl_80450D58 lbl_80450D58: .skip 0x8 -.global lbl_80450D60 -lbl_80450D60: +.global _mProcID +_mProcID: .skip 0x4 .global lbl_80450D64 lbl_80450D64: diff --git a/include/d/d_stage/asm/func_80025014.s b/include/d/d_stage/asm/func_80025014.s index d24bb3d83d1..ecb8fa8e7fc 100644 --- a/include/d/d_stage/asm/func_80025014.s +++ b/include/d/d_stage/asm/func_80025014.s @@ -156,7 +156,7 @@ lbl_80025208: /* 80025250 00022190 7F C3 F3 78 */ mr r3, r30 /* 80025254 00022194 7F A4 EB 78 */ mr r4, r29 /* 80025258 00022198 4B FF FC A5 */ bl dStage_actorCreate__FP22stage_actor_data_classP16fopAcM_prm_class -/* 8002525C 0002219C 80 6D 87 E0 */ lwz r3, lbl_80450D60-_SDA_BASE_(r13) +/* 8002525C 0002219C 80 6D 87 E0 */ lwz r3, _mProcID-_SDA_BASE_(r13) /* 80025260 000221A0 4B FF 9A 51 */ bl fopScnM_SearchByID__FUi /* 80025264 000221A4 A8 03 00 08 */ lha r0, 8(r3) /* 80025268 000221A8 2C 00 00 0B */ cmpwi r0, 0xb diff --git a/include/f/f_op/f_op_actor_mng/asm/func_800198C4.s b/include/f/f_op/f_op_actor_mng/asm/func_800198C4.s index f19131177d5..7e85cf47693 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_800198C4.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_800198C4.s @@ -4,10 +4,10 @@ /* 800198D0 00016810 93 E1 00 0C */ stw r31, 0xc(r1) /* 800198D4 00016814 93 C1 00 08 */ stw r30, 8(r1) /* 800198D8 00016818 7C 7E 1B 78 */ mr r30, r3 -/* 800198DC 0001681C 80 6D 87 E0 */ lwz r3, lbl_80450D60-_SDA_BASE_(r13) +/* 800198DC 0001681C 80 6D 87 E0 */ lwz r3, _mProcID-_SDA_BASE_(r13) /* 800198E0 00016820 48 00 53 D1 */ bl fopScnM_SearchByID__FUi /* 800198E4 00016824 7C 7F 1B 78 */ mr r31, r3 -/* 800198E8 00016828 80 6D 87 C0 */ lwz r3, lbl_80450D40-_SDA_BASE_(r13) +/* 800198E8 00016828 80 6D 87 C0 */ lwz r3, g_fpcNd_type-_SDA_BASE_(r13) /* 800198EC 0001682C 80 9F 00 B4 */ lwz r4, 0xb4(r31) /* 800198F0 00016830 48 00 6D 5D */ bl fpcBs_Is_JustOfType__Fii /* 800198F4 00016834 2C 03 00 00 */ cmpwi r3, 0 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_80019934.s b/include/f/f_op/f_op_actor_mng/asm/func_80019934.s index 2529b903975..dbd6220e115 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_80019934.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_80019934.s @@ -13,7 +13,7 @@ /* 80019964 000168A4 80 63 03 FC */ lwz r3, 0x3fc(r3) /* 80019968 000168A8 48 00 53 49 */ bl fopScnM_SearchByID__FUi /* 8001996C 000168AC 7C 7F 1B 78 */ mr r31, r3 -/* 80019970 000168B0 80 6D 87 C0 */ lwz r3, lbl_80450D40-_SDA_BASE_(r13) +/* 80019970 000168B0 80 6D 87 C0 */ lwz r3, g_fpcNd_type-_SDA_BASE_(r13) /* 80019974 000168B4 80 9F 00 B4 */ lwz r4, 0xb4(r31) /* 80019978 000168B8 48 00 6C D5 */ bl fpcBs_Is_JustOfType__Fii /* 8001997C 000168BC 2C 03 00 00 */ cmpwi r3, 0 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001CA1C.s b/include/f/f_op/f_op_actor_mng/asm/func_8001CA1C.s index 8ff3d053e2f..a3c035863b1 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001CA1C.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001CA1C.s @@ -31,7 +31,7 @@ /* 8001CA8C 000199CC 40 82 00 08 */ bne lbl_8001CA94 /* 8001CA90 000199D0 48 00 00 34 */ b lbl_8001CAC4 lbl_8001CA94: -/* 8001CA94 000199D4 80 6D 87 C0 */ lwz r3, lbl_80450D40-_SDA_BASE_(r13) +/* 8001CA94 000199D4 80 6D 87 C0 */ lwz r3, g_fpcNd_type-_SDA_BASE_(r13) /* 8001CA98 000199D8 80 9F 00 B4 */ lwz r4, 0xb4(r31) /* 8001CA9C 000199DC 48 00 3B B1 */ bl fpcBs_Is_JustOfType__Fii /* 8001CAA0 000199E0 2C 03 00 00 */ cmpwi r3, 0 diff --git a/include/f/f_op/f_op_msg_mng/asm/func_8001F9B4.s b/include/f/f_op/f_op_msg_mng/asm/func_8001F9B4.s index 090bf35c238..3530b93e47f 100644 --- a/include/f/f_op/f_op_msg_mng/asm/func_8001F9B4.s +++ b/include/f/f_op/f_op_msg_mng/asm/func_8001F9B4.s @@ -4,10 +4,10 @@ /* 8001F9C0 0001C900 93 E1 00 0C */ stw r31, 0xc(r1) /* 8001F9C4 0001C904 93 C1 00 08 */ stw r30, 8(r1) /* 8001F9C8 0001C908 7C 7E 1B 78 */ mr r30, r3 -/* 8001F9CC 0001C90C 80 6D 87 E0 */ lwz r3, lbl_80450D60-_SDA_BASE_(r13) +/* 8001F9CC 0001C90C 80 6D 87 E0 */ lwz r3, _mProcID-_SDA_BASE_(r13) /* 8001F9D0 0001C910 4B FF F2 E1 */ bl fopScnM_SearchByID__FUi /* 8001F9D4 0001C914 7C 7F 1B 78 */ mr r31, r3 -/* 8001F9D8 0001C918 80 6D 87 C0 */ lwz r3, lbl_80450D40-_SDA_BASE_(r13) +/* 8001F9D8 0001C918 80 6D 87 C0 */ lwz r3, g_fpcNd_type-_SDA_BASE_(r13) /* 8001F9DC 0001C91C 80 9F 00 B4 */ lwz r4, 0xb4(r31) /* 8001F9E0 0001C920 48 00 0C 6D */ bl fpcBs_Is_JustOfType__Fii /* 8001F9E4 0001C924 2C 03 00 00 */ cmpwi r3, 0 diff --git a/include/f/f_pc/f_pc_priority.h b/include/f/f_pc/f_pc_priority.h index 26f44e24040..1bcc150408f 100644 --- a/include/f/f_pc/f_pc_priority.h +++ b/include/f/f_pc/f_pc_priority.h @@ -12,10 +12,10 @@ typedef struct process_priority_queue_info { } process_priority_queue_info; typedef struct process_priority_class { - create_tag_class mBase; - process_method_tag_class mMtdTag; - process_priority_queue_info mInfoQ; - process_priority_queue_info mInfoCurr; + /* 0x00 */ create_tag_class mBase; + /* 0x14 */ process_method_tag_class mMtdTag; + /* 0x30 */ process_priority_queue_info mInfoQ; + /* 0x38 */ process_priority_queue_info mInfoCurr; } process_priority_class; s32 fpcPi_IsInQueue(process_priority_class* pPi); diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index 8955397a629..1df5e916162 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -95,7 +95,7 @@ extern u8 lbl_803A6920; extern u8 lbl_803A696C; extern u8 lbl_80450D67; extern u8 lbl_80451C90; -extern u8 lbl_80450D60; +extern u8 _mProcID; extern u8 lbl_804307EC; extern u8 lbl_803A65CC; extern u8 lbl_803A65FC; diff --git a/src/f/f_op/f_op_actor_mng.cpp b/src/f/f_op/f_op_actor_mng.cpp index 0a7f92c0d0f..1977e216eb4 100644 --- a/src/f/f_op/f_op_actor_mng.cpp +++ b/src/f/f_op/f_op_actor_mng.cpp @@ -269,8 +269,8 @@ extern u8 lbl_80450CC9; extern u8 lbl_80450CD0; extern u8 lbl_80450CD4; extern u8 lbl_80450CD8; -extern u8 lbl_80450D40; -extern u8 lbl_80450D60; +extern u8 g_fpcNd_type; +extern u8 _mProcID; extern u8 lbl_80450D64; extern u8 lbl_80450DA4; extern u8 lbl_80450F90; diff --git a/src/f/f_pc/f_pc_deletor.cpp b/src/f/f_pc/f_pc_deletor.cpp index 046d6fd1aae..6fae0313e4d 100644 --- a/src/f/f_pc/f_pc_deletor.cpp +++ b/src/f/f_pc/f_pc_deletor.cpp @@ -11,7 +11,7 @@ // g_fpcDtTg_Queue extern node_list_class lbl_803A39A0; // g_fpcNd_type -extern s32 lbl_80450D40; +extern s32 g_fpcNd_type; BOOL fpcLd_Use(s16 procName); s32 fpcLd_IsLoaded(s16 procName); @@ -62,7 +62,7 @@ s32 fpcDt_ToDeleteQ(base_process_class* pProc) { if (cTg_IsUse(&pProc->mDtTg.mBase) != 0) { return 1; } else { - if (fpcBs_Is_JustOfType(lbl_80450D40, pProc->mSubType) != 0) { + if (fpcBs_Is_JustOfType(g_fpcNd_type, pProc->mSubType) != 0) { process_node_class* procNode = (process_node_class*)pProc; if (fpcNd_IsDeleteTiming(procNode) == 0) { return 0; diff --git a/src/f/f_pc/f_pc_executor.cpp b/src/f/f_pc/f_pc_executor.cpp index e5d8d6e0b71..7f768c2cd84 100644 --- a/src/f/f_pc/f_pc_executor.cpp +++ b/src/f/f_pc/f_pc_executor.cpp @@ -9,7 +9,7 @@ #include "f/f_pc/f_pc_searcher.h" // g_fpcNd_type -extern s32 lbl_80450D40; +extern s32 g_fpcNd_type; base_process_class* fpcEx_Search(fpcLyIt_JudgeFunc pFunc, void* pUserData) { return (base_process_class*)fpcLyIt_AllJudge(pFunc, pUserData); @@ -44,7 +44,7 @@ s32 fpcEx_ToLineQ(base_process_class* pProc) { } pProc->mInitState = 2; - if (fpcBs_Is_JustOfType(lbl_80450D40, pProc->mSubType)) { + if (fpcBs_Is_JustOfType(g_fpcNd_type, pProc->mSubType)) { process_node_class* pNode = (process_node_class*)pProc; fpcLyIt_OnlyHere(&pNode->mLayer, (cNdIt_MethodFunc)fpcEx_ToLineQ, pNode); } diff --git a/src/f/f_pc/f_pc_node.cpp b/src/f/f_pc/f_pc_node.cpp index a53c88426c3..70b716c554f 100644 --- a/src/f/f_pc/f_pc_node.cpp +++ b/src/f/f_pc/f_pc_node.cpp @@ -3,7 +3,7 @@ #include "f/f_pc/f_pc_layer_iter.h" // g_fpcNd_type -extern int lbl_80450D40; +extern int g_fpcNd_type; // f_pc_node::g_fpcNd_IsCheckOfDeleteTiming extern s32 lbl_804505E0; @@ -35,7 +35,7 @@ void* fpcNd_IsCreatingFromUnder(void* pProcNodeV) { layer_class* layer; process_node_class* pProcNode = static_cast(pProcNodeV); if (pProcNode != NULL && - fpcBs_Is_JustOfType(lbl_80450D40, pProcNode->mBase.mSubType) != FALSE) { + fpcBs_Is_JustOfType(g_fpcNd_type, pProcNode->mBase.mSubType) != FALSE) { layer = &pProcNode->mLayer; if (fpcLy_IsCreatingMesg(layer) == 0x0) { return (process_node_class*)fpcLyIt_Judge( @@ -79,7 +79,7 @@ s32 fpcNd_Create(process_node_class* pProcNode1) { if (pProcNode->mBase.mInitState == 0) { node_process_profile_definition* pProcProfileDef = (node_process_profile_definition*)pProcNode->mBase.mpProf; - pProcNode->mBase.mSubType = fpcBs_MakeOfType(&lbl_80450D40); + pProcNode->mBase.mSubType = fpcBs_MakeOfType(&g_fpcNd_type); pProcNode->mpNodeMtd = pProcProfileDef->mNDrwMthCls; fpcLy_Create(&pProcNode->mLayer, pProcNode, pProcNode->mLayerNodeLists, 0x10); pProcNode->mUnk0 = 0; diff --git a/src/f/f_pc/f_pc_pause.cpp b/src/f/f_pc/f_pc_pause.cpp index f4e38a6da60..025a5b81576 100644 --- a/src/f/f_pc/f_pc_pause.cpp +++ b/src/f/f_pc/f_pc_pause.cpp @@ -5,7 +5,7 @@ #include "f/f_pc/f_pc_node.h" // f_pc_node::g_fpcNd_type -extern s32 lbl_80450D40; +extern s32 g_fpcNd_type; #ifdef NON_MATCHING s32 fpcPause_IsEnable(void* pProcess, u8 flag) { @@ -24,7 +24,7 @@ s32 fpcPause_Enable(void* pProcess, u8 flag) { base_process_class* pProc = (base_process_class*)pProcess; pProc->mPauseFlag |= flag; - if (fpcBs_Is_JustOfType(lbl_80450D40, pProc->mSubType)) { + if (fpcBs_Is_JustOfType(g_fpcNd_type, pProc->mSubType)) { process_node_class* pNode = (process_node_class*)pProc; fpcLyIt_OnlyHere(&pNode->mLayer, (cNdIt_MethodFunc)fpcPause_Enable, (void*)(flag & 0xFF)); } @@ -35,7 +35,7 @@ s32 fpcPause_Disable(void* pProcess, u8 flag) { base_process_class* pProc = (base_process_class*)pProcess; pProc->mPauseFlag &= (0xFF - flag) & 0xFF; - if (fpcBs_Is_JustOfType(lbl_80450D40, pProc->mSubType)) { + if (fpcBs_Is_JustOfType(g_fpcNd_type, pProc->mSubType)) { process_node_class* pNode = (process_node_class*)pProc; fpcLyIt_OnlyHere(&pNode->mLayer, (cNdIt_MethodFunc)fpcPause_Disable, (void*)flag); } diff --git a/src/f/f_pc/f_pc_stdcreate_req.cpp b/src/f/f_pc/f_pc_stdcreate_req.cpp index 56fad390d71..43cfdd0fb8d 100644 --- a/src/f/f_pc/f_pc_stdcreate_req.cpp +++ b/src/f/f_pc/f_pc_stdcreate_req.cpp @@ -5,7 +5,7 @@ #include "f/f_pc/f_pc_node.h" // f_pc_node::g_fpcNd_type -extern s32 lbl_80450D40; +extern s32 g_fpcNd_type; // f_pc_stdcreate_req::submethod$2261 extern create_request_method_class lbl_803A3AF0; // f_pc_stdcreate_req::method$2262 @@ -46,7 +46,7 @@ s32 fpcSCtRq_phase_SubCreateProcess(standard_create_request_class* pStdCreateReq s32 fpcSCtRq_phase_IsComplete(standard_create_request_class* pStdCreateReq) { process_node_class* procNode = (process_node_class*)pStdCreateReq->mBase.mpRes; - if (fpcBs_Is_JustOfType(lbl_80450D40, procNode->mBase.mSubType) == 1) { + if (fpcBs_Is_JustOfType(g_fpcNd_type, procNode->mBase.mSubType) == 1) { if (fpcLy_IsCreatingMesg(&procNode->mLayer) == 1) { return cPhs_ZERO_e; }