Resolve all gameInfo fakematches (#2995)

* Clean up various inlines/fakematches/comments

* Copy OptRuby inline name from TWW debug

* Resolve all dEvt_control_c related fakematches, return pointer instead of reference

* Fix some more missing inline usages
This commit is contained in:
LagoLunatic
2025-12-24 19:57:36 -05:00
committed by GitHub
parent cefe919b8d
commit 229527daf7
194 changed files with 767 additions and 1029 deletions
+1 -13
View File
@@ -909,7 +909,6 @@ void daObj_Kanban2_c::calcNormalSwing() {
field_0x626 = sp8;
}
// NONMATCHING - gameinfo mEvent load, equivalent
void daObj_Kanban2_c::executeNormal() {
calcNormalSwing();
mCcSph.OffAtSetBit();
@@ -953,20 +952,9 @@ void daObj_Kanban2_c::executeNormal() {
break;
case 1:
mInvulnerabilityTimer = 3;
#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 (dComIfGp_event_runCheck() && eventInfo.checkCommandTalk()) {
if (mMsgFlow.doFlow(this, NULL, 0)) {
#if VERSION != VERSION_SHIELD_DEBUG
play->getEvent().reset();
#else
dComIfGp_event_reset();
#endif
field_0x9fe = 0;
}
} else {