diff --git a/rel/d/a/d_a_do/d_a_do.cpp b/rel/d/a/d_a_do/d_a_do.cpp index 46d91e09ca2..ee592aadb42 100644 --- a/rel/d/a/d_a_do/d_a_do.cpp +++ b/rel/d/a/d_a_do/d_a_do.cpp @@ -571,7 +571,6 @@ SECTION_RODATA static f32 const lit_3846 = 30.0f; COMPILER_STRIP_GATE(0x8066EE10, &lit_3846); /* 80668264-8066833C 000604 00D8+00 1/1 0/0 0/0 .text daDo_other_bg_check2__FP8do_classP4cXyz */ -#ifndef NONMATCHING static int daDo_other_bg_check2(do_class* i_dogP, cXyz* i_posP) { Vec dog_pos; // defining as cXyz moves the destructor above this function, breaking the TU Vec i_pos; // defining as cXyz moves the destructor above this function, breaking the TU @@ -584,10 +583,10 @@ static int daDo_other_bg_check2(do_class* i_dogP, cXyz* i_posP) { // do_class* dog = (do_class*)i_dogP; // required for match, maybe fake match? i_pos = *pos; - i_pos.y += 30.0f; + i_pos.y += FLOAT_LABEL(lit_3846); dog_pos = dog->current.pos; - dog_pos.y += 30.0f; + dog_pos.y += FLOAT_LABEL(lit_3846); lin_chk.Set((cXyz*)&dog_pos,(cXyz*)&i_pos,dog); if (dComIfG_Bgsp().LineCross(&lin_chk)) { @@ -596,16 +595,6 @@ static int daDo_other_bg_check2(do_class* i_dogP, cXyz* i_posP) { return 0; } } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daDo_other_bg_check2(do_class* i_dogP, cXyz* i_posP) { - nofralloc -#include "asm/rel/d/a/d_a_do/d_a_do/daDo_other_bg_check2__FP8do_classP4cXyz.s" -} -#pragma pop -#endif /* ############################################################################################## */ /* 8066F278-8066F27C 000008 0001+03 3/3 0/0 0/0 .bss @1109 */