mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-05-30 08:26:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'decomp/main'

Browse Source
This commit is contained in:
Max Roncace
2026-03-18 01:56:47 -04:00
parent f17c134aff dee722dab5
commit bb061a1225
133 changed files with 1091 additions and 584 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_msg_object.cpp
+10 -1
View File
@@ -1602,7 +1602,16 @@ u8 dMsgObject_c::isSend() {
}
void dMsgObject_c::readMessageGroupLocal(mDoDvdThd_mountXArchive_c** p_arcMount) {
#if AVOID_UB
// largest possible value msgGroup appears to be 99, but just in case
// we leave enough space to fit INT_MAX
static char arcName[32];
#else
// We write at least 23 bytes into this which causes an overflow,
// but in practice arcName is followed by two bytes of padding
// at the end of .bss which mitigates the problem.
static char arcName[22];
#endif
int msgGroup = dStage_stagInfo_GetMsgGroup(dComIfGp_getStage()->getStagInfo());
#if REGION_PAL
@@ -2133,7 +2142,7 @@ u16 dMsgObject_c::getSmellTypeMessageIDLocal() {
if (smell < dItemNo_SMELL_MEDICINE_e + 1 && smell >= dItemNo_SMELL_YELIA_POUCH_e) {
msgId = smell + 0x165;
} else {
if (dComIfGs_getCollectSmell() != -1) {
if (dComIfGs_getCollectSmell() != 0xFF) {
OS_REPORT("smell type ====> %d\n", dComIfGs_getCollectSmell());
JUT_WARN(4858, "smell type no entry!");
}