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

fix msgId/msgNo naming mixups

Browse Source
This commit is contained in:
LagoLunatic
2024-04-10 23:55:17 -04:00
parent 95f93e05d7
commit 282756e6e8
25 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_agbsw0.h
+1 -1
View File
@@ -7,7 +7,7 @@
class daAgb_c;
struct agb_mail_struct {
/* 0x00 */ u16 msgID;
/* 0x00 */ u16 msgNo;
/* 0x02 */ u8 swToSet;
/* 0x03 */ u8 stageSaveTbl;
/* 0x04 */ u8 roomNo;
include/d/actor/d_a_auction.h
+1 -1
View File
@@ -94,7 +94,7 @@ public:
/* 0x7F8 */ u16 mEvtNoItemIdx;
/* 0x7FA */ u16 mEvtStart2Idx;
/* 0x7FC */ u16 mEvtEnd2Idx;
/* 0x7FE */ u16 mCurrItemNameMsgID;
/* 0x7FE */ u16 mCurrItemNameMsgNo;
/* 0x800 */ u8 m800[0x81C - 0x800];
/* 0x81C */ u8 m81C;
/* 0x81D */ u8 m81D;
include/d/actor/d_a_npc_ji1.h
+1 -1
View File
@@ -36,7 +36,7 @@ public:
u32 getMsg1stType();
u32 getMsg2ndType();
u32 getMsg();
u16 next_msgStatus(u32* msgId);
u16 next_msgStatus(u32* pMsgNo);
u32 talkAction(void*);
u32 speakAction(void*);
u32 speakBadAction(void*);
include/d/actor/d_a_npc_os.h
+1 -1
View File
@@ -149,7 +149,7 @@ public:
void eventOrder();
void checkOrder();
BOOL checkCommandTalk();
u16 next_msgStatus(u32*);
u16 next_msgStatus(u32* pMsgNo);
u32 getMsg();
void setCollision();
void setAttention(bool);
include/d/actor/d_a_obj_paper.h
+1 -1
View File
@@ -61,7 +61,7 @@ namespace daObjPaper {
/* 0x3CC */ dCcD_Stts mColStatus;
/* 0x408 */ bool mbHasCc;
/* 0x40C */ int mMode;
/* 0x410 */ u32 mMsgId;
/* 0x410 */ uint mMsgId;
/* 0x414 */ msg_class* mpMsg;
/* 0x418 */ Type_e mType;
};
include/d/actor/d_a_obj_toripost.h
+1 -1
View File
@@ -38,7 +38,7 @@ public:
int getMsgXY();
int getMsgNormal();
u32 getMsg();
u16 next_msgStatus(u32* msgId);
u16 next_msgStatus(u32* pMsgNo);
bool checkTalk();
void eventOrder();
void checkOrder();
include/d/actor/d_a_tag_hint.h
+1 -1
View File
@@ -46,7 +46,7 @@ public:
public:
/* 0x290 */ u8 m290[0x298 - 0x290];
/* 0x298 */ u32 mMsgId;
/* 0x298 */ u32 mMsgNo;
/* 0x29C */ int m29C;
/* 0x2A0 */ s16 m2A0;
/* 0x2A2 */ u8 mCurProc;
include/d/d_lib.h
+1 -1
View File
@@ -103,7 +103,7 @@ void dLib_getPosFromMtx(f32(*)[4], cXyz*);
bool dLib_pathInfo(dPath**, u8);
void dLib_pathMove(cXyz*, s8*, dPath*, f32, int (*)(cXyz*, cXyz*, cXyz*, void*), void*);
void dLib_setNextStageBySclsNum(u8 i_sclsnum, s8 room_no);
u32 dLib_setFirstMsg(u16 eventBit, u32 firstMsgID, u32 secondMsgID);
u32 dLib_setFirstMsg(u16 eventBit, u32 firstMsgNo, u32 secondMsgNo);
/**
* Checks if Link is within a circular area.
*/
include/d/d_npc.h
+1 -1
View File
@@ -259,7 +259,7 @@ public:
/* 0x6BC */ u8 field_0x6bc[4];
/* 0x6C0 */ /* vtable */
virtual u16 next_msgStatus(u32* msgId) { return fopMsgStts_MSG_ENDS_e; }
virtual u16 next_msgStatus(u32* pMsgNo) { return fopMsgStts_MSG_ENDS_e; }
virtual u32 getMsg() { return 0; }
virtual void anmAtr(u16) {}
include/d/d_shop.h
+2 -2
View File
@@ -30,8 +30,8 @@ struct ShopItems_c__ItemData {
struct __shop_items_set_data {
/* 0x00 */ ShopItems_c__ItemData* mpItemData;
/* 0x04 */ u32 mShowMsgID;
/* 0x08 */ u32 mBuyMsgID;
/* 0x04 */ u32 mShowMsgNo;
/* 0x08 */ u32 mBuyMsgNo;
/* 0x0C */ u32 m0C;
/* 0x10 */ int mCount;
};
include/f_op/f_op_msg.h
+1 -1
View File
@@ -30,7 +30,7 @@ public:
/* 0xD8 */ msg_method_class* sub_method;
/* 0xDC */ fopAc_ac_c* mpActor;
/* 0xE0 */ cXyz mPos;
/* 0xEC */ u32 mMsgID;
/* 0xEC */ u32 mMsgNo;
/* 0xF0 */ u32 field_0xf0;
/* 0xF4 */ u32 field_0xf4;
/* 0xF8 */ u16 mStatus;
include/f_op/f_op_msg_mng.h
+1 -1
View File
@@ -20,7 +20,7 @@ struct msg_process_profile_definition {
struct fopMsg_prm_class {
/* 0x00 */ fopAc_ac_c* mpActor;
/* 0x04 */ cXyz mPos;
/* 0x10 */ u32 mMsgID;
/* 0x10 */ u32 mMsgNo;
/* 0x14 */ u32 field_0x14;
/* 0x18 */ int field_0x18;
}; // Size: 0x1C
src/d/actor/d_a_agbsw0.cpp
+6 -6
View File
@@ -791,11 +791,11 @@ BOOL daAgbsw0_c::ExeSubM3() {
daAgb_c* agb = dComIfGp_getAgb();
if(agb && agb->isActive() && (agb->isFree() || agb->getFollowTarget() != 1) && HitCheck(agb)) {
#if VERSION == VERSION_JPN
u16 gbaMsgId = TriforceCheck();
u16 gbaMsgNo = TriforceCheck();
#else
u16 gbaMsgId = TriforceCheck(agb);
u16 gbaMsgNo = TriforceCheck(agb);
#endif
MailSend(BigLittleChange(gbaMsgId) >> 0x10, 0xF, 0xFF, 0xFF, 0);
MailSend(BigLittleChange(gbaMsgNo) >> 0x10, 0xF, 0xFF, 0xFF, 0);
field_0x298 = 1;
}
else {
@@ -2463,8 +2463,8 @@ BOOL daAgbsw0_c::MoveCheck(s16 param_1) {
}
/* 0000477C-00004818 .text MailSend__10daAgbsw0_cFUsUcUcUcUc */
void daAgbsw0_c::MailSend(u16 msgID, u8 reactType, u8 toCheck, u8 toSet, u8 sfx) {
mMail.msgID = msgID;
void daAgbsw0_c::MailSend(u16 msgNo, u8 reactType, u8 toCheck, u8 toSet, u8 sfx) {
mMail.msgNo = msgNo;
mMail.swToSet = toSet;
mMail.swToCheck = toCheck;
mMail.stageSaveTbl = dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo());
@@ -2525,7 +2525,7 @@ static BOOL daAgbsw0_Delete(daAgbsw0_c* i_this) {
if((id <= 4 || id == 9 || 0xC <= id) && mDoGaC_GbaLink() && i_this->field_0x298 == 1) {
agb_mail_struct info;
info.msgID = 0xFFFF;
info.msgNo = 0xFFFF;
info.swToSet = 0xFF;
info.swToCheck = 0xFF;
info.stageSaveTbl = dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo());
src/d/actor/d_a_npc_bs1.cpp
+1 -1
View File
@@ -1454,7 +1454,7 @@ u16 daNpc_Bs1_c::talk() {
}
if(dComIfGp_checkMesgSendButton()) {
m738 = l_msg->mMsgID;
m738 = l_msg->mMsgNo;
if(!shopStickMoveMsgCheck(m738)) {
if(!shopMsgCheck(m738)) {
mShopItems.mSelectedItemIdx = -1;
src/d/actor/d_a_npc_ji1.cpp
+8 -8
View File
@@ -24,7 +24,7 @@ static u8 dummy5[0x4C];
static daNpc_Ji1_HIO_c l_HIO;
static u32 l_msgId;
static uint l_msgId;
static msg_class* l_msg;
static dCcD_SrcCyl l_cyl_src = {
@@ -769,7 +769,7 @@ u32 daNpc_Ji1_c::getMsg() {
}
/* 00002A60-00002C64 .text next_msgStatus__11daNpc_Ji1_cFPUl */
u16 daNpc_Ji1_c::next_msgStatus(u32* msgId) {
u16 daNpc_Ji1_c::next_msgStatus(u32* pMsgNo) {
/* Nonmatching */
u16 status = fopMsgStts_MSG_CONTINUES_e;
@@ -1068,7 +1068,7 @@ u32 daNpc_Ji1_c::evn_talk_init(int staffIdx) {
u32* pMsgNo = dComIfGp_evmng_getMyIntegerP(staffIdx, "MsgNo");
u32* pEndMsgNo = dComIfGp_evmng_getMyIntegerP(staffIdx, "EndMsgNo");
l_msgId = -1;
l_msgId = fpcM_ERROR_PROCESS_ID_e;
l_msg = 0;
if(pMsgNo) {
field_0x2AC = *pMsgNo;
@@ -1110,7 +1110,7 @@ u32 daNpc_Ji1_c::evn_talk_init(int staffIdx) {
/* 000049AC-00004B1C .text evn_talk__11daNpc_Ji1_cFv */
u32 daNpc_Ji1_c::evn_talk() {
if(l_msgId == -1) {
if(l_msgId == fpcM_ERROR_PROCESS_ID_e) {
l_msgId = fopMsgM_messageSet(field_0x2AC, &eyePos);
}
else if(!l_msg) {
@@ -1139,7 +1139,7 @@ u32 daNpc_Ji1_c::evn_talk() {
if(l_msg->mStatus == fopMsgStts_BOX_CLOSED_e) {
l_msg->mStatus = fopMsgStts_MSG_DESTROYED_e;
l_msg = 0;
l_msgId = -1;
l_msgId = fpcM_ERROR_PROCESS_ID_e;
return true;
}
@@ -1170,7 +1170,7 @@ u32 daNpc_Ji1_c::evn_continue_talk_init(int staffIdx) {
/* 00004B84-00004CF4 .text evn_continue_talk__11daNpc_Ji1_cFv */
u32 daNpc_Ji1_c::evn_continue_talk() {
if(l_msgId == -1) {
if(l_msgId == fpcM_ERROR_PROCESS_ID_e) {
l_msgId = fopMsgM_messageSet(field_0x2AC, &eyePos);
}
else if(!l_msg) {
@@ -1199,7 +1199,7 @@ u32 daNpc_Ji1_c::evn_continue_talk() {
if(l_msg->mStatus == fopMsgStts_BOX_CLOSED_e) {
l_msg->mStatus = fopMsgStts_MSG_DESTROYED_e;
l_msg = 0;
l_msgId = -1;
l_msgId = fpcM_ERROR_PROCESS_ID_e;
return true;
}
@@ -2359,7 +2359,7 @@ void daNpc_Ji1_c::setAnimFromMsgNo(u32 msgNo) {
/* Nonmatching */
if(l_msg) {
msgNo = l_msg->mMsgID;
msgNo = l_msg->mMsgNo;
}
// the switch cases for this are annoying to work out
src/d/actor/d_a_npc_kamome.cpp
+1 -1
View File
@@ -25,7 +25,7 @@ static char* l_staff_name = "HyoiKam";
static u8 temp[0x4C]; // TODO
static daNpc_kam_HIO_c l_HIO;
static int l_hio_counter;
static u32 l_msgId;
static uint l_msgId;
static msg_class* l_msg;
static daNpc_kam_c* l_act;
static s16 l_demo_start_chk_cnt;
src/d/actor/d_a_npc_md.cpp
+1 -1
View File
@@ -1291,7 +1291,7 @@ BOOL daNpc_Md_c::harpWaitNpcAction(void*) {
/* Nonmatching */
}
static u32 l_msgId;
static uint l_msgId;
static msg_class* l_msg;
/* 00004CFC-00004D40 .text XYTalkCheck__10daNpc_Md_cFv */
src/d/actor/d_a_npc_os.cpp
+4 -4
View File
@@ -796,7 +796,7 @@ BOOL daNpc_Os_c::finish02NpcAction(void* param_1) {
return true;
}
static u32 l_msgId;
static uint l_msgId;
static msg_class* l_msg;
/* 00001F48-00002118 .text talkNpcAction__10daNpc_Os_cFPv */
@@ -1843,13 +1843,13 @@ BOOL daNpc_Os_c::checkCommandTalk() {
}
/* 00005468-000054BC .text next_msgStatus__10daNpc_Os_cFPUl */
u16 daNpc_Os_c::next_msgStatus(u32* msgId) {
u16 daNpc_Os_c::next_msgStatus(u32* pMsgNo) {
u16 status = fopMsgStts_MSG_CONTINUES_e;
if(*msgId == 0) {
if(*pMsgNo == 0) {
status = fopMsgStts_MSG_ENDS_e;
}
else if(*msgId == 0xEF4) {
else if(*pMsgNo == 0xEF4) {
dComIfGs_onEventBit(0x2510);
status = fopMsgStts_MSG_ENDS_e;
}
src/d/actor/d_a_obj_toripost.cpp
+16 -16
View File
@@ -384,7 +384,7 @@ u32 daObjTpost_c::getMsg() {
}
/* 000009EC-00000CF4 .text next_msgStatus__12daObjTpost_cFPUl */
u16 daObjTpost_c::next_msgStatus(u32* msgId) {
u16 daObjTpost_c::next_msgStatus(u32* pMsgNo) {
static const u32 pay_msg_num[3] = {
0x0CEC,
0x0CED,
@@ -392,25 +392,25 @@ u16 daObjTpost_c::next_msgStatus(u32* msgId) {
};
u16 status = fopMsgStts_MSG_CONTINUES_e;
switch(*msgId) {
switch(*pMsgNo) {
case 0xCE5:
case 0xCE6:
if(mNumReadable) {
dComIfGp_setMessageCountNumber(getReceiveLetterNum());
*msgId = 0xCEB;
*pMsgNo = 0xCEB;
}
else {
*msgId = 0xCE7;
*pMsgNo = 0xCE7;
}
break;
case 0xCEB:
dComIfGp_setMessageCountNumber(field_0x8F0);
*msgId = 0xCF7;
*pMsgNo = 0xCF7;
break;
case 0xCF7:
if(l_HIO.field_0x07 != 0 || m_letter[mNumReadable].field_0x00 != 0) {
*msgId = 0xCF3;
*pMsgNo = 0xCF3;
}
else {
field_0x8E9 = 1;
@@ -419,13 +419,13 @@ u16 daObjTpost_c::next_msgStatus(u32* msgId) {
break;
case 0xCE8:
*msgId = pay_msg_num[mPayType];
*pMsgNo = pay_msg_num[mPayType];
break;
case 0xCEC:
case 0xCED:
case 0xCEE:
*msgId = 0xCEF;
*pMsgNo = 0xCEF;
break;
case 0xCEF:
@@ -434,27 +434,27 @@ u16 daObjTpost_c::next_msgStatus(u32* msgId) {
dComIfGp_setItemRupeeCount(-getSendPrice());
dComIfGs_setReserveItemEmpty();
deliverLetter();
*msgId = 0xCF2;
*pMsgNo = 0xCF2;
}
else {
setAnm(3, false);
field_0x8EA = 1;
*msgId = 0xCF1;
*pMsgNo = 0xCF1;
}
}
else {
setAnm(3, false);
field_0x8EA = 1;
*msgId = 0xCF0;
*pMsgNo = 0xCF0;
}
break;
case 0xCF3:
if(m_letter[mNumReadable].mEventReg == 0xB203) {
*msgId = 0xCF8;
*pMsgNo = 0xCF8;
}
else {
*msgId = 0xCF4;
*pMsgNo = 0xCF4;
}
break;
@@ -471,11 +471,11 @@ u16 daObjTpost_c::next_msgStatus(u32* msgId) {
status = fopMsgStts_MSG_ENDS_e;
}
else {
*msgId = 0xCF6;
*pMsgNo = 0xCF6;
}
}
else {
*msgId = 0xCF5;
*pMsgNo = 0xCF5;
}
break;
@@ -486,7 +486,7 @@ u16 daObjTpost_c::next_msgStatus(u32* msgId) {
mNumReadable = getReadableLetterNum();
if(mNumReadable) {
dComIfGp_setMessageCountNumber(field_0x8F0);
*msgId = 0xCF7;
*pMsgNo = 0xCF7;
}
else {
status = fopMsgStts_MSG_ENDS_e;
src/d/actor/d_a_tag_msg.cpp
+1 -1
View File
@@ -26,7 +26,7 @@ static u8 bss_941 ALIGN_DECL(4);
static u8 bss_939 ALIGN_DECL(4);
static u8 bss_937 ALIGN_DECL(4);
static u8 bss_936 ALIGN_DECL(4);
static u32 l_msgId;
static uint l_msgId;
static msg_class* l_msg;
static u8 msg_mode;
src/d/d_event_data.cpp
+1 -1
View File
@@ -270,7 +270,7 @@ void dEvDtStaff_c::specialProcMessage() {
"TELOP_ON",
"TELOP_OFF",
};
static u32 l_msgId;
static uint l_msgId;
static msg_class* l_msg;
static int l_msgNo;
src/d/d_lib.cpp
+3 -3
View File
@@ -206,12 +206,12 @@ void dLib_setNextStageBySclsNum(u8 i_sclsnum, s8 room_no) {
}
/* 80057EC0-80057F30 .text dLib_setFirstMsg__FUsUlUl */
u32 dLib_setFirstMsg(u16 eventBit, u32 firstMsgID, u32 secondMsgID) {
u32 dLib_setFirstMsg(u16 eventBit, u32 firstMsgNo, u32 secondMsgNo) {
if (!dComIfGs_isEventBit(eventBit)) {
dComIfGs_onEventBit(eventBit);
return firstMsgID;
return firstMsgNo;
} else {
return secondMsgID;
return secondMsgNo;
}
}
src/d/d_shop.cpp
+8 -8
View File
@@ -1200,12 +1200,12 @@ u8 ShopItems_c::getSelectItemNo() {
/* 80060078-80060090 .text getSelectItemShowMsg__11ShopItems_cFv */
u32 ShopItems_c::getSelectItemShowMsg() {
return mpItemSetList[mSelectedItemIdx]->mShowMsgID;
return mpItemSetList[mSelectedItemIdx]->mShowMsgNo;
}
/* 80060090-800600A8 .text getSelectItemBuyMsg__11ShopItems_cFv */
u32 ShopItems_c::getSelectItemBuyMsg() {
return mpItemSetList[mSelectedItemIdx]->mBuyMsgID;
return mpItemSetList[mSelectedItemIdx]->mBuyMsgNo;
}
/* 800600A8-80060138 .text dShop_get_next_select__FiP11ShopItems_c */
@@ -1255,7 +1255,7 @@ BOOL ShopItems_c::isSoldOutItemAll() {
}
/* 8006019C-8006036C .text dShop_now_triggercheck__FP9msg_classP9STControlP11ShopItems_cPUlPFPv_UlPv */
BOOL dShop_now_triggercheck(msg_class* msg, STControl* stickControl, ShopItems_c* shopItems, u32* pMsgID, dShop_DefaultMsgCallback defaultMsgCb, void* defaultMsgArg) {
BOOL dShop_now_triggercheck(msg_class* msg, STControl* stickControl, ShopItems_c* shopItems, u32* pMsgNo, dShop_DefaultMsgCallback defaultMsgCb, void* defaultMsgArg) {
int itemDataIdx;
int selectedItemIdx;
__shop_items_set_data** itemSetList;
@@ -1291,20 +1291,20 @@ BOOL dShop_now_triggercheck(msg_class* msg, STControl* stickControl, ShopItems_c
if (idxChanged) {
if (nextIdx < 0) {
if (defaultMsgCb == NULL) {
*pMsgID = default_select_msg[itemDataIdx];
*pMsgNo = default_select_msg[itemDataIdx];
} else {
*pMsgID = defaultMsgCb(defaultMsgArg);
*pMsgNo = defaultMsgCb(defaultMsgArg);
}
} else {
if (shopItems->isSoldOutItem(nextIdx)) {
*pMsgID = itemSetList[nextIdx]->m0C;
*pMsgNo = itemSetList[nextIdx]->m0C;
} else {
*pMsgID = itemSetList[nextIdx]->mShowMsgID;
*pMsgNo = itemSetList[nextIdx]->mShowMsgNo;
}
}
msg->mStatus = fopMsgStts_MSG_CONTINUES_e;
fopMsgM_messageSet(*pMsgID);
fopMsgM_messageSet(*pMsgNo);
fopMsgM_messageSendOn();
shopItems->mSelectedItemIdx = nextIdx;
}
src/f_op/f_op_msg.cpp
+1 -1
View File
@@ -64,7 +64,7 @@ int fopMsg_Create(void* i_this) {
if (prm != NULL) {
_this->mpActor = prm->mpActor;
_this->mPos = prm->mPos;
_this->mMsgID = prm->mMsgID;
_this->mMsgNo = prm->mMsgNo;
_this->field_0xf0 = prm->field_0x14;
_this->field_0xf4 = prm->field_0x18;
}
src/f_op/f_op_msg_mng.cpp
+3 -3
View File
@@ -166,14 +166,14 @@ void fopMsgM_Delete(void* i_this) {
}
/* 8002AF6C-8002B030 .text createAppend__FP10fopAc_ac_cP4cXyzPUlPUlUi */
fopMsg_prm_class* createAppend(fopAc_ac_c* actor, cXyz* pos, u32* msg_id, u32* p4, uint p5) {
fopMsg_prm_class* createAppend(fopAc_ac_c* actor, cXyz* pos, u32* msg_no, u32* p4, uint p5) {
fopMsg_prm_class* params = (fopMsg_prm_class*) cMl::memalignB(-4, sizeof(fopMsg_prm_class));
if (params == NULL)
return NULL;
params->mpActor = actor;
if (msg_id != NULL)
params->mMsgID = *msg_id;
if (msg_no != NULL)
params->mMsgNo = *msg_no;
if (p4 != NULL)
params->field_0x14 = *p4;