diff options
| author | Tal Hayon <talhayon1@gmail.com> | 2023-05-18 12:08:41 +0300 |
|---|---|---|
| committer | Tal Hayon <talhayon1@gmail.com> | 2023-05-18 12:08:41 +0300 |
| commit | b7bc5b42a57f7e351c04af1244b3014e228716d3 (patch) | |
| tree | ca441cfbed520d1a5a2587be78bbf36c24224a35 /src/d/msg/d_msg_out_font.cpp | |
| parent | ac269f04bafda63095160d4282b9f6883179050e (diff) | |
Work on d_msg_flow
Diffstat (limited to 'src/d/msg/d_msg_out_font.cpp')
| -rw-r--r-- | src/d/msg/d_msg_out_font.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/d/msg/d_msg_out_font.cpp b/src/d/msg/d_msg_out_font.cpp index 1a5ca727f2..886a982e84 100644 --- a/src/d/msg/d_msg_out_font.cpp +++ b/src/d/msg/d_msg_out_font.cpp @@ -8,6 +8,7 @@ #include "dol2asm.h" #include "dolphin/types.h" #include "d/com/d_com_inf_game.h" +#include "f_op/f_op_msg_mng.h" // // Forward References: @@ -789,6 +790,20 @@ void COutFont_c::reset(J2DTextBox* p_textBox) { /* 80228490-80228530 222DD0 00A0+00 1/1 0/0 0/0 .text setBlendAnime__10COutFont_cFP10J2DPictures */ +// regalloc +#ifdef NONMATCHING +void COutFont_c::setBlendAnime(J2DPicture* param_0, s16 param_1) { + s32 iVar5 = param_1; + iVar5 = 0x14 - iVar5 / 0x14 * 0x14; + if (iVar5 < 10) { + f32 dVar6 = fopMsgM_valueIncrease(10, iVar5, 0); + param_0->setBlendRatio(1.0f - dVar6, dVar6); + } else { + f32 dVar6 = fopMsgM_valueIncrease(10, iVar5 - 10, 0); + param_0->setBlendRatio(dVar6, 1.0f - dVar6); + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off @@ -797,6 +812,7 @@ asm void COutFont_c::setBlendAnime(J2DPicture* param_0, s16 param_1) { #include "asm/d/msg/d_msg_out_font/setBlendAnime__10COutFont_cFP10J2DPictures.s" } #pragma pop +#endif /* 80228530-80228578 222E70 0048+00 1/1 0/0 0/0 .text getBtiName__10COutFont_cFi */ const char* COutFont_c::getBtiName(int nameIdx) { |