mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-09-04 02:19:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

msg_flow wip

Browse Source
This commit is contained in:
TakaRikka
2022-03-15 02:25:25 -07:00
parent fdaeb3437d
commit 985d47a5c8
33 changed files with 1675 additions and 2006 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/a/d_a_alink.cpp
+3 -3
View File
@@ -19464,8 +19464,8 @@ BOOL daAlink_c::checkCutTurnCharge() const {
}
/* 800D0208-800D0228 0CAB48 0020+00 1/0 0/0 0/0 .text checkAcceptDungeonWarpAlink__9daAlink_cFi */
void daAlink_c::checkAcceptDungeonWarpAlink(int param_0) {
checkAcceptWarp();
bool daAlink_c::checkAcceptDungeonWarpAlink(int param_0) {
return checkAcceptWarp();
}
/* 800D0228-800D0274 0CAB68 004C+00 1/0 0/0 0/0 .text getSpinnerActor__9daAlink_cFv */
@@ -30958,7 +30958,7 @@ static asm void daAlink_searchPortal(fopAc_ac_c* param_0, void* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daAlink_c::checkAcceptWarp() {
asm bool daAlink_c::checkAcceptWarp() {
nofralloc
#include "asm/d/a/d_a_alink/checkAcceptWarp__9daAlink_cFv.s"
}
src/d/com/d_com_inf_game.cpp
+1 -1
View File
@@ -1412,7 +1412,7 @@ int dComIfG_resDelete(request_of_phase_process_class* i_phase, char const* resNa
return 1;
}
u8 dComIfGp_getReverb(int roomNo) {
s8 dComIfGp_getReverb(int roomNo) {
return dStage_roomRead_dt_c_GetReverbStage(*dComIfGp_getStageRoom(), roomNo);
}
src/d/com/d_com_static.cpp
+1 -1
View File
@@ -449,7 +449,7 @@ asm void daNpcKakashi_setSwdTutorialStep(u8 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daNpcKakashi_getSwdTutorialStep() {
asm int daNpcKakashi_getSwdTutorialStep() {
nofralloc
#include "asm/d/com/d_com_static/daNpcKakashi_getSwdTutorialStep__Fv.s"
}
src/d/d_stage.cpp
+1 -1
View File
@@ -2476,7 +2476,7 @@ static asm int dStage_roomReadInit(dStage_dt_c* param_0, void* param_1, int para
/* 80025E40-80025E70 020780 0030+00 0/0 1/1 0/0 .text
* dStage_roomRead_dt_c_GetReverbStage__FR14roomRead_classi */
u8 dStage_roomRead_dt_c_GetReverbStage(roomRead_class& room, int index) {
s8 dStage_roomRead_dt_c_GetReverbStage(roomRead_class& room, int index) {
if (index < 0 || index >= room.field_0x0) {
index = 0;
}
src/d/meter/d_meter2_info.cpp
+1 -1
View File
@@ -1418,7 +1418,7 @@ int dMeter2Info_setNewLetterSender() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMeter2Info_setNewLetterSender() {
asm int dMeter2Info_setNewLetterSender() {
nofralloc
#include "asm/d/meter/d_meter2_info/dMeter2Info_setNewLetterSender__Fv.s"
}
src/d/msg/d_msg_class.cpp
-7
View File
@@ -15,12 +15,6 @@ struct mDoCPd_c {
static u8 m_cpadInfo[256];
};
struct Vec {};
struct cXyz {
/* 80266B34 */ void operator-(Vec const&) const;
};
struct jmessage_tControl {
/* 802299EC */ jmessage_tControl();
};
@@ -549,7 +543,6 @@ extern "C" void __dl__FPv();
extern "C" void getBounds__7J2DPaneFv();
extern "C" void getParentPane__7J2DPaneFv();
extern "C" void getStringPtr__10J2DTextBoxCFv();
extern "C" void PSVECSquareMag();
extern "C" void _savefpr_27();
extern "C" void _restfpr_27();
extern "C" void _savegpr_24();
src/d/msg/d_msg_flow.cpp
+1111 -1588
View File
File diff suppressed because it is too large Load Diff
src/d/msg/d_msg_object.cpp
+7 -51
View File
@@ -12,28 +12,6 @@
// Types:
//
struct jmessage_tControl {};
struct jmessage_tReference {
/* 80228B04 */ jmessage_tReference();
/* 80229034 */ void pageSend();
/* 80229168 */ void selectMessage();
/* 802294A8 */ void inputNumber();
/* 802297E4 */ void shiftCharCountBuffer();
/* 80229810 */ void resetCharCountBuffer();
/* 8022994C */ void isLightEnd();
/* 80238C78 */ void setActorPos(cXyz);
};
struct jmessage_tSequenceProcessor {
/* 8022B558 */ jmessage_tSequenceProcessor(jmessage_tReference const*, jmessage_tControl*);
};
struct jmessage_tRenderingProcessor {
/* 8022CCB0 */ jmessage_tRenderingProcessor(jmessage_tReference const*);
/* 8022E12C */ void resetRendering();
};
struct dMsgString_c {
/* 80249C20 */ dMsgString_c();
/* 80249D28 */ ~dMsgString_c();
@@ -133,28 +111,6 @@ struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct JMessage {
struct TControl {
/* 802A75D4 */ void reset();
/* 802A7634 */ void update();
/* 802A76BC */ void render();
/* 802A77E8 */ void setMessageCode(u16, u16);
/* 802A78F4 */ void setMessageID(u32, u32, bool*);
};
struct TResourceContainer {
struct TCResource {
/* 802A8EF8 */ ~TCResource();
};
/* 802A906C */ TResourceContainer();
};
struct TParse {
/* 802A9130 */ TParse(JMessage::TResourceContainer*);
};
};
//
// Forward References:
//
@@ -1125,7 +1081,7 @@ asm void dMsgObject_c::isHowlMessage() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMsgObject_c::isMidonaMessage() {
asm bool dMsgObject_c::isMidonaMessage() {
nofralloc
#include "asm/d/msg/d_msg_object/isMidonaMessage__12dMsgObject_cFv.s"
}
@@ -1474,7 +1430,7 @@ asm void dMsgObject_c::offCameraCancelFlag() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMsgObject_c::isKillMessageFlag() {
asm bool dMsgObject_c::isKillMessageFlag() {
nofralloc
#include "asm/d/msg/d_msg_object/isKillMessageFlag__12dMsgObject_cFv.s"
}
@@ -1781,7 +1737,7 @@ asm void dMsgObject_c::getString(u32 param_0, J2DTextBox* param_1, J2DTextBox* p
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMsgObject_c::getMsgDtPtr() {
asm u8* dMsgObject_c::getMsgDtPtr() {
nofralloc
#include "asm/d/msg/d_msg_object/getMsgDtPtr__12dMsgObject_cFv.s"
}
@@ -2121,7 +2077,7 @@ asm void dMsgObject_c::isHowlHearingMode() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMsgObject_c::getSelectBombBagID() {
asm u8 dMsgObject_c::getSelectBombBagID() {
nofralloc
#include "asm/d/msg/d_msg_object/getSelectBombBagID__12dMsgObject_cFv.s"
}
@@ -2131,7 +2087,7 @@ asm void dMsgObject_c::getSelectBombBagID() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMsgObject_c::getSelectBombPrice() {
asm s16 dMsgObject_c::getSelectBombPrice() {
nofralloc
#include "asm/d/msg/d_msg_object/getSelectBombPrice__12dMsgObject_cFv.s"
}
@@ -2232,7 +2188,7 @@ static asm void dMsgObject_addTotalPayment(s16 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMsgObject_getFundRaising() {
asm u16 dMsgObject_getFundRaising() {
nofralloc
#include "asm/d/msg/d_msg_object/dMsgObject_getFundRaising__Fv.s"
}
@@ -2262,7 +2218,7 @@ static asm void dMsgObject_addFundRaising(s16 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMsgObject_getOffering() {
asm u16 dMsgObject_getOffering() {
nofralloc
#include "asm/d/msg/d_msg_object/dMsgObject_getOffering__Fv.s"
}
src/d/shop/d_shop_system.cpp
+2 -2
View File
@@ -1940,9 +1940,9 @@ int dShopSystem_c::seq_choose(fopAc_ac_c* actor, dMsgFlow_c* p_flow) {
p_flow->doFlow(actor, NULL, 0);
u16 select_num = p_flow->getSelectNum();
int select_num = p_flow->getSelectNum();
if (dMsgObject_c::getStatus() != 6 && dMsgObject_c::getStatus() != 8 && dMsgObject_c::getStatus() != 9 && dMsgObject_c::getStatus() != 20) {
if (select_num == 0) {
if ((u16)select_num == 0) {
setSeq(SEQ_DECIDE_YES);
} else {
setSeq(SEQ_DECIDE_NO);
src/f_op/f_op_msg_mng.cpp
+1 -1
View File
@@ -129,7 +129,7 @@ asm void fopMsgM_setStageLayer(void* param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void fopMsgM_SearchByID(unsigned int param_0) {
asm msg_class* fopMsgM_SearchByID(unsigned int param_0) {
nofralloc
#include "asm/f_op/f_op_msg_mng/fopMsgM_SearchByID__FUi.s"
}