mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-09-09 19:01:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

A lot of work on Australian version, actors still need to be sorted

Browse Source
This commit is contained in:
Cuyler36
2025-08-16 10:39:19 -04:00
parent b4da3dbd69
commit c4856f9843
123 changed files with 13005 additions and 12655 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/actor/ac_quest_talk_island.c
+5 -10
View File
@@ -192,7 +192,7 @@ static void aQMgr_normal_set_free_str(QUEST_MANAGER_ACTOR* manager) {
mMsg_SET_FREE_STR(mMsg_FREE_STR12, animal->parent_name, LAND_NAME_SIZE);
}
typedef int (*aQMgr_CALENDAR_CONV_PROC)(lbRTC_ymd_c*, const lbRTC_ymd_c*);
typedef int (*aQMgr_CALENDAR_CONV_PROC)(lbRTC_ymd_c*, lbRTC_ymd_c*);
static void aQMgr_set_calendar_free_str(aQMgr_CALENDAR_CONV_PROC conv_proc, int month_str_no, int day_str_no, u8 month, u8 day) {
static u8 uru_tuki[10] = "leap month";
@@ -1600,18 +1600,15 @@ static int aQMgr_decide_player_msg_no(QUEST_MANAGER_ACTOR* manager, int looks) {
static Anmmem_c* aQMgr_get_other_memory(Anmmem_c* memory, int cnt, PersonalID_c* pid, int needs_letter) {
int j;
int mem_cnt;
Anmmem_c* mem;
int i;
Anmmem_c* ret_mem = NULL;
int i;
int sel_idx;
ret_mem = NULL;
mem_cnt = 0;
for (i = 0; i < cnt; i++) {
mem = &memory[i];
if (!mNpc_CheckFreeAnimalMemory(mem) && mPr_CheckCmpPersonalID(pid, &mem->memory_player_id) != TRUE && (!needs_letter || mem->letter_info.exists == TRUE)) {
if (!mNpc_CheckFreeAnimalMemory(&memory[i]) && mPr_CheckCmpPersonalID(pid, &memory[i].memory_player_id) != TRUE && (!needs_letter || memory[i].letter_info.exists == TRUE)) {
mem_cnt++;
}
}
@@ -1620,11 +1617,9 @@ static Anmmem_c* aQMgr_get_other_memory(Anmmem_c* memory, int cnt, PersonalID_c*
sel_idx = RANDOM(mem_cnt);
for (j = 0; j < cnt; j++) {
mem = &memory[j];
if (!mNpc_CheckFreeAnimalMemory(mem) && !mPr_CheckCmpPersonalID(pid, &mem->memory_player_id) && (!needs_letter || mem->letter_info.exists == TRUE)) {
if (!mNpc_CheckFreeAnimalMemory(&memory[j]) && !mPr_CheckCmpPersonalID(pid, &memory[j].memory_player_id) && (!needs_letter || memory[j].letter_info.exists == TRUE)) {
if (sel_idx == 0) {
ret_mem = mem;
ret_mem = &memory[j];
break;
}
src/actor/ac_quest_talk_normal_init.c
+1 -1
View File
@@ -822,7 +822,7 @@ static void aQMgr_set_free_str_memory(Anmmem_c* memory) {
aQMgr_set_number_free_str_add_nichi(memory->last_speak_time.day, mMsg_FREE_STR19);
}
typedef int (*aQMgr_CALENDAR_CONV_PROC)(lbRTC_ymd_c*, const lbRTC_ymd_c*);
typedef int (*aQMgr_CALENDAR_CONV_PROC)(lbRTC_ymd_c*, lbRTC_ymd_c*);
static void aQMgr_set_calendar_free_str(aQMgr_CALENDAR_CONV_PROC conv_proc, int month_str_no, int day_str_no, u8 month, u8 day) {
static u8 uru_tuki[10] = "leap month";