diff options
| author | TakaRikka <takarikka@outlook.com> | 2023-07-16 23:45:01 -0700 |
|---|---|---|
| committer | TakaRikka <takarikka@outlook.com> | 2023-07-16 23:45:01 -0700 |
| commit | 0b60233fae3aee1d46ab8be3d6aba895bd61ef54 (patch) | |
| tree | 0c3d81664e976877c7bf9797760b119a5630b112 /src/d/msg/d_msg_object.cpp | |
| parent | 3e5903296fc3308a7199b3d7a55f320fd90c0c21 (diff) | |
| parent | 8a579ec1613f78ec273516af265c02317cea6fc9 (diff) | |
Merge branch 'master' of https://github.com/zeldaret/tp into lv4floor
Diffstat (limited to 'src/d/msg/d_msg_object.cpp')
| -rw-r--r-- | src/d/msg/d_msg_object.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/d/msg/d_msg_object.cpp b/src/d/msg/d_msg_object.cpp index 9b6ba08756..d77c7c6800 100644 --- a/src/d/msg/d_msg_object.cpp +++ b/src/d/msg/d_msg_object.cpp @@ -1662,7 +1662,7 @@ asm void dMsgObject_c::changeGroup(s16 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dMsgObject_c::getString(u32 param_0, J2DTextBox* param_1, J2DTextBox* param_2, +asm bool dMsgObject_c::getString(u32 param_0, J2DTextBox* param_1, J2DTextBox* param_2, JUTFont* param_3, COutFont_c* param_4, char* param_5, char* param_6, char* param_7, s16* param_8) { nofralloc |