mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-19 05:02:12 -04:00
Merge branch 'wip/linkfix2' into wip/linkfix
This commit is contained in:
@@ -2754,9 +2754,9 @@ void daE_YMB_c::action() {
|
||||
}
|
||||
|
||||
if (mAction != 5) {
|
||||
attention_info.distances[2] = 24;
|
||||
attention_info.distances[fopAc_attn_BATTLE_e] = 24;
|
||||
} else {
|
||||
attention_info.distances[2] = 25;
|
||||
attention_info.distances[fopAc_attn_BATTLE_e] = 25;
|
||||
}
|
||||
|
||||
field_0x712 = 0;
|
||||
@@ -3158,7 +3158,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
|
||||
return i_this->CreateHeap();
|
||||
}
|
||||
|
||||
cPhs__Step daE_YMB_c::create() {
|
||||
cPhs_Step daE_YMB_c::create() {
|
||||
fopAcM_ct(this, daE_YMB_c);
|
||||
|
||||
mSwitchBit = fopAcM_GetParam(this);
|
||||
@@ -3170,7 +3170,7 @@ cPhs__Step daE_YMB_c::create() {
|
||||
}
|
||||
}
|
||||
|
||||
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&mPhase, "E_YB");
|
||||
cPhs_Step phase = dComIfG_resLoad(&mPhase, "E_YB");
|
||||
if (phase == cPhs_COMPLEATE_e) {
|
||||
OS_REPORT("E_YMB PARAM %x\n", fopAcM_GetParam(this));
|
||||
if (!fopAcM_entrySolidHeap(this, useHeapInit, 0x5200)) {
|
||||
|
||||
Reference in New Issue
Block a user