mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-19 13:03:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

k_wmark / k_wpillar OK, fop actor enums / debug building (#1946)

Browse Source 
* d_k_wmark / d_k_wpillar OK

* make debug buildable / add assert functionality

* add more fop actor enums

* remove asm
This commit is contained in:
TakaRikka
2023-09-28 12:01:42 -07:00
committed by GitHub
parent 673e69386a
commit 89ed2b8a26
206 changed files with 1612 additions and 2472 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/event/d_event.cpp
+13 -13
View File
@@ -144,7 +144,7 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// This probably will need to be moved once actual debug rom decomp begins
#if DEBUG
#ifdef DEBUG
static dEvDb_bit_c dEvDb_bit_table[799] = {
#include "src/d/event/d_event_debug_bit_table.inc"
};
@@ -328,7 +328,7 @@ void dEvt_control_c::setParam(dEvt_order_c* p_order) {
s32 dEvt_control_c::beforeFlagProc(dEvt_order_c* p_order) {
fopAc_ac_c* actor = p_order->mActor2;
if (p_order->mFlag & 4 && actor->mEvtInfo.chkCondition(1) != true) {
if (p_order->mFlag & 4 && actor->mEvtInfo.chkCondition(dEvtCnd_CANTALK_e) != true) {
return 0;
}
@@ -442,7 +442,7 @@ int dEvt_control_c::talkXyCheck(dEvt_order_c* p_order) {
return 0;
}
if (pActor2 == NULL || !pActor2->mEvtInfo.chkCondition(0x20)) {
if (pActor2 == NULL || !pActor2->mEvtInfo.chkCondition(dEvtCnd_CANTALKITEM_e)) {
return 0;
}
@@ -467,9 +467,9 @@ int dEvt_control_c::catchCheck(dEvt_order_c* p_order) {
return 0;
}
actor1->mEvtInfo.setCommand(6);
actor1->mEvtInfo.setCommand(dEvtCmd_INCATCH_e);
if (actor2 != NULL) {
actor2->mEvtInfo.setCommand(6);
actor2->mEvtInfo.setCommand(dEvtCmd_INCATCH_e);
}
setParam(p_order);
@@ -486,12 +486,12 @@ int dEvt_control_c::catchCheck(dEvt_order_c* p_order) {
int dEvt_control_c::talkEnd() {
fopAc_ac_c* actor = getPt1();
if (actor != NULL) {
actor->mEvtInfo.setCommand(0);
actor->mEvtInfo.setCommand(dEvtCmd_NONE_e);
}
actor = getPt2();
if (actor != NULL) {
actor->mEvtInfo.setCommand(0);
actor->mEvtInfo.setCommand(dEvtCmd_NONE_e);
}
if (mSpecifiedEvent != -1) {
@@ -540,11 +540,11 @@ int dEvt_control_c::demoCheck(dEvt_order_c* p_order) {
}
if (actor1 != NULL) {
actor1->mEvtInfo.setCommand(2);
actor1->mEvtInfo.setCommand(dEvtCmd_INDEMO_e);
}
if (actor2 != NULL) {
actor2->mEvtInfo.setCommand(2);
actor2->mEvtInfo.setCommand(dEvtCmd_INDEMO_e);
}
mMode = EVT_MODE_DEMO;
@@ -557,12 +557,12 @@ int dEvt_control_c::demoCheck(dEvt_order_c* p_order) {
int dEvt_control_c::demoEnd() {
fopAc_ac_c* actor = getPt1();
if (actor != NULL) {
actor->mEvtInfo.setCommand(0);
actor->mEvtInfo.setCommand(dEvtCmd_NONE_e);
}
actor = getPt2();
if (actor != NULL) {
actor->mEvtInfo.setCommand(0);
actor->mEvtInfo.setCommand(dEvtCmd_NONE_e);
}
if (mSpecifiedEvent != -1) {
@@ -578,7 +578,7 @@ int dEvt_control_c::potentialCheck(dEvt_order_c* p_order) {
if (!beforeFlagProc(p_order)) {
return 0;
} else {
actor->mEvtInfo.setCommand(2);
actor->mEvtInfo.setCommand(dEvtCmd_INDEMO_e);
mMode = EVT_MODE_DEMO;
setParam(p_order);
afterFlagProc(p_order);
@@ -1271,7 +1271,7 @@ void* dEvt_control_c::getStbDemoData(char* resName) {
}
dEvt_info_c::dEvt_info_c() {
setCommand(0);
setCommand(dEvtCmd_NONE_e);
setCondition(2);
setEventId(-1);
setMapToolId(-1);
src/d/event/d_event_debug_bit_table.inc
+6 -6
View File
@@ -102,7 +102,7 @@
"810 ゴーストのにおいを覚えた", // Learned ghost's scent
"京極", // Kyogoku
0x6210,
"D_MN10:LV4ダンジョン" // LV4 Dungeon
"D_MN10:LV4ダンジョン", // LV4 Dungeon
0x9,
0xa,
},
@@ -1155,7 +1155,7 @@
"681 １匹目のゴーストを倒した後のミドナヒントを聞いた", // Heard Midna's hint after defeating first ghost
"京極", // Kyogoku
0x5302,
"D_MN10:LV4ダンジョン" // LV4 Dungeon,
"D_MN10:LV4ダンジョン", // LV4 Dungeon,
0x9,
0xa,
},
@@ -1164,7 +1164,7 @@
"680 ゴースト逃亡デモ後のミドナヒントを聞いた", // Heard Midna's hint after cutscene of ghost escaping
"京極", // Kyogoku
0x5304,
"D_MN10:LV4ダンジョン" // LV4 Dungeon,
"D_MN10:LV4ダンジョン", // LV4 Dungeon,
0x9,
0xa,
},
@@ -1386,7 +1386,7 @@
},
{
"F_0655",
"655 ウキ釣りで【トアルナマズ】を初めて釣った",　// Caught an Ordon Catfish using bobber first time
"655 ウキ釣りで【トアルナマズ】を初めて釣った", // Caught an Ordon Catfish using bobber first time
"京極", // Kyogoku
0x5008,
"釣り", // Fishing
@@ -3990,7 +3990,7 @@
"361 スピナー柱まわした", // Spun the spinning pillars
"京極", // Kyogoku
0x2c10,
"D_MN10:LV4ダンジョン" // LV4 Dungeon,
"D_MN10:LV4ダンジョン", // LV4 Dungeon,
0x9,
0xa,
},
@@ -4854,7 +4854,7 @@
"265 LV4ダンジョンクリア", // LV4 dungeon clear
"京極", // Kyogoku
0x2010,
"D_MN10:LV4ダンジョン" // LV4 Dungeon,
"D_MN10:LV4ダンジョン", // LV4 Dungeon,
0x9,
0xa,
},