From 3ce8e6f6b32f8ce1e455fa24d028fcd0b2e23181 Mon Sep 17 00:00:00 2001 From: Angie Date: Thu, 12 Oct 2023 21:03:53 -0300 Subject: [PATCH] more naming --- src/overlays/actors/ovl_En_An/z_en_an.c | 641 ++++++++++++------------ src/overlays/actors/ovl_En_An/z_en_an.h | 12 +- tools/disasm/functions.txt | 14 +- 3 files changed, 338 insertions(+), 329 deletions(-) diff --git a/src/overlays/actors/ovl_En_An/z_en_an.c b/src/overlays/actors/ovl_En_An/z_en_an.c index 21eda6286..0776861d4 100644 --- a/src/overlays/actors/ovl_En_An/z_en_an.c +++ b/src/overlays/actors/ovl_En_An/z_en_an.c @@ -49,49 +49,49 @@ typedef enum AnjuScheduleResult { /* 18 */ ANJU_SCH_RECEPTIONIST_IDLE, /* 19 */ ANJU_SCH_19, // Standing next to the Inn's front door at closing time /* 20 */ ANJU_SCH_20, // unused - /* 21 */ ANJU_SCH_GIVE_LUNCH_TO_GRANDMA, + /* 21 */ ANJU_SCH_GIVE_LUNCH_TO_GRANNY, /* 22 */ ANJU_SCH_SWEEPING, /* 23 */ ANJU_SCH_MIDNIGHT_MEETING, - /* 24 */ ANJU_SCH_24, // Day 2, 21:30 ~ 23:00, on the employees-only room, talking with her mom + /* 24 */ ANJU_SCH_TALKING_WITH_MOM, // Day 2, 21:30 ~ 23:00, on the employees-only room, talking with her mom /* 25 */ ANJU_SCH_25, // Set manually in code instead of via script - /* 26 */ ANJU_SCH_DOOR_26, // Passing through to Grandma's door (entering) - /* 27 */ ANJU_SCH_DOOR_27, // Passing through to Grandma's door (leaving) - /* 28 */ ANJU_SCH_DOOR_28, // Passing through the door of the employees-only room (entering), after giving Grandma's lunch - /* 29 */ ANJU_SCH_DOOR_29, // Passing through the door of the employees-only room (leaving), after giving Grandma's lunch + /* 26 */ ANJU_SCH_DOOR_26, // Passing through to Granny's door (entering) + /* 27 */ ANJU_SCH_DOOR_27, // Passing through to Granny's door (leaving) + /* 28 */ ANJU_SCH_DOOR_28, // Passing through the door of the employees-only room (entering), after giving Granny's lunch + /* 29 */ ANJU_SCH_DOOR_29, // Passing through the door of the employees-only room (leaving), after giving Granny's lunch /* 30 */ ANJU_SCH_DOOR_30, // Passing through the door of the employees-only room (entering), after closing the Inn /* 31 */ ANJU_SCH_DOOR_31, // Passing through the door of the employees-only room (leaving), to have the midnight meeting /* 32 */ ANJU_SCH_DOOR_32, // Passing through the door of the employees-only room (leaving), going to the Laundry Pool /* 33 */ ANJU_SCH_DOOR_33, // Passing through the Inn's front door (leaving) (inside the Inn), going to the Laundry Pool /* 34 */ ANJU_SCH_DOOR_34, // Passing through the Inn's front door (entering) (inside the Inn), going from the Laundry Pool /* 35 */ ANJU_SCH_DOOR_35, // Passing through the door of the employees-only room (entering), after going to the Laundry Pool - /* 36 */ ANJU_SCH_DOOR_36, // Passing through the door of the second guest room (leaving), after sweeping the floor + /* 36 */ ANJU_SCH_DOOR_36, // Passing through the door of the Large Suite (leaving), after sweeping the floor /* 37 */ ANJU_SCH_DOOR_37, // Passing through the Inn's front door (leaving) (East Clock Town), going to the Laundry Pool /* 38 */ ANJU_SCH_DOOR_38, // Passing through the Inn's front door (entering) (East Clock Town), going from the Laundry Pool /* 39 */ ANJU_SCH_DOOR_39, // Passing through the door of the employees-only room (entering, after sweeping the floor - /* 40 */ ANJU_SCH_40, // Going from the front desk to the kitchen + /* 40 */ ANJU_SCH_WALKING_40, // Going from the front desk to the kitchen /* 41 */ ANJU_SCH_41, // unused - /* 42 */ ANJU_SCH_42, // Walking from the kitchen to Grandma's room - /* 43 */ ANJU_SCH_43, // Inside Grandma's room, walking to give her her food - /* 44 */ ANJU_SCH_44, // Inside Grandma's room, walking out - /* 45 */ ANJU_SCH_45, // Left Grandma's room, walking towards employees-only room - /* 46 */ ANJU_SCH_46, // Left employees-only room, walking to front desk - /* 47 */ ANJU_SCH_47, // Walking from the front desk to right next to the Inn's front door - /* 48 */ ANJU_SCH_48, // Walking from the Inn's front door after closing, to the employees-only room - /* 49 */ ANJU_SCH_49, // Walking from the employees-only room to the kitchen, to have the midnight meeting - /* 50 */ ANJU_SCH_50, // Walking from the employees-only room to Inn's front door, to go to the Laundry Pool - /* 51 */ ANJU_SCH_51, // Walking from the Inn's front door to the employees-only room, after going to the Laundry Pool - /* 52 */ ANJU_SCH_52, // Day 3, 11:00 ~ 11:25, Stopped sweeping, walking out of the room - /* 53 */ ANJU_SCH_53, // Day 3, 11:00 ~ 11:25, Walking through the hallway after sweeping - /* 54 */ ANJU_SCH_54, // Walking through East Clock Town, going to the Laundry Pool - /* 55 */ ANJU_SCH_55, // Walking through South Clock Town, East Clock Town perspective, going to the Laundry Pool - /* 56 */ ANJU_SCH_LAUNDRY_POOL_WALKING_IN, - /* 57 */ ANJU_SCH_LAUNDRY_POOL_LEAVING, - /* 58 */ ANJU_SCH_58, // Walking through South Clock Town, East Clock Town perspective, going to the Inn from the Laundry Pool - /* 59 */ ANJU_SCH_59, // Walking through East Clock Town, going to the Inn from the Laundry Pool - /* 60 */ ANJU_SCH_60, // Walking through East Clock Town, South Clock Town perspective, going to the Laundry Pool - /* 61 */ ANJU_SCH_61, // Walking through South Clock Town, going to the Laundry Pool - /* 62 */ ANJU_SCH_62, // Walking through South Clock Town, going to the Inn from the Laundry Pool - /* 63 */ ANJU_SCH_63, // Walking through East Clock Town, South Clock Town perspective, going to the Inn from the Laundry Pool + /* 42 */ ANJU_SCH_WALKING_42, // Walking from the kitchen to Granny's room + /* 43 */ ANJU_SCH_WALKING_43, // Inside Granny's room, walking to give her her food + /* 44 */ ANJU_SCH_WALKING_44, // Inside Granny's room, walking out + /* 45 */ ANJU_SCH_WALKING_45, // Left Granny's room, walking towards employees-only room + /* 46 */ ANJU_SCH_WALKING_46, // Left employees-only room, walking to front desk + /* 47 */ ANJU_SCH_WALKING_47, // Walking from the front desk to right next to the Inn's front door + /* 48 */ ANJU_SCH_WALKING_48, // Walking from the Inn's front door after closing, to the employees-only room + /* 49 */ ANJU_SCH_WALKING_49, // Walking from the employees-only room to the kitchen, to have the midnight meeting + /* 50 */ ANJU_SCH_WALKING_50, // Walking from the employees-only room to Inn's front door, to go to the Laundry Pool + /* 51 */ ANJU_SCH_WALKING_51, // Walking from the Inn's front door to the employees-only room, after going to the Laundry Pool + /* 52 */ ANJU_SCH_WALKING_52, // Day 3, 11:00 ~ 11:25, Stopped sweeping, walking out of the room + /* 53 */ ANJU_SCH_WALKING_53, // Day 3, 11:00 ~ 11:25, Walking through the hallway after sweeping + /* 54 */ ANJU_SCH_WALKING_54, // Walking through East Clock Town, going to the Laundry Pool + /* 55 */ ANJU_SCH_WALKING_55, // Walking through South Clock Town, East Clock Town perspective, going to the Laundry Pool + /* 56 */ ANJU_SCH_WALKING_56, + /* 57 */ ANJU_SCH_WALKING_57, + /* 58 */ ANJU_SCH_WALKING_58, // Walking through South Clock Town, East Clock Town perspective, going to the Inn from the Laundry Pool + /* 59 */ ANJU_SCH_WALKING_59, // Walking through East Clock Town, going to the Inn from the Laundry Pool + /* 60 */ ANJU_SCH_WALKING_60, // Walking through East Clock Town, South Clock Town perspective, going to the Laundry Pool + /* 61 */ ANJU_SCH_WALKING_61, // Walking through South Clock Town, going to the Laundry Pool + /* 62 */ ANJU_SCH_WALKING_62, // Walking through South Clock Town, going to the Inn from the Laundry Pool + /* 63 */ ANJU_SCH_WALKING_63, // Walking through East Clock Town, South Clock Town perspective, going to the Inn from the Laundry Pool /* 64 */ ANJU_SCH_MAX } AnjuScheduleResult; @@ -129,29 +129,29 @@ static u8 sScheduleScript[] = { /* 0x0B5 */ SCHEDULE_CMD_CHECK_FLAG_S(WEEKEVENTREG_HAD_MIDNIGHT_MEETING, 0x0BF - 0x0B9), /* 0x0B9 */ SCHEDULE_CMD_RET_TIME(0, 0, 6, 0, ANJU_SCH_MIDNIGHT_MEETING), /* 0x0BF */ SCHEDULE_CMD_RET_NONE(), - /* 0x0C0 */ SCHEDULE_CMD_RET_TIME(23, 15, 0, 0, ANJU_SCH_49), + /* 0x0C0 */ SCHEDULE_CMD_RET_TIME(23, 15, 0, 0, ANJU_SCH_WALKING_49), /* 0x0C6 */ SCHEDULE_CMD_RET_TIME(23, 10, 23, 15, ANJU_SCH_DOOR_31), /* 0x0CC */ SCHEDULE_CMD_RET_TIME(21, 5, 21, 10, ANJU_SCH_DOOR_30), - /* 0x0D2 */ SCHEDULE_CMD_RET_TIME(20, 30, 21, 5, ANJU_SCH_48), + /* 0x0D2 */ SCHEDULE_CMD_RET_TIME(20, 30, 21, 5, ANJU_SCH_WALKING_48), /* 0x0D8 */ SCHEDULE_CMD_RET_TIME(20, 20, 20, 30, ANJU_SCH_19), - /* 0x0DE */ SCHEDULE_CMD_RET_TIME(19, 50, 20, 20, ANJU_SCH_47), + /* 0x0DE */ SCHEDULE_CMD_RET_TIME(19, 50, 20, 20, ANJU_SCH_WALKING_47), /* 0x0E4 */ SCHEDULE_CMD_RET_TIME(16, 30, 19, 50, ANJU_SCH_RECEPTIONIST_IDLE), /* 0x0EA */ SCHEDULE_CMD_RET_TIME(16, 10, 16, 30, ANJU_SCH_ATTEND_GORON), /* 0x0F0 */ SCHEDULE_CMD_RET_TIME(14, 18, 16, 10, ANJU_SCH_RECEPTIONIST_IDLE), /* 0x0F6 */ SCHEDULE_CMD_RET_TIME(14, 8, 14, 18, ANJU_SCH_RECEIVE_LETTER_FROM_POSTMAN), /* 0x0FC */ SCHEDULE_CMD_RET_TIME(13, 50, 14, 8, ANJU_SCH_RECEPTIONIST_IDLE), - /* 0x102 */ SCHEDULE_CMD_RET_TIME(13, 20, 13, 50, ANJU_SCH_46), + /* 0x102 */ SCHEDULE_CMD_RET_TIME(13, 20, 13, 50, ANJU_SCH_WALKING_46), /* 0x108 */ SCHEDULE_CMD_RET_TIME(13, 15, 13, 20, ANJU_SCH_DOOR_29), /* 0x10E */ SCHEDULE_CMD_RET_TIME(12, 55, 13, 0, ANJU_SCH_DOOR_28), - /* 0x114 */ SCHEDULE_CMD_RET_TIME(12, 25, 12, 55, ANJU_SCH_45), + /* 0x114 */ SCHEDULE_CMD_RET_TIME(12, 25, 12, 55, ANJU_SCH_WALKING_45), /* 0x11A */ SCHEDULE_CMD_RET_TIME(12, 20, 12, 25, ANJU_SCH_DOOR_27), - /* 0x120 */ SCHEDULE_CMD_RET_TIME(12, 15, 12, 20, ANJU_SCH_44), - /* 0x126 */ SCHEDULE_CMD_RET_TIME(12, 0, 12, 15, ANJU_SCH_GIVE_LUNCH_TO_GRANDMA), - /* 0x12C */ SCHEDULE_CMD_RET_TIME(11, 55, 12, 0, ANJU_SCH_43), + /* 0x120 */ SCHEDULE_CMD_RET_TIME(12, 15, 12, 20, ANJU_SCH_WALKING_44), + /* 0x126 */ SCHEDULE_CMD_RET_TIME(12, 0, 12, 15, ANJU_SCH_GIVE_LUNCH_TO_GRANNY), + /* 0x12C */ SCHEDULE_CMD_RET_TIME(11, 55, 12, 0, ANJU_SCH_WALKING_43), /* 0x132 */ SCHEDULE_CMD_RET_TIME(11, 50, 11, 55, ANJU_SCH_DOOR_26), - /* 0x138 */ SCHEDULE_CMD_RET_TIME(11, 30, 11, 50, ANJU_SCH_42), + /* 0x138 */ SCHEDULE_CMD_RET_TIME(11, 30, 11, 50, ANJU_SCH_WALKING_42), /* 0x13E */ SCHEDULE_CMD_RET_TIME(11, 10, 11, 30, ANJU_SCH_COOKING), - /* 0x144 */ SCHEDULE_CMD_RET_TIME(10, 55, 11, 10, ANJU_SCH_40), + /* 0x144 */ SCHEDULE_CMD_RET_TIME(10, 55, 11, 10, ANJU_SCH_WALKING_40), /* 0x14A */ SCHEDULE_CMD_RET_TIME(6, 0, 10, 55, ANJU_SCH_RECEPTIONIST_IDLE), /* 0x150 */ SCHEDULE_CMD_RET_NONE(), /* 0x151 */ SCHEDULE_CMD_CHECK_NOT_IN_DAY_L(2, 0x391 - 0x156), @@ -170,17 +170,17 @@ static u8 sScheduleScript[] = { /* 0x19D */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(21, 0, 21, 5, 0x1B0 - 0x1A3), /* 0x1A3 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(21, 30, 23, 0, 0x1AA - 0x1A9), /* 0x1A9 */ SCHEDULE_CMD_RET_NONE(), - /* 0x1AA */ SCHEDULE_CMD_RET_TIME(21, 30, 23, 0, ANJU_SCH_24), + /* 0x1AA */ SCHEDULE_CMD_RET_TIME(21, 30, 23, 0, ANJU_SCH_TALKING_WITH_MOM), /* 0x1B0 */ SCHEDULE_CMD_RET_TIME(21, 0, 21, 5, ANJU_SCH_DOOR_30), - /* 0x1B6 */ SCHEDULE_CMD_RET_TIME(20, 30, 21, 0, ANJU_SCH_48), + /* 0x1B6 */ SCHEDULE_CMD_RET_TIME(20, 30, 21, 0, ANJU_SCH_WALKING_48), /* 0x1BC */ SCHEDULE_CMD_RET_TIME(20, 20, 20, 30, ANJU_SCH_19), - /* 0x1C2 */ SCHEDULE_CMD_RET_TIME(19, 50, 20, 20, ANJU_SCH_47), + /* 0x1C2 */ SCHEDULE_CMD_RET_TIME(19, 50, 20, 20, ANJU_SCH_WALKING_47), /* 0x1C8 */ SCHEDULE_CMD_RET_TIME(18, 0, 19, 50, ANJU_SCH_RECEPTIONIST_IDLE), /* 0x1CE */ SCHEDULE_CMD_RET_TIME(17, 55, 18, 0, ANJU_SCH_DOOR_35), - /* 0x1D4 */ SCHEDULE_CMD_RET_TIME(17, 30, 17, 55, ANJU_SCH_51), + /* 0x1D4 */ SCHEDULE_CMD_RET_TIME(17, 30, 17, 55, ANJU_SCH_WALKING_51), /* 0x1DA */ SCHEDULE_CMD_RET_TIME(17, 24, 17, 30, ANJU_SCH_DOOR_34), /* 0x1E0 */ SCHEDULE_CMD_RET_TIME(11, 29, 11, 39, ANJU_SCH_DOOR_33), - /* 0x1E6 */ SCHEDULE_CMD_RET_TIME(11, 9, 11, 29, ANJU_SCH_50), + /* 0x1E6 */ SCHEDULE_CMD_RET_TIME(11, 9, 11, 29, ANJU_SCH_WALKING_50), /* 0x1EC */ SCHEDULE_CMD_RET_TIME(11, 3, 11, 9, ANJU_SCH_DOOR_32), /* 0x1F2 */ SCHEDULE_CMD_CHECK_NOT_IN_SCENE_S(SCENE_TOWN, 0x23F - 0x1F6), /* 0x1F6 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(11, 29, 11, 39, 0x239 - 0x1FC), @@ -191,10 +191,10 @@ static u8 sScheduleScript[] = { /* 0x214 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(17, 24, 17, 30, 0x21B - 0x21A), /* 0x21A */ SCHEDULE_CMD_RET_NONE(), /* 0x21B */ SCHEDULE_CMD_RET_TIME(17, 24, 17, 30, ANJU_SCH_DOOR_38), - /* 0x221 */ SCHEDULE_CMD_RET_TIME(16, 45, 17, 24, ANJU_SCH_59), - /* 0x227 */ SCHEDULE_CMD_RET_TIME(15, 55, 16, 45, ANJU_SCH_58), - /* 0x22D */ SCHEDULE_CMD_RET_TIME(12, 25, 13, 15, ANJU_SCH_55), - /* 0x233 */ SCHEDULE_CMD_RET_TIME(11, 39, 12, 25, ANJU_SCH_54), + /* 0x221 */ SCHEDULE_CMD_RET_TIME(16, 45, 17, 24, ANJU_SCH_WALKING_59), + /* 0x227 */ SCHEDULE_CMD_RET_TIME(15, 55, 16, 45, ANJU_SCH_WALKING_58), + /* 0x22D */ SCHEDULE_CMD_RET_TIME(12, 25, 13, 15, ANJU_SCH_WALKING_55), + /* 0x233 */ SCHEDULE_CMD_RET_TIME(11, 39, 12, 25, ANJU_SCH_WALKING_54), /* 0x239 */ SCHEDULE_CMD_RET_TIME(11, 29, 11, 39, ANJU_SCH_DOOR_37), /* 0x23F */ SCHEDULE_CMD_CHECK_NOT_IN_SCENE_S(SCENE_CLOCKTOWER, 0x274 - 0x243), /* 0x243 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(11, 39, 12, 25, 0x26E - 0x249), @@ -202,18 +202,18 @@ static u8 sScheduleScript[] = { /* 0x24F */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(15, 55, 16, 45, 0x262 - 0x255), /* 0x255 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(16, 45, 17, 24, 0x25C - 0x25B), /* 0x25B */ SCHEDULE_CMD_RET_NONE(), - /* 0x25C */ SCHEDULE_CMD_RET_TIME(16, 45, 17, 24, ANJU_SCH_63), - /* 0x262 */ SCHEDULE_CMD_RET_TIME(15, 55, 16, 45, ANJU_SCH_62), - /* 0x268 */ SCHEDULE_CMD_RET_TIME(12, 25, 13, 15, ANJU_SCH_61), - /* 0x26E */ SCHEDULE_CMD_RET_TIME(11, 39, 12, 25, ANJU_SCH_60), + /* 0x25C */ SCHEDULE_CMD_RET_TIME(16, 45, 17, 24, ANJU_SCH_WALKING_63), + /* 0x262 */ SCHEDULE_CMD_RET_TIME(15, 55, 16, 45, ANJU_SCH_WALKING_62), + /* 0x268 */ SCHEDULE_CMD_RET_TIME(12, 25, 13, 15, ANJU_SCH_WALKING_61), + /* 0x26E */ SCHEDULE_CMD_RET_TIME(11, 39, 12, 25, ANJU_SCH_WALKING_60), /* 0x274 */ SCHEDULE_CMD_CHECK_NOT_IN_SCENE_S(SCENE_ALLEY, 0x29D - 0x278), /* 0x278 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(13, 15, 13, 45, 0x297 - 0x27E), /* 0x27E */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(13, 45, 15, 25, 0x291 - 0x284), /* 0x284 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(15, 25, 15, 55, 0x28B - 0x28A), /* 0x28A */ SCHEDULE_CMD_RET_NONE(), - /* 0x28B */ SCHEDULE_CMD_RET_TIME(15, 25, 15, 55, ANJU_SCH_LAUNDRY_POOL_LEAVING), + /* 0x28B */ SCHEDULE_CMD_RET_TIME(15, 25, 15, 55, ANJU_SCH_WALKING_57), /* 0x291 */ SCHEDULE_CMD_RET_TIME(13, 45, 15, 25, ANJU_SCH_LAUNDRY_POOL_SIT), - /* 0x297 */ SCHEDULE_CMD_RET_TIME(13, 15, 13, 45, ANJU_SCH_LAUNDRY_POOL_WALKING_IN), + /* 0x297 */ SCHEDULE_CMD_RET_TIME(13, 15, 13, 45, ANJU_SCH_WALKING_56), /* 0x29D */ SCHEDULE_CMD_RET_NONE(), /* 0x29E */ SCHEDULE_CMD_CHECK_NOT_IN_SCENE_L(SCENE_YADOYA, 0x390 - 0x2A3), /* 0x2A3 */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(6, 0, 10, 55, 0x38A - 0x2AA), @@ -236,24 +236,24 @@ static u8 sScheduleScript[] = { /* 0x311 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(21, 5, 21, 10, 0x324 - 0x317), /* 0x317 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(21, 30, 23, 0, 0x31E - 0x31D), /* 0x31D */ SCHEDULE_CMD_RET_NONE(), - /* 0x31E */ SCHEDULE_CMD_RET_TIME(21, 30, 23, 0, ANJU_SCH_24), + /* 0x31E */ SCHEDULE_CMD_RET_TIME(21, 30, 23, 0, ANJU_SCH_TALKING_WITH_MOM), /* 0x324 */ SCHEDULE_CMD_RET_TIME(21, 5, 21, 10, ANJU_SCH_DOOR_30), - /* 0x32A */ SCHEDULE_CMD_RET_TIME(20, 30, 21, 5, ANJU_SCH_48), + /* 0x32A */ SCHEDULE_CMD_RET_TIME(20, 30, 21, 5, ANJU_SCH_WALKING_48), /* 0x330 */ SCHEDULE_CMD_RET_TIME(20, 20, 20, 30, ANJU_SCH_19), - /* 0x336 */ SCHEDULE_CMD_RET_TIME(19, 50, 20, 20, ANJU_SCH_47), + /* 0x336 */ SCHEDULE_CMD_RET_TIME(19, 50, 20, 20, ANJU_SCH_WALKING_47), /* 0x33C */ SCHEDULE_CMD_RET_TIME(13, 50, 19, 50, ANJU_SCH_RECEPTIONIST_IDLE), - /* 0x342 */ SCHEDULE_CMD_RET_TIME(13, 20, 13, 50, ANJU_SCH_46), + /* 0x342 */ SCHEDULE_CMD_RET_TIME(13, 20, 13, 50, ANJU_SCH_WALKING_46), /* 0x348 */ SCHEDULE_CMD_RET_TIME(13, 15, 13, 20, ANJU_SCH_DOOR_29), /* 0x34E */ SCHEDULE_CMD_RET_TIME(12, 55, 13, 0, ANJU_SCH_DOOR_28), - /* 0x354 */ SCHEDULE_CMD_RET_TIME(12, 25, 12, 55, ANJU_SCH_45), + /* 0x354 */ SCHEDULE_CMD_RET_TIME(12, 25, 12, 55, ANJU_SCH_WALKING_45), /* 0x35A */ SCHEDULE_CMD_RET_TIME(12, 20, 12, 25, ANJU_SCH_DOOR_27), - /* 0x360 */ SCHEDULE_CMD_RET_TIME(12, 15, 12, 20, ANJU_SCH_44), - /* 0x366 */ SCHEDULE_CMD_RET_TIME(12, 0, 12, 15, ANJU_SCH_GIVE_LUNCH_TO_GRANDMA), - /* 0x36C */ SCHEDULE_CMD_RET_TIME(11, 55, 12, 0, ANJU_SCH_43), + /* 0x360 */ SCHEDULE_CMD_RET_TIME(12, 15, 12, 20, ANJU_SCH_WALKING_44), + /* 0x366 */ SCHEDULE_CMD_RET_TIME(12, 0, 12, 15, ANJU_SCH_GIVE_LUNCH_TO_GRANNY), + /* 0x36C */ SCHEDULE_CMD_RET_TIME(11, 55, 12, 0, ANJU_SCH_WALKING_43), /* 0x372 */ SCHEDULE_CMD_RET_TIME(11, 50, 11, 55, ANJU_SCH_DOOR_26), - /* 0x378 */ SCHEDULE_CMD_RET_TIME(11, 30, 11, 50, ANJU_SCH_42), + /* 0x378 */ SCHEDULE_CMD_RET_TIME(11, 30, 11, 50, ANJU_SCH_WALKING_42), /* 0x37E */ SCHEDULE_CMD_RET_TIME(11, 10, 11, 30, ANJU_SCH_COOKING), - /* 0x384 */ SCHEDULE_CMD_RET_TIME(10, 55, 11, 10, ANJU_SCH_40), + /* 0x384 */ SCHEDULE_CMD_RET_TIME(10, 55, 11, 10, ANJU_SCH_WALKING_40), /* 0x38A */ SCHEDULE_CMD_RET_TIME(6, 0, 10, 55, ANJU_SCH_RECEPTIONIST_IDLE), /* 0x390 */ SCHEDULE_CMD_RET_NONE(), /* 0x391 */ SCHEDULE_CMD_CHECK_NOT_IN_DAY_L(3, 0x447 - 0x396), @@ -266,9 +266,9 @@ static u8 sScheduleScript[] = { /* 0x3B6 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(11, 50, 12, 0, 0x3BD - 0x3BC), /* 0x3BC */ SCHEDULE_CMD_RET_NONE(), /* 0x3BD */ SCHEDULE_CMD_RET_TIME(11, 50, 12, 0, ANJU_SCH_DOOR_39), - /* 0x3C3 */ SCHEDULE_CMD_RET_TIME(11, 30, 11, 50, ANJU_SCH_53), + /* 0x3C3 */ SCHEDULE_CMD_RET_TIME(11, 30, 11, 50, ANJU_SCH_WALKING_53), /* 0x3C9 */ SCHEDULE_CMD_RET_TIME(11, 25, 11, 30, ANJU_SCH_DOOR_36), - /* 0x3CF */ SCHEDULE_CMD_RET_TIME(11, 0, 11, 25, ANJU_SCH_52), + /* 0x3CF */ SCHEDULE_CMD_RET_TIME(11, 0, 11, 25, ANJU_SCH_WALKING_52), /* 0x3D5 */ SCHEDULE_CMD_RET_TIME(6, 0, 11, 0, ANJU_SCH_SWEEPING), /* 0x3DB */ SCHEDULE_CMD_CHECK_NOT_IN_SCENE_S(SCENE_OMOYA, 0x3EC - 0x3DF), /* 0x3DF */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(18, 0, 6, 0, 0x3E6 - 0x3E5), @@ -287,9 +287,9 @@ static u8 sScheduleScript[] = { /* 0x41C */ SCHEDULE_CMD_RET_TIME(5, 0, 6, 0, ANJU_SCH_WAITING_FOR_KAFEI), /* 0x422 */ SCHEDULE_CMD_RET_TIME(18, 0, 5, 0, ANJU_SCH_WAITING_FOR_KAFEI), /* 0x428 */ SCHEDULE_CMD_RET_TIME(11, 50, 12, 0, ANJU_SCH_DOOR_39), - /* 0x42E */ SCHEDULE_CMD_RET_TIME(11, 30, 11, 50, ANJU_SCH_53), + /* 0x42E */ SCHEDULE_CMD_RET_TIME(11, 30, 11, 50, ANJU_SCH_WALKING_53), /* 0x434 */ SCHEDULE_CMD_RET_TIME(11, 25, 11, 30, ANJU_SCH_DOOR_36), - /* 0x43A */ SCHEDULE_CMD_RET_TIME(11, 0, 11, 25, ANJU_SCH_52), + /* 0x43A */ SCHEDULE_CMD_RET_TIME(11, 0, 11, 25, ANJU_SCH_WALKING_52), /* 0x440 */ SCHEDULE_CMD_RET_TIME(6, 0, 11, 0, ANJU_SCH_SWEEPING), /* 0x446 */ SCHEDULE_CMD_RET_NONE(), /* 0x447 */ SCHEDULE_CMD_RET_NONE(), @@ -304,29 +304,29 @@ s32 scheduleScript(PlayState* play) { if ((6, 0) <= NOW <= (10, 55)) { return ANJU_SCH_RECEPTIONIST_IDLE; } else if ((10, 55) <= NOW <= (11, 10)) { - return ANJU_SCH_40; + return ANJU_SCH_WALKING_40; } else if ((11, 10) <= NOW <= (11, 30)) { return ANJU_SCH_COOKING; } else if ((11, 30) <= NOW <= (11, 50)) { - return ANJU_SCH_42; + return ANJU_SCH_WALKING_42; } else if ((11, 50) <= NOW <= (11, 55)) { return ANJU_SCH_DOOR_26; } else if ((11, 55) <= NOW <= (12, 0)) { - return ANJU_SCH_43; + return ANJU_SCH_WALKING_43; } else if ((12, 0) <= NOW <= (12, 15)) { - return ANJU_SCH_GIVE_LUNCH_TO_GRANDMA; + return ANJU_SCH_GIVE_LUNCH_TO_GRANNY; } else if ((12, 15) <= NOW <= (12, 20)) { - return ANJU_SCH_44; + return ANJU_SCH_WALKING_44; } else if ((12, 20) <= NOW <= (12, 25)) { return ANJU_SCH_DOOR_27; } else if ((12, 25) <= NOW <= (12, 55)) { - return ANJU_SCH_45; + return ANJU_SCH_WALKING_45; } else if ((12, 55) <= NOW <= (13, 0)) { return ANJU_SCH_DOOR_28; } else if ((13, 15) <= NOW <= (13, 20)) { return ANJU_SCH_DOOR_29; } else if ((13, 20) <= NOW <= (13, 50)) { - return ANJU_SCH_46; + return ANJU_SCH_WALKING_46; } else if ((13, 50) <= NOW <= (14, 8)) { return ANJU_SCH_RECEPTIONIST_IDLE; } else if ((14, 8) <= NOW <= (14, 18)) { @@ -338,18 +338,18 @@ s32 scheduleScript(PlayState* play) { } else if ((16, 30) <= NOW <= (19, 50)) { return ANJU_SCH_RECEPTIONIST_IDLE; } else if ((19, 50) <= NOW <= (20, 20)) { - return ANJU_SCH_47; + return ANJU_SCH_WALKING_47; } else if ((20, 20) <= NOW <= (20, 30)) { return ANJU_SCH_19; } else if ((20, 30) <= NOW <= (21, 5)) { - return ANJU_SCH_48; + return ANJU_SCH_WALKING_48; } else if ((21, 5) <= NOW <= (21, 10)) { return ANJU_SCH_DOOR_30; } else if (CHECK_WEEKEVENTREG(WEEKEVENTREG_PROMISED_MIDNIGHT_MEETING)) { if ((23, 10) <= NOW <= (23, 15)) { return ANJU_SCH_DOOR_31; } else if ((23, 15) <= NOW <= (0, 0)) { - return ANJU_SCH_49; + return ANJU_SCH_WALKING_49; } else if ((0, 0) <= NOW <= (6, 0)) { if (CHECK_WEEKEVENTREG(WEEKEVENTREG_HAD_MIDNIGHT_MEETING)) { return None; @@ -370,41 +370,41 @@ s32 scheduleScript(PlayState* play) { if ((6, 0) <= NOW <= (10, 55)) { return ANJU_SCH_RECEPTIONIST_IDLE; } else if ((10, 55) <= NOW <= (11, 10)) { - return ANJU_SCH_40; + return ANJU_SCH_WALKING_40; } else if ((11, 10) <= NOW <= (11, 30)) { return ANJU_SCH_COOKING; } else if ((11, 30) <= NOW <= (11, 50)) { - return ANJU_SCH_42; + return ANJU_SCH_WALKING_42; } else if ((11, 50) <= NOW <= (11, 55)) { return ANJU_SCH_DOOR_26; } else if ((11, 55) <= NOW <= (12, 0)) { - return ANJU_SCH_43; + return ANJU_SCH_WALKING_43; } else if ((12, 0) <= NOW <= (12, 15)) { - return ANJU_SCH_GIVE_LUNCH_TO_GRANDMA; + return ANJU_SCH_GIVE_LUNCH_TO_GRANNY; } else if ((12, 15) <= NOW <= (12, 20)) { - return ANJU_SCH_44; + return ANJU_SCH_WALKING_44; } else if ((12, 20) <= NOW <= (12, 25)) { return ANJU_SCH_DOOR_27; } else if ((12, 25) <= NOW <= (12, 55)) { - return ANJU_SCH_45; + return ANJU_SCH_WALKING_45; } else if ((12, 55) <= NOW <= (13, 0)) { return ANJU_SCH_DOOR_28; } else if ((13, 15) <= NOW <= (13, 20)) { return ANJU_SCH_DOOR_29; } else if ((13, 20) <= NOW <= (13, 50)) { - return ANJU_SCH_46; + return ANJU_SCH_WALKING_46; } else if ((13, 50) <= NOW <= (19, 50)) { return ANJU_SCH_RECEPTIONIST_IDLE; } else if ((19, 50) <= NOW <= (20, 20)) { - return ANJU_SCH_47; + return ANJU_SCH_WALKING_47; } else if ((20, 20) <= NOW <= (20, 30)) { return ANJU_SCH_19; } else if ((20, 30) <= NOW <= (21, 5)) { - return ANJU_SCH_48; + return ANJU_SCH_WALKING_48; } else if ((21, 5) <= NOW <= (21, 10)) { return ANJU_SCH_DOOR_30; } else if ((21, 30) <= NOW <= (23, 0)) { - return ANJU_SCH_24; + return ANJU_SCH_TALKING_WITH_MOM; } else { return None; } @@ -415,27 +415,27 @@ s32 scheduleScript(PlayState* play) { if ((11, 3) <= NOW <= (11, 9)) { return ANJU_SCH_DOOR_32; } else if ((11, 9) <= NOW <= (11, 29)) { - return ANJU_SCH_50; + return ANJU_SCH_WALKING_50; } else if ((11, 29) <= NOW <= (11, 39)) { return ANJU_SCH_DOOR_33; } else if ((17, 24) <= NOW <= (17, 30)) { return ANJU_SCH_DOOR_34; } else if ((17, 30) <= NOW <= (17, 55)) { - return ANJU_SCH_51; + return ANJU_SCH_WALKING_51; } else if ((17, 55) <= NOW <= (18, 0)) { return ANJU_SCH_DOOR_35; } else if ((18, 0) <= NOW <= (19, 50)) { return ANJU_SCH_RECEPTIONIST_IDLE; } else if ((19, 50) <= NOW <= (20, 20)) { - return ANJU_SCH_47; + return ANJU_SCH_WALKING_47; } else if ((20, 20) <= NOW <= (20, 30)) { return ANJU_SCH_19; } else if ((20, 30) <= NOW <= (21, 0)) { - return ANJU_SCH_48; + return ANJU_SCH_WALKING_48; } else if ((21, 0) <= NOW <= (21, 5)) { return ANJU_SCH_DOOR_30; } else if ((21, 30) <= NOW <= (23, 0)) { - return ANJU_SCH_24; + return ANJU_SCH_TALKING_WITH_MOM; } else { return None; } @@ -443,13 +443,13 @@ s32 scheduleScript(PlayState* play) { if ((11, 29) <= NOW <= (11, 39)) { return ANJU_SCH_DOOR_37; } else if ((11, 39) <= NOW <= (12, 25)) { - return ANJU_SCH_54; + return ANJU_SCH_WALKING_54; } else if ((12, 25) <= NOW <= (13, 15)) { - return ANJU_SCH_55; + return ANJU_SCH_WALKING_55; } else if ((15, 55) <= NOW <= (16, 45)) { - return ANJU_SCH_58; + return ANJU_SCH_WALKING_58; } else if ((16, 45) <= NOW <= (17, 24)) { - return ANJU_SCH_59; + return ANJU_SCH_WALKING_59; } else if ((17, 24) <= NOW <= (17, 30)) { return ANJU_SCH_DOOR_38; } else { @@ -457,23 +457,23 @@ s32 scheduleScript(PlayState* play) { } } else if (play->sceneId == SCENE_CLOCKTOWER) { if ((11, 39) <= NOW <= (12, 25)) { - return ANJU_SCH_60; + return ANJU_SCH_WALKING_60; } else if ((12, 25) <= NOW <= (13, 15)) { - return ANJU_SCH_61; + return ANJU_SCH_WALKING_61; } else if ((15, 55) <= NOW <= (16, 45)) { - return ANJU_SCH_62; + return ANJU_SCH_WALKING_62; } else if ((16, 45) <= NOW <= (17, 24)) { - return ANJU_SCH_63; + return ANJU_SCH_WALKING_63; } else { return None; } } else if (play->sceneId == SCENE_ALLEY) { if ((13, 15) <= NOW <= (13, 45)) { - return ANJU_SCH_LAUNDRY_POOL_WALKING_IN; + return ANJU_SCH_WALKING_56; } else if ((13, 45) <= NOW <= (15, 25)) { return ANJU_SCH_LAUNDRY_POOL_SIT; } else if ((15, 25) <= NOW <= (15, 55)) { - return ANJU_SCH_LAUNDRY_POOL_LEAVING; + return ANJU_SCH_WALKING_57; } else { return None; } @@ -486,11 +486,11 @@ s32 scheduleScript(PlayState* play) { if ((6, 0) <= NOW <= (11, 0)) { return ANJU_SCH_SWEEPING; } else if ((11, 0) <= NOW <= (11, 25)) { - return ANJU_SCH_52; + return ANJU_SCH_WALKING_52; } else if ((11, 25) <= NOW <= (11, 30)) { return ANJU_SCH_DOOR_36; } else if ((11, 30) <= NOW <= (11, 50)) { - return ANJU_SCH_53; + return ANJU_SCH_WALKING_53; } else if ((11, 50) <= NOW <= (12, 0)) { return ANJU_SCH_DOOR_39; } else if ((18, 0) <= NOW <= (5, 0)) { @@ -507,11 +507,11 @@ s32 scheduleScript(PlayState* play) { if ((6, 0) <= NOW <= (11, 0)) { return ANJU_SCH_SWEEPING; } else if ((11, 0) <= NOW <= (11, 25)) { - return ANJU_SCH_52; + return ANJU_SCH_WALKING_52; } else if ((11, 25) <= NOW <= (11, 30)) { return ANJU_SCH_DOOR_36; } else if ((11, 30) <= NOW <= (11, 50)) { - return ANJU_SCH_53; + return ANJU_SCH_WALKING_53; } else if ((11, 50) <= NOW <= (12, 0)) { return ANJU_SCH_DOOR_39; } else { @@ -554,10 +554,10 @@ static s32 sSearchTimePathLimit[ANJU_SCH_MAX] = { 10, // ANJU_SCH_RECEPTIONIST_IDLE 11, // ANJU_SCH_19 -1, // ANJU_SCH_20 - 4, // ANJU_SCH_GIVE_LUNCH_TO_GRANDMA + 4, // ANJU_SCH_GIVE_LUNCH_TO_GRANNY 22, // ANJU_SCH_SWEEPING 15, // ANJU_SCH_MIDNIGHT_MEETING - -1, // ANJU_SCH_24 + -1, // ANJU_SCH_TALKING_WITH_MOM -1, // ANJU_SCH_25 3, // ANJU_SCH_DOOR_26 6, // ANJU_SCH_DOOR_27 @@ -573,30 +573,30 @@ static s32 sSearchTimePathLimit[ANJU_SCH_MAX] = { 0, // ANJU_SCH_DOOR_37 5, // ANJU_SCH_DOOR_38 25, // ANJU_SCH_DOOR_39 - 0, // ANJU_SCH_40 + 0, // ANJU_SCH_WALKING_40 1, // ANJU_SCH_41 - 2, // ANJU_SCH_42 - 4, // ANJU_SCH_43 - 5, // ANJU_SCH_44 - 7, // ANJU_SCH_45 - 10, // ANJU_SCH_46 - 11, // ANJU_SCH_47 - 12, // ANJU_SCH_48 - 15, // ANJU_SCH_49 - 17, // ANJU_SCH_50 - 20, // ANJU_SCH_51 - 22, // ANJU_SCH_52 - 24, // ANJU_SCH_53 - 1, // ANJU_SCH_54 - 2, // ANJU_SCH_55 - 0, // ANJU_SCH_LAUNDRY_POOL_WALKING_IN - 1, // ANJU_SCH_LAUNDRY_POOL_LEAVING - 3, // ANJU_SCH_58 - 4, // ANJU_SCH_59 - 0, // ANJU_SCH_60 - 1, // ANJU_SCH_61 - 2, // ANJU_SCH_62 - 3, // ANJU_SCH_63 + 2, // ANJU_SCH_WALKING_42 + 4, // ANJU_SCH_WALKING_43 + 5, // ANJU_SCH_WALKING_44 + 7, // ANJU_SCH_WALKING_45 + 10, // ANJU_SCH_WALKING_46 + 11, // ANJU_SCH_WALKING_47 + 12, // ANJU_SCH_WALKING_48 + 15, // ANJU_SCH_WALKING_49 + 17, // ANJU_SCH_WALKING_50 + 20, // ANJU_SCH_WALKING_51 + 22, // ANJU_SCH_WALKING_52 + 24, // ANJU_SCH_WALKING_53 + 1, // ANJU_SCH_WALKING_54 + 2, // ANJU_SCH_WALKING_55 + 0, // ANJU_SCH_WALKING_56 + 1, // ANJU_SCH_WALKING_57 + 3, // ANJU_SCH_WALKING_58 + 4, // ANJU_SCH_WALKING_59 + 0, // ANJU_SCH_WALKING_60 + 1, // ANJU_SCH_WALKING_61 + 2, // ANJU_SCH_WALKING_62 + 3, // ANJU_SCH_WALKING_63 }; s32 sAnjuMsgScript_SchReceiveLetterFromPostman[0x1B] = { @@ -610,7 +610,7 @@ s32 sAnjuMsgScript_SchAttendGoron[0x21] = { 0x0000180E, 0x28B82D00, 0x010C0900, 0x00115610, 0x10090000, 0x170E2956, 0x0C090000, 0x180E2957, 0x0C090000, 0x170E2958, 0x0C090000, 0x180E2959, 0x2D00010C, 0x09000012, 0x10000000, }; -s32 sAnjuMsgScript_SchGiveLunchToGrandma[0x15] = { +s32 sAnjuMsgScript_SchGiveLunchToGranny[0x15] = { 0x09000017, 0x0E28C70C, 0x09000018, 0x0E28C80C, 0x09000017, 0x0E28C90C, 0x09000018, 0x0E28CA0C, 0x09000017, 0x0E28CB0C, 0x09000018, 0x0E28CC0C, 0x09000017, 0x0E28CD0C, 0x09000018, 0x0E28CE0C, 0x09000017, 0x0E28CF2D, 0x12D00, 0x0E0C0900, 0x100000, @@ -1378,7 +1378,7 @@ s32 EnAn_MsgEvent_AttendGoron(Actor* thisx, PlayState* play) { return var_a2; } -s32 EnAn_MsgEvent_GiveLunchToGrandma(Actor* thisx, PlayState* play) { +s32 EnAn_MsgEvent_GiveLunchToGranny(Actor* thisx, PlayState* play) { EnAn* this = THIS; s16 csId = EnAn_GetChildCsId(this, 0); s32 ret = 0; @@ -1502,9 +1502,9 @@ s32* EnAn_GetMsgEventScript(EnAn* this, PlayState* play) { Player* player = GET_PLAYER(play); switch (this->scheduleResult) { - case ANJU_SCH_GIVE_LUNCH_TO_GRANDMA: - this->msgEventFunc = EnAn_MsgEvent_GiveLunchToGrandma; - return sAnjuMsgScript_SchGiveLunchToGrandma; + case ANJU_SCH_GIVE_LUNCH_TO_GRANNY: + this->msgEventFunc = EnAn_MsgEvent_GiveLunchToGranny; + return sAnjuMsgScript_SchGiveLunchToGranny; case ANJU_SCH_RECEIVE_LETTER_FROM_POSTMAN: this->msgEventFunc = EnAn_MsgEvent_ReceiveLetterFromPostman; @@ -1533,18 +1533,18 @@ s32* EnAn_GetMsgEventScript(EnAn* this, PlayState* play) { case ANJU_SCH_WAITING_FOR_KAFEI: return sAnjuMsgScript_SchWaitingForKafei; - case ANJU_SCH_40: - case ANJU_SCH_42: - case ANJU_SCH_43: - case ANJU_SCH_44: - case ANJU_SCH_45: - case ANJU_SCH_47: + case ANJU_SCH_WALKING_40: + case ANJU_SCH_WALKING_42: + case ANJU_SCH_WALKING_43: + case ANJU_SCH_WALKING_44: + case ANJU_SCH_WALKING_45: + case ANJU_SCH_WALKING_47: return sAnjuMsgScript_80B58B7C; case ANJU_SCH_LAUNDRY_POOL_SIT: return sAnjuMsgScript_SchLaundryPoolDeku; - case ANJU_SCH_49: + case ANJU_SCH_WALKING_49: return sAnjuMsgScript_80B589FC; default: @@ -1555,7 +1555,7 @@ s32* EnAn_GetMsgEventScript(EnAn* this, PlayState* play) { } if (Player_GetMask(play) == PLAYER_MASK_KAFEIS_MASK) { - if (this->scheduleResult == ANJU_SCH_49) { + if (this->scheduleResult == ANJU_SCH_WALKING_49) { return sAnjuMsgScript_80B58B88; } @@ -1603,13 +1603,13 @@ s32* EnAn_GetMsgEventScript(EnAn* this, PlayState* play) { case ANJU_SCH_WAITING_FOR_KAFEI: return sAnjuMsgScript_SchWaitingForKafei; - case ANJU_SCH_40: + case ANJU_SCH_WALKING_40: return sAnjuMsgScript_Sch28; - case ANJU_SCH_42: - case ANJU_SCH_43: - case ANJU_SCH_44: - case ANJU_SCH_45: + case ANJU_SCH_WALKING_42: + case ANJU_SCH_WALKING_43: + case ANJU_SCH_WALKING_44: + case ANJU_SCH_WALKING_45: return D_80B58980; case ANJU_SCH_LAUNDRY_POOL_SIT: @@ -1623,7 +1623,7 @@ s32* EnAn_GetMsgEventScript(EnAn* this, PlayState* play) { return sAnjuMsgScript_Sch12_B; case ANJU_SCH_19: - case ANJU_SCH_47: + case ANJU_SCH_WALKING_47: return sAnjuMsgScript_InnCloseTime; case ANJU_SCH_SWEEPING: @@ -1632,17 +1632,17 @@ s32* EnAn_GetMsgEventScript(EnAn* this, PlayState* play) { case ANJU_SCH_MIDNIGHT_MEETING: return sAnjuMsgScript_80B589FC; - case ANJU_SCH_48: + case ANJU_SCH_WALKING_48: return sAnjuMsgScript_Sch30; - case ANJU_SCH_49: + case ANJU_SCH_WALKING_49: if (player->transformation == PLAYER_FORM_HUMAN) { return sAnjuMsgScript_80B58B88; } return sAnjuMsgScript_80B589FC; - case ANJU_SCH_52: - case ANJU_SCH_53: + case ANJU_SCH_WALKING_52: + case ANJU_SCH_WALKING_53: return sAnjuMsgScript_Sch34_Sch35; default: @@ -1666,11 +1666,11 @@ s32 EnAn_CheckTalk(EnAn* this, PlayState* play) { if ((this->scheduleResult == ANJU_SCH_WAITING_FOR_KAFEI) || (this->scheduleResult == ANJU_SCH_LAUNDRY_POOL_SIT) || (this->scheduleResult == ANJU_SCH_RECEPTIONIST_IDLE) || (this->scheduleResult == ANJU_SCH_19) || (this->scheduleResult == ANJU_SCH_MIDNIGHT_MEETING) || (this->scheduleResult == ANJU_SCH_SWEEPING) || - (this->scheduleResult == ANJU_SCH_40) || (this->scheduleResult == ANJU_SCH_42) || - (this->scheduleResult == ANJU_SCH_43) || (this->scheduleResult == ANJU_SCH_44) || - (this->scheduleResult == ANJU_SCH_45) || (this->scheduleResult == ANJU_SCH_47) || - (this->scheduleResult == ANJU_SCH_48) || (this->scheduleResult == ANJU_SCH_49) || - (this->scheduleResult == ANJU_SCH_52) || (this->scheduleResult == ANJU_SCH_53)) { + (this->scheduleResult == ANJU_SCH_WALKING_40) || (this->scheduleResult == ANJU_SCH_WALKING_42) || + (this->scheduleResult == ANJU_SCH_WALKING_43) || (this->scheduleResult == ANJU_SCH_WALKING_44) || + (this->scheduleResult == ANJU_SCH_WALKING_45) || (this->scheduleResult == ANJU_SCH_WALKING_47) || + (this->scheduleResult == ANJU_SCH_WALKING_48) || (this->scheduleResult == ANJU_SCH_WALKING_49) || + (this->scheduleResult == ANJU_SCH_WALKING_52) || (this->scheduleResult == ANJU_SCH_WALKING_53)) { this->stateFlags |= ENAN_STATE_20; } @@ -1785,17 +1785,17 @@ s32 EnAn_ChooseAnimAfterTalking(EnAn* this, PlayState* play) { EnAn_ChangeAnim(this, play, ENAN_ANIM_COOKING); break; - case ANJU_SCH_GIVE_LUNCH_TO_GRANDMA: + case ANJU_SCH_GIVE_LUNCH_TO_GRANNY: EnAn_ChangeAnim(this, play, ENAN_ANIM_WAITING_WITH_TRAY); break; - case ANJU_SCH_47: - case ANJU_SCH_49: + case ANJU_SCH_WALKING_47: + case ANJU_SCH_WALKING_49: EnAn_ChangeAnim(this, play, ENAN_ANIM_WALK); break; - case ANJU_SCH_52: - case ANJU_SCH_53: + case ANJU_SCH_WALKING_52: + case ANJU_SCH_WALKING_53: EnAn_ChangeAnim(this, play, ENAN_ANIM_BROOM_WALK); this->stateFlags |= ENAN_STATE_DRAW_BROOM; break; @@ -2134,7 +2134,7 @@ Actor* EnAn_FindLookAtActor(EnAn* this, PlayState* play) { actor = &GET_PLAYER(play)->actor; break; - case ANJU_SCH_GIVE_LUNCH_TO_GRANDMA: + case ANJU_SCH_GIVE_LUNCH_TO_GRANNY: actor = EnAn_FindActor(this, play, ACTORCAT_NPC, ACTOR_EN_NB); break; @@ -2282,8 +2282,8 @@ s32 func_80B561A4(EnAn* this, PlayState* play, ScheduleOutput* scheduleOutput) { Math_Vec3s_ToVec3f(&firstPos, &points[0]); Math_Vec3s_ToVec3f(&secondPos, &points[1]); - Math_Vec3f_Copy(&this->unk_228, &firstPos); - Math_Vec3f_Copy(&this->unk_234, &secondPos); + Math_Vec3f_Copy(&this->doorEntrancePos, &firstPos); + Math_Vec3f_Copy(&this->doorExitPos, &secondPos); this->actor.world.rot.y = Math_Vec3f_Yaw(&firstPos, &secondPos); Math_Vec3f_Copy(&this->actor.world.pos, &firstPos); @@ -2294,7 +2294,7 @@ s32 func_80B561A4(EnAn* this, PlayState* play, ScheduleOutput* scheduleOutput) { } this->unk_378 = scheduleOutput->time1 - scheduleOutput->time0; - this->unk_37A = now - scheduleOutput->time0; + this->var1.unk_37A = now - scheduleOutput->time0; switch (scheduleOutput->result) { case ANJU_SCH_DOOR_27: @@ -2361,7 +2361,7 @@ s32 func_80B56418(EnAn* this, PlayState* play, ScheduleOutput* scheduleOutput) { } if (this->timePath != NULL) { - if ((this->scheduleResult < ANJU_SCH_40) && (this->scheduleResult != ANJU_SCH_NONE) && + if ((this->scheduleResult < ANJU_SCH_WALKING_40) && (this->scheduleResult != ANJU_SCH_NONE) && (this->timePathTimeSpeed >= 0)) { startTime = now; } else { @@ -2383,20 +2383,20 @@ s32 func_80B56418(EnAn* this, PlayState* play, ScheduleOutput* scheduleOutput) { this->stateFlags &= ~ENAN_STATE_10; switch (scheduleOutput->result) { - case ANJU_SCH_44: - case ANJU_SCH_45: - case ANJU_SCH_50: - case ANJU_SCH_51: - case ANJU_SCH_54: - case ANJU_SCH_55: - case ANJU_SCH_LAUNDRY_POOL_WALKING_IN: - case ANJU_SCH_LAUNDRY_POOL_LEAVING: - case ANJU_SCH_58: - case ANJU_SCH_59: - case ANJU_SCH_60: - case ANJU_SCH_61: - case ANJU_SCH_62: - case ANJU_SCH_63: + case ANJU_SCH_WALKING_44: + case ANJU_SCH_WALKING_45: + case ANJU_SCH_WALKING_50: + case ANJU_SCH_WALKING_51: + case ANJU_SCH_WALKING_54: + case ANJU_SCH_WALKING_55: + case ANJU_SCH_WALKING_56: + case ANJU_SCH_WALKING_57: + case ANJU_SCH_WALKING_58: + case ANJU_SCH_WALKING_59: + case ANJU_SCH_WALKING_60: + case ANJU_SCH_WALKING_61: + case ANJU_SCH_WALKING_62: + case ANJU_SCH_WALKING_63: this->savedFaceIndex = ENAN_FACE_2; this->faceIndex = ENAN_FACE_2; this->eyeTimer = 8; @@ -2404,19 +2404,19 @@ s32 func_80B56418(EnAn* this, PlayState* play, ScheduleOutput* scheduleOutput) { } switch (scheduleOutput->result) { - case ANJU_SCH_42: - case ANJU_SCH_43: + case ANJU_SCH_WALKING_42: + case ANJU_SCH_WALKING_43: SubS_SetOfferMode(&this->stateFlags, SUBS_OFFER_MODE_ONSCREEN, SUBS_OFFER_MODE_MASK); /* fallthrough */ - case ANJU_SCH_44: - case ANJU_SCH_45: + case ANJU_SCH_WALKING_44: + case ANJU_SCH_WALKING_45: EnAn_ChangeAnim(this, play, ENAN_ANIM_WALKING_WITH_TRAY); this->stateFlags |= ENAN_STATE_100 | ENAN_STATE_200; this->stateFlags |= ENAN_STATE_DRAW_TRAY; break; - case ANJU_SCH_52: - case ANJU_SCH_53: + case ANJU_SCH_WALKING_52: + case ANJU_SCH_WALKING_53: EnAn_ChangeAnim(this, play, ENAN_ANIM_BROOM_WALK); SubS_SetOfferMode(&this->stateFlags, SUBS_OFFER_MODE_ONSCREEN, SUBS_OFFER_MODE_MASK); @@ -2424,31 +2424,31 @@ s32 func_80B56418(EnAn* this, PlayState* play, ScheduleOutput* scheduleOutput) { this->stateFlags |= ENAN_STATE_DRAW_BROOM; break; - case ANJU_SCH_50: - case ANJU_SCH_51: + case ANJU_SCH_WALKING_50: + case ANJU_SCH_WALKING_51: EnAn_ChangeAnim(this, play, ENAN_ANIM_WALK); this->stateFlags |= ENAN_STATE_100 | ENAN_STATE_200; break; - case ANJU_SCH_54: - case ANJU_SCH_55: - case ANJU_SCH_LAUNDRY_POOL_WALKING_IN: - case ANJU_SCH_LAUNDRY_POOL_LEAVING: - case ANJU_SCH_58: - case ANJU_SCH_59: - case ANJU_SCH_60: - case ANJU_SCH_61: - case ANJU_SCH_62: - case ANJU_SCH_63: + case ANJU_SCH_WALKING_54: + case ANJU_SCH_WALKING_55: + case ANJU_SCH_WALKING_56: + case ANJU_SCH_WALKING_57: + case ANJU_SCH_WALKING_58: + case ANJU_SCH_WALKING_59: + case ANJU_SCH_WALKING_60: + case ANJU_SCH_WALKING_61: + case ANJU_SCH_WALKING_62: + case ANJU_SCH_WALKING_63: EnAn_ChangeAnim(this, play, ENAN_ANIM_UMBRELLA_WALK); this->stateFlags |= ENAN_STATE_100 | ENAN_STATE_200; this->stateFlags |= ENAN_STATE_DRAW_UMBRELLA; break; - case ANJU_SCH_40: - case ANJU_SCH_47: - case ANJU_SCH_48: - case ANJU_SCH_49: + case ANJU_SCH_WALKING_40: + case ANJU_SCH_WALKING_47: + case ANJU_SCH_WALKING_48: + case ANJU_SCH_WALKING_49: SubS_SetOfferMode(&this->stateFlags, SUBS_OFFER_MODE_ONSCREEN, SUBS_OFFER_MODE_MASK); this->stateFlags |= ENAN_STATE_100 | ENAN_STATE_200; /* fallthrough */ @@ -2537,7 +2537,7 @@ s32 func_80B56880(EnAn* this, PlayState* play, ScheduleOutput* scheduleOutput) { case ANJU_SCH_MIDNIGHT_MEETING: EnAn_ChangeAnim(this, play, ENAN_ANIM_IDLE); SubS_SetOfferMode(&this->stateFlags, SUBS_OFFER_MODE_ONSCREEN, SUBS_OFFER_MODE_MASK); - this->unk_37A = 0; + this->var1.followScheduleState = 0; this->stateFlags |= ENAN_STATE_100 | ENAN_STATE_200; if (scheduleOutput->result == ANJU_SCH_RECEPTIONIST_IDLE) { this->unk_374 = 70.0f; @@ -2553,10 +2553,10 @@ s32 func_80B56880(EnAn* this, PlayState* play, ScheduleOutput* scheduleOutput) { this->stateFlags |= ENAN_STATE_40; this->actor.world.rot.y += 0x7FF8; this->actor.shape.rot.y = this->actor.world.rot.y; - this->unk_37A = 4; + this->var1.laundryPoolState = 4; } else { EnAn_ChangeAnim(this, play, ENAN_ANIM_UMBRELLA_WALK); - this->unk_37A = 0; + this->var1.laundryPoolState = 0; } this->savedFaceIndex = ENAN_FACE_2; @@ -2619,7 +2619,7 @@ s32 func_80B56BC0(EnAn* this, PlayState* play, ScheduleOutput* scheduleOutput) { EnAn_ChangeAnim(this, play, ENAN_ANIM_SIT); break; - case ANJU_SCH_24: + case ANJU_SCH_TALKING_WITH_MOM: EnAn_ChangeAnim(this, play, ENAN_ANIM_SITTING_IN_DISBELIEVE); this->savedFaceIndex = ENAN_FACE_5; this->faceIndex = ENAN_FACE_5; @@ -2668,7 +2668,7 @@ s32 EnAn_ProcessScheduleOutput(EnAn* this, PlayState* play, ScheduleOutput* sche ret = func_80B56094(this, play, scheduleOutput); break; - case ANJU_SCH_GIVE_LUNCH_TO_GRANDMA: + case ANJU_SCH_GIVE_LUNCH_TO_GRANNY: ret = func_80B5611C(this, play, scheduleOutput); break; @@ -2677,7 +2677,7 @@ s32 EnAn_ProcessScheduleOutput(EnAn* this, PlayState* play, ScheduleOutput* sche break; case ANJU_SCH_WAITING_FOR_KAFEI: - case ANJU_SCH_24: + case ANJU_SCH_TALKING_WITH_MOM: ret = func_80B56BC0(this, play, scheduleOutput); break; @@ -2714,29 +2714,29 @@ s32 EnAn_ProcessScheduleOutput(EnAn* this, PlayState* play, ScheduleOutput* sche ret = func_80B561A4(this, play, scheduleOutput); break; - case ANJU_SCH_40: - case ANJU_SCH_42: - case ANJU_SCH_43: - case ANJU_SCH_44: - case ANJU_SCH_45: - case ANJU_SCH_46: - case ANJU_SCH_47: - case ANJU_SCH_48: - case ANJU_SCH_49: - case ANJU_SCH_50: - case ANJU_SCH_51: - case ANJU_SCH_52: - case ANJU_SCH_53: - case ANJU_SCH_54: - case ANJU_SCH_55: - case ANJU_SCH_LAUNDRY_POOL_WALKING_IN: - case ANJU_SCH_LAUNDRY_POOL_LEAVING: - case ANJU_SCH_58: - case ANJU_SCH_59: - case ANJU_SCH_60: - case ANJU_SCH_61: - case ANJU_SCH_62: - case ANJU_SCH_63: + case ANJU_SCH_WALKING_40: + case ANJU_SCH_WALKING_42: + case ANJU_SCH_WALKING_43: + case ANJU_SCH_WALKING_44: + case ANJU_SCH_WALKING_45: + case ANJU_SCH_WALKING_46: + case ANJU_SCH_WALKING_47: + case ANJU_SCH_WALKING_48: + case ANJU_SCH_WALKING_49: + case ANJU_SCH_WALKING_50: + case ANJU_SCH_WALKING_51: + case ANJU_SCH_WALKING_52: + case ANJU_SCH_WALKING_53: + case ANJU_SCH_WALKING_54: + case ANJU_SCH_WALKING_55: + case ANJU_SCH_WALKING_56: + case ANJU_SCH_WALKING_57: + case ANJU_SCH_WALKING_58: + case ANJU_SCH_WALKING_59: + case ANJU_SCH_WALKING_60: + case ANJU_SCH_WALKING_61: + case ANJU_SCH_WALKING_62: + case ANJU_SCH_WALKING_63: ret = func_80B56418(this, play, scheduleOutput); break; @@ -2748,46 +2748,48 @@ s32 EnAn_ProcessScheduleOutput(EnAn* this, PlayState* play, ScheduleOutput* sche return ret; } +/* Start of HandleShedule functions */ + // RotateTowardsLookAtActor? -s32 func_80B56E44(EnAn* this, PlayState* play) { - Vec3f sp2C; - Vec3f sp20; +s32 EnAn_HandleSch_InteractActor(EnAn* this, PlayState* play) { + Vec3f lookAtActorPos; + Vec3f pos; if ((this->lookAtActor != NULL) && (this->lookAtActor->update != NULL)) { - Math_Vec3f_Copy(&sp2C, &this->lookAtActor->world.pos); - Math_Vec3f_Copy(&sp20, &this->actor.world.pos); - this->actor.world.rot.y = Math_Vec3f_Yaw(&sp20, &sp2C); + Math_Vec3f_Copy(&lookAtActorPos, &this->lookAtActor->world.pos); + Math_Vec3f_Copy(&pos, &this->actor.world.pos); + this->actor.world.rot.y = Math_Vec3f_Yaw(&pos, &lookAtActorPos); } return true; } -s32 func_80B56EB4(EnAn* this, PlayState* play) { +s32 EnAn_HandleSch_Door(EnAn* this, PlayState* play) { EnDoor* door = EnAn_FindDoor(play, this->scheduleResult); Vec3f sp38; - f32 temp_fv0; + f32 distance; s32 pad; if (!SubS_InCsMode(play) && (this->timePathTimeSpeed != 0)) { if ((door != NULL) && (door->knobDoor.dyna.actor.update != NULL)) { - // Tell the door to be open while passing through it and which orientation - if ((this->unk_37A / (f32)this->unk_378) <= 0.9f) { + // Tell the door actor to be open while passing through it and which orientation + if ((this->var1.unk_37A / (f32)this->unk_378) <= 0.9f) { door->openTimer = this->doorOpenTimer; } else { door->openTimer = 0; } } - this->unk_37A = CLAMP(this->unk_37A, 0, this->unk_378); - temp_fv0 = Math_Vec3f_DistXZ(&this->unk_228, &this->unk_234) / this->unk_378; + this->var1.unk_37A = CLAMP(this->var1.unk_37A, 0, this->unk_378); + distance = Math_Vec3f_DistXZ(&this->doorEntrancePos, &this->doorExitPos) / this->unk_378; sp38.x = 0.0f; sp38.y = 0.0f; - sp38.z = this->unk_37A * temp_fv0; + sp38.z = this->var1.unk_37A * distance; - Lib_Vec3f_TranslateAndRotateY(&this->unk_228, this->actor.world.rot.y, &sp38, &this->actor.world.pos); + Lib_Vec3f_TranslateAndRotateY(&this->doorEntrancePos, this->actor.world.rot.y, &sp38, &this->actor.world.pos); - this->unk_37A += this->timePathTimeSpeed; + this->var1.unk_37A += this->timePathTimeSpeed; if (Animation_OnFrame(&this->skelAnime, 3.0f) || Animation_OnFrame(&this->skelAnime, 15.0f)) { Actor_PlaySfx(&this->actor, NA_SE_EV_PIRATE_WALK); } @@ -2796,17 +2798,18 @@ s32 func_80B56EB4(EnAn* this, PlayState* play) { return 0; } -s32 func_80B5702C(EnAn* this, PlayState* play) { +s32 EnAn_HandleSch_FollowTimePath(EnAn* this, PlayState* play) { f32 knots[265]; - Vec3f sp70; - Vec3f sp64; + Vec3f worldPos; Vec3f timePathTargetPos; - s32 sp54; - s32 sp50 = 0; + Vec3f timePathTargetPos; + s32 timePathElapsedTime; + s32 timePathWaypoint; s32 pad; - sp54 = 0; - SubS_TimePathing_FillKnots(knots, 3, this->timePath->count + 3); + timePathElapsedTime = 0; + timePathWaypoint = 0; + SubS_TimePathing_FillKnots(knots, SUBS_TIME_PATHING_ORDER, this->timePath->count + SUBS_TIME_PATHING_ORDER); if (!(this->stateFlags & ENAN_STATE_8)) { timePathTargetPos = gZeroVec3f; @@ -2824,8 +2827,8 @@ s32 func_80B5702C(EnAn* this, PlayState* play) { this->actor.world.pos.z = timePathTargetPos.z; if (SubS_InCsMode(play)) { - sp54 = this->timePathElapsedTime; - sp50 = this->timePathWaypoint; + timePathElapsedTime = this->timePathElapsedTime; + timePathWaypoint = this->timePathWaypoint; timePathTargetPos = this->actor.world.pos; } this->timePathTargetPos = gZeroVec3f; @@ -2835,14 +2838,14 @@ s32 func_80B5702C(EnAn* this, PlayState* play) { &this->timePathTargetPos, this->timePathTimeSpeed)) { this->stateFlags |= ENAN_STATE_10; } else { - sp70 = this->actor.world.pos; - sp64 = this->timePathTargetPos; - this->actor.world.rot.y = Math_Vec3f_Yaw(&sp70, &sp64); + worldPos = this->actor.world.pos; + timePathTargetPos = this->timePathTargetPos; + this->actor.world.rot.y = Math_Vec3f_Yaw(&worldPos, &timePathTargetPos); } if (SubS_InCsMode(play)) { - this->timePathElapsedTime = sp54; - this->timePathWaypoint = sp50; + this->timePathElapsedTime = timePathElapsedTime; + this->timePathWaypoint = timePathWaypoint; this->timePathTargetPos = timePathTargetPos; } else if (Animation_OnFrame(&this->skelAnime, 3.0f) || Animation_OnFrame(&this->skelAnime, 15.0f)) { Actor_PlaySfx(&this->actor, NA_SE_EV_PIRATE_WALK); @@ -2851,7 +2854,7 @@ s32 func_80B5702C(EnAn* this, PlayState* play) { return 0; } -s32 func_80B572D4(EnAn* this, PlayState* play) { +s32 EnAn_HandleSch_80B572D4(EnAn* this, PlayState* play) { switch (this->scheduleResult) { case ANJU_SCH_MIDNIGHT_MEETING: if (func_80B55F8C(play) && EnAn_IsFacingAndNearPlayer(this)) { @@ -2888,30 +2891,30 @@ s32 func_80B572D4(EnAn* this, PlayState* play) { return 0; } -s32 func_80B573F4(EnAn* this, PlayState* play) { - s16 temp1; - s16 temp2; +s32 EnAn_HandleSch_LaundryPool(EnAn* this, PlayState* play) { + s16 worldRot; + s16 shapeRot; - switch (this->unk_37A) { + switch (this->var1.laundryPoolState) { case 0x0: this->actor.world.rot.y += 0x7FF8; - this->unk_37A++; + this->var1.laundryPoolState++; break; case 0x1: - temp1 = (this->actor.world.rot.y / 0xB6) * 0xB6; - temp2 = (this->actor.shape.rot.y / 0xB6) * 0xB6; - if (temp1 == temp2) { + worldRot = (this->actor.world.rot.y / 0xB6) * 0xB6; + shapeRot = (this->actor.shape.rot.y / 0xB6) * 0xB6; + if (worldRot == shapeRot) { Math_Vec3s_Copy(&this->actor.shape.rot, &this->actor.world.rot); EnAn_ChangeAnim(this, play, ENAN_ANIM_UMBRELLA_SIT); this->stateFlags |= ENAN_STATE_40; - this->unk_37A++; + this->var1.laundryPoolState++; } break; case 0x2: if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { - this->unk_37A++; + this->var1.laundryPoolState++; } break; @@ -2925,18 +2928,18 @@ s32 func_80B573F4(EnAn* this, PlayState* play) { case 0x4: SubS_SetOfferMode(&this->stateFlags, SUBS_OFFER_MODE_ONSCREEN, SUBS_OFFER_MODE_MASK); - this->unk_37A++; + this->var1.laundryPoolState++; break; } return 0; } -s32 func_80B575BC(EnAn* this, PlayState* play) { - s32 temp = this->actor.shape.rot.y; - s16 temp_v1 = ABS_ALT(BINANG_SUB(this->actor.yawTowardsPlayer, temp)); +s32 EnAn_HandleSch_80B575BC(EnAn* this, PlayState* play) { + s32 yRot = this->actor.shape.rot.y; + s16 yaw = ABS_ALT(BINANG_SUB(this->actor.yawTowardsPlayer, yRot)); - if (temp_v1 < 0x4000) { + if (yaw < 0x4000) { SubS_SetOfferMode(&this->stateFlags, SUBS_OFFER_MODE_ONSCREEN, SUBS_OFFER_MODE_MASK); } else { SubS_SetOfferMode(&this->stateFlags, SUBS_OFFER_MODE_NONE, SUBS_OFFER_MODE_MASK); @@ -2951,11 +2954,11 @@ s32 func_80B575BC(EnAn* this, PlayState* play) { return 1; } -s32 func_80B57674(EnAn* this, PlayState* play) { - s16 temp = BINANG_ADD(this->actor.shape.rot.y, 0x3000); - s16 temp_v1 = ABS_ALT(BINANG_SUB(this->actor.yawTowardsPlayer, temp)); +s32 EnAn_HandleSch_80B57674(EnAn* this, PlayState* play) { + s16 yRot = BINANG_ADD(this->actor.shape.rot.y, 0x3000); + s16 yaw = ABS_ALT(BINANG_SUB(this->actor.yawTowardsPlayer, yRot)); - if (temp_v1 < 0x3000) { + if (yaw < 0x3000) { SubS_SetOfferMode(&this->stateFlags, SUBS_OFFER_MODE_ONSCREEN, SUBS_OFFER_MODE_MASK); } else { SubS_SetOfferMode(&this->stateFlags, SUBS_OFFER_MODE_NONE, SUBS_OFFER_MODE_MASK); @@ -2965,24 +2968,26 @@ s32 func_80B57674(EnAn* this, PlayState* play) { return 1; } +/* End of HandleShedule functions */ + void EnAn_HandleSchedule(EnAn* this, PlayState* play) { switch (this->scheduleResult) { case ANJU_SCH_RECEIVE_LETTER_FROM_POSTMAN: case ANJU_SCH_ATTEND_GORON: - case ANJU_SCH_GIVE_LUNCH_TO_GRANDMA: - func_80B56E44(this, play); + case ANJU_SCH_GIVE_LUNCH_TO_GRANNY: + EnAn_HandleSch_InteractActor(this, play); break; case ANJU_SCH_LAUNDRY_POOL_SIT: - func_80B573F4(this, play); + EnAn_HandleSch_LaundryPool(this, play); break; case ANJU_SCH_WAITING_FOR_KAFEI: - func_80B575BC(this, play); + EnAn_HandleSch_80B575BC(this, play); break; case ANJU_SCH_25: - func_80B57674(this, play); + EnAn_HandleSch_80B57674(this, play); break; case ANJU_SCH_RANCH: @@ -2990,12 +2995,12 @@ void EnAn_HandleSchedule(EnAn* this, PlayState* play) { case ANJU_SCH_RECEPTIONIST_IDLE: case ANJU_SCH_19: case ANJU_SCH_SWEEPING: - case ANJU_SCH_24: - func_80B572D4(this, play); + case ANJU_SCH_TALKING_WITH_MOM: + EnAn_HandleSch_80B572D4(this, play); break; case ANJU_SCH_MIDNIGHT_MEETING: - func_80B572D4(this, play); + EnAn_HandleSch_80B572D4(this, play); break; case ANJU_SCH_DOOR_26: @@ -3012,33 +3017,33 @@ void EnAn_HandleSchedule(EnAn* this, PlayState* play) { case ANJU_SCH_DOOR_37: case ANJU_SCH_DOOR_38: case ANJU_SCH_DOOR_39: - func_80B56EB4(this, play); + EnAn_HandleSch_Door(this, play); break; - case ANJU_SCH_40: - case ANJU_SCH_42: - case ANJU_SCH_43: - case ANJU_SCH_44: - case ANJU_SCH_45: - case ANJU_SCH_46: - case ANJU_SCH_47: - case ANJU_SCH_48: - case ANJU_SCH_49: - case ANJU_SCH_50: - case ANJU_SCH_51: - case ANJU_SCH_52: - case ANJU_SCH_53: - case ANJU_SCH_54: - case ANJU_SCH_55: - case ANJU_SCH_LAUNDRY_POOL_WALKING_IN: - case ANJU_SCH_LAUNDRY_POOL_LEAVING: - case ANJU_SCH_58: - case ANJU_SCH_59: - case ANJU_SCH_60: - case ANJU_SCH_61: - case ANJU_SCH_62: - case ANJU_SCH_63: - func_80B5702C(this, play); + case ANJU_SCH_WALKING_40: + case ANJU_SCH_WALKING_42: + case ANJU_SCH_WALKING_43: + case ANJU_SCH_WALKING_44: + case ANJU_SCH_WALKING_45: + case ANJU_SCH_WALKING_46: + case ANJU_SCH_WALKING_47: + case ANJU_SCH_WALKING_48: + case ANJU_SCH_WALKING_49: + case ANJU_SCH_WALKING_50: + case ANJU_SCH_WALKING_51: + case ANJU_SCH_WALKING_52: + case ANJU_SCH_WALKING_53: + case ANJU_SCH_WALKING_54: + case ANJU_SCH_WALKING_55: + case ANJU_SCH_WALKING_56: + case ANJU_SCH_WALKING_57: + case ANJU_SCH_WALKING_58: + case ANJU_SCH_WALKING_59: + case ANJU_SCH_WALKING_60: + case ANJU_SCH_WALKING_61: + case ANJU_SCH_WALKING_62: + case ANJU_SCH_WALKING_63: + EnAn_HandleSch_FollowTimePath(this, play); break; } diff --git a/src/overlays/actors/ovl_En_An/z_en_an.h b/src/overlays/actors/ovl_En_An/z_en_an.h index bc13a33a1..9856d7a15 100644 --- a/src/overlays/actors/ovl_En_An/z_en_an.h +++ b/src/overlays/actors/ovl_En_An/z_en_an.h @@ -51,10 +51,10 @@ typedef struct EnAn { /* 0x210 */ s32 msgScriptResumePos; /* 0x214 */ s8 roomNum; /* 0x215 */ s8 doorOpenTimer; - /* 0x218 */ Actor* lookAtActor; + /* 0x218 */ Actor* lookAtActor; // interactActor /* 0x21C */ UNK_TYPE1 unk_21C[0xC]; - /* 0x228 */ Vec3f unk_228; - /* 0x234 */ Vec3f unk_234; + /* 0x228 */ Vec3f doorEntrancePos; // Position of the point just before entering the door + /* 0x234 */ Vec3f doorExitPos; // Position of the point just after passing through the door /* 0x240 */ Vec3f headComputedPos; /* 0x24C */ UNK_TYPE1 unk_24C[0xC]; /* 0x258 */ Vec3s headComputedRot; @@ -68,7 +68,11 @@ typedef struct EnAn { /* 0x36C */ UNK_TYPE1 unk_36C[0x8]; /* 0x374 */ f32 unk_374; /* 0x378 */ s16 unk_378; // schedule time diff - /* 0x37A */ s16 unk_37A; // schedule time diff + /* 0x37A */ union { + s16 unk_37A; // schedule time diff + s16 laundryPoolState; + s16 followScheduleState; // unused + } var1; /* 0x37C */ s16 headRotZ; /* 0x37E */ s16 headRotY; /* 0x380 */ UNK_TYPE1 unk_380[0x4]; diff --git a/tools/disasm/functions.txt b/tools/disasm/functions.txt index ea12278da..b40611e99 100644 --- a/tools/disasm/functions.txt +++ b/tools/disasm/functions.txt @@ -14050,13 +14050,13 @@ 0x80B56BC0:("func_80B56BC0",), 0x80B56CAC:("func_80B56CAC",), 0x80B56D28:("EnAn_ProcessScheduleOutput",), - 0x80B56E44:("func_80B56E44",), - 0x80B56EB4:("func_80B56EB4",), - 0x80B5702C:("func_80B5702C",), - 0x80B572D4:("func_80B572D4",), - 0x80B573F4:("func_80B573F4",), - 0x80B575BC:("func_80B575BC",), - 0x80B57674:("func_80B57674",), + 0x80B56E44:("EnAn_HandleSch_InteractActor",), + 0x80B56EB4:("EnAn_HandleSch_Door",), + 0x80B5702C:("EnAn_HandleSch_FollowTimePath",), + 0x80B572D4:("EnAn_HandleSch_80B572D4",), + 0x80B573F4:("EnAn_HandleSch_LaundryPool",), + 0x80B575BC:("EnAn_HandleSch_80B575BC",), + 0x80B57674:("EnAn_HandleSch_80B57674",), 0x80B57718:("EnAn_HandleSchedule",), 0x80B577F0:("EnAn_Initialize",), 0x80B578F8:("EnAn_FollowSchedule",),