mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-08-30 17:00:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Document EnTest3 (#1881)

Browse Source 
* Document `EnTest3`

* Add comments for enum-type fields

* Add scheduled action index comments

Co-authored-by: Copilot <copilot@github.com>

* Use enums in comparisons

* Rename `sp3C`

* Rewrite comments on speak data

Co-authored-by: Copilot <copilot@github.com>

* Reformat

* Missed a text comment

* Missed another text comment

---------

Co-authored-by: Copilot <copilot@github.com>
This commit is contained in:
Jordan Longstaff
2026-07-18 15:20:31 -04:00
committed by GitHub
parent ae6e93fcf9
commit 5fd95d51f9
19 changed files with 801 additions and 601 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/schedule_scripting_language.md
+2 -2
View File
@@ -721,7 +721,7 @@ A `not` must always be followed by a [conditional check command](#conditional-ch
The following two scripts are equivalent:
```c
if_week_event_reg (WEEKEVENTREG_51_08) {
if_week_event_reg (WEEKEVENTREG_KAFEI_ENTRUSTED_LINK) {
if_since_time (22, 0) {
return_s (12)
} else {
@@ -733,7 +733,7 @@ if_week_event_reg (WEEKEVENTREG_51_08) {
```
```c
not if_week_event_reg (WEEKEVENTREG_51_08) {
not if_week_event_reg (WEEKEVENTREG_KAFEI_ENTRUSTED_LINK) {
return_s (12)
} else {
if_since_time (22, 0) {
include/z64save.h
+13 -13
View File
@@ -945,13 +945,13 @@ typedef enum {
#define WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_EAST_UPPER_CLOCKTOWN PACK_WEEKEVENTREG_FLAG(27, 0x08)
#define WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_EAST_LOWER_CLOCKTOWN PACK_WEEKEVENTREG_FLAG(27, 0x10)
#define WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_SOUTH_LOWER_CLOCKTOWN PACK_WEEKEVENTREG_FLAG(27, 0x20)
#define WEEKEVENTREG_27_40 PACK_WEEKEVENTREG_FLAG(27, 0x40)
#define WEEKEVENTREG_27_80 PACK_WEEKEVENTREG_FLAG(27, 0x80)
#define WEEKEVENTREG_28_01 PACK_WEEKEVENTREG_FLAG(28, 0x01)
#define WEEKEVENTREG_28_02 PACK_WEEKEVENTREG_FLAG(28, 0x02)
#define WEEKEVENTREG_28_04 PACK_WEEKEVENTREG_FLAG(28, 0x04)
#define WEEKEVENTREG_28_08 PACK_WEEKEVENTREG_FLAG(28, 0x08)
#define WEEKEVENTREG_28_10 PACK_WEEKEVENTREG_FLAG(28, 0x10)
#define WEEKEVENTREG_POSTMAN_CHECKED_SOUTH_UPPER_CLOCKTOWN PACK_WEEKEVENTREG_FLAG(27, 0x40)
#define WEEKEVENTREG_POSTMAN_CHECKED_NORTH_CLOCKTOWN PACK_WEEKEVENTREG_FLAG(27, 0x80)
#define WEEKEVENTREG_POSTMAN_CHECKED_EAST_UPPER_CLOCKTOWN PACK_WEEKEVENTREG_FLAG(28, 0x01)
#define WEEKEVENTREG_POSTMAN_CHECKED_EAST_LOWER_CLOCKTOWN PACK_WEEKEVENTREG_FLAG(28, 0x02)
#define WEEKEVENTREG_POSTMAN_CHECKED_SOUTH_LOWER_CLOCKTOWN PACK_WEEKEVENTREG_FLAG(28, 0x04)
#define WEEKEVENTREG_LETTER_TO_KAFEI_SCHEDULED_DAY_2 PACK_WEEKEVENTREG_FLAG(28, 0x08)
#define WEEKEVENTREG_LETTER_TO_KAFEI_SCHEDULED_DAY_3 PACK_WEEKEVENTREG_FLAG(28, 0x10)
#define WEEKEVENTREG_28_20 PACK_WEEKEVENTREG_FLAG(28, 0x20)
#define WEEKEVENTREG_28_40 PACK_WEEKEVENTREG_FLAG(28, 0x40)
#define WEEKEVENTREG_28_80 PACK_WEEKEVENTREG_FLAG(28, 0x80)
@@ -1111,9 +1111,9 @@ typedef enum {
#define WEEKEVENTREG_50_40 PACK_WEEKEVENTREG_FLAG(50, 0x40)
#define WEEKEVENTREG_RECEIVED_PENDANT_OF_MEMORIES PACK_WEEKEVENTREG_FLAG(50, 0x80)
#define WEEKEVENTREG_DELIVERED_PENDANT_OF_MEMORIES PACK_WEEKEVENTREG_FLAG(51, 0x01)
#define WEEKEVENTREG_51_02 PACK_WEEKEVENTREG_FLAG(51, 0x02)
#define WEEKEVENTREG_51_04 PACK_WEEKEVENTREG_FLAG(51, 0x04)
#define WEEKEVENTREG_51_08 PACK_WEEKEVENTREG_FLAG(51, 0x08)
#define WEEKEVENTREG_LETTER_TO_KAFEI_SCHEDULED_TODAY PACK_WEEKEVENTREG_FLAG(51, 0x02)
#define WEEKEVENTREG_HIT_LAUNDRY_POOL_BELL PACK_WEEKEVENTREG_FLAG(51, 0x04)
#define WEEKEVENTREG_KAFEI_ENTRUSTED_LINK PACK_WEEKEVENTREG_FLAG(51, 0x08)
#define WEEKEVENTREG_51_10 PACK_WEEKEVENTREG_FLAG(51, 0x10)
#define WEEKEVENTREG_ESCAPED_SAKONS_HIDEOUT PACK_WEEKEVENTREG_FLAG(51, 0x20)
@@ -1510,7 +1510,7 @@ typedef enum {
#define WEEKEVENTREG_90_02 PACK_WEEKEVENTREG_FLAG(90, 0x02)
#define WEEKEVENTREG_90_04 PACK_WEEKEVENTREG_FLAG(90, 0x04)
#define WEEKEVENTREG_90_08 PACK_WEEKEVENTREG_FLAG(90, 0x08)
#define WEEKEVENTREG_POSTMAN_RECEIVED_LETTER_TO_KAFEI PACK_WEEKEVENTREG_FLAG(90, 0x08)
#define WEEKEVENTREG_RECEIVED_GOSSIP_STONE_GROTTO_HEART_PIECE PACK_WEEKEVENTREG_FLAG(90, 0x10)
// Related to Fishermans's jumping minigame
@@ -1519,8 +1519,8 @@ typedef enum {
#define WEEKEVENTREG_90_80 PACK_WEEKEVENTREG_FLAG(90, 0x80)
#define WEEKEVENTREG_91_01 PACK_WEEKEVENTREG_FLAG(91, 0x01)
#define WEEKEVENTREG_91_02 PACK_WEEKEVENTREG_FLAG(91, 0x02)
#define WEEKEVENTREG_91_04 PACK_WEEKEVENTREG_FLAG(91, 0x04)
#define WEEKEVENTREG_91_08 PACK_WEEKEVENTREG_FLAG(91, 0x08)
#define WEEKEVENTREG_LETTER_TO_KAFEI_SENT_IN_TIME PACK_WEEKEVENTREG_FLAG(91, 0x04)
#define WEEKEVENTREG_LETTER_TO_KAFEI_SENT_LATE PACK_WEEKEVENTREG_FLAG(91, 0x08)
#define WEEKEVENTREG_91_10 PACK_WEEKEVENTREG_FLAG(91, 0x10)
#define WEEKEVENTREG_91_20 PACK_WEEKEVENTREG_FLAG(91, 0x20)
#define WEEKEVENTREG_91_40 PACK_WEEKEVENTREG_FLAG(91, 0x40)
src/code/z_kankyo.c
+48 -44
View File
@@ -1657,47 +1657,51 @@ void Environment_UpdateSun(PlayState* play) {
}
}
void func_800F88C4(u16 weekEventFlag) {
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_28_08) && !CHECK_WEEKEVENTREG(WEEKEVENTREG_28_10) &&
CHECK_WEEKEVENTREG(weekEventFlag)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_91_04)) {
SET_WEEKEVENTREG(WEEKEVENTREG_28_08);
SET_WEEKEVENTREG(WEEKEVENTREG_90_08);
SET_WEEKEVENTREG(WEEKEVENTREG_51_02);
void Environment_SetLetterToKafeiScheduledIf(u16 weekEventFlag) {
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_LETTER_TO_KAFEI_SCHEDULED_DAY_2) &&
!CHECK_WEEKEVENTREG(WEEKEVENTREG_LETTER_TO_KAFEI_SCHEDULED_DAY_3) && CHECK_WEEKEVENTREG(weekEventFlag)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_LETTER_TO_KAFEI_SENT_IN_TIME)) {
SET_WEEKEVENTREG(WEEKEVENTREG_LETTER_TO_KAFEI_SCHEDULED_DAY_2);
SET_WEEKEVENTREG(WEEKEVENTREG_POSTMAN_RECEIVED_LETTER_TO_KAFEI);
SET_WEEKEVENTREG(WEEKEVENTREG_LETTER_TO_KAFEI_SCHEDULED_TODAY);
}
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_91_08)) {
SET_WEEKEVENTREG(WEEKEVENTREG_28_10);
SET_WEEKEVENTREG(WEEKEVENTREG_90_08);
SET_WEEKEVENTREG(WEEKEVENTREG_51_02);
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_LETTER_TO_KAFEI_SENT_LATE)) {
SET_WEEKEVENTREG(WEEKEVENTREG_LETTER_TO_KAFEI_SCHEDULED_DAY_3);
SET_WEEKEVENTREG(WEEKEVENTREG_POSTMAN_RECEIVED_LETTER_TO_KAFEI);
SET_WEEKEVENTREG(WEEKEVENTREG_LETTER_TO_KAFEI_SCHEDULED_TODAY);
}
}
}
void func_800F8970(void) {
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_27_40) && (SCRIPT_TIME_NOW >= SCRIPT_TIME(9, 31))) {
SET_WEEKEVENTREG(WEEKEVENTREG_27_40);
func_800F88C4(WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_SOUTH_UPPER_CLOCKTOWN);
void Environment_UpdateCheckedPostboxes(void) {
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_POSTMAN_CHECKED_SOUTH_UPPER_CLOCKTOWN) &&
(SCRIPT_TIME_NOW >= SCRIPT_TIME(9, 31))) {
SET_WEEKEVENTREG(WEEKEVENTREG_POSTMAN_CHECKED_SOUTH_UPPER_CLOCKTOWN);
Environment_SetLetterToKafeiScheduledIf(WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_SOUTH_UPPER_CLOCKTOWN);
}
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_27_80) && (SCRIPT_TIME_NOW >= SCRIPT_TIME(10, 3))) {
SET_WEEKEVENTREG(WEEKEVENTREG_27_80);
func_800F88C4(WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_NORTH_CLOCKTOWN);
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_POSTMAN_CHECKED_NORTH_CLOCKTOWN) && (SCRIPT_TIME_NOW >= SCRIPT_TIME(10, 3))) {
SET_WEEKEVENTREG(WEEKEVENTREG_POSTMAN_CHECKED_NORTH_CLOCKTOWN);
Environment_SetLetterToKafeiScheduledIf(WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_NORTH_CLOCKTOWN);
}
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_28_01) && (SCRIPT_TIME_NOW >= SCRIPT_TIME(10, 35))) {
SET_WEEKEVENTREG(WEEKEVENTREG_28_01);
func_800F88C4(WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_EAST_UPPER_CLOCKTOWN);
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_POSTMAN_CHECKED_EAST_UPPER_CLOCKTOWN) &&
(SCRIPT_TIME_NOW >= SCRIPT_TIME(10, 35))) {
SET_WEEKEVENTREG(WEEKEVENTREG_POSTMAN_CHECKED_EAST_UPPER_CLOCKTOWN);
Environment_SetLetterToKafeiScheduledIf(WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_EAST_UPPER_CLOCKTOWN);
}
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_28_02) && (SCRIPT_TIME_NOW >= SCRIPT_TIME(10, 53))) {
SET_WEEKEVENTREG(WEEKEVENTREG_28_02);
func_800F88C4(WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_EAST_LOWER_CLOCKTOWN);
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_POSTMAN_CHECKED_EAST_LOWER_CLOCKTOWN) &&
(SCRIPT_TIME_NOW >= SCRIPT_TIME(10, 53))) {
SET_WEEKEVENTREG(WEEKEVENTREG_POSTMAN_CHECKED_EAST_LOWER_CLOCKTOWN);
Environment_SetLetterToKafeiScheduledIf(WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_EAST_LOWER_CLOCKTOWN);
}
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_28_04) && (SCRIPT_TIME_NOW >= SCRIPT_TIME(11, 25))) {
SET_WEEKEVENTREG(WEEKEVENTREG_28_04);
func_800F88C4(WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_SOUTH_LOWER_CLOCKTOWN);
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_POSTMAN_CHECKED_SOUTH_LOWER_CLOCKTOWN) &&
(SCRIPT_TIME_NOW >= SCRIPT_TIME(11, 25))) {
SET_WEEKEVENTREG(WEEKEVENTREG_POSTMAN_CHECKED_SOUTH_LOWER_CLOCKTOWN);
Environment_SetLetterToKafeiScheduledIf(WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_SOUTH_LOWER_CLOCKTOWN);
}
}
@@ -1711,30 +1715,30 @@ void Environment_UpdatePostmanEvents(PlayState* play) {
EVENTINF_SET_7_E0(day, eventInfBits);
SET_WEEKEVENTREG(WEEKEVENTREG_27_40);
SET_WEEKEVENTREG(WEEKEVENTREG_27_80);
SET_WEEKEVENTREG(WEEKEVENTREG_28_01);
SET_WEEKEVENTREG(WEEKEVENTREG_28_02);
SET_WEEKEVENTREG(WEEKEVENTREG_28_04);
SET_WEEKEVENTREG(WEEKEVENTREG_POSTMAN_CHECKED_SOUTH_UPPER_CLOCKTOWN);
SET_WEEKEVENTREG(WEEKEVENTREG_POSTMAN_CHECKED_NORTH_CLOCKTOWN);
SET_WEEKEVENTREG(WEEKEVENTREG_POSTMAN_CHECKED_EAST_UPPER_CLOCKTOWN);
SET_WEEKEVENTREG(WEEKEVENTREG_POSTMAN_CHECKED_EAST_LOWER_CLOCKTOWN);
SET_WEEKEVENTREG(WEEKEVENTREG_POSTMAN_CHECKED_SOUTH_LOWER_CLOCKTOWN);
func_800F88C4(WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_SOUTH_UPPER_CLOCKTOWN);
func_800F88C4(WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_NORTH_CLOCKTOWN);
func_800F88C4(WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_EAST_UPPER_CLOCKTOWN);
func_800F88C4(WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_EAST_LOWER_CLOCKTOWN);
func_800F88C4(WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_SOUTH_LOWER_CLOCKTOWN);
Environment_SetLetterToKafeiScheduledIf(WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_SOUTH_UPPER_CLOCKTOWN);
Environment_SetLetterToKafeiScheduledIf(WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_NORTH_CLOCKTOWN);
Environment_SetLetterToKafeiScheduledIf(WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_EAST_UPPER_CLOCKTOWN);
Environment_SetLetterToKafeiScheduledIf(WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_EAST_LOWER_CLOCKTOWN);
Environment_SetLetterToKafeiScheduledIf(WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_SOUTH_LOWER_CLOCKTOWN);
CLEAR_WEEKEVENTREG(WEEKEVENTREG_27_40);
CLEAR_WEEKEVENTREG(WEEKEVENTREG_27_80);
CLEAR_WEEKEVENTREG(WEEKEVENTREG_28_01);
CLEAR_WEEKEVENTREG(WEEKEVENTREG_28_02);
CLEAR_WEEKEVENTREG(WEEKEVENTREG_28_04);
CLEAR_WEEKEVENTREG(WEEKEVENTREG_POSTMAN_CHECKED_SOUTH_UPPER_CLOCKTOWN);
CLEAR_WEEKEVENTREG(WEEKEVENTREG_POSTMAN_CHECKED_NORTH_CLOCKTOWN);
CLEAR_WEEKEVENTREG(WEEKEVENTREG_POSTMAN_CHECKED_EAST_UPPER_CLOCKTOWN);
CLEAR_WEEKEVENTREG(WEEKEVENTREG_POSTMAN_CHECKED_EAST_LOWER_CLOCKTOWN);
CLEAR_WEEKEVENTREG(WEEKEVENTREG_POSTMAN_CHECKED_SOUTH_LOWER_CLOCKTOWN);
}
if ((SCRIPT_TIME_NOW < SCRIPT_TIME(9, 0)) || (SCRIPT_TIME_NOW > SCRIPT_TIME(12, 0))) {
CLEAR_WEEKEVENTREG(WEEKEVENTREG_90_08);
CLEAR_WEEKEVENTREG(WEEKEVENTREG_POSTMAN_RECEIVED_LETTER_TO_KAFEI);
}
func_800F8970();
Environment_UpdateCheckedPostboxes();
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_ROOM_KEY) && !CHECK_WEEKEVENTREG(WEEKEVENTREG_55_02)) {
if (((void)0, gSaveContext.save.day) >= 2) {
src/code/z_sram_JPN.c
+1 -1
View File
@@ -144,7 +144,7 @@ u16 sPersistentCycleWeekEventRegs[ARRAY_COUNT(gSaveContext.save.saveInfo.weekEve
/* 48 */ 0,
/* 49 */ 0,
/* 50 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_50_02) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_50_04),
/* 51 */ PERSISTENT_WEEKEVENTREG_ALT(WEEKEVENTREG_51_04),
/* 51 */ PERSISTENT_WEEKEVENTREG_ALT(WEEKEVENTREG_HIT_LAUNDRY_POOL_BELL),
/* 52 */ 0,
/* 53 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BUSINESS_SCRUB_HEART_PIECE) |
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_53_40),
src/code/z_sram_NES.c
+1 -1
View File
@@ -144,7 +144,7 @@ u16 sPersistentCycleWeekEventRegs[ARRAY_COUNT(gSaveContext.save.saveInfo.weekEve
/* 48 */ 0,
/* 49 */ 0,
/* 50 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_50_02) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_50_04),
/* 51 */ PERSISTENT_WEEKEVENTREG_ALT(WEEKEVENTREG_51_04),
/* 51 */ PERSISTENT_WEEKEVENTREG_ALT(WEEKEVENTREG_HIT_LAUNDRY_POOL_BELL),
/* 52 */ 0,
/* 53 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BUSINESS_SCRUB_HEART_PIECE) |
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_53_40),
src/overlays/actors/ovl_En_Cha/z_en_cha.c
+2 -2
View File
@@ -89,8 +89,8 @@ void EnCha_Idle(EnCha* this, PlayState* play) {
if (this->collider.base.acFlags & AC_HIT) {
Actor_PlaySfx(&this->actor, NA_SE_EV_DOOR_BELL);
this->actor.home.rot.z = 0x7D0;
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_51_04)) {
SET_WEEKEVENTREG(WEEKEVENTREG_51_04);
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_HIT_LAUNDRY_POOL_BELL)) {
SET_WEEKEVENTREG(WEEKEVENTREG_HIT_LAUNDRY_POOL_BELL);
this->actionFunc = EnCha_Ring;
}
}
src/overlays/actors/ovl_En_Door/scheduleScripts.schl
+3 -3
View File
@@ -56,7 +56,7 @@ sDoorSch_PostOffice {
// "Out delivering mail"
return_s (0x8)
} else if_day (2) {
if_week_event_reg (WEEKEVENTREG_28_08) {
if_week_event_reg (WEEKEVENTREG_LETTER_TO_KAFEI_SCHEDULED_DAY_2) {
// Related to letter to Kafei
if_before_time (13, 0) {
@@ -132,7 +132,7 @@ sDoorSch_CuriosityShop {
// Laundry Pool
sDoorSch_LaundryPool {
if_day (2) {
not if_week_event_reg (WEEKEVENTREG_28_08) {
not if_week_event_reg (WEEKEVENTREG_LETTER_TO_KAFEI_SCHEDULED_DAY_2) {
return_s (0xC)
} else if_time_range (15, 10, 22, 0) {
return_none
@@ -142,7 +142,7 @@ sDoorSch_LaundryPool {
}
if_day (3) {
if_since_time (13, 0) {
not if_week_event_reg (WEEKEVENTREG_51_08) {
not if_week_event_reg (WEEKEVENTREG_KAFEI_ENTRUSTED_LINK) {
return_s (0xC)
} else if_since_time (22, 0) {
return_s (0xC)
src/overlays/actors/ovl_En_Pm/scheduleScripts.schl
+3 -3
View File
@@ -137,7 +137,7 @@ D_80AFAD80 {
return_none
}
} else if_day (2) {
if_week_event_reg (WEEKEVENTREG_28_08) {
if_week_event_reg (WEEKEVENTREG_LETTER_TO_KAFEI_SCHEDULED_DAY_2) {
if_time_range (9, 0, 12, 0) {
branch (label_0x117)
} else if_time_range (12, 0, 13, 1) {
@@ -264,7 +264,7 @@ D_80AFAD80 {
return_none
}
} else if_day (3) {
if_week_event_reg (WEEKEVENTREG_28_08) {
if_week_event_reg (WEEKEVENTREG_LETTER_TO_KAFEI_SCHEDULED_DAY_2) {
if_time_range (9, 0, 12, 0) {
branch (label_0x117)
} else if_time_range (12, 0, 13, 1) {
@@ -284,7 +284,7 @@ D_80AFAD80 {
} else {
return_none
}
} else if_week_event_reg (WEEKEVENTREG_28_10) {
} else if_week_event_reg (WEEKEVENTREG_LETTER_TO_KAFEI_SCHEDULED_DAY_3) {
if_time_range (9, 0, 12, 0) {
branch (label_0x117)
} else if_time_range (12, 0, 13, 1) {
src/overlays/actors/ovl_En_Pm/z_en_pm.c
+14 -12
View File
@@ -939,34 +939,36 @@ void func_80AF8AC8(EnPm* this) {
}
void func_80AF8BA8(s32 arg0) {
static u16 D_80AFB8D4[] = {
static u16 sLetterToKafeiDepositedWeekEventReg[] = {
WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_SOUTH_UPPER_CLOCKTOWN,
WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_NORTH_CLOCKTOWN,
WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_EAST_UPPER_CLOCKTOWN,
WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_EAST_LOWER_CLOCKTOWN,
WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_SOUTH_LOWER_CLOCKTOWN,
};
static u16 D_80AFB8E0[] = {
WEEKEVENTREG_27_40, WEEKEVENTREG_27_80, WEEKEVENTREG_28_01, WEEKEVENTREG_28_02, WEEKEVENTREG_28_04,
static u16 sPostboxCheckedWeekEventReg[] = {
WEEKEVENTREG_POSTMAN_CHECKED_SOUTH_UPPER_CLOCKTOWN, WEEKEVENTREG_POSTMAN_CHECKED_NORTH_CLOCKTOWN,
WEEKEVENTREG_POSTMAN_CHECKED_EAST_UPPER_CLOCKTOWN, WEEKEVENTREG_POSTMAN_CHECKED_EAST_LOWER_CLOCKTOWN,
WEEKEVENTREG_POSTMAN_CHECKED_SOUTH_LOWER_CLOCKTOWN,
};
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_88_02)) {
if (CHECK_WEEKEVENTREG(D_80AFB8D4[arg0])) {
if (CHECK_WEEKEVENTREG(sLetterToKafeiDepositedWeekEventReg[arg0])) {
switch (gSaveContext.save.day) {
case 2:
SET_WEEKEVENTREG(WEEKEVENTREG_28_08);
SET_WEEKEVENTREG(WEEKEVENTREG_LETTER_TO_KAFEI_SCHEDULED_DAY_2);
break;
case 3:
SET_WEEKEVENTREG(WEEKEVENTREG_28_10);
SET_WEEKEVENTREG(WEEKEVENTREG_LETTER_TO_KAFEI_SCHEDULED_DAY_3);
break;
}
SET_WEEKEVENTREG(WEEKEVENTREG_51_02);
SET_WEEKEVENTREG(WEEKEVENTREG_90_08);
SET_WEEKEVENTREG(WEEKEVENTREG_LETTER_TO_KAFEI_SCHEDULED_TODAY);
SET_WEEKEVENTREG(WEEKEVENTREG_POSTMAN_RECEIVED_LETTER_TO_KAFEI);
}
}
SET_WEEKEVENTREG(D_80AFB8E0[arg0]);
SET_WEEKEVENTREG(sPostboxCheckedWeekEventReg[arg0]);
}
void func_80AF8C68(EnPm* this, PlayState* play) {
@@ -1103,7 +1105,7 @@ s32 func_80AF9008(EnPm* this, PlayState* play, ScheduleOutput* scheduleOutput) {
this->unk_36C = scheduleOutput->time1 - scheduleOutput->time0;
this->unk_36E = sp56 - scheduleOutput->time0;
this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_90_08)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_POSTMAN_RECEIVED_LETTER_TO_KAFEI)) {
this->unk_356 |= 0x800;
}
this->unk_356 |= 0x9000;
@@ -1183,7 +1185,7 @@ s32 func_80AF91E8(EnPm* this, PlayState* play, ScheduleOutput* scheduleOutput) {
default:
SubS_SetOfferMode(&this->unk_356, SUBS_OFFER_MODE_ONSCREEN, SUBS_OFFER_MODE_MASK);
EnPm_ChangeAnim(this, ENPM_ANIM_0);
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_90_08)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_POSTMAN_RECEIVED_LETTER_TO_KAFEI)) {
this->unk_356 |= 0x800;
}
this->unk_356 |= 0x9000;
@@ -1299,7 +1301,7 @@ s32 func_80AF95E8(EnPm* this, PlayState* play, ScheduleOutput* scheduleOutput) {
break;
case 23:
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_90_08)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_POSTMAN_RECEIVED_LETTER_TO_KAFEI)) {
this->unk_356 |= 0x800;
}
SET_WEEKEVENTREG(WEEKEVENTREG_60_04);
src/overlays/actors/ovl_En_Pst/z_en_pst.c
+27 -19
View File
@@ -48,7 +48,8 @@ MsgScript D_80B2C23C[] = {
/* 0x0023 0x01 */ MSCRIPT_CMD_AWAIT_TEXT(),
/* 0x0024 0x03 */ MSCRIPT_CMD_SET_WEEK_EVENT_REG(WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_SOUTH_UPPER_CLOCKTOWN),
/* 0x0027 0x03 */ MSCRIPT_CMD_DELETE_ITEM(ITEM_LETTER_TO_KAFEI),
/* 0x002A 0x05 */ MSCRIPT_CMD_CHECK_WEEK_EVENT_REG(WEEKEVENTREG_27_40, 0x0037 - 0x002F),
/* 0x002A 0x05 */
MSCRIPT_CMD_CHECK_WEEK_EVENT_REG(WEEKEVENTREG_POSTMAN_CHECKED_SOUTH_UPPER_CLOCKTOWN, 0x0037 - 0x002F),
/* 0x002F 0x03 */ MSCRIPT_CMD_CONTINUE_TEXT(0x2788),
/* 0x0032 0x03 */ MSCRIPT_CMD_NOTEBOOK_EVENT(BOMBERS_NOTEBOOK_EVENT_DEPOSITED_LETTER_TO_KAFEI),
/* 0x0035 0x01 */ MSCRIPT_CMD_AWAIT_TEXT(),
@@ -89,7 +90,7 @@ MsgScript D_80B2C288[] = {
/* 0x0023 0x01 */ MSCRIPT_CMD_AWAIT_TEXT(),
/* 0x0024 0x03 */ MSCRIPT_CMD_SET_WEEK_EVENT_REG(WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_NORTH_CLOCKTOWN),
/* 0x0027 0x03 */ MSCRIPT_CMD_DELETE_ITEM(ITEM_LETTER_TO_KAFEI),
/* 0x002A 0x05 */ MSCRIPT_CMD_CHECK_WEEK_EVENT_REG(WEEKEVENTREG_27_80, 0x0037 - 0x002F),
/* 0x002A 0x05 */ MSCRIPT_CMD_CHECK_WEEK_EVENT_REG(WEEKEVENTREG_POSTMAN_CHECKED_NORTH_CLOCKTOWN, 0x0037 - 0x002F),
/* 0x002F 0x03 */ MSCRIPT_CMD_CONTINUE_TEXT(0x2788),
/* 0x0032 0x03 */ MSCRIPT_CMD_NOTEBOOK_EVENT(BOMBERS_NOTEBOOK_EVENT_DEPOSITED_LETTER_TO_KAFEI),
/* 0x0035 0x01 */ MSCRIPT_CMD_AWAIT_TEXT(),
@@ -130,7 +131,8 @@ MsgScript D_80B2C2D4[] = {
/* 0x0023 0x01 */ MSCRIPT_CMD_AWAIT_TEXT(),
/* 0x0024 0x03 */ MSCRIPT_CMD_SET_WEEK_EVENT_REG(WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_EAST_UPPER_CLOCKTOWN),
/* 0x0027 0x03 */ MSCRIPT_CMD_DELETE_ITEM(ITEM_LETTER_TO_KAFEI),
/* 0x002A 0x05 */ MSCRIPT_CMD_CHECK_WEEK_EVENT_REG(WEEKEVENTREG_28_01, 0x0037 - 0x002F),
/* 0x002A 0x05 */
MSCRIPT_CMD_CHECK_WEEK_EVENT_REG(WEEKEVENTREG_POSTMAN_CHECKED_EAST_UPPER_CLOCKTOWN, 0x0037 - 0x002F),
/* 0x002F 0x03 */ MSCRIPT_CMD_CONTINUE_TEXT(0x2788),
/* 0x0032 0x03 */ MSCRIPT_CMD_NOTEBOOK_EVENT(BOMBERS_NOTEBOOK_EVENT_DEPOSITED_LETTER_TO_KAFEI),
/* 0x0035 0x01 */ MSCRIPT_CMD_AWAIT_TEXT(),
@@ -171,7 +173,8 @@ MsgScript D_80B2C320[] = {
/* 0x0023 0x01 */ MSCRIPT_CMD_AWAIT_TEXT(),
/* 0x0024 0x03 */ MSCRIPT_CMD_SET_WEEK_EVENT_REG(WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_EAST_LOWER_CLOCKTOWN),
/* 0x0027 0x03 */ MSCRIPT_CMD_DELETE_ITEM(ITEM_LETTER_TO_KAFEI),
/* 0x002A 0x05 */ MSCRIPT_CMD_CHECK_WEEK_EVENT_REG(WEEKEVENTREG_28_02, 0x0037 - 0x002F),
/* 0x002A 0x05 */
MSCRIPT_CMD_CHECK_WEEK_EVENT_REG(WEEKEVENTREG_POSTMAN_CHECKED_EAST_LOWER_CLOCKTOWN, 0x0037 - 0x002F),
/* 0x002F 0x03 */ MSCRIPT_CMD_CONTINUE_TEXT(0x2788),
/* 0x0032 0x03 */ MSCRIPT_CMD_NOTEBOOK_EVENT(BOMBERS_NOTEBOOK_EVENT_DEPOSITED_LETTER_TO_KAFEI),
/* 0x0035 0x01 */ MSCRIPT_CMD_AWAIT_TEXT(),
@@ -212,7 +215,8 @@ MsgScript D_80B2C36C[] = {
/* 0x0023 0x01 */ MSCRIPT_CMD_AWAIT_TEXT(),
/* 0x0024 0x03 */ MSCRIPT_CMD_SET_WEEK_EVENT_REG(WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_SOUTH_LOWER_CLOCKTOWN),
/* 0x0027 0x03 */ MSCRIPT_CMD_DELETE_ITEM(ITEM_LETTER_TO_KAFEI),
/* 0x002A 0x05 */ MSCRIPT_CMD_CHECK_WEEK_EVENT_REG(WEEKEVENTREG_28_04, 0x0037 - 0x002F),
/* 0x002A 0x05 */
MSCRIPT_CMD_CHECK_WEEK_EVENT_REG(WEEKEVENTREG_POSTMAN_CHECKED_SOUTH_LOWER_CLOCKTOWN, 0x0037 - 0x002F),
/* 0x002F 0x03 */ MSCRIPT_CMD_CONTINUE_TEXT(0x2788),
/* 0x0032 0x03 */ MSCRIPT_CMD_NOTEBOOK_EVENT(BOMBERS_NOTEBOOK_EVENT_DEPOSITED_LETTER_TO_KAFEI),
/* 0x0035 0x01 */ MSCRIPT_CMD_AWAIT_TEXT(),
@@ -260,7 +264,8 @@ MsgScript D_80B2C3E8[] = {
/* 0x0003 0x01 */ MSCRIPT_CMD_AWAIT_TEXT(),
/* 0x0004 0x03 */ MSCRIPT_CMD_SET_WEEK_EVENT_REG(WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_SOUTH_UPPER_CLOCKTOWN),
/* 0x0007 0x03 */ MSCRIPT_CMD_DELETE_ITEM(ITEM_LETTER_TO_KAFEI),
/* 0x000A 0x05 */ MSCRIPT_CMD_CHECK_WEEK_EVENT_REG(WEEKEVENTREG_27_40, 0x0017 - 0x000F),
/* 0x000A 0x05 */
MSCRIPT_CMD_CHECK_WEEK_EVENT_REG(WEEKEVENTREG_POSTMAN_CHECKED_SOUTH_UPPER_CLOCKTOWN, 0x0017 - 0x000F),
/* 0x000F 0x03 */ MSCRIPT_CMD_CONTINUE_TEXT(0x2788),
/* 0x0012 0x03 */ MSCRIPT_CMD_NOTEBOOK_EVENT(BOMBERS_NOTEBOOK_EVENT_DEPOSITED_LETTER_TO_KAFEI),
/* 0x0015 0x01 */ MSCRIPT_CMD_AWAIT_TEXT(),
@@ -277,7 +282,7 @@ MsgScript D_80B2C408[] = {
/* 0x0003 0x01 */ MSCRIPT_CMD_AWAIT_TEXT(),
/* 0x0004 0x03 */ MSCRIPT_CMD_SET_WEEK_EVENT_REG(WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_NORTH_CLOCKTOWN),
/* 0x0007 0x03 */ MSCRIPT_CMD_DELETE_ITEM(ITEM_LETTER_TO_KAFEI),
/* 0x000A 0x05 */ MSCRIPT_CMD_CHECK_WEEK_EVENT_REG(WEEKEVENTREG_27_80, 0x0017 - 0x000F),
/* 0x000A 0x05 */ MSCRIPT_CMD_CHECK_WEEK_EVENT_REG(WEEKEVENTREG_POSTMAN_CHECKED_NORTH_CLOCKTOWN, 0x0017 - 0x000F),
/* 0x000F 0x03 */ MSCRIPT_CMD_CONTINUE_TEXT(0x2788),
/* 0x0012 0x03 */ MSCRIPT_CMD_NOTEBOOK_EVENT(BOMBERS_NOTEBOOK_EVENT_DEPOSITED_LETTER_TO_KAFEI),
/* 0x0015 0x01 */ MSCRIPT_CMD_AWAIT_TEXT(),
@@ -294,7 +299,8 @@ MsgScript D_80B2C428[] = {
/* 0x0003 0x01 */ MSCRIPT_CMD_AWAIT_TEXT(),
/* 0x0004 0x03 */ MSCRIPT_CMD_SET_WEEK_EVENT_REG(WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_EAST_UPPER_CLOCKTOWN),
/* 0x0007 0x03 */ MSCRIPT_CMD_DELETE_ITEM(ITEM_LETTER_TO_KAFEI),
/* 0x000A 0x05 */ MSCRIPT_CMD_CHECK_WEEK_EVENT_REG(WEEKEVENTREG_28_01, 0x0017 - 0x000F),
/* 0x000A 0x05 */
MSCRIPT_CMD_CHECK_WEEK_EVENT_REG(WEEKEVENTREG_POSTMAN_CHECKED_EAST_UPPER_CLOCKTOWN, 0x0017 - 0x000F),
/* 0x000F 0x03 */ MSCRIPT_CMD_CONTINUE_TEXT(0x2788),
/* 0x0012 0x03 */ MSCRIPT_CMD_NOTEBOOK_EVENT(BOMBERS_NOTEBOOK_EVENT_DEPOSITED_LETTER_TO_KAFEI),
/* 0x0015 0x01 */ MSCRIPT_CMD_AWAIT_TEXT(),
@@ -311,7 +317,8 @@ MsgScript D_80B2C448[] = {
/* 0x0003 0x01 */ MSCRIPT_CMD_AWAIT_TEXT(),
/* 0x0004 0x03 */ MSCRIPT_CMD_SET_WEEK_EVENT_REG(WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_EAST_LOWER_CLOCKTOWN),
/* 0x0007 0x03 */ MSCRIPT_CMD_DELETE_ITEM(ITEM_LETTER_TO_KAFEI),
/* 0x000A 0x05 */ MSCRIPT_CMD_CHECK_WEEK_EVENT_REG(WEEKEVENTREG_28_02, 0x0017 - 0x000F),
/* 0x000A 0x05 */
MSCRIPT_CMD_CHECK_WEEK_EVENT_REG(WEEKEVENTREG_POSTMAN_CHECKED_EAST_LOWER_CLOCKTOWN, 0x0017 - 0x000F),
/* 0x000F 0x03 */ MSCRIPT_CMD_CONTINUE_TEXT(0x2788),
/* 0x0012 0x03 */ MSCRIPT_CMD_NOTEBOOK_EVENT(BOMBERS_NOTEBOOK_EVENT_DEPOSITED_LETTER_TO_KAFEI),
/* 0x0015 0x01 */ MSCRIPT_CMD_AWAIT_TEXT(),
@@ -328,7 +335,8 @@ MsgScript D_80B2C468[] = {
/* 0x0003 0x01 */ MSCRIPT_CMD_AWAIT_TEXT(),
/* 0x0004 0x03 */ MSCRIPT_CMD_SET_WEEK_EVENT_REG(WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_SOUTH_LOWER_CLOCKTOWN),
/* 0x0007 0x03 */ MSCRIPT_CMD_DELETE_ITEM(ITEM_LETTER_TO_KAFEI),
/* 0x000A 0x05 */ MSCRIPT_CMD_CHECK_WEEK_EVENT_REG(WEEKEVENTREG_28_04, 0x0017 - 0x000F),
/* 0x000A 0x05 */
MSCRIPT_CMD_CHECK_WEEK_EVENT_REG(WEEKEVENTREG_POSTMAN_CHECKED_SOUTH_LOWER_CLOCKTOWN, 0x0017 - 0x000F),
/* 0x000F 0x03 */ MSCRIPT_CMD_CONTINUE_TEXT(0x2788),
/* 0x0012 0x03 */ MSCRIPT_CMD_NOTEBOOK_EVENT(BOMBERS_NOTEBOOK_EVENT_DEPOSITED_LETTER_TO_KAFEI),
/* 0x0015 0x01 */ MSCRIPT_CMD_AWAIT_TEXT(),
@@ -425,19 +433,19 @@ s32 EnPst_HandleLetterDay1(EnPst* this) {
s32 EnPst_HandleLetterDay2(EnPst* this) {
switch (this->actor.params) {
case POSTBOX_SOUTH_UPPER_CLOCKTOWN:
return CHECK_WEEKEVENTREG(WEEKEVENTREG_27_40);
return CHECK_WEEKEVENTREG(WEEKEVENTREG_POSTMAN_CHECKED_SOUTH_UPPER_CLOCKTOWN);
case POSTBOX_NORTH_CLOCKTOWN:
return CHECK_WEEKEVENTREG(WEEKEVENTREG_27_80);
return CHECK_WEEKEVENTREG(WEEKEVENTREG_POSTMAN_CHECKED_NORTH_CLOCKTOWN);
case POSTBOX_EAST_UPPER_CLOCKTOWN:
return CHECK_WEEKEVENTREG(WEEKEVENTREG_28_01);
return CHECK_WEEKEVENTREG(WEEKEVENTREG_POSTMAN_CHECKED_EAST_UPPER_CLOCKTOWN);
case POSTBOX_EAST_LOWER_CLOCKTOWN:
return CHECK_WEEKEVENTREG(WEEKEVENTREG_28_02);
return CHECK_WEEKEVENTREG(WEEKEVENTREG_POSTMAN_CHECKED_EAST_LOWER_CLOCKTOWN);
case POSTBOX_SOUTH_LOWER_CLOCKTOWN:
return CHECK_WEEKEVENTREG(WEEKEVENTREG_28_04);
return CHECK_WEEKEVENTREG(WEEKEVENTREG_POSTMAN_CHECKED_SOUTH_LOWER_CLOCKTOWN);
default:
return false;
@@ -631,19 +639,19 @@ void EnPst_Talk(EnPst* this, PlayState* play) {
if (EnPst_HandleLetterDay1(this) != this->isLetterToKafeiDeposited) {
switch (gSaveContext.save.day) {
case 1:
SET_WEEKEVENTREG(WEEKEVENTREG_91_04);
SET_WEEKEVENTREG(WEEKEVENTREG_LETTER_TO_KAFEI_SENT_IN_TIME);
break;
case 2:
if (EnPst_HandleLetterDay2(this)) {
SET_WEEKEVENTREG(WEEKEVENTREG_91_08);
SET_WEEKEVENTREG(WEEKEVENTREG_LETTER_TO_KAFEI_SENT_LATE);
} else {
SET_WEEKEVENTREG(WEEKEVENTREG_91_04);
SET_WEEKEVENTREG(WEEKEVENTREG_LETTER_TO_KAFEI_SENT_IN_TIME);
}
break;
default:
SET_WEEKEVENTREG(WEEKEVENTREG_91_08);
SET_WEEKEVENTREG(WEEKEVENTREG_LETTER_TO_KAFEI_SENT_LATE);
break;
}
}
src/overlays/actors/ovl_En_Suttari/z_en_suttari.c
+1 -1
View File
@@ -978,7 +978,7 @@ void func_80BAC6E8(EnSuttari* this, PlayState* play) {
} else if ((gSaveContext.save.day == 3) && (CURRENT_TIME <= CLOCK_TIME(19, 0)) &&
!CHECK_WEEKEVENTREG(WEEKEVENTREG_61_08) &&
!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECOVERED_STOLEN_BOMB_BAG) &&
CHECK_WEEKEVENTREG(WEEKEVENTREG_51_08)) {
CHECK_WEEKEVENTREG(WEEKEVENTREG_KAFEI_ENTRUSTED_LINK)) {
this->animIndex = SUTTARI_ANIM_2;
Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, this->animIndex);
this->actionFunc = func_80BACEE0;
src/overlays/actors/ovl_En_Test3/scheduleScripts.schl
+28 -28
View File
@@ -2,21 +2,21 @@ sScheduleScript {
if_day (1) {
if_scene (SCENE_ALLEY) {
if_time_range (6, 50, 7, 20) {
return_time (6, 50, 7, 20, 15)
return_time (6, 50, 7, 20, KAFEI_SCH_RETURNING_TO_CURIOSITY_SHOP_DAY_1)
} else if_before_time (7, 30) {
return_none
} else if_week_event_reg (WEEKEVENTREG_51_04) {
return_s (10)
} else if_week_event_reg (WEEKEVENTREG_HIT_LAUNDRY_POOL_BELL) {
return_s (KAFEI_SCH_HEARD_BELL_RING)
} else {
return_none
}
} else if_scene (SCENE_CLOCKTOWER) {
if_time_range (6, 0, 6, 30) {
return_time (6, 0, 6, 30, 13)
return_time (6, 0, 6, 30, KAFEI_SCH_GOING_TO_POSTBOX)
} else if_time_range (6, 30, 6, 35) {
return_s (1)
return_s (KAFEI_SCH_HANDLING_LETTER)
} else if_time_range (6, 35, 6, 50) {
return_time (6, 35, 6, 50, 14)
return_time (6, 35, 6, 50, KAFEI_SCH_RETURNING_TO_LAUNDRY_POOL)
} else {
return_none
}
@@ -24,24 +24,24 @@ sScheduleScript {
return_none
}
} else if_day (2) {
if_week_event_reg (WEEKEVENTREG_51_02) {
if_week_event_reg (WEEKEVENTREG_LETTER_TO_KAFEI_SCHEDULED_TODAY) {
if_scene (SCENE_ALLEY) {
if_before_time (13, 0) {
branch (label_0x050)
} else if_time_range (15, 5, 15, 25) {
return_time (15, 5, 15, 25, 16)
return_time (15, 5, 15, 25, KAFEI_SCH_RUNNING_TO_POSTMAN)
} else if_time_range (15, 25, 15, 40) {
return_s (1)
return_s (KAFEI_SCH_HANDLING_LETTER)
} else if_time_range (15, 40, 16, 0) {
return_time (15, 40, 16, 0, 17)
return_time (15, 40, 16, 0, KAFEI_SCH_RUNNING_BACK_TO_DOOR_WITH_LETTER)
} else {
return_none
}
} else if_scene (SCENE_AYASHIISHOP) {
if_time_range (15, 55, 16, 10) {
return_time (15, 55, 16, 10, 12)
return_time (15, 55, 16, 10, KAFEI_SCH_RETURNING_TO_CURIOSITY_SHOP_DAY_2)
} else if_time_range (16, 10, 22, 10) {
return_s (3)
return_s (KAFEI_SCH_MEETING_LINK_IN_CURIOSITY_SHOP)
} else {
return_none
}
@@ -52,8 +52,8 @@ sScheduleScript {
branch (label_0x050)
label_0x050:
if_week_event_reg (WEEKEVENTREG_51_04) {
return_l (10)
if_week_event_reg (WEEKEVENTREG_HIT_LAUNDRY_POOL_BELL) {
return_l (KAFEI_SCH_HEARD_BELL_RING)
} else {
return_none
}
@@ -62,8 +62,8 @@ sScheduleScript {
if_week_event_reg (WEEKEVENTREG_RECOVERED_STOLEN_BOMB_BAG) {
label_0x12C:
if_scene (SCENE_AYASHIISHOP) {
if_week_event_reg (WEEKEVENTREG_51_08) {
return_s (4)
if_week_event_reg (WEEKEVENTREG_KAFEI_ENTRUSTED_LINK) {
return_s (KAFEI_SCH_WAITING_AT_CURIOSITY_SHOP)
} else {
return_none
}
@@ -74,33 +74,33 @@ sScheduleScript {
if_week_event_reg (WEEKEVENTREG_SAKON_DEAD) {
branch (label_0x12C)
} else if_scene (SCENE_SECOM) {
return_s (7)
return_s (KAFEI_SCH_INSIDE_SAKONS_HIDEOUT)
} else if_week_event_reg (WEEKEVENTREG_ESCAPED_SAKONS_HIDEOUT) {
if_scene (SCENE_IKANA) {
if_week_event_reg (WEEKEVENTREG_90_02) {
return_none
} else {
return_s (9)
return_s (KAFEI_SCH_RUNNING_TO_TOWN)
}
} else if_scene (SCENE_TOWN) {
if_time_range (4, 0, 4, 10) {
return_time (4, 0, 4, 10, 11)
return_time (4, 0, 4, 10, KAFEI_SCH_ENTERING_CLOCK_TOWN_EAST)
} else {
return_none
}
} else if_scene (SCENE_YADOYA) {
if_time_range (4, 10, 4, 30) {
return_time (4, 10, 4, 30, 18)
return_time (4, 10, 4, 30, KAFEI_SCH_ENTERING_STOCK_POT_INN)
} else if_week_event_reg (WEEKEVENTREG_DELIVERED_PENDANT_OF_MEMORIES) {
if_time_range (4, 30, 6, 0) {
return_s (8)
return_s (KAFEI_SCH_BECOMING_A_COUPLE)
} else {
return_none
}
} else if_time_range (4, 30, 4, 45) {
return_time (4, 30, 4, 45, 19)
return_time (4, 30, 4, 45, KAFEI_SCH_WALKING_TO_BRIDAL_DRESS)
} else if_time_range (4, 45, 6, 0) {
return_s (6)
return_s (KAFEI_SCH_COULDNT_KEEP_PROMISE)
} else {
return_none
}
@@ -108,18 +108,18 @@ sScheduleScript {
return_none
}
} else if_scene (SCENE_IKANA) {
not if_week_event_reg (WEEKEVENTREG_51_08) {
return_s (5)
not if_week_event_reg (WEEKEVENTREG_KAFEI_ENTRUSTED_LINK) {
return_s (KAFEI_SCH_WAITING_OUTSIDE_SAKONS_HIDEOUT)
} else if_week_event_reg (WEEKEVENTREG_61_08) {
return_s (5)
return_s (KAFEI_SCH_WAITING_OUTSIDE_SAKONS_HIDEOUT)
} else if_week_event_reg (WEEKEVENTREG_51_10) {
if_time_range (19, 0, 19, 10) {
return_time (19, 0, 19, 10, 20)
return_time (19, 0, 19, 10, KAFEI_SCH_ENTERING_SAKONS_HIDEOUT)
} else {
return_none
}
} else if_before_time (19, 0) {
return_s (5)
return_s (KAFEI_SCH_WAITING_OUTSIDE_SAKONS_HIDEOUT)
} else {
return_none
}
src/overlays/actors/ovl_En_Test3/z_en_test3.c
+514 -328
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Test3/z_en_test3.h
+18 -18
View File
@@ -11,31 +11,31 @@ typedef void (*EnTest3ActionFunc)(struct EnTest3*, PlayState*);
#define KAFEI_GET_PARAM_1E0(thisx) (((thisx)->params >> 5) & 0xF)
typedef struct {
/* 0x0 */ u8 unk_0;
/* 0x1 */ u8 unk_1;
/* 0x0 */ u8 talkActionIndex; // EnTest3TalkState
/* 0x1 */ u8 argument; // used for various purposes, including a timer; 0 means no next message
/* 0x2 */ u16 textId;
} EnTest3_struct_D78; // size = 0x4
} EnTest3SpeakData; // size = 0x4
typedef struct EnTest3 {
/* 0x000 */ Player player;
/* 0xD78 */ EnTest3_struct_D78* unk_D78;
/* 0xD7C */ Path* unk_D7C;
/* 0xD80 */ s32 unk_D80;
/* 0xD84 */ f32 unk_D84;
/* 0xD78 */ EnTest3SpeakData* speakData;
/* 0xD7C */ Path* currentPath;
/* 0xD80 */ s32 timeSpeed;
/* 0xD84 */ f32 waypointProgress;
/* 0xD88 */ s8 scheduleResult;
/* 0xD89 */ u8 unk_D89;
/* 0xD8A */ s16 unk_D8A;
/* 0xD8C */ u8 unk_D8C;
/* 0xD89 */ u8 isTimePathStarted; // only lowest bit is used
/* 0xD8A */ s16 bellTimer;
/* 0xD8C */ u8 nextMsgTimer;
/* 0xD8D */ s8 csId;
/* 0xD8E */ s16 subCamId;
/* 0xD90 */ Player* unk_D90;
/* 0xD94 */ EnTest3ActionFunc unk_D94;
/* 0xD98 */ Vec3f unk_D98;
/* 0xDA4 */ f32 unk_DA4;
/* 0xDA8 */ s32 unk_DA8;
/* 0xDAC */ s32 unk_DAC;
/* 0xDB0 */ s32 unk_DB0;
/* 0xDB4 */ s32 unk_DB4;
/* 0xD90 */ Player* link;
/* 0xD94 */ EnTest3ActionFunc mainActionFunc;
/* 0xD98 */ Vec3f targetPos;
/* 0xDA4 */ f32 schPathProgress;
/* 0xDA8 */ s32 schPathRemainingTime;
/* 0xDAC */ s32 waypointRemainingTime;
/* 0xDB0 */ s32 waypointIndex;
/* 0xDB4 */ s32 schPathElapsedTime;
} EnTest3; // size = 0xDB8
#endif // Z_EN_TEST3_H
tools/disasm/n64-jp-1.1/functions.txt
+49 -49
View File
@@ -1731,8 +1731,8 @@ Environment_LerpColor = 0x800F8B14; // type:func size:0x128
Environment_IsSceneUpsideDown = 0x800F8C3C; // type:func size:0x2C
Environment_UpdateLights = 0x800F8C68; // type:func size:0x155C
Environment_UpdateSun = 0x800FA1C4; // type:func size:0x370
func_800F88C4 = 0x800FA534; // type:func size:0xAC
func_800F8970 = 0x800FA5E0; // type:func size:0x12C
Environment_SetLetterToKafeiScheduledIf = 0x800FA534; // type:func size:0xAC
Environment_UpdateCheckedPostboxes = 0x800FA5E0; // type:func size:0x12C
Environment_UpdatePostmanEvents = 0x800FA70C; // type:func size:0x234
Environment_Update = 0x800FA940; // type:func size:0xB0
Environment_DrawSun = 0x800FA9F0; // type:func size:0x9A4
@@ -10344,55 +10344,55 @@ EnTest2_Init = 0x80A41410; // type:func size:0x54
EnTest2_Update = 0x80A41464; // type:func size:0x108
EnTest2_UpdateForLens = 0x80A4156C; // type:func size:0x38
EnTest2_Draw = 0x80A415A4; // type:func size:0x16C
func_80A3E7E0 = 0x80A41860; // type:func size:0x2C
func_80A3E80C = 0x80A4188C; // type:func size:0x64
func_80A3E870 = 0x80A418F0; // type:func size:0x14
func_80A3E884 = 0x80A41904; // type:func size:0x14
func_80A3E898 = 0x80A41918; // type:func size:0xD0
func_80A3E960 = 0x80A419E8; // type:func size:0x1C
func_80A3E97C = 0x80A41A04; // type:func size:0x60
func_80A3E9DC = 0x80A41A64; // type:func size:0x54
func_80A3EA30 = 0x80A41AB8; // type:func size:0x94
func_80A3EAC4 = 0x80A41B4C; // type:func size:0x34
func_80A3EAF8 = 0x80A41B80; // type:func size:0x94
func_80A3EB8C = 0x80A41C14; // type:func size:0x70
func_80A3EBFC = 0x80A41C84; // type:func size:0x34
func_80A3EC30 = 0x80A41CB8; // type:func size:0x14
func_80A3EC44 = 0x80A41CCC; // type:func size:0xA8
func_80A3ECEC = 0x80A41D74; // type:func size:0x38
func_80A3ED24 = 0x80A41DAC; // type:func size:0x70
EnTest3_SetMainAction = 0x80A41860; // type:func size:0x2C
EnTest3_TalkTriggersAction = 0x80A4188C; // type:func size:0x64
EnTest3_SetupTalk_TriggerFaceRevealCs = 0x80A418F0; // type:func size:0x14
EnTest3_SetupTalk_DoNothing = 0x80A41904; // type:func size:0x14
EnTest3_SetupTalk_NextMessage = 0x80A41918; // type:func size:0xD0
EnTest3_SetupTalk_SetNextMessageTimer = 0x80A419E8; // type:func size:0x1C
EnTest3_HandleTalk_Wait = 0x80A41A04; // type:func size:0x60
EnTest3_StartCutscene = 0x80A41A64; // type:func size:0x54
EnTest3_SetupTalk_CutsceneCheck = 0x80A41AB8; // type:func size:0x94
EnTest3_HandleTalk_Done = 0x80A41B4C; // type:func size:0x34
EnTest3_HandleTalk_Event = 0x80A41B80; // type:func size:0x94
EnTest3_HandleTalk_LookAtPeephole = 0x80A41C14; // type:func size:0x70
EnTest3_HandleTalk_Closing = 0x80A41C84; // type:func size:0x34
EnTest3_HandleTalk_EndOfMessage = 0x80A41CB8; // type:func size:0x14
EnTest3_HandleTalk_Choice = 0x80A41CCC; // type:func size:0xA8
EnTest3_ShouldTriggerCutscene = 0x80A41D74; // type:func size:0x38
EnTest3_NextTalkStateTriggersCutscene = 0x80A41DAC; // type:func size:0x70
EnTest3_Init = 0x80A41E1C; // type:func size:0x250
EnTest3_Destroy = 0x80A4206C; // type:func size:0xC0
func_80A3F080 = 0x80A4212C; // type:func size:0x1C
func_80A3F09C = 0x80A42148; // type:func size:0x14
func_80A3F0B0 = 0x80A4215C; // type:func size:0x64
func_80A3F114 = 0x80A421C0; // type:func size:0x48
func_80A3F15C = 0x80A42208; // type:func size:0x160
func_80A3F2BC = 0x80A42368; // type:func size:0xC8
func_80A3F384 = 0x80A42430; // type:func size:0x120
func_80A3F4A4 = 0x80A42550; // type:func size:0x90
func_80A3F534 = 0x80A425E0; // type:func size:0x70
func_80A3F5A4 = 0x80A42650; // type:func size:0x88
func_80A3F62C = 0x80A426D8; // type:func size:0x110
func_80A3F73C = 0x80A427E8; // type:func size:0x1A0
func_80A3F8D4 = 0x80A42988; // type:func size:0xD0
func_80A3F9A4 = 0x80A42A58; // type:func size:0x40
func_80A3F9E4 = 0x80A42A98; // type:func size:0x74
func_80A3FA58 = 0x80A42B0C; // type:func size:0x174
func_80A3FBCC = 0x80A42C80; // type:func size:0x1C
func_80A3FBE8 = 0x80A42C9C; // type:func size:0x1BC
func_80A3FDE4 = 0x80A42E58; // type:func size:0x3C
func_80A3FE20 = 0x80A42E94; // type:func size:0x100
func_80A3FF10 = 0x80A42F94; // type:func size:0xC0
func_80A3FFD0 = 0x80A43054; // type:func size:0xC8
func_80A40098 = 0x80A4311C; // type:func size:0x198
func_80A40230 = 0x80A432B4; // type:func size:0x444
func_80A40678 = 0x80A436F8; // type:func size:0x1AC
func_80A40824 = 0x80A438A4; // type:func size:0x28
func_80A4084C = 0x80A438CC; // type:func size:0xBC
func_80A40908 = 0x80A43988; // type:func size:0xCC
func_80A409D4 = 0x80A43A54; // type:func size:0x98
EnTest3_EnablePeephole = 0x80A43AEC; // type:func size:0x24
EnTest3_ProcessSchedule_StopDrawing = 0x80A4212C; // type:func size:0x1C
EnTest3_HandleSchedule_StopDrawing = 0x80A42148; // type:func size:0x14
EnTest3_ReturnControlToLink = 0x80A4215C; // type:func size:0x64
EnTest3_EndCsAction = 0x80A421C0; // type:func size:0x48
EnTest3_MoveTowardNextPoint = 0x80A42208; // type:func size:0x160
EnTest3_FindNearbyActor = 0x80A42368; // type:func size:0xC8
EnTest3_IsOpeningDoor = 0x80A42430; // type:func size:0x120
EnTest3_RecognizesLink = 0x80A42550; // type:func size:0x90
EnTest3_GetSpeakDataAtShop = 0x80A425E0; // type:func size:0x70
EnTest3_GetSpeakDataAtIkana = 0x80A42650; // type:func size:0x88
EnTest3_ProcessSchedule_CanTalk = 0x80A426D8; // type:func size:0x110
EnTest3_HandleSchedule_CanTalk = 0x80A427E8; // type:func size:0x1A0
EnTest3_ProcessSchedule_FindMailCarrier = 0x80A42988; // type:func size:0xD0
EnTest3_HandleSchedule_TurnToMailCarrier = 0x80A42A58; // type:func size:0x40
EnTest3_ProcessSchedule_BellRung = 0x80A42A98; // type:func size:0x74
EnTest3_HandleSchedule_BellRung = 0x80A42B0C; // type:func size:0x174
EnTest3_ProcessSchedule_SakonHideout = 0x80A42C80; // type:func size:0x1C
EnTest3_HandleSchedule_SakonHideout = 0x80A42C9C; // type:func size:0x1BC
EnTest3_ProcessSchedule_RunToTownCs = 0x80A42E58; // type:func size:0x3C
EnTest3_HandleSchedule_RunToTownCs = 0x80A42E94; // type:func size:0x100
EnTest3_ProcessSchedule_CouplesMaskCs = 0x80A42F94; // type:func size:0xC0
EnTest3_HandleSchedule_CouplesMaskCs = 0x80A43054; // type:func size:0xC8
EnTest3_ProcessSchedule_ComputeWaypoint = 0x80A4311C; // type:func size:0x198
EnTest3_HandleSchedule_MoveToWaypoint = 0x80A432B4; // type:func size:0x444
EnTest3_Action_FollowSchedule = 0x80A436F8; // type:func size:0x1AC
EnTest3_Action_Unused = 0x80A438A4; // type:func size:0x28
EnTest3_Action_HandleTalk = 0x80A438CC; // type:func size:0xBC
EnTest3_Action_GivePendant = 0x80A43988; // type:func size:0xCC
EnTest3_UpdateControl = 0x80A43A54; // type:func size:0x98
EnTest3_PostTalk_EnablePeephole = 0x80A43AEC; // type:func size:0x24
EnTest3_Update = 0x80A43B10; // type:func size:0x260
EnTest3_OverrideLimbDraw = 0x80A43D70; // type:func size:0x244
EnTest3_PostLimbDraw = 0x80A43FB4; // type:func size:0x368
tools/disasm/n64-us/functions.txt
+49 -49
View File
@@ -1721,8 +1721,8 @@ Environment_LerpColor = 0x800F6EA4; // type:func
Environment_IsSceneUpsideDown = 0x800F6FCC; // type:func
Environment_UpdateLights = 0x800F6FF8; // type:func
Environment_UpdateSun = 0x800F8554; // type:func
func_800F88C4 = 0x800F88C4; // type:func
func_800F8970 = 0x800F8970; // type:func
Environment_SetLetterToKafeiScheduledIf = 0x800F88C4; // type:func
Environment_UpdateCheckedPostboxes = 0x800F8970; // type:func
Environment_UpdatePostmanEvents = 0x800F8A9C; // type:func
Environment_Update = 0x800F8CD4; // type:func
Environment_DrawSun = 0x800F8D84; // type:func
@@ -10346,55 +10346,55 @@ EnTest2_Init = 0x80A3E390; // type:func
EnTest2_Update = 0x80A3E3E4; // type:func
EnTest2_UpdateForLens = 0x80A3E4EC; // type:func
EnTest2_Draw = 0x80A3E524; // type:func
func_80A3E7E0 = 0x80A3E7E0; // type:func
func_80A3E80C = 0x80A3E80C; // type:func
func_80A3E870 = 0x80A3E870; // type:func
func_80A3E884 = 0x80A3E884; // type:func
func_80A3E898 = 0x80A3E898; // type:func
func_80A3E960 = 0x80A3E960; // type:func
func_80A3E97C = 0x80A3E97C; // type:func
func_80A3E9DC = 0x80A3E9DC; // type:func
func_80A3EA30 = 0x80A3EA30; // type:func
func_80A3EAC4 = 0x80A3EAC4; // type:func
func_80A3EAF8 = 0x80A3EAF8; // type:func
func_80A3EB8C = 0x80A3EB8C; // type:func
func_80A3EBFC = 0x80A3EBFC; // type:func
func_80A3EC30 = 0x80A3EC30; // type:func
func_80A3EC44 = 0x80A3EC44; // type:func
func_80A3ECEC = 0x80A3ECEC; // type:func
func_80A3ED24 = 0x80A3ED24; // type:func
EnTest3_SetMainAction = 0x80A3E7E0; // type:func
EnTest3_TalkTriggersAction = 0x80A3E80C; // type:func
EnTest3_SetupTalk_TriggerFaceRevealCs = 0x80A3E870; // type:func
EnTest3_SetupTalk_DoNothing = 0x80A3E884; // type:func
EnTest3_SetupTalk_NextMessage = 0x80A3E898; // type:func
EnTest3_SetupTalk_SetNextMessageTimer = 0x80A3E960; // type:func
EnTest3_HandleTalk_Wait = 0x80A3E97C; // type:func
EnTest3_StartCutscene = 0x80A3E9DC; // type:func
EnTest3_SetupTalk_CutsceneCheck = 0x80A3EA30; // type:func
EnTest3_HandleTalk_Done = 0x80A3EAC4; // type:func
EnTest3_HandleTalk_Event = 0x80A3EAF8; // type:func
EnTest3_HandleTalk_LookAtPeephole = 0x80A3EB8C; // type:func
EnTest3_HandleTalk_Closing = 0x80A3EBFC; // type:func
EnTest3_HandleTalk_EndOfMessage = 0x80A3EC30; // type:func
EnTest3_HandleTalk_Choice = 0x80A3EC44; // type:func
EnTest3_ShouldTriggerCutscene = 0x80A3ECEC; // type:func
EnTest3_NextTalkStateTriggersCutscene = 0x80A3ED24; // type:func
EnTest3_Init = 0x80A3ED94; // type:func
EnTest3_Destroy = 0x80A3EFE4; // type:func
func_80A3F080 = 0x80A3F080; // type:func
func_80A3F09C = 0x80A3F09C; // type:func
func_80A3F0B0 = 0x80A3F0B0; // type:func
func_80A3F114 = 0x80A3F114; // type:func
func_80A3F15C = 0x80A3F15C; // type:func
func_80A3F2BC = 0x80A3F2BC; // type:func
func_80A3F384 = 0x80A3F384; // type:func
func_80A3F4A4 = 0x80A3F4A4; // type:func
func_80A3F534 = 0x80A3F534; // type:func
func_80A3F5A4 = 0x80A3F5A4; // type:func
func_80A3F62C = 0x80A3F62C; // type:func
func_80A3F73C = 0x80A3F73C; // type:func
func_80A3F8D4 = 0x80A3F8D4; // type:func
func_80A3F9A4 = 0x80A3F9A4; // type:func
func_80A3F9E4 = 0x80A3F9E4; // type:func
func_80A3FA58 = 0x80A3FA58; // type:func
func_80A3FBCC = 0x80A3FBCC; // type:func
func_80A3FBE8 = 0x80A3FBE8; // type:func
func_80A3FDE4 = 0x80A3FDE4; // type:func
func_80A3FE20 = 0x80A3FE20; // type:func
func_80A3FF10 = 0x80A3FF10; // type:func
func_80A3FFD0 = 0x80A3FFD0; // type:func
func_80A40098 = 0x80A40098; // type:func
func_80A40230 = 0x80A40230; // type:func
func_80A40678 = 0x80A40678; // type:func
func_80A40824 = 0x80A40824; // type:func
func_80A4084C = 0x80A4084C; // type:func
func_80A40908 = 0x80A40908; // type:func
func_80A409D4 = 0x80A409D4; // type:func
EnTest3_EnablePeephole = 0x80A40A6C; // type:func
EnTest3_ProcessSchedule_StopDrawing = 0x80A3F080; // type:func
EnTest3_HandleSchedule_StopDrawing = 0x80A3F09C; // type:func
EnTest3_ReturnControlToLink = 0x80A3F0B0; // type:func
EnTest3_EndCsAction = 0x80A3F114; // type:func
EnTest3_MoveTowardNextPoint = 0x80A3F15C; // type:func
EnTest3_FindNearbyActor = 0x80A3F2BC; // type:func
EnTest3_IsOpeningDoor = 0x80A3F384; // type:func
EnTest3_RecognizesLink = 0x80A3F4A4; // type:func
EnTest3_GetSpeakDataAtShop = 0x80A3F534; // type:func
EnTest3_GetSpeakDataAtIkana = 0x80A3F5A4; // type:func
EnTest3_ProcessSchedule_CanTalk = 0x80A3F62C; // type:func
EnTest3_HandleSchedule_CanTalk = 0x80A3F73C; // type:func
EnTest3_ProcessSchedule_FindMailCarrier = 0x80A3F8D4; // type:func
EnTest3_HandleSchedule_TurnToMailCarrier = 0x80A3F9A4; // type:func
EnTest3_ProcessSchedule_BellRung = 0x80A3F9E4; // type:func
EnTest3_HandleSchedule_BellRung = 0x80A3FA58; // type:func
EnTest3_ProcessSchedule_SakonHideout = 0x80A3FBCC; // type:func
EnTest3_HandleSchedule_SakonHideout = 0x80A3FBE8; // type:func
EnTest3_ProcessSchedule_RunToTownCs = 0x80A3FDE4; // type:func
EnTest3_HandleSchedule_RunToTownCs = 0x80A3FE20; // type:func
EnTest3_ProcessSchedule_CouplesMaskCs = 0x80A3FF10; // type:func
EnTest3_HandleSchedule_CouplesMaskCs = 0x80A3FFD0; // type:func
EnTest3_ProcessSchedule_ComputeWaypoint = 0x80A40098; // type:func
EnTest3_HandleSchedule_MoveToWaypoint = 0x80A40230; // type:func
EnTest3_Action_FollowSchedule = 0x80A40678; // type:func
EnTest3_Action_Unused = 0x80A40824; // type:func
EnTest3_Action_HandleTalk = 0x80A4084C; // type:func
EnTest3_Action_GivePendant = 0x80A40908; // type:func
EnTest3_UpdateControl = 0x80A409D4; // type:func
EnTest3_PostTalk_EnablePeephole = 0x80A40A6C; // type:func
EnTest3_Update = 0x80A40A90; // type:func
EnTest3_OverrideLimbDraw = 0x80A40CF0; // type:func
EnTest3_PostLimbDraw = 0x80A40F34; // type:func
tools/overlayhelpers/mscriptdis.py
+13 -13
View File
@@ -283,13 +283,13 @@ week_event_reg = {
(27 << 8) | 0x08: "WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_EAST_UPPER_CLOCKTOWN",
(27 << 8) | 0x10: "WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_EAST_LOWER_CLOCKTOWN",
(27 << 8) | 0x20: "WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_SOUTH_LOWER_CLOCKTOWN",
(27 << 8) | 0x40: "WEEKEVENTREG_27_40",
(27 << 8) | 0x80: "WEEKEVENTREG_27_80",
(28 << 8) | 0x01: "WEEKEVENTREG_28_01",
(28 << 8) | 0x02: "WEEKEVENTREG_28_02",
(28 << 8) | 0x04: "WEEKEVENTREG_28_04",
(28 << 8) | 0x08: "WEEKEVENTREG_28_08",
(28 << 8) | 0x10: "WEEKEVENTREG_28_10",
(27 << 8) | 0x40: "WEEKEVENTREG_POSTMAN_CHECKED_SOUTH_UPPER_CLOCKTOWN",
(27 << 8) | 0x80: "WEEKEVENTREG_POSTMAN_CHECKED_NORTH_CLOCKTOWN",
(28 << 8) | 0x01: "WEEKEVENTREG_POSTMAN_CHECKED_EAST_UPPER_CLOCKTOWN",
(28 << 8) | 0x02: "WEEKEVENTREG_POSTMAN_CHECKED_EAST_LOWER_CLOCKTOWN",
(28 << 8) | 0x04: "WEEKEVENTREG_POSTMAN_CHECKED_SOUTH_LOWER_CLOCKTOWN",
(28 << 8) | 0x08: "WEEKEVENTREG_LETTER_TO_KAFEI_SCHEDULED_DAY_2",
(28 << 8) | 0x10: "WEEKEVENTREG_LETTER_TO_KAFEI_SCHEDULED_DAY_3",
(28 << 8) | 0x20: "WEEKEVENTREG_28_20",
(28 << 8) | 0x40: "WEEKEVENTREG_28_40",
(28 << 8) | 0x80: "WEEKEVENTREG_28_80",
@@ -470,9 +470,9 @@ week_event_reg = {
(50 << 8) | 0x40: "WEEKEVENTREG_50_40",
(50 << 8) | 0x80: "WEEKEVENTREG_RECEIVED_PENDANT_OF_MEMORIES",
(51 << 8) | 0x01: "WEEKEVENTREG_DELIVERED_PENDANT_OF_MEMORIES",
(51 << 8) | 0x02: "WEEKEVENTREG_51_02",
(51 << 8) | 0x04: "WEEKEVENTREG_51_04",
(51 << 8) | 0x08: "WEEKEVENTREG_51_08",
(51 << 8) | 0x02: "WEEKEVENTREG_LETTER_TO_KAFEI_SCHEDULED_TODAY",
(51 << 8) | 0x04: "WEEKEVENTREG_HIT_LAUNDRY_POOL_BELL",
(51 << 8) | 0x08: "WEEKEVENTREG_KAFEI_ENTRUSTED_LINK",
(51 << 8) | 0x10: "WEEKEVENTREG_51_10",
(51 << 8) | 0x20: "WEEKEVENTREG_ESCAPED_SAKONS_HIDEOUT",
(51 << 8) | 0x40: "WEEKEVENTREG_COUPLES_MASK_CUTSCENE_FINISHED",
@@ -784,15 +784,15 @@ week_event_reg = {
(90 << 8) | 0x01: "WEEKEVENTREG_90_01",
(90 << 8) | 0x02: "WEEKEVENTREG_90_02",
(90 << 8) | 0x04: "WEEKEVENTREG_90_04",
(90 << 8) | 0x08: "WEEKEVENTREG_90_08",
(90 << 8) | 0x08: "WEEKEVENTREG_POSTMAN_RECEIVED_LETTER_TO_KAFEI",
(90 << 8) | 0x10: "WEEKEVENTREG_RECEIVED_GOSSIP_STONE_GROTTO_HEART_PIECE",
(90 << 8) | 0x20: "WEEKEVENTREG_90_20",
(90 << 8) | 0x40: "WEEKEVENTREG_90_40",
(90 << 8) | 0x80: "WEEKEVENTREG_90_80",
(91 << 8) | 0x01: "WEEKEVENTREG_91_01",
(91 << 8) | 0x02: "WEEKEVENTREG_91_02",
(91 << 8) | 0x04: "WEEKEVENTREG_91_04",
(91 << 8) | 0x08: "WEEKEVENTREG_91_08",
(91 << 8) | 0x04: "WEEKEVENTREG_LETTER_TO_KAFEI_SENT_IN_TIME",
(91 << 8) | 0x08: "WEEKEVENTREG_LETTER_TO_KAFEI_SENT_LATE",
(91 << 8) | 0x10: "WEEKEVENTREG_91_10",
(91 << 8) | 0x20: "WEEKEVENTREG_91_20",
(91 << 8) | 0x40: "WEEKEVENTREG_91_40",
tools/sizes/code_functions.csv
+2 -2
View File
@@ -1238,8 +1238,8 @@ asm/non_matchings/code/z_kankyo/Environment_LerpColor.s,Environment_LerpColor,0x
asm/non_matchings/code/z_kankyo/Environment_IsSceneUpsideDown.s,Environment_IsSceneUpsideDown,0x800F6FCC,0xB
asm/non_matchings/code/z_kankyo/Environment_UpdateLights.s,Environment_UpdateLights,0x800F6FF8,0x557
asm/non_matchings/code/z_kankyo/Environment_UpdateSun.s,Environment_UpdateSun,0x800F8554,0xDC
asm/non_matchings/code/z_kankyo/func_800F88C4.s,func_800F88C4,0x800F88C4,0x2B
asm/non_matchings/code/z_kankyo/func_800F8970.s,func_800F8970,0x800F8970,0x4B
asm/non_matchings/code/z_kankyo/Environment_SetLetterToKafeiScheduledIf.s,Environment_SetLetterToKafeiScheduledIf,0x800F88C4,0x2B
asm/non_matchings/code/z_kankyo/Environment_UpdateCheckedPostboxes.s,Environment_UpdateCheckedPostboxes,0x800F8970,0x4B
asm/non_matchings/code/z_kankyo/Environment_UpdatePostmanEvents.s,Environment_UpdatePostmanEvents,0x800F8A9C,0x8E
asm/non_matchings/code/z_kankyo/Environment_Update.s,Environment_Update,0x800F8CD4,0x2C
asm/non_matchings/code/z_kankyo/Environment_DrawSun.s,Environment_DrawSun,0x800F8D84,0x269
1 asm/non_matchings/code/z_en_a_keep/EnAObj_Init.s EnAObj_Init 0x800A5AC0 0x2B
1238 asm/non_matchings/code/z_kankyo/Environment_IsSceneUpsideDown.s Environment_IsSceneUpsideDown 0x800F6FCC 0xB
1239 asm/non_matchings/code/z_kankyo/Environment_UpdateLights.s Environment_UpdateLights 0x800F6FF8 0x557
1240 asm/non_matchings/code/z_kankyo/Environment_UpdateSun.s Environment_UpdateSun 0x800F8554 0xDC
1241 asm/non_matchings/code/z_kankyo/func_800F88C4.s asm/non_matchings/code/z_kankyo/Environment_SetLetterToKafeiScheduledIf.s func_800F88C4 Environment_SetLetterToKafeiScheduledIf 0x800F88C4 0x2B
1242 asm/non_matchings/code/z_kankyo/func_800F8970.s asm/non_matchings/code/z_kankyo/Environment_UpdateCheckedPostboxes.s func_800F8970 Environment_UpdateCheckedPostboxes 0x800F8970 0x4B
1243 asm/non_matchings/code/z_kankyo/Environment_UpdatePostmanEvents.s Environment_UpdatePostmanEvents 0x800F8A9C 0x8E
1244 asm/non_matchings/code/z_kankyo/Environment_Update.s Environment_Update 0x800F8CD4 0x2C
1245 asm/non_matchings/code/z_kankyo/Environment_DrawSun.s Environment_DrawSun 0x800F8D84 0x269
tools/weekeventregconvert.py
+13 -13
View File
@@ -226,13 +226,13 @@ weekEventReg = {
(27 << 8) | 0x08: "WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_EAST_UPPER_CLOCKTOWN",
(27 << 8) | 0x10: "WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_EAST_LOWER_CLOCKTOWN",
(27 << 8) | 0x20: "WEEKEVENTREG_DEPOSITED_LETTER_TO_KAFEI_SOUTH_LOWER_CLOCKTOWN",
(27 << 8) | 0x40: "WEEKEVENTREG_27_40",
(27 << 8) | 0x80: "WEEKEVENTREG_27_80",
(28 << 8) | 0x01: "WEEKEVENTREG_28_01",
(28 << 8) | 0x02: "WEEKEVENTREG_28_02",
(28 << 8) | 0x04: "WEEKEVENTREG_28_04",
(28 << 8) | 0x08: "WEEKEVENTREG_28_08",
(28 << 8) | 0x10: "WEEKEVENTREG_28_10",
(27 << 8) | 0x40: "WEEKEVENTREG_POSTMAN_CHECKED_SOUTH_UPPER_CLOCKTOWN",
(27 << 8) | 0x80: "WEEKEVENTREG_POSTMAN_CHECKED_NORTH_CLOCKTOWN",
(28 << 8) | 0x01: "WEEKEVENTREG_POSTMAN_CHECKED_EAST_UPPER_CLOCKTOWN",
(28 << 8) | 0x02: "WEEKEVENTREG_POSTMAN_CHECKED_EAST_LOWER_CLOCKTOWN",
(28 << 8) | 0x04: "WEEKEVENTREG_POSTMAN_CHECKED_SOUTH_LOWER_CLOCKTOWN",
(28 << 8) | 0x08: "WEEKEVENTREG_LETTER_TO_KAFEI_SCHEDULED_DAY_2",
(28 << 8) | 0x10: "WEEKEVENTREG_LETTER_TO_KAFEI_SCHEDULED_DAY_3",
(28 << 8) | 0x20: "WEEKEVENTREG_28_20",
(28 << 8) | 0x40: "WEEKEVENTREG_28_40",
(28 << 8) | 0x80: "WEEKEVENTREG_28_80",
@@ -413,9 +413,9 @@ weekEventReg = {
(50 << 8) | 0x40: "WEEKEVENTREG_50_40",
(50 << 8) | 0x80: "WEEKEVENTREG_RECEIVED_PENDANT_OF_MEMORIES",
(51 << 8) | 0x01: "WEEKEVENTREG_DELIVERED_PENDANT_OF_MEMORIES",
(51 << 8) | 0x02: "WEEKEVENTREG_51_02",
(51 << 8) | 0x04: "WEEKEVENTREG_51_04",
(51 << 8) | 0x08: "WEEKEVENTREG_51_08",
(51 << 8) | 0x02: "WEEKEVENTREG_LETTER_TO_KAFEI_SCHEDULED_TODAY",
(51 << 8) | 0x04: "WEEKEVENTREG_HIT_LAUNDRY_POOL_BELL",
(51 << 8) | 0x08: "WEEKEVENTREG_KAFEI_ENTRUSTED_LINK",
(51 << 8) | 0x10: "WEEKEVENTREG_51_10",
(51 << 8) | 0x20: "WEEKEVENTREG_ESCAPED_SAKONS_HIDEOUT",
(51 << 8) | 0x40: "WEEKEVENTREG_COUPLES_MASK_CUTSCENE_FINISHED",
@@ -727,15 +727,15 @@ weekEventReg = {
(90 << 8) | 0x01: "WEEKEVENTREG_90_01",
(90 << 8) | 0x02: "WEEKEVENTREG_90_02",
(90 << 8) | 0x04: "WEEKEVENTREG_90_04",
(90 << 8) | 0x08: "WEEKEVENTREG_90_08",
(90 << 8) | 0x08: "WEEKEVENTREG_POSTMAN_RECEIVED_LETTER_TO_KAFEI",
(90 << 8) | 0x10: "WEEKEVENTREG_RECEIVED_GOSSIP_STONE_GROTTO_HEART_PIECE",
(90 << 8) | 0x20: "WEEKEVENTREG_90_20",
(90 << 8) | 0x40: "WEEKEVENTREG_90_40",
(90 << 8) | 0x80: "WEEKEVENTREG_90_80",
(91 << 8) | 0x01: "WEEKEVENTREG_91_01",
(91 << 8) | 0x02: "WEEKEVENTREG_91_02",
(91 << 8) | 0x04: "WEEKEVENTREG_91_04",
(91 << 8) | 0x08: "WEEKEVENTREG_91_08",
(91 << 8) | 0x04: "WEEKEVENTREG_LETTER_TO_KAFEI_SENT_IN_TIME",
(91 << 8) | 0x08: "WEEKEVENTREG_LETTER_TO_KAFEI_SENT_LATE",
(91 << 8) | 0x10: "WEEKEVENTREG_91_10",
(91 << 8) | 0x20: "WEEKEVENTREG_91_20",
(91 << 8) | 0x40: "WEEKEVENTREG_91_40",