mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-05-23 06:34:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for m_npc, m_notice

Browse Source
This commit is contained in:
Cuyler36
2025-08-14 03:56:18 -04:00
parent b3264b6652
commit 7ecd923824
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/m_notice.c
+1 -1
View File
@@ -52,7 +52,7 @@ typedef struct notice_date_data_s {
/* 0x02 */ u16 date;
} mNtc_date_data_c;
static mNtc_date_data_c mNtc_auto_nwrite_data[48];
static mNtc_date_data_c mNtc_auto_nwrite_data[mNtc_DATA_LIST_NUM];
static void mNtc_copy_data_list() {
static mNtc_date_data_c auto_nwrite_date_data[mNtc_DATA_LIST_NUM] = {
src/game/m_npc.c
+7 -11
View File
@@ -2323,23 +2323,18 @@ extern void mNpc_SetDefAnimal(Animal_c* animal, mActor_name_t npc_id, mNpc_Defau
}
static void mNpc_SetHaveAppeared(mActor_name_t npc_id) {
u8 v;
int idx;
int bit;
u8* used_tbl = Save_Get(npc_used_tbl);
int idx;
int i;
if (ITEM_NAME_GET_TYPE(npc_id) == NAME_TYPE_NPC) {
idx = npc_id & 0xFFF;
i = idx / 8;
if (i < ARRAY_COUNT(Save_Get(npc_used_tbl))) {
/* what in the fuck */
v = used_tbl[i];
bit = idx & 7;
bit = 1 << bit;
v |= bit;
used_tbl[i] = v;
used_tbl += i;
idx = idx & 7u;
*used_tbl |= 1 << idx;
}
}
}
@@ -2350,7 +2345,8 @@ static int mNpc_GetHaveAppeared_idx(int idx) {
int res = TRUE;
if (i < ARRAY_COUNT(Save_Get(npc_used_tbl))) {
res = (used_tbl[i] >> (idx & 7)) & 1;
used_tbl += i;
res = (*used_tbl >> (idx & 7u)) & 1;
}
return res;