diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2024-01-31 10:05:04 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-31 20:05:04 +0200 |
| commit | 4a081109bdc7283d0e086a73f01b74f7addffc34 (patch) | |
| tree | e68a52fd1fa5f71a47d74145114b3a992f6214b6 /src/m_Do/m_Do_ext.cpp | |
| parent | 255cc868e43f3754b29fa089a2a02e617ecb09bb (diff) | |
d_a_no_chg_room / d_a_e_st_line done (#2056)
* no_chg_room done
* d_a_e_st_line done
* remove asm
* d_a_e_bi_leaf done
* d_a_e_hb_leaf done
Diffstat (limited to 'src/m_Do/m_Do_ext.cpp')
| -rw-r--r-- | src/m_Do/m_Do_ext.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 7cb89d93f2..edeb2ee5e5 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -317,7 +317,7 @@ extern "C" void getCellWidth__7JUTFontCFv(); extern "C" void getCellHeight__7JUTFontCFv(); extern "C" void __dt__26mDoExt_3DlineMatSortPacketFv(); extern "C" bool getMaterialID__19mDoExt_3DlineMat1_cFv(); -extern "C" bool getMaterialID__19mDoExt_3DlineMat0_cFv(); +extern "C" int getMaterialID__19mDoExt_3DlineMat0_cFv(); extern "C" void setAnmTransform__10J3DMtxCalcFUcP15J3DAnmTransform(); extern "C" void setAnmTransform__10J3DMtxCalcFP15J3DAnmTransform(); extern "C" bool getAnmTransform__10J3DMtxCalcFUc(); @@ -3607,7 +3607,7 @@ extern "C" void __ct__4cXyzFv() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void mDoExt_3DlineMat0_c::init(u16 param_0, u16 param_1, int param_2) { +asm int mDoExt_3DlineMat0_c::init(u16 param_0, u16 param_1, int param_2) { nofralloc #include "asm/m_Do/m_Do_ext/init__19mDoExt_3DlineMat0_cFUsUsi.s" } @@ -4212,7 +4212,8 @@ int mDoExt_3DlineMat1_c::getMaterialID() { } /* 80014E84-80014E8C 00F7C4 0008+00 1/0 0/0 0/0 .text getMaterialID__19mDoExt_3DlineMat0_cFv */ -int mDoExt_3DlineMat0_c::getMaterialID() { +// int mDoExt_3DlineMat0_c::getMaterialID() { +extern "C" int getMaterialID__19mDoExt_3DlineMat0_cFv() { return 0; } |