From f834379a8b60e0d3308e5aa064a910cead92b899 Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Fri, 15 Sep 2023 04:15:46 -0700 Subject: [PATCH] fix functions not returning values (#1926) --- include/JSystem/J2DGraph/J2DPicture.h | 2 +- include/JSystem/J2DGraph/J2DPictureEx.h | 2 +- libs/JSystem/J2DGraph/J2DPictureEx.cpp | 2 +- src/d/a/d_a_npc_cd.cpp | 1 + src/d/a/d_a_npc_cd2.cpp | 1 + src/d/d_name.cpp | 16 +++++++++++----- src/f_op/f_op_msg_mng.cpp | 6 +++--- 7 files changed, 19 insertions(+), 11 deletions(-) diff --git a/include/JSystem/J2DGraph/J2DPicture.h b/include/JSystem/J2DGraph/J2DPicture.h index bc64178f92a..a3fc4f4d621 100644 --- a/include/JSystem/J2DGraph/J2DPicture.h +++ b/include/JSystem/J2DGraph/J2DPicture.h @@ -57,7 +57,7 @@ public: /* 802FF320 */ virtual void prepend(JUTTexture*, f32); /* 801BDD70 */ virtual void insert(ResTIMG const*, u8, f32); /* 802FD168 */ virtual bool insert(ResTIMG const*, JUTPalette*, u8, f32); - /* 80020368 */ virtual void insert(char const*, u8, f32); + /* 80020368 */ virtual bool insert(char const*, u8, f32); /* 802FD4B4 */ virtual bool insert(char const*, JUTPalette*, u8, f32); /* 802FD524 */ virtual bool insert(JUTTexture*, u8, f32); /* 802FD6F4 */ virtual bool remove(u8); diff --git a/include/JSystem/J2DGraph/J2DPictureEx.h b/include/JSystem/J2DGraph/J2DPictureEx.h index 51b1748299a..d8941697291 100644 --- a/include/JSystem/J2DGraph/J2DPictureEx.h +++ b/include/JSystem/J2DGraph/J2DPictureEx.h @@ -56,7 +56,7 @@ public: /* 80306F34 */ virtual void prepend(JUTTexture*, f32); /* 80307058 */ virtual void insert(ResTIMG const*, u8, f32); /* 80303F34 */ virtual bool insert(ResTIMG const*, JUTPalette*, u8, f32); - /* 80307024 */ virtual void insert(char const*, u8, f32); + /* 80307024 */ virtual bool insert(char const*, u8, f32); /* 80303FD8 */ virtual bool insert(char const*, JUTPalette*, u8, f32); /* 80304048 */ virtual bool insert(JUTTexture*, u8, f32); /* 8030446C */ virtual bool remove(u8); diff --git a/libs/JSystem/J2DGraph/J2DPictureEx.cpp b/libs/JSystem/J2DGraph/J2DPictureEx.cpp index 5b33179a6d3..561a4f7dd41 100644 --- a/libs/JSystem/J2DGraph/J2DPictureEx.cpp +++ b/libs/JSystem/J2DGraph/J2DPictureEx.cpp @@ -1260,7 +1260,7 @@ asm void J2DPictureEx::prepend(ResTIMG const* param_0, f32 param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DPictureEx::insert(char const* param_0, u8 param_1, f32 param_2) { +asm bool J2DPictureEx::insert(char const* param_0, u8 param_1, f32 param_2) { nofralloc #include "asm/JSystem/J2DGraph/J2DPictureEx/insert__12J2DPictureExFPCcUcf.s" } diff --git a/src/d/a/d_a_npc_cd.cpp b/src/d/a/d_a_npc_cd.cpp index b83fe83d273..e54ea7604e8 100644 --- a/src/d/a/d_a_npc_cd.cpp +++ b/src/d/a/d_a_npc_cd.cpp @@ -682,6 +682,7 @@ int daNpcCd_c::loadResrc(int param_0, int param_1) { if (result != cPhs_COMPLEATE_e) { return result; } + return result; } /* 80156C50-80156D1C 151590 00CC+00 0/0 0/0 1/1 .text removeResrc__9daNpcCd_cFii */ diff --git a/src/d/a/d_a_npc_cd2.cpp b/src/d/a/d_a_npc_cd2.cpp index d21840bd8ae..43dae827ed1 100644 --- a/src/d/a/d_a_npc_cd2.cpp +++ b/src/d/a/d_a_npc_cd2.cpp @@ -1790,6 +1790,7 @@ int daNpcCd2_c::loadResrc(int idx, int param_1) { if (result != cPhs_COMPLEATE_e) { return result; } + return result; } /* 80158CBC-80158D88 1535FC 00CC+00 0/0 0/0 4/4 .text removeResrc__10daNpcCd2_cFii */ diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp index d0ff478015a..34f1b3dcdbe 100644 --- a/src/d/d_name.cpp +++ b/src/d/d_name.cpp @@ -1422,17 +1422,23 @@ void dName_c::NameStrSet() { /* 80251048-80251094 24B988 004C+00 6/6 0/0 0/0 .text getMenuPosIdx__7dName_cFUc */ s32 dName_c::getMenuPosIdx(u8 selPos) { + s32 result; switch (selPos) { case 0: - return 0; + result = 0; + break; case 1: - return 1; + result = 1; + break; case 2: - return 2; + result = 2; + break; case 3: - return 3; + result = 3; + break; } - //!@bug UB: no default return + return result; + //!@bug UB: uninitialized default return } /* 80251094-8025115C 24B9D4 00C8+00 1/0 0/0 0/0 .text draw__14dDlst_NameIN_cFv */ diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp index fd6e89e8a27..8a85eefb619 100644 --- a/src/f_op/f_op_msg_mng.cpp +++ b/src/f_op/f_op_msg_mng.cpp @@ -406,12 +406,12 @@ void J2DPicture::setBlendRatio(f32 param_0, f32 param_1) { /* 80020338-80020368 01AC78 0030+00 0/0 1/0 0/0 .text append__10J2DPictureFPCcf */ bool J2DPicture::append(char const* param_0, f32 param_1) { - insert(param_0, mTextureCount, param_1); + return insert(param_0, mTextureCount, param_1); } /* 80020368-8002039C 01ACA8 0034+00 0/0 1/0 0/0 .text insert__10J2DPictureFPCcUcf */ -void J2DPicture::insert(char const* param_0, u8 param_1, f32 param_2) { - insert(param_0, NULL, param_1, param_2); +bool J2DPicture::insert(char const* param_0, u8 param_1, f32 param_2) { + return insert(param_0, NULL, param_1, param_2); } /* 8002039C-800203E0 01ACDC 0044+00 0/0 3/3 0/0 .text fopMsgM_createExpHeap__FUlP7JKRHeap