d_a_obj_kanban2 & more OK (#2674)

* d_a_obj_kanban2 OK via gameInfo fakematch

Closes #1001

* Mark d_a_obj_kanban2 as matching for JP

* Mark npc_jagar as Matching

* d_a_tag_allmato OK via gameInfo fake match

* d_a_obj_wchain OK

* d_a_obj_so OK

---------

Co-authored-by: Max Roncace <me@caseif.net>
This commit is contained in:
YunataSavior
2025-09-20 12:09:06 -07:00
committed by GitHub
parent 72236276a6
commit affd5d7f95
13 changed files with 131 additions and 101 deletions
+12 -1
View File
@@ -1002,9 +1002,20 @@ void daObj_Kanban2_c::executeNormal() {
break;
case 1:
mInvulnerabilityTimer = 3;
if (dComIfGp_event_runCheck() && eventInfo.checkCommandTalk()) {
#if VERSION != VERSION_SHIELD_DEBUG
// TODO: gameInfo fake match to force reuse of pointer
dComIfG_play_c* play = &g_dComIfG_gameInfo.play;
if (play->getEvent().runCheck() && eventInfo.checkCommandTalk())
#else
if (dComIfGp_event_runCheck() && eventInfo.checkCommandTalk())
#endif
{
if (mMsgFlow.doFlow(this, NULL, 0)) {
#if VERSION != VERSION_SHIELD_DEBUG
play->getEvent().reset();
#else
dComIfGp_event_reset();
#endif
field_0x9fe = 0;
}
} else {