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

Demo work (#984)

Browse Source
This commit is contained in:
LagoLunatic
2026-05-09 18:42:01 -04:00
committed by GitHub
parent 0e98a9b636
commit fe76ad5a3b
41 changed files with 546 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_player_npc.cpp
+14 -12
View File
@@ -17,12 +17,17 @@ int daPy_npc_c::check_initialRoom() {
if (mAcch.GetGroundH() == -G_CM3D_F_INF || dComIfG_Bgsp()->GetGroundCode(mAcch.m_gnd) == 4) {
return 0;
}
#if VERSION == VERSION_DEMO
fopAcM_SetHomeRoomNo(this, dComIfG_Bgsp()->GetRoomId(mAcch.m_gnd));
fopAcM_SetRoomNo(this, dComIfG_Bgsp()->GetRoomId(mAcch.m_gnd));
#else
int roomNo = dComIfG_Bgsp()->GetRoomId(mAcch.m_gnd);
if (roomNo < 0 || !dComIfGp_roomControl_checkStatusFlag(roomNo, 0x10)) {
return 0;
}
fopAcM_SetHomeRoomNo(this, roomNo);
fopAcM_SetRoomNo(this, roomNo);
#endif
return -1;
}
return 1;
@@ -30,7 +35,7 @@ int daPy_npc_c::check_initialRoom() {
/* 8015A448-8015A524 .text check_moveStop__10daPy_npc_cFv */
BOOL daPy_npc_c::check_moveStop() {
int roomNo = current.roomNo;
int roomNo = fopAcM_GetRoomNo(this);
BOOL hasBgW = dComIfGp_roomControl_checkStatusFlag(roomNo, 0x10);
if ((roomNo < 0 || !hasBgW)) {
if (!hasBgW || m4E8 >= 30) {
@@ -50,10 +55,10 @@ BOOL daPy_npc_c::check_moveStop() {
/* 8015A524-8015A590 .text setRestart__10daPy_npc_cFSc */
void daPy_npc_c::setRestart(s8 option) {
if (option == dComIfGs_getRestartOption()) {
bool playerInDoor = dComIfGp_getPlayer(0)->eventInfo.checkCommandDoor();
BOOL playerInDoor = dComIfGp_getPlayer(0)->eventInfo.checkCommandDoor();
s8 roomNo = current.roomNo;
s8 optionRoomNo = dComIfGs_getRestartOptionRoomNo();
if (!playerInDoor && roomNo != optionRoomNo) {
if (playerInDoor == FALSE && roomNo != optionRoomNo) {
unconditionalSetRestart(option);
}
}
@@ -76,13 +81,13 @@ void daPy_npc_c::setOffsetHomePos() {
/* 8015A6A4-8015AA0C .text setPointRestart__10daPy_npc_cFsSc */
void daPy_npc_c::setPointRestart(s16 i_point, s8 option) {
JUT_ASSERT(157, dComIfGp_getStagePlayer() != NULL);
JUT_ASSERT(DEMO_SELECT(152, 157), dComIfGp_getStagePlayer() != NULL);
stage_scls_info_dummy_class* sclsinfo = dComIfGp_getStageSclsInfo();
JUT_ASSERT(159, sclsinfo != NULL);
JUT_ASSERT(DEMO_SELECT(154, 159), sclsinfo != NULL);
JUT_ASSERT(161, 0 <= i_point && i_point < sclsinfo->num);
JUT_ASSERT(DEMO_SELECT(156, 161), 0 <= i_point && i_point < sclsinfo->num);
stage_scls_info_class* scls_data = sclsinfo->m_entries;
JUT_ASSERT(163, scls_data != NULL);
JUT_ASSERT(DEMO_SELECT(158, 163), scls_data != NULL);
stage_actor_data_class* player_data = dComIfGp_getStagePlayer()->m_entries;
int scls_start_code = scls_data[i_point].mStart;
@@ -94,7 +99,7 @@ void daPy_npc_c::setPointRestart(s16 i_point, s8 option) {
}
player_data++;
}
JUT_ASSERT(174, i != dComIfGp_getStagePlayerNum());
JUT_ASSERT(DEMO_SELECT(169, 174), i != dComIfGp_getStagePlayerNum());
home.pos = player_data->base.position;
home.angle.y = player_data->base.angle.y;
@@ -134,10 +139,7 @@ BOOL daPy_npc_c::initialRestartOption(s8 option, BOOL save) {
if (!partner) {
dComIfGp_setCb1Player(this);
if (save && option != dComIfGs_getRestartOption()) {
s16 rotY;
s8 roomNo = current.roomNo;
rotY = home.angle.y;
dComIfGs_setRestartOption(&home.pos, rotY, roomNo, option);
dComIfGs_setRestartOption(&home.pos, home.angle.y, current.roomNo, option);
}
return TRUE;
}