mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-28 00:02:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Process profiles and enums cleanup (#1031)

Browse Source 
* Fix some profile comments

* Add missing static for local visibility data

* Move proc name and draw priority enums to f_pc

* Add _e suffix to daObjBarrier_c proc enum

* Change proc name enum format to match TP

* Change draw prio enum format to match TP

* Change ItemNo enum format, finish fixing item names

* Revert static for cb1 hio

* Clean up formatting of profile comments

* Fix comment alignment
This commit is contained in:
LagoLunatic
2026-05-26 00:11:58 -04:00
committed by GitHub
parent 79277cb2b2
commit 102042628f
540 changed files with 9562 additions and 10530 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/f_op/f_op_msg_mng.cpp
+70 -71
View File
@@ -16,7 +16,6 @@
#include "f_pc/f_pc_layer_iter.h"
#include "f_pc/f_pc_searcher.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
#include "d/actor/d_a_npc_bs1.h"
#include "JSystem/J2DGraph/J2DTextBox.h"
#include "JSystem/J2DGraph/J2DPicture.h"
@@ -57,73 +56,73 @@ static struct {
u8 itemNo;
const char* filename;
} itemicon[] = {
/* 0x00 */ {dItem_TELESCOPE_e, "telescope.bti"},
/* 0x01 */ {NORMAL_SAIL, "sail_00.bti"},
/* 0x02 */ {dItem_WIND_WAKER_e, "baton.bti"},
/* 0x03 */ {dItem_GRAPPLING_HOOK_e, "rope.bti"},
/* 0x04 */ {dItem_SPOILS_BAG_e, "coverofbeast.bti"},
/* 0x05 */ {dItem_BOOMERANG_e, "boomerang.bti"},
/* 0x06 */ {dItem_DEKU_LEAF_e, "fan.bti"},
/* 0x07 */ {dItem_TINGLE_TUNER_e, "whistle.bti"},
/* 0x08 */ {CAMERA, "camera.bti"},
/* 0x09 */ {dItem_IRON_BOOTS_e, "boots_00.bti"},
/* 0x0A */ {dItem_MAGIC_ARMOR_e, "shield_02.bti"},
/* 0x0B */ {dItem_BAIT_BAG_e, "coverofbait.bti"},
/* 0x0C */ {dItem_BOW_e, "bow_01.bti"},
/* 0x0D */ {dItem_BOMB_BAG_e, "bomb_00.bti"},
/* 0x0E */ {dItem_EMPTY_BOTTLE_e, "bottle_00.bti"},
/* 0x0F */ {dItem_RED_POTION_e, "bottle_01.bti"},
/* 0x10 */ {dItem_GREEN_POTION_e, "bottle_02.bti"},
/* 0x11 */ {dItem_BLUE_POTION_e, "bottle_03.bti"},
/* 0x12 */ {dItem_DELIVERY_BAG_e, "delivery.bti"},
/* 0x13 */ {dItem_HOOKSHOT_e, "hookshot.bti"},
/* 0x14 */ {dItem_SKULL_HAMMER_e, "hammer_01.bti"},
/* 0x00 */ {dItemNo_TELESCOPE_e, "telescope.bti"},
/* 0x01 */ {dItemNo_SAIL_e, "sail_00.bti"},
/* 0x02 */ {dItemNo_WIND_WAKER_e, "baton.bti"},
/* 0x03 */ {dItemNo_GRAPPLING_HOOK_e, "rope.bti"},
/* 0x04 */ {dItemNo_SPOILS_BAG_e, "coverofbeast.bti"},
/* 0x05 */ {dItemNo_BOOMERANG_e, "boomerang.bti"},
/* 0x06 */ {dItemNo_DEKU_LEAF_e, "fan.bti"},
/* 0x07 */ {dItemNo_TINGLE_TUNER_e, "whistle.bti"},
/* 0x08 */ {dItemNo_PICTO_BOX_e, "camera.bti"},
/* 0x09 */ {dItemNo_IRON_BOOTS_e, "boots_00.bti"},
/* 0x0A */ {dItemNo_MAGIC_ARMOR_e, "shield_02.bti"},
/* 0x0B */ {dItemNo_BAIT_BAG_e, "coverofbait.bti"},
/* 0x0C */ {dItemNo_BOW_e, "bow_01.bti"},
/* 0x0D */ {dItemNo_BOMB_BAG_e, "bomb_00.bti"},
/* 0x0E */ {dItemNo_EMPTY_BOTTLE_e, "bottle_00.bti"},
/* 0x0F */ {dItemNo_RED_POTION_e, "bottle_01.bti"},
/* 0x10 */ {dItemNo_GREEN_POTION_e, "bottle_02.bti"},
/* 0x11 */ {dItemNo_BLUE_POTION_e, "bottle_03.bti"},
/* 0x12 */ {dItemNo_DELIVERY_BAG_e, "delivery.bti"},
/* 0x13 */ {dItemNo_HOOKSHOT_e, "hookshot.bti"},
/* 0x14 */ {dItemNo_SKULL_HAMMER_e, "hammer_01.bti"},
/* 0x15 */ {dItem_MAGIC_ARMOR_e, "shield_02.bti"},
/* 0x16 */ {dItem_MAGIC_ARMOR_e, "shield_02.bti"},
/* 0x17 */ {dItem_MAGIC_ARMOR_e, "shield_02.bti"},
/* 0x15 */ {dItemNo_MAGIC_ARMOR_e, "shield_02.bti"},
/* 0x16 */ {dItemNo_MAGIC_ARMOR_e, "shield_02.bti"},
/* 0x17 */ {dItemNo_MAGIC_ARMOR_e, "shield_02.bti"},
/* 0x18 */ {dItem_SKULL_NECKLACE_e, "beast_01.bti"},
/* 0x19 */ {dItem_BOKOBABA_SEED_e, "beast_02.bti"},
/* 0x1A */ {dItem_GOLDEN_FEATHER_e, "beast_03.bti"},
/* 0x1B */ {dItem_KNIGHTS_CREST_e, "beast_04.bti"},
/* 0x1C */ {dItem_RED_JELLY_e, "beast_05.bti"},
/* 0x1D */ {dItem_GREEN_JELLY_e, "beast_06.bti"},
/* 0x1E */ {dItem_BLUE_JELLY_e, "beast_07.bti"},
/* 0x1F */ {dItem_JOY_PENDANT_e, "beast_08.bti"},
/* 0x18 */ {dItemNo_SKULL_NECKLACE_e, "beast_01.bti"},
/* 0x19 */ {dItemNo_BOKOBABA_SEED_e, "beast_02.bti"},
/* 0x1A */ {dItemNo_GOLDEN_FEATHER_e, "beast_03.bti"},
/* 0x1B */ {dItemNo_KNIGHTS_CREST_e, "beast_04.bti"},
/* 0x1C */ {dItemNo_RED_JELLY_e, "beast_05.bti"},
/* 0x1D */ {dItemNo_GREEN_JELLY_e, "beast_06.bti"},
/* 0x1E */ {dItemNo_BLUE_JELLY_e, "beast_07.bti"},
/* 0x1F */ {dItemNo_JOY_PENDANT_e, "beast_08.bti"},
/* 0x20 */ {dItem_NONE_e, "beast_09.bti"},
/* 0x21 */ {dItem_NONE_e, "beast_10.bti"},
/* 0x22 */ {dItem_NONE_e, "beast_11.bti"},
/* 0x23 */ {dItem_NONE_e, "beast_12.bti"},
/* 0x20 */ {dItemNo_NONE_e, "beast_09.bti"},
/* 0x21 */ {dItemNo_NONE_e, "beast_10.bti"},
/* 0x22 */ {dItemNo_NONE_e, "beast_11.bti"},
/* 0x23 */ {dItemNo_NONE_e, "beast_12.bti"},
/* 0x24 */ {dItem_HYOI_PEAR_e, "beast_02.bti"},
/* 0x25 */ {dItem_BIRD_BAIT_5_e, "beast_02.bti"},
/* 0x26 */ {dItem_NONE_e, "beast_03.bti"},
/* 0x27 */ {dItem_NONE_e, "beast_04.bti"},
/* 0x28 */ {dItem_NONE_e, "beast_05.bti"},
/* 0x29 */ {dItem_NONE_e, "beast_06.bti"},
/* 0x2A */ {dItem_NONE_e, "beast_07.bti"},
/* 0x2B */ {dItem_NONE_e, "beast_08.bti"},
/* 0x24 */ {dItemNo_HYOI_PEAR_e, "beast_02.bti"},
/* 0x25 */ {dItemNo_BIRD_BAIT_5_e, "beast_02.bti"},
/* 0x26 */ {dItemNo_NONE_e, "beast_03.bti"},
/* 0x27 */ {dItemNo_NONE_e, "beast_04.bti"},
/* 0x28 */ {dItemNo_NONE_e, "beast_05.bti"},
/* 0x29 */ {dItemNo_NONE_e, "beast_06.bti"},
/* 0x2A */ {dItemNo_NONE_e, "beast_07.bti"},
/* 0x2B */ {dItemNo_NONE_e, "beast_08.bti"},
/* 0x2C */ {dItem_NONE_e, "beast_09.bti"},
/* 0x2D */ {dItem_NONE_e, "beast_10.bti"},
/* 0x2E */ {dItem_NONE_e, "beast_11.bti"},
/* 0x2F */ {dItem_NONE_e, "beast_12.bti"},
/* 0x2C */ {dItemNo_NONE_e, "beast_09.bti"},
/* 0x2D */ {dItemNo_NONE_e, "beast_10.bti"},
/* 0x2E */ {dItemNo_NONE_e, "beast_11.bti"},
/* 0x2F */ {dItemNo_NONE_e, "beast_12.bti"},
/* 0x30 */ {FLOWER_1, "beast_02.bti"},
/* 0x31 */ {FLOWER_2, "beast_02.bti"},
/* 0x32 */ {FLOWER_3, "beast_03.bti"},
/* 0x33 */ {HEROS_FLAG, "beast_04.bti"},
/* 0x34 */ {TAIRYO_FLAG, "beast_05.bti"},
/* 0x35 */ {SALES_FLAG, "beast_06.bti"},
/* 0x36 */ {WIND_FLAG, "beast_07.bti"},
/* 0x37 */ {RED_FLAG, "beast_08.bti"},
/* 0x30 */ {dItemNo_TOWN_FLOWER_e, "beast_02.bti"},
/* 0x31 */ {dItemNo_SEA_FLOWER_e, "beast_02.bti"},
/* 0x32 */ {dItemNo_EXOTIC_FLOWER_e, "beast_03.bti"},
/* 0x33 */ {dItemNo_HEROS_FLAG_e, "beast_04.bti"},
/* 0x34 */ {dItemNo_BIG_CATCH_FLAG_e, "beast_05.bti"},
/* 0x35 */ {dItemNo_BIG_SALE_FLAG_e, "beast_06.bti"},
/* 0x36 */ {dItemNo_PINWHEEL_e, "beast_07.bti"},
/* 0x37 */ {dItemNo_SICKLE_MOON_FLAG_e, "beast_08.bti"},
/* 0x38 */ {FOSSIL_HEAD, "beast_09.bti"},
/* 0x39 */ {WATER_STATUE, "beast_10.bti"},
/* 0x3A */ {POSTMAN_STATUE, "beast_11.bti"},
/* 0x3B */ {PRESIDENT_STATUE, "beast_12.bti"},
/* 0x38 */ {dItemNo_SKULL_TOWER_IDOL_e, "beast_09.bti"},
/* 0x39 */ {dItemNo_FOUNTAIN_IDOL_e, "beast_10.bti"},
/* 0x3A */ {dItemNo_POSTMAN_STATUE_e, "beast_11.bti"},
/* 0x3B */ {dItemNo_SHOP_GURU_STATUE_e, "beast_12.bti"},
};
struct fopMsgM_pane_alpha_class;
@@ -358,10 +357,10 @@ fpc_ProcID fopMsgM_messageTypeSelect(fopAc_ac_c* param_1, cXyz* param_2, u32* pa
fpc_ProcID pcId;
if(*param_3 >> 0x10 == 0x63) {
pcId = fopMsgM_create(PROC_SCP, param_1, param_2, param_3, param_4, NULL);
pcId = fopMsgM_create(fpcNm_SCP_e, param_1, param_2, param_3, param_4, NULL);
}
else if(*param_3 >> 0x10 == 0x59) {
pcId = fopMsgM_create(PROC_PB, param_1, param_2, param_3, param_4, NULL);
pcId = fopMsgM_create(fpcNm_PB_e, param_1, param_2, param_3, param_4, NULL);
}
else {
mesg_header* header = msgGet.getMesgHeader(*param_3);
@@ -375,22 +374,22 @@ fpc_ProcID fopMsgM_messageTypeSelect(fopAc_ac_c* param_1, cXyz* param_2, u32* pa
dComIfGp_setMessageRupee(price);
if(type == 2 || type == 6 || type == 7) {
pcId = fopMsgM_create(PROC_MSG2, param_1, param_2, param_3, param_4, NULL);
pcId = fopMsgM_create(fpcNm_MSG2_e, param_1, param_2, param_3, param_4, NULL);
}
else {
pcId = fopMsgM_create(PROC_MSG, param_1, param_2, param_3, param_4, NULL);
pcId = fopMsgM_create(fpcNm_MSG_e, param_1, param_2, param_3, param_4, NULL);
}
}
else {
*param_3 = 1;
*param_4 = *param_3;
pcId = fopMsgM_create(PROC_MSG, param_1, param_2, param_3, param_4, NULL);
pcId = fopMsgM_create(fpcNm_MSG_e, param_1, param_2, param_3, param_4, NULL);
}
}
else {
*param_3 = 1;
*param_4 = *param_3;
pcId = fopMsgM_create(PROC_MSG, param_1, param_2, param_3, param_4, NULL);
pcId = fopMsgM_create(fpcNm_MSG_e, param_1, param_2, param_3, param_4, NULL);
}
JKRFileLoader::removeResource(header, NULL);
@@ -441,7 +440,7 @@ fpc_ProcID fopMsgM_messageSet(u32 msgNo, fopAc_ac_c* pActor) {
else {
pMsg->mMsgNo = msgNo;
pMsg->field_0xf0 = msgNo;
if(fopMsgM_SearchByName(PROC_SCP) || fopMsgM_SearchByName(PROC_PB)) {
if(fopMsgM_SearchByName(fpcNm_SCP_e) || fopMsgM_SearchByName(fpcNm_PB_e)) {
fopMsgM_Delete(pMsg);
i_msgID = fpcM_ERROR_PROCESS_ID_e;
}
@@ -474,7 +473,7 @@ fpc_ProcID fopMsgM_messageSet(u32 msgNo, cXyz* lookAtPos) {
else {
pMsg->mMsgNo = msgNo;
pMsg->field_0xf0 = msgNo;
if(fopMsgM_SearchByName(PROC_SCP) || fopMsgM_SearchByName(PROC_PB)) {
if(fopMsgM_SearchByName(fpcNm_SCP_e) || fopMsgM_SearchByName(fpcNm_PB_e)) {
fopMsgM_Delete(pMsg);
i_msgID = fpcM_ERROR_PROCESS_ID_e;
}
@@ -506,7 +505,7 @@ fpc_ProcID fopMsgM_messageSet(u32 msgNo) {
else {
pMsg->mMsgNo = msgNo;
pMsg->field_0xf0 = msgNo;
if(fopMsgM_SearchByName(PROC_SCP) || fopMsgM_SearchByName(PROC_PB)) {
if(fopMsgM_SearchByName(fpcNm_SCP_e) || fopMsgM_SearchByName(fpcNm_PB_e)) {
fopMsgM_Delete(pMsg);
i_msgID = fpcM_ERROR_PROCESS_ID_e;
}
@@ -560,7 +559,7 @@ u32 fopMsgM_tactMessageSet() {
else {
pMsg->mMsgNo = msgNoTemp;
pMsg->field_0xf0 = msgNoTemp;
if(fopMsgM_SearchByName(PROC_SCP) || fopMsgM_SearchByName(PROC_PB)) {
if(fopMsgM_SearchByName(fpcNm_SCP_e) || fopMsgM_SearchByName(fpcNm_PB_e)) {
fopMsgM_Delete(pMsg);
i_msgID = fpcM_ERROR_PROCESS_ID_e;
}