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 215c971b5..69f7ea01b 100644 --- a/src/overlays/actors/ovl_En_An/z_en_an.c +++ b/src/overlays/actors/ovl_En_An/z_en_an.c @@ -20,7 +20,7 @@ void EnAn_Init(Actor* thisx, PlayState* play); void EnAn_Destroy(Actor* thisx, PlayState* play); void EnAn_Update(Actor* thisx, PlayState* play); -void EnAn_Draw(Actor* this, PlayState* play); +void EnAn_Draw(Actor* thisx, PlayState* play); // Action funcs void func_80B577F0(EnAn* this, PlayState* play); @@ -98,90 +98,90 @@ typedef enum AnjuScheduleResult { static u8 sScheduleScript[] = { /* 0x000 */ SCHEDULE_CMD_CHECK_NOT_IN_DAY_L(1, 0x151 - 0x005), /* 0x005 */ SCHEDULE_CMD_CHECK_NOT_IN_SCENE_L(SCENE_YADOYA, 0x150 - 0x00A), - /* 0x00A */ SCHEDULE_CMD_CHECK_TIME_RANGE_L( 6, 0, 10, 55, 0x14A - 0x011), + /* 0x00A */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(6, 0, 10, 55, 0x14A - 0x011), /* 0x011 */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(10, 55, 11, 10, 0x144 - 0x018), /* 0x018 */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(11, 10, 11, 30, 0x13E - 0x01F), /* 0x01F */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(11, 30, 11, 50, 0x138 - 0x026), /* 0x026 */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(11, 50, 11, 55, 0x132 - 0x02D), - /* 0x02D */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(11, 55, 12, 0, 0x12C - 0x034), - /* 0x034 */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(12, 0, 12, 15, 0x126 - 0x03B), + /* 0x02D */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(11, 55, 12, 0, 0x12C - 0x034), + /* 0x034 */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(12, 0, 12, 15, 0x126 - 0x03B), /* 0x03B */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(12, 15, 12, 20, 0x120 - 0x042), /* 0x042 */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(12, 20, 12, 25, 0x11A - 0x049), /* 0x049 */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(12, 25, 12, 55, 0x114 - 0x050), - /* 0x050 */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(12, 55, 13, 0, 0x10E - 0x057), + /* 0x050 */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(12, 55, 13, 0, 0x10E - 0x057), /* 0x057 */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(13, 15, 13, 20, 0x108 - 0x05E), /* 0x05E */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(13, 20, 13, 50, 0x102 - 0x065), - /* 0x065 */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(13, 50, 14, 8, 0x0FC - 0x06C), - /* 0x06C */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(14, 8, 14, 18, 0x0F6 - 0x073), + /* 0x065 */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(13, 50, 14, 8, 0x0FC - 0x06C), + /* 0x06C */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(14, 8, 14, 18, 0x0F6 - 0x073), /* 0x073 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(14, 18, 16, 10, 0x0F0 - 0x079), /* 0x079 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(16, 10, 16, 30, 0x0EA - 0x07F), /* 0x07F */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(16, 30, 19, 50, 0x0E4 - 0x085), /* 0x085 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(19, 50, 20, 20, 0x0DE - 0x08B), /* 0x08B */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(20, 20, 20, 30, 0x0D8 - 0x091), - /* 0x091 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(20, 30, 21, 5, 0x0D2 - 0x097), - /* 0x097 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(21, 5, 21, 10, 0x0CC - 0x09D), + /* 0x091 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(20, 30, 21, 5, 0x0D2 - 0x097), + /* 0x097 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(21, 5, 21, 10, 0x0CC - 0x09D), /* 0x09D */ SCHEDULE_CMD_CHECK_FLAG_S(WEEKEVENTREG_PROMISED_MIDNIGHT_MEETING, 0x0A2 - 0x0A1), /* 0x0A1 */ SCHEDULE_CMD_RET_NONE(), /* 0x0A2 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(23, 10, 23, 15, 0x0C6 - 0x0A8), - /* 0x0A8 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(23, 15, 0, 0, 0x0C0 - 0x0AE), - /* 0x0AE */ SCHEDULE_CMD_CHECK_TIME_RANGE_S( 0, 0, 6, 0, 0x0B5 - 0x0B4), + /* 0x0A8 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(23, 15, 0, 0, 0x0C0 - 0x0AE), + /* 0x0AE */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(0, 0, 6, 0, 0x0B5 - 0x0B4), /* 0x0B4 */ SCHEDULE_CMD_RET_NONE(), /* 0x0B5 */ SCHEDULE_CMD_CHECK_FLAG_S(WEEKEVENTREG_HAD_MIDNIGHT_MEETING, 0x0BF - 0x0B9), - /* 0x0B9 */ SCHEDULE_CMD_RET_TIME( 0, 0, 6, 0, 23), + /* 0x0B9 */ SCHEDULE_CMD_RET_TIME(0, 0, 6, 0, 23), /* 0x0BF */ SCHEDULE_CMD_RET_NONE(), - /* 0x0C0 */ SCHEDULE_CMD_RET_TIME(23, 15, 0, 0, ANJU_SCH_31), + /* 0x0C0 */ SCHEDULE_CMD_RET_TIME(23, 15, 0, 0, ANJU_SCH_31), /* 0x0C6 */ SCHEDULE_CMD_RET_TIME(23, 10, 23, 15, ANJU_SCH_1F), - /* 0x0CC */ SCHEDULE_CMD_RET_TIME(21, 5, 21, 10, ANJU_SCH_1E), - /* 0x0D2 */ SCHEDULE_CMD_RET_TIME(20, 30, 21, 5, ANJU_SCH_30), + /* 0x0CC */ SCHEDULE_CMD_RET_TIME(21, 5, 21, 10, ANJU_SCH_1E), + /* 0x0D2 */ SCHEDULE_CMD_RET_TIME(20, 30, 21, 5, ANJU_SCH_30), /* 0x0D8 */ SCHEDULE_CMD_RET_TIME(20, 20, 20, 30, ANJU_SCH_13), /* 0x0DE */ SCHEDULE_CMD_RET_TIME(19, 50, 20, 20, ANJU_SCH_2F), /* 0x0E4 */ SCHEDULE_CMD_RET_TIME(16, 30, 19, 50, ANJU_SCH_12), /* 0x0EA */ SCHEDULE_CMD_RET_TIME(16, 10, 16, 30, ANJU_SCH_11), /* 0x0F0 */ SCHEDULE_CMD_RET_TIME(14, 18, 16, 10, ANJU_SCH_12), - /* 0x0F6 */ SCHEDULE_CMD_RET_TIME(14, 8, 14, 18, ANJU_SCH_10), - /* 0x0FC */ SCHEDULE_CMD_RET_TIME(13, 50, 14, 8, ANJU_SCH_12), + /* 0x0F6 */ SCHEDULE_CMD_RET_TIME(14, 8, 14, 18, ANJU_SCH_10), + /* 0x0FC */ SCHEDULE_CMD_RET_TIME(13, 50, 14, 8, ANJU_SCH_12), /* 0x102 */ SCHEDULE_CMD_RET_TIME(13, 20, 13, 50, ANJU_SCH_2E), /* 0x108 */ SCHEDULE_CMD_RET_TIME(13, 15, 13, 20, ANJU_SCH_1D), - /* 0x10E */ SCHEDULE_CMD_RET_TIME(12, 55, 13, 0, ANJU_SCH_1C), + /* 0x10E */ SCHEDULE_CMD_RET_TIME(12, 55, 13, 0, ANJU_SCH_1C), /* 0x114 */ SCHEDULE_CMD_RET_TIME(12, 25, 12, 55, ANJU_SCH_2D), /* 0x11A */ SCHEDULE_CMD_RET_TIME(12, 20, 12, 25, ANJU_SCH_1B), /* 0x120 */ SCHEDULE_CMD_RET_TIME(12, 15, 12, 20, ANJU_SCH_2C), - /* 0x126 */ SCHEDULE_CMD_RET_TIME(12, 0, 12, 15, ANJU_SCH_15), - /* 0x12C */ SCHEDULE_CMD_RET_TIME(11, 55, 12, 0, ANJU_SCH_2B), + /* 0x126 */ SCHEDULE_CMD_RET_TIME(12, 0, 12, 15, ANJU_SCH_15), + /* 0x12C */ SCHEDULE_CMD_RET_TIME(11, 55, 12, 0, ANJU_SCH_2B), /* 0x132 */ SCHEDULE_CMD_RET_TIME(11, 50, 11, 55, ANJU_SCH_1A), /* 0x138 */ SCHEDULE_CMD_RET_TIME(11, 30, 11, 50, ANJU_SCH_2A), /* 0x13E */ SCHEDULE_CMD_RET_TIME(11, 10, 11, 30, ANJU_SCH_E), /* 0x144 */ SCHEDULE_CMD_RET_TIME(10, 55, 11, 10, ANJU_SCH_28), - /* 0x14A */ SCHEDULE_CMD_RET_TIME( 6, 0, 10, 55, ANJU_SCH_12), + /* 0x14A */ SCHEDULE_CMD_RET_TIME(6, 0, 10, 55, ANJU_SCH_12), /* 0x150 */ SCHEDULE_CMD_RET_NONE(), /* 0x151 */ SCHEDULE_CMD_CHECK_NOT_IN_DAY_L(2, 0x391 - 0x156), /* 0x156 */ SCHEDULE_CMD_CHECK_FLAG_L(WEEKEVENTREG_HAD_MIDNIGHT_MEETING, 0x29E - 0x15B), /* 0x15B */ SCHEDULE_CMD_CHECK_NOT_IN_SCENE_L(SCENE_YADOYA, 0x1F2 - 0x160), - /* 0x160 */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(11, 3, 11, 9, 0x1EC - 0x167), - /* 0x167 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(11, 9, 11, 29, 0x1E6 - 0x16D), + /* 0x160 */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(11, 3, 11, 9, 0x1EC - 0x167), + /* 0x167 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(11, 9, 11, 29, 0x1E6 - 0x16D), /* 0x16D */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(11, 29, 11, 39, 0x1E0 - 0x173), /* 0x173 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(17, 24, 17, 30, 0x1DA - 0x179), /* 0x179 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(17, 30, 17, 55, 0x1D4 - 0x17F), - /* 0x17F */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(17, 55, 18, 0, 0x1CE - 0x185), - /* 0x185 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(18, 0, 19, 50, 0x1C8 - 0x18B), + /* 0x17F */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(17, 55, 18, 0, 0x1CE - 0x185), + /* 0x185 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(18, 0, 19, 50, 0x1C8 - 0x18B), /* 0x18B */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(19, 50, 20, 20, 0x1C2 - 0x191), /* 0x191 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(20, 20, 20, 30, 0x1BC - 0x197), - /* 0x197 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(20, 30, 21, 0, 0x1B6 - 0x19D), - /* 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), + /* 0x197 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(20, 30, 21, 0, 0x1B6 - 0x19D), + /* 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_18), - /* 0x1B0 */ SCHEDULE_CMD_RET_TIME(21, 0, 21, 5, ANJU_SCH_1E), - /* 0x1B6 */ SCHEDULE_CMD_RET_TIME(20, 30, 21, 0, ANJU_SCH_30), + /* 0x1AA */ SCHEDULE_CMD_RET_TIME(21, 30, 23, 0, ANJU_SCH_18), + /* 0x1B0 */ SCHEDULE_CMD_RET_TIME(21, 0, 21, 5, ANJU_SCH_1E), + /* 0x1B6 */ SCHEDULE_CMD_RET_TIME(20, 30, 21, 0, ANJU_SCH_30), /* 0x1BC */ SCHEDULE_CMD_RET_TIME(20, 20, 20, 30, ANJU_SCH_13), /* 0x1C2 */ SCHEDULE_CMD_RET_TIME(19, 50, 20, 20, ANJU_SCH_2F), - /* 0x1C8 */ SCHEDULE_CMD_RET_TIME(18, 0, 19, 50, ANJU_SCH_12), - /* 0x1CE */ SCHEDULE_CMD_RET_TIME(17, 55, 18, 0, ANJU_SCH_23), + /* 0x1C8 */ SCHEDULE_CMD_RET_TIME(18, 0, 19, 50, ANJU_SCH_12), + /* 0x1CE */ SCHEDULE_CMD_RET_TIME(17, 55, 18, 0, ANJU_SCH_23), /* 0x1D4 */ SCHEDULE_CMD_RET_TIME(17, 30, 17, 55, ANJU_SCH_33), /* 0x1DA */ SCHEDULE_CMD_RET_TIME(17, 24, 17, 30, ANJU_SCH_22), /* 0x1E0 */ SCHEDULE_CMD_RET_TIME(11, 29, 11, 39, ANJU_SCH_21), - /* 0x1E6 */ SCHEDULE_CMD_RET_TIME(11, 9, 11, 29, ANJU_SCH_32), - /* 0x1EC */ SCHEDULE_CMD_RET_TIME(11, 3, 11, 9, ANJU_SCH_20), + /* 0x1E6 */ SCHEDULE_CMD_RET_TIME(11, 9, 11, 29, ANJU_SCH_32), + /* 0x1EC */ SCHEDULE_CMD_RET_TIME(11, 3, 11, 9, ANJU_SCH_20), /* 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), /* 0x1FC */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(11, 39, 12, 25, 0x233 - 0x202), @@ -216,81 +216,81 @@ static u8 sScheduleScript[] = { /* 0x297 */ SCHEDULE_CMD_RET_TIME(13, 15, 13, 45, ANJU_SCH_38), /* 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), + /* 0x2A3 */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(6, 0, 10, 55, 0x38A - 0x2AA), /* 0x2AA */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(10, 55, 11, 10, 0x384 - 0x2B1), /* 0x2B1 */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(11, 10, 11, 30, 0x37E - 0x2B8), /* 0x2B8 */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(11, 30, 11, 50, 0x378 - 0x2BF), /* 0x2BF */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(11, 50, 11, 55, 0x372 - 0x2C6), - /* 0x2C6 */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(11, 55, 12, 0, 0x36C - 0x2CD), - /* 0x2CD */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(12, 0, 12, 15, 0x366 - 0x2D4), + /* 0x2C6 */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(11, 55, 12, 0, 0x36C - 0x2CD), + /* 0x2CD */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(12, 0, 12, 15, 0x366 - 0x2D4), /* 0x2D4 */ SCHEDULE_CMD_CHECK_TIME_RANGE_L(12, 15, 12, 20, 0x360 - 0x2DB), /* 0x2DB */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(12, 20, 12, 25, 0x35A - 0x2E1), /* 0x2E1 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(12, 25, 12, 55, 0x354 - 0x2E7), - /* 0x2E7 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(12, 55, 13, 0, 0x34E - 0x2ED), + /* 0x2E7 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(12, 55, 13, 0, 0x34E - 0x2ED), /* 0x2ED */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(13, 15, 13, 20, 0x348 - 0x2F3), /* 0x2F3 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(13, 20, 13, 50, 0x342 - 0x2F9), /* 0x2F9 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(13, 50, 19, 50, 0x33C - 0x2FF), /* 0x2FF */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(19, 50, 20, 20, 0x336 - 0x305), /* 0x305 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(20, 20, 20, 30, 0x330 - 0x30B), - /* 0x30B */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(20, 30, 21, 5, 0x32A - 0x311), - /* 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), + /* 0x30B */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(20, 30, 21, 5, 0x32A - 0x311), + /* 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_18), - /* 0x324 */ SCHEDULE_CMD_RET_TIME(21, 5, 21, 10, ANJU_SCH_1E), - /* 0x32A */ SCHEDULE_CMD_RET_TIME(20, 30, 21, 5, ANJU_SCH_30), + /* 0x31E */ SCHEDULE_CMD_RET_TIME(21, 30, 23, 0, ANJU_SCH_18), + /* 0x324 */ SCHEDULE_CMD_RET_TIME(21, 5, 21, 10, ANJU_SCH_1E), + /* 0x32A */ SCHEDULE_CMD_RET_TIME(20, 30, 21, 5, ANJU_SCH_30), /* 0x330 */ SCHEDULE_CMD_RET_TIME(20, 20, 20, 30, ANJU_SCH_13), /* 0x336 */ SCHEDULE_CMD_RET_TIME(19, 50, 20, 20, ANJU_SCH_2F), /* 0x33C */ SCHEDULE_CMD_RET_TIME(13, 50, 19, 50, ANJU_SCH_12), /* 0x342 */ SCHEDULE_CMD_RET_TIME(13, 20, 13, 50, ANJU_SCH_2E), /* 0x348 */ SCHEDULE_CMD_RET_TIME(13, 15, 13, 20, ANJU_SCH_1D), - /* 0x34E */ SCHEDULE_CMD_RET_TIME(12, 55, 13, 0, ANJU_SCH_1C), + /* 0x34E */ SCHEDULE_CMD_RET_TIME(12, 55, 13, 0, ANJU_SCH_1C), /* 0x354 */ SCHEDULE_CMD_RET_TIME(12, 25, 12, 55, ANJU_SCH_2D), /* 0x35A */ SCHEDULE_CMD_RET_TIME(12, 20, 12, 25, ANJU_SCH_1B), /* 0x360 */ SCHEDULE_CMD_RET_TIME(12, 15, 12, 20, ANJU_SCH_2C), - /* 0x366 */ SCHEDULE_CMD_RET_TIME(12, 0, 12, 15, ANJU_SCH_15), - /* 0x36C */ SCHEDULE_CMD_RET_TIME(11, 55, 12, 0, ANJU_SCH_2B), + /* 0x366 */ SCHEDULE_CMD_RET_TIME(12, 0, 12, 15, ANJU_SCH_15), + /* 0x36C */ SCHEDULE_CMD_RET_TIME(11, 55, 12, 0, ANJU_SCH_2B), /* 0x372 */ SCHEDULE_CMD_RET_TIME(11, 50, 11, 55, ANJU_SCH_1A), /* 0x378 */ SCHEDULE_CMD_RET_TIME(11, 30, 11, 50, ANJU_SCH_2A), /* 0x37E */ SCHEDULE_CMD_RET_TIME(11, 10, 11, 30, ANJU_SCH_E), /* 0x384 */ SCHEDULE_CMD_RET_TIME(10, 55, 11, 10, ANJU_SCH_28), - /* 0x38A */ SCHEDULE_CMD_RET_TIME( 6, 0, 10, 55, ANJU_SCH_12), + /* 0x38A */ SCHEDULE_CMD_RET_TIME(6, 0, 10, 55, ANJU_SCH_12), /* 0x390 */ SCHEDULE_CMD_RET_NONE(), /* 0x391 */ SCHEDULE_CMD_CHECK_NOT_IN_DAY_L(3, 0x447 - 0x396), /* 0x396 */ SCHEDULE_CMD_CHECK_FLAG_S(WEEKEVENTREG_DELIVERED_PENDANT_OF_MEMORIES, 0x3ED - 0x39A), /* 0x39A */ SCHEDULE_CMD_CHECK_NOT_IN_SCENE_S(SCENE_YADOYA, 0x3DB - 0x39E), - /* 0x39E */ SCHEDULE_CMD_CHECK_TIME_RANGE_S( 6, 0, 11, 0, 0x3D5 - 0x3A4), - /* 0x3A4 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(11, 0, 11, 25, 0x3CF - 0x3AA), + /* 0x39E */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(6, 0, 11, 0, 0x3D5 - 0x3A4), + /* 0x3A4 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(11, 0, 11, 25, 0x3CF - 0x3AA), /* 0x3AA */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(11, 25, 11, 30, 0x3C9 - 0x3B0), /* 0x3B0 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(11, 30, 11, 50, 0x3C3 - 0x3B6), - /* 0x3B6 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(11, 50, 12, 0, 0x3BD - 0x3BC), + /* 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_27), + /* 0x3BD */ SCHEDULE_CMD_RET_TIME(11, 50, 12, 0, ANJU_SCH_27), /* 0x3C3 */ SCHEDULE_CMD_RET_TIME(11, 30, 11, 50, ANJU_SCH_35), /* 0x3C9 */ SCHEDULE_CMD_RET_TIME(11, 25, 11, 30, ANJU_SCH_24), - /* 0x3CF */ SCHEDULE_CMD_RET_TIME(11, 0, 11, 25, ANJU_SCH_34), - /* 0x3D5 */ SCHEDULE_CMD_RET_TIME( 6, 0, 11, 0, ANJU_SCH_16), + /* 0x3CF */ SCHEDULE_CMD_RET_TIME(11, 0, 11, 25, ANJU_SCH_34), + /* 0x3D5 */ SCHEDULE_CMD_RET_TIME(6, 0, 11, 0, ANJU_SCH_16), /* 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), + /* 0x3DF */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(18, 0, 6, 0, 0x3E6 - 0x3E5), /* 0x3E5 */ SCHEDULE_CMD_RET_NONE(), - /* 0x3E6 */ SCHEDULE_CMD_RET_TIME(18, 0, 6, 0, ANJU_SCH_C), + /* 0x3E6 */ SCHEDULE_CMD_RET_TIME(18, 0, 6, 0, ANJU_SCH_C), /* 0x3EC */ SCHEDULE_CMD_RET_NONE(), /* 0x3ED */ SCHEDULE_CMD_CHECK_NOT_IN_SCENE_S(SCENE_YADOYA, 0x446 - 0x3F1), - /* 0x3F1 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S( 6, 0, 11, 0, 0x440 - 0x3F7), - /* 0x3F7 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(11, 0, 11, 25, 0x43A - 0x3FD), + /* 0x3F1 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(6, 0, 11, 0, 0x440 - 0x3F7), + /* 0x3F7 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(11, 0, 11, 25, 0x43A - 0x3FD), /* 0x3FD */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(11, 25, 11, 30, 0x434 - 0x403), /* 0x403 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(11, 30, 11, 50, 0x42E - 0x409), - /* 0x409 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(11, 50, 12, 0, 0x428 - 0x40F), - /* 0x40F */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(18, 0, 5, 0, 0x422 - 0x415), - /* 0x415 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S( 5, 0, 6, 0, 0x41C - 0x41B), + /* 0x409 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(11, 50, 12, 0, 0x428 - 0x40F), + /* 0x40F */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(18, 0, 5, 0, 0x422 - 0x415), + /* 0x415 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(5, 0, 6, 0, 0x41C - 0x41B), /* 0x41B */ SCHEDULE_CMD_RET_NONE(), - /* 0x41C */ SCHEDULE_CMD_RET_TIME( 5, 0, 6, 0, ANJU_SCH_1), - /* 0x422 */ SCHEDULE_CMD_RET_TIME(18, 0, 5, 0, ANJU_SCH_1), - /* 0x428 */ SCHEDULE_CMD_RET_TIME(11, 50, 12, 0, ANJU_SCH_27), + /* 0x41C */ SCHEDULE_CMD_RET_TIME(5, 0, 6, 0, ANJU_SCH_1), + /* 0x422 */ SCHEDULE_CMD_RET_TIME(18, 0, 5, 0, ANJU_SCH_1), + /* 0x428 */ SCHEDULE_CMD_RET_TIME(11, 50, 12, 0, ANJU_SCH_27), /* 0x42E */ SCHEDULE_CMD_RET_TIME(11, 30, 11, 50, ANJU_SCH_35), /* 0x434 */ SCHEDULE_CMD_RET_TIME(11, 25, 11, 30, ANJU_SCH_24), - /* 0x43A */ SCHEDULE_CMD_RET_TIME(11, 0, 11, 25, ANJU_SCH_34), - /* 0x440 */ SCHEDULE_CMD_RET_TIME( 6, 0, 11, 0, ANJU_SCH_16), + /* 0x43A */ SCHEDULE_CMD_RET_TIME(11, 0, 11, 25, ANJU_SCH_34), + /* 0x440 */ SCHEDULE_CMD_RET_TIME(6, 0, 11, 0, ANJU_SCH_16), /* 0x446 */ SCHEDULE_CMD_RET_NONE(), /* 0x447 */ SCHEDULE_CMD_RET_NONE(), }; @@ -299,7 +299,7 @@ s32 D_80B58618[ANJU_SCH_MAX] = { -1, // ANJU_SCH_NONE 10, // ANJU_SCH_1 -1, // ANJU_SCH_2 - 0, // ANJU_SCH_3 + 0, // ANJU_SCH_3 -1, // ANJU_SCH_4 -1, // ANJU_SCH_5 -1, // ANJU_SCH_6 @@ -310,22 +310,22 @@ s32 D_80B58618[ANJU_SCH_MAX] = { -1, // ANJU_SCH_B -1, // ANJU_SCH_C -1, // ANJU_SCH_D - 0, // ANJU_SCH_E + 0, // ANJU_SCH_E -1, // ANJU_SCH_F 10, // ANJU_SCH_10 10, // ANJU_SCH_11 10, // ANJU_SCH_12 11, // ANJU_SCH_13 -1, // ANJU_SCH_14 - 4, // ANJU_SCH_15 + 4, // ANJU_SCH_15 22, // ANJU_SCH_16 15, // ANJU_SCH_17 -1, // ANJU_SCH_18 -1, // ANJU_SCH_19 - 3, // ANJU_SCH_1A - 6, // ANJU_SCH_1B - 8, // ANJU_SCH_1C - 9, // ANJU_SCH_1D + 3, // ANJU_SCH_1A + 6, // ANJU_SCH_1B + 8, // ANJU_SCH_1C + 9, // ANJU_SCH_1D 13, // ANJU_SCH_1E 14, // ANJU_SCH_1F 16, // ANJU_SCH_20 @@ -333,15 +333,15 @@ s32 D_80B58618[ANJU_SCH_MAX] = { 19, // ANJU_SCH_22 21, // ANJU_SCH_23 23, // ANJU_SCH_24 - 0, // ANJU_SCH_25 - 5, // ANJU_SCH_26 + 0, // ANJU_SCH_25 + 5, // ANJU_SCH_26 25, // ANJU_SCH_27 - 0, // ANJU_SCH_28 - 1, // ANJU_SCH_29 - 2, // ANJU_SCH_2A - 4, // ANJU_SCH_2B - 5, // ANJU_SCH_2C - 7, // ANJU_SCH_2D + 0, // ANJU_SCH_28 + 1, // ANJU_SCH_29 + 2, // ANJU_SCH_2A + 4, // ANJU_SCH_2B + 5, // ANJU_SCH_2C + 7, // ANJU_SCH_2D 10, // ANJU_SCH_2E 11, // ANJU_SCH_2F 12, // ANJU_SCH_30 @@ -350,299 +350,83 @@ s32 D_80B58618[ANJU_SCH_MAX] = { 20, // ANJU_SCH_33 22, // ANJU_SCH_34 24, // ANJU_SCH_35 - 1, // ANJU_SCH_36 - 2, // ANJU_SCH_37 - 0, // ANJU_SCH_38 - 1, // ANJU_SCH_39 - 3, // ANJU_SCH_3A - 4, // ANJU_SCH_3B - 0, // ANJU_SCH_3C - 1, // ANJU_SCH_3D - 2, // ANJU_SCH_3E - 3, // ANJU_SCH_3F + 1, // ANJU_SCH_36 + 2, // ANJU_SCH_37 + 0, // ANJU_SCH_38 + 1, // ANJU_SCH_39 + 3, // ANJU_SCH_3A + 4, // ANJU_SCH_3B + 0, // ANJU_SCH_3C + 1, // ANJU_SCH_3D + 2, // ANJU_SCH_3E + 3, // ANJU_SCH_3F }; s32 D_80B58718[0x1B] = { - 0x560800, - 0x44090000, - 0x0E28BA0C, - 0x09000017, - 0x0E28BB0C, - 0x09000018, - 0x0E28BC0C, - 0x09000017, - 0x0E28BD0C, - 0x09000018, - 0x0E28BE0C, - 0x09000017, - 0x0E28BF0C, - 0x09000018, - 0x0E28C02D, - 0x12D00, - 0x0B0C0900, - 0x115608, - 0x10090000, - 0x0E295C0C, - 0x09000017, - 0x0E295D0C, - 0x09000018, - 0x0E295E2D, - 0x12D00, - 0x0B0C0900, - 0x100000, + 0x00560800, 0x44090000, 0x0E28BA0C, 0x09000017, 0x0E28BB0C, 0x09000018, 0x0E28BC0C, 0x09000017, 0x0E28BD0C, + 0x09000018, 0x0E28BE0C, 0x09000017, 0x0E28BF0C, 0x09000018, 0x0E28C02D, 0x00012D00, 0x0B0C0900, 0x00115608, + 0x10090000, 0x0E295C0C, 0x09000017, 0x0E295D0C, 0x09000018, 0x0E295E2D, 0x00012D00, 0x0B0C0900, 0x00100000, }; s32 D_80B58784[0x21] = { - 0x09000000, - 0x4B10001E, - 0x0E28B10C, - 0x09000017, - 0x0E28B20C, - 0x09000018, - 0x0E28B32D, - 0x11137, - 0x020C0900, - 0x100056, - 0x10002E0E, - 0x28B10C09, - 0x170E, - 0x28B50C09, - 0x180E, - 0x28B60C09, - 0x170E, - 0x28B70C09, - 0x180E, - 0x28B82D00, - 0x010C0900, - 0x115610, - 0x10090000, - 0x170E2956, - 0x0C090000, - 0x180E2957, - 0x0C090000, - 0x170E2958, - 0x0C090000, - 0x180E2959, - 0x2D00010C, - 0x09000012, - 0x10000000, + 0x09000000, 0x4B10001E, 0x0E28B10C, 0x09000017, 0x0E28B20C, 0x09000018, 0x0E28B32D, 0x00011137, 0x020C0900, + 0x00100056, 0x10002E0E, 0x28B10C09, 0x0000170E, 0x28B50C09, 0x0000180E, 0x28B60C09, 0x0000170E, 0x28B70C09, + 0x0000180E, 0x28B82D00, 0x010C0900, 0x00115610, 0x10090000, 0x170E2956, 0x0C090000, 0x180E2957, 0x0C090000, + 0x170E2958, 0x0C090000, 0x180E2959, 0x2D00010C, 0x09000012, 0x10000000, }; s32 D_80B58808[0x15] = { - 0x09000017, - 0x0E28C70C, - 0x09000018, - 0x0E28C80C, - 0x09000017, - 0x0E28C90C, - 0x09000018, - 0x0E28CA0C, - 0x09000017, - 0x0E28CB0C, - 0x09000018, - 0x0E28CC0C, - 0x09000017, - 0x0E28CD0C, - 0x09000018, - 0x0E28CE0C, - 0x09000017, - 0x0E28CF2D, - 0x12D00, - 0x0E0C0900, - 0x100000, + 0x09000017, 0x0E28C70C, 0x09000018, 0x0E28C80C, 0x09000017, 0x0E28C90C, 0x09000018, + 0x0E28CA0C, 0x09000017, 0x0E28CB0C, 0x09000018, 0x0E28CC0C, 0x09000017, 0x0E28CD0C, + 0x09000018, 0x0E28CE0C, 0x09000017, 0x0E28CF2D, 0x12D00, 0x0E0C0900, 0x100000, }; s32 D_80B5885C[0x37] = { - 0x220B0000, - 0x69002020, - 0x64004B, - 0x1000B700, - 0x370100AA, - 0x370200, - 0x550E28A0, - 0x0C090000, - 0x0F28A80C, - 0x05000000, - 0x30000030, - 0x0E28A90C, - 0x0F28AA0C, - 0x0F28AB0C, - 0x120600A0, - 0x1300, - 0xA02F0000, - 0x2E2D0014, - 0x0C114B10, - 0x0700000E, - 0x28AD2D00, - 0x010C2400, - 0x41161031, - 0x0E28A30C, - 0x0900000F, - 0x28A52D00, - 0x010C1137, - 0x01100020, - 0x2000340E, - 0x28A00C09, - 0xF28, - 0xA10C0500, - 0xF00, - 0x300E28, - 0xA20C0900, - 0xF28A3, - 0x0C190008, - 0x310E28A4, - 0x0C090000, - 0x0F28A52D, - 0x10C11, - 0x20201023, - 0x400012, - 0x0E28A00C, - 0x0900000F, - 0x28A62D00, - 0x010C2400, - 0x40100E28, - 0xA72D0001, - 0x0C102300, - 0x41000B0E, - 0x28AC2D00, - 0x010C2400, - 0x41100E28, - 0xAD0C1000, + 0x220B0000, 0x69002020, 0x64004B, 0x1000B700, 0x370100AA, 0x370200, 0x550E28A0, 0x0C090000, + 0x0F28A80C, 0x05000000, 0x30000030, 0x0E28A90C, 0x0F28AA0C, 0x0F28AB0C, 0x120600A0, 0x1300, + 0xA02F0000, 0x2E2D0014, 0x0C114B10, 0x0700000E, 0x28AD2D00, 0x010C2400, 0x41161031, 0x0E28A30C, + 0x0900000F, 0x28A52D00, 0x010C1137, 0x01100020, 0x2000340E, 0x28A00C09, 0xF28, 0xA10C0500, + 0xF00, 0x300E28, 0xA20C0900, 0xF28A3, 0x0C190008, 0x310E28A4, 0x0C090000, 0x0F28A52D, + 0x10C11, 0x20201023, 0x400012, 0x0E28A00C, 0x0900000F, 0x28A62D00, 0x010C2400, 0x40100E28, + 0xA72D0001, 0x0C102300, 0x41000B0E, 0x28AC2D00, 0x010C2400, 0x41100E28, 0xAD0C1000, }; s32 D_80B58938[3] = { 0x0E18852D, 0x10C12, 0x10000000 }; s32 D_80B58944[2] = { 0x0E28AF2D, 0x10C10 }; s32 D_80B5894C[2] = { 0x0E28C12D, 0x10C10 }; s32 D_80B58954[0xB] = { - 0x350100, - 0x1C0E28C3, - 0x0C0F28C4, - 0x0C150900, - 0xE28C5, - 0x2D00010C, - 0x15090000, - 0x11350112, - 0x100E28C2, - 0x2D00010C, - 0x10000000, + 0x350100, 0x1C0E28C3, 0x0C0F28C4, 0x0C150900, 0xE28C5, 0x2D00010C, + 0x15090000, 0x11350112, 0x100E28C2, 0x2D00010C, 0x10000000, }; s32 D_80B58980[2] = { 0x0E28C62D, 0x10C10 }; s32 D_80B58988[3] = { 0x0E28F70C, 0x0F28F82D, 0x10C10 }; s32 D_80B58994[2] = { 0x0E28F82D, 0x10C10 }; s32 D_80B5899C[4] = { 0x0E28F90C, 0x0F28FA0C, 0x0F28FB2D, 0x10C10 }; s32 D_80B589AC[0x14] = { - 0x0E28D70C, - 0x0F28D80C, - 0x0F28D90C, - 0x0F28DA0C, - 0x0F28DB0C, - 0x05000700, - 0x731, - 0x0E28D919, - -0x16CFF2, - 0x28DC0C11, - 0x32201132, - 0x10120600, - 0xAA000013, - 0xAA2F00, - 0x2E2D00, - 0x012D0017, - 0x2D00160C, - 0x0700000E, - 0x28DE0C15, - 0x09000010, + 0x0E28D70C, 0x0F28D80C, 0x0F28D90C, 0x0F28DA0C, 0x0F28DB0C, 0x05000700, 0x731, + 0x0E28D919, -0x16CFF2, 0x28DC0C11, 0x32201132, 0x10120600, 0xAA000013, 0xAA2F00, + 0x2E2D00, 0x012D0017, 0x2D00160C, 0x0700000E, 0x28DE0C15, 0x09000010, }; s32 D_80B589FC[2] = { 0x0E28D62D, 0x10C10 }; s32 D_80B58A04[8] = { - 0x522000, - 0x100E294F, - 0x0C0F2950, - 0x2D00010C, - 0x12115220, - 0x100E2951, - 0x2D00010C, - 0x12100000, + 0x522000, 0x100E294F, 0x0C0F2950, 0x2D00010C, 0x12115220, 0x100E2951, 0x2D00010C, 0x12100000, }; s32 D_80B58A24[6] = { 0x524000, 0x0B0E2952, 0x2D00010C, 0x11524010, 0x0E29532D, 0x10C10 }; s32 D_80B58A3C[2] = { 0x0E28E02D, 0x10C10 }; s32 D_80B58A44[0x1E] = { - 0x320800, - 0x080E28D5, - 0x2D00010C, - 0x10003220, - 0x80E28, - -0x2BD2FFFF, - 0x0C100033, - 0x01001A25, - 0x30001D, - 0x27000300, - 0x080E28E3, - 0x2D00010C, - 0x100E28E2, - 0x2D00010C, - 0x100E28E1, - 0x2D00010C, - 0x100E28E4, - 0x0C0E00FF, - 0x1E003600, - 0x0E000000, - 0x0C2C28E7, - 0x0C2F0000, - 0x2D00010C, - 0x1012102C, - 0x28E50C2F, - 0xC2A, - 0x300F28, - -0x19D2FFFF, - 0x2D001A0C, - 0x11330110, + 0x320800, 0x080E28D5, 0x2D00010C, 0x10003220, 0x80E28, -0x2BD2FFFF, 0x0C100033, 0x01001A25, + 0x30001D, 0x27000300, 0x080E28E3, 0x2D00010C, 0x100E28E2, 0x2D00010C, 0x100E28E1, 0x2D00010C, + 0x100E28E4, 0x0C0E00FF, 0x1E003600, 0x0E000000, 0x0C2C28E7, 0x0C2F0000, 0x2D00010C, 0x1012102C, + 0x28E50C2F, 0xC2A, 0x300F28, -0x19D2FFFF, 0x2D001A0C, 0x11330110, }; s32 D_80B58ABC[2] = { 0x0E28D02D, 0x10C10 }; s32 D_80B58AC4[9] = { - 0x320800, - 0x160E28D1, - 0x0C0F28D2, - 0x0C0F28D3, - 0x2D00152D, - 0x10C11, - 0x3208100E, - 0x28D32D00, - 0x010C1000, + 0x320800, 0x160E28D1, 0x0C0F28D2, 0x0C0F28D3, 0x2D00152D, 0x10C11, 0x3208100E, 0x28D32D00, 0x010C1000, }; s32 D_80B58AE8[3] = { 0x0E28DF2D, 0x10C12, 0x10000000 }; s32 D_80B58AF4[0x12] = { - 0x372000, - 0x29003208, - 0x2A0E28, - -0x17F3EAF7, - 0xE28, - -0x16F3F0D8, - -0x15F3EAF7, - 0xE28, - -0x14F3F0D8, - -0x13D2FFFF, - 0x0C121137, - 0x20100E28, - -0x13F3EDF0, - 0x0E28EE0C, - 0x0F28EB0C, - 0x0F28EC2D, - 0x10C12, - 0x11372010, + 0x372000, 0x29003208, 0x2A0E28, -0x17F3EAF7, 0xE28, -0x16F3F0D8, -0x15F3EAF7, 0xE28, -0x14F3F0D8, + -0x13D2FFFF, 0x0C121137, 0x20100E28, -0x13F3EDF0, 0x0E28EE0C, 0x0F28EB0C, 0x0F28EC2D, 0x10C12, 0x11372010, }; s32 D_80B58B3C[0x10] = { - 0x372000, - 0x21003208, - 0x220E28, - -0x17F3F0D8, - -0x12F3EAF7, - 0xE28, - -0x14F3F0D8, - -0x13D2FFFF, - 0x0C121137, - 0x20100E28, - -0x13F3EDF0, - 0x0E28EE0C, - 0x0F28EB0C, - 0x0F28EC2D, - 0x10C12, - 0x11372010, + 0x372000, 0x21003208, 0x220E28, -0x17F3F0D8, -0x12F3EAF7, 0xE28, -0x14F3F0D8, -0x13D2FFFF, + 0x0C121137, 0x20100E28, -0x13F3EDF0, 0x0E28EE0C, 0x0F28EB0C, 0x0F28EC2D, 0x10C12, 0x11372010, }; s32 D_80B58B7C[3] = { 0x0E29512D, 0x10C12, 0x10000000 }; s32 D_80B58B88[2] = { 0x0E29612D, 0x10C10 }; @@ -662,8 +446,22 @@ ActorInit En_An_InitVars = { // static ColliderCylinderInit sCylinderInit = { static ColliderCylinderInit D_80B58BBC = { - { COLTYPE_HIT1, AT_NONE, AC_NONE, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1, COLSHAPE_CYLINDER, }, - { ELEMTYPE_UNK1, { 0x00000000, 0x00, 0x00 }, { 0x00000000, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_NONE, OCELEM_ON, }, + { + COLTYPE_HIT1, + AT_NONE, + AC_NONE, + OC1_ON | OC1_TYPE_ALL, + OC2_TYPE_1, + COLSHAPE_CYLINDER, + }, + { + ELEMTYPE_UNK1, + { 0x00000000, 0x00, 0x00 }, + { 0x00000000, 0x00, 0x00 }, + TOUCH_NONE | TOUCH_SFX_NORMAL, + BUMP_NONE, + OCELEM_ON, + }, { 14, 62, 0, { 0, 0, 0 } }, }; @@ -688,7 +486,11 @@ s32 func_80B53840(EnAn* this, PlayState* play) { return false; } - if (((this->an2ObjectSlot >= 0) && (SubS_IsObjectLoaded(this->an2ObjectSlot, play) == 0)) || ((this->an3ObjectSlot >= 0) && (SubS_IsObjectLoaded(this->an3ObjectSlot, play) == 0)) || ((this->maskKerfayObjectSlot >= 0) && (SubS_IsObjectLoaded(this->maskKerfayObjectSlot, play) == 0)) || ((this->an4ObjectSlot >= 0) && (SubS_IsObjectLoaded(this->an4ObjectSlot, play) == 0)) || ((this->msmoObjectSlot >= 0) && (SubS_IsObjectLoaded(this->msmoObjectSlot, play) == 0))) { + if (((this->an2ObjectSlot >= 0) && (SubS_IsObjectLoaded(this->an2ObjectSlot, play) == 0)) || + ((this->an3ObjectSlot >= 0) && (SubS_IsObjectLoaded(this->an3ObjectSlot, play) == 0)) || + ((this->maskKerfayObjectSlot >= 0) && (SubS_IsObjectLoaded(this->maskKerfayObjectSlot, play) == 0)) || + ((this->an4ObjectSlot >= 0) && (SubS_IsObjectLoaded(this->an4ObjectSlot, play) == 0)) || + ((this->msmoObjectSlot >= 0) && (SubS_IsObjectLoaded(this->msmoObjectSlot, play) == 0))) { ret = true; } else { this->actor.draw = EnAn_Draw; @@ -698,7 +500,6 @@ s32 func_80B53840(EnAn* this, PlayState* play) { return ret; } - Actor* func_80B539CC(EnAn* this, PlayState* play, u8 actorCategory, s16 actorId) { Actor* foundActor = NULL; @@ -863,23 +664,23 @@ typedef enum EnAnAnimation { // sAnimationInfo AnimationInfoS D_80B58BF4[ENAN_ANIM_MAX] = { - { &object_an1_Anim_013E1C, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_0 - { &object_an1_Anim_008B6C, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_1 + { &object_an1_Anim_013E1C, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_0 + { &object_an1_Anim_008B6C, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_1 { &object_an1_Anim_008B6C, 1.0f, 0, -1, ANIMMODE_LOOP, -6 }, // ENAN_ANIM_2 - { &object_an1_Anim_00544C, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_3 + { &object_an1_Anim_00544C, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_3 { &object_an1_Anim_00544C, 1.0f, 0, -1, ANIMMODE_ONCE, -6 }, // ENAN_ANIM_4 - { &object_an1_Anim_0026B4, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_5 - { &object_an1_Anim_001E74, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_6 - { &object_an1_Anim_013048, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_7 - { &object_an1_Anim_013048, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_8 - { &object_an1_Anim_0071E8, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_9 + { &object_an1_Anim_0026B4, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_5 + { &object_an1_Anim_001E74, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_6 + { &object_an1_Anim_013048, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_7 + { &object_an1_Anim_013048, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_8 + { &object_an1_Anim_0071E8, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_9 { &object_an1_Anim_0071E8, 1.0f, 0, -1, ANIMMODE_LOOP, -6 }, // ENAN_ANIM_10 - { &object_an1_Anim_007E08, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_11 - { &object_an1_Anim_0065C8, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_12 - { &object_an1_Anim_001090, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_13 - { &object_an1_Anim_00144C, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_14 - { &object_an1_Anim_00341C, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_15 - { &object_an1_Anim_003EA8, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_16 + { &object_an1_Anim_007E08, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_11 + { &object_an1_Anim_0065C8, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_12 + { &object_an1_Anim_001090, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_13 + { &object_an1_Anim_00144C, 1.0f, 0, -1, ANIMMODE_ONCE, 0 }, // ENAN_ANIM_14 + { &object_an1_Anim_00341C, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_15 + { &object_an1_Anim_003EA8, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_16 { &object_an2_Anim_0028DC, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_17 { &object_an2_Anim_0042CC, 1.0f, 0, -1, ANIMMODE_LOOP, 0 }, // ENAN_ANIM_18 @@ -1074,7 +875,8 @@ void EnAn_UpdateFace(EnAn* this) { this->eyeTexIndex++; if (this->eyeTexIndex >= ENAN_EYES_4) { - if ((this->faceIndex == ENAN_FACE_0) || (this->faceIndex == ENAN_FACE_1) || (this->faceIndex == ENAN_FACE_3)) { + if ((this->faceIndex == ENAN_FACE_0) || (this->faceIndex == ENAN_FACE_1) || + (this->faceIndex == ENAN_FACE_3)) { this->unk_38E = Rand_S16Offset(0x1E, 0x1E); } else { this->unk_38E = 8; @@ -1109,8 +911,11 @@ void func_80B54124(EnAn* this, PlayState* play, u32 arg2) { this->unk_3AC -= 2; Gfx_SetupDL25_Xlu(play->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(play->state.gfxCtx, 0, this->unk_3A8, 0U, 0x10, 0x10, 1, 0U, this->unk_3AC, 0x10, 0x10)); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPSegment(POLY_XLU_DISP++, 0x08, + Gfx_TwoTexScroll(play->state.gfxCtx, 0, this->unk_3A8, 0U, 0x10, 0x10, 1, 0U, this->unk_3AC, + 0x10, 0x10)); gSPDisplayList(POLY_XLU_DISP++, object_an1_DL_0111E8); Gfx_SetupDL25_Opa(play->state.gfxCtx); @@ -1124,7 +929,8 @@ void func_80B54124(EnAn* this, PlayState* play, u32 arg2) { Matrix_TranslateRotateZYX(&D_80B58E54, &D_80B58E60); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, object_mask_kerfay_DL_000D40); gSPSegment(POLY_OPA_DISP++, 0x06, play->objectCtx.slots[originalObjectSlot].segment); } @@ -1159,7 +965,8 @@ void func_80B54124(EnAn* this, PlayState* play, u32 arg2) { if ((this->unk_3B4 != 0) && (otherObjectSlot >= 0)) { Matrix_TranslateRotateZYX(&D_80B58E68, &D_80B58E74); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_OPA_DISP++, 0x06, play->objectCtx.slots[otherObjectSlot].segment); gSPDisplayList(POLY_OPA_DISP++, gMoonMaskDL); gSPSegment(POLY_OPA_DISP++, 0x06, play->objectCtx.slots[originalObjectSlot].segment); @@ -1216,7 +1023,7 @@ s16 func_80B54750(EnAn* this, s32 arg1) { } s32 func_80B547C8(Actor* thisx, PlayState* play) { - EnAn *this = THIS; + EnAn* this = THIS; s16 csId = func_80B546F4(this, 0); s32 ret = 0; @@ -1243,7 +1050,8 @@ s32 func_80B547C8(Actor* thisx, PlayState* play) { if ((CHECK_WEEKEVENTREG(WEEKEVENTREG_86_08)) && (this->unk_394 == 3)) { CutsceneManager_Stop(csId); } else if ((this->actor.child != NULL) && (this->actor.child->update != NULL)) { - Camera_SetTargetActor(Play_GetCamera(play, CutsceneManager_GetCurrentSubCamId(csId)), this->actor.child); + Camera_SetTargetActor(Play_GetCamera(play, CutsceneManager_GetCurrentSubCamId(csId)), + this->actor.child); } this->unk_394++; ret = 1; @@ -1259,14 +1067,14 @@ s32 func_80B547C8(Actor* thisx, PlayState* play) { return ret; } s32 func_80B5492C(Actor* thisx, PlayState* play) { - EnAn *this = THIS; + EnAn* this = THIS; s16 csId = func_80B546F4(this, 0); s32 var_a2 = 0; switch (this->unk_394) { case 0x0: var_a2 = 0; - if (func_80B54678(this, csId)) { + if (func_80B54678(this, csId)) { goto label; } break; @@ -1279,14 +1087,14 @@ s32 func_80B5492C(Actor* thisx, PlayState* play) { this->unk_394++; break; - case 0x1: case 0x3: if (!(CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_ROOM_KEY)) && (this->unk_394 == 3)) { CutsceneManager_Stop(csId); this->unk_394 = 5; } else if ((this->actor.child != NULL) && (this->actor.child->update != NULL)) { - Camera_SetTargetActor(Play_GetCamera(play, CutsceneManager_GetCurrentSubCamId(csId)), this->actor.child); + Camera_SetTargetActor(Play_GetCamera(play, CutsceneManager_GetCurrentSubCamId(csId)), + this->actor.child); } this->unk_394++; var_a2 = 1; @@ -1302,7 +1110,7 @@ s32 func_80B5492C(Actor* thisx, PlayState* play) { } s32 func_80B54A94(Actor* thisx, PlayState* play) { - EnAn *this = THIS; + EnAn* this = THIS; s16 csId = func_80B54750(this, 0); s32 ret = 0; @@ -1320,7 +1128,8 @@ s32 func_80B54A94(Actor* thisx, PlayState* play) { case 0x8: label: if ((this->actor.child != NULL) && (this->actor.child->update != NULL)) { - Camera_SetTargetActor(Play_GetCamera(play, CutsceneManager_GetCurrentSubCamId(csId)), this->actor.child); + Camera_SetTargetActor(Play_GetCamera(play, CutsceneManager_GetCurrentSubCamId(csId)), + this->actor.child); } ret = 1; this->unk_394 += 1; @@ -1346,7 +1155,7 @@ s32 func_80B54A94(Actor* thisx, PlayState* play) { } s32 func_80B54BC4(Actor* thisx, PlayState* play) { - EnAn *this = THIS; + EnAn* this = THIS; if (this->unk_394 == 0) { func_800B7298(play, &this->actor, PLAYER_CSMODE_WAIT); @@ -1361,7 +1170,7 @@ s32 func_80B54BC4(Actor* thisx, PlayState* play) { } s32 func_80B54C5C(Actor* thisx, PlayState* play) { - EnAn *this = THIS; + EnAn* this = THIS; s32 sp20 = false; switch (this->unk_394) { @@ -1388,7 +1197,7 @@ s32 func_80B54C5C(Actor* thisx, PlayState* play) { } s32 func_80B54D18(Actor* thisx, PlayState* play) { - EnAn *this = THIS; + EnAn* this = THIS; s32 ret = false; switch (this->unk_394) { @@ -1405,7 +1214,7 @@ s32 func_80B54D18(Actor* thisx, PlayState* play) { case 0x1: label: - this->unk_360 &= ~(0x20|0x4000); + this->unk_360 &= ~(0x20 | 0x4000); this->unk_360 |= 0x200; EnAn_ChangeAnim(this, play, ENAN_ANIM_20); ret = true; @@ -1488,15 +1297,17 @@ s32* func_80B54DF4(EnAn* this, PlayState* play) { return D_80B58A44; } - //if ((gSaveContext.save.time - 0x3FFC) < 0x5883) { - //if (SCHEDULE_CONVERT_TIME_ALT(gSaveContext.save.time) < SCHEDULE_CONVERT_TIME_ALT(CLOCK_TIME(14, 18))) { + // if ((gSaveContext.save.time - 0x3FFC) < 0x5883) { + // if (SCHEDULE_CONVERT_TIME_ALT(gSaveContext.save.time) < SCHEDULE_CONVERT_TIME_ALT(CLOCK_TIME(14, + // 18))) { if (SCHEDULE_CONVERT_TIME_ALT(gSaveContext.save.time) < SCHEDULE_CALC_TIME_ALT(14, 18)) { return D_80B58ABC; } return D_80B58AC4; } - if ((player->transformation == PLAYER_FORM_HUMAN) && CHECK_WEEKEVENTREG(WEEKEVENTREG_PROMISED_MIDNIGHT_MEETING)) { + if ((player->transformation == PLAYER_FORM_HUMAN) && + CHECK_WEEKEVENTREG(WEEKEVENTREG_PROMISED_MIDNIGHT_MEETING)) { if (this->scheduleResult == ANJU_SCH_17) { this->msgEventFunc = func_80B54BC4; return D_80B589AC; @@ -1577,7 +1388,14 @@ s32 func_80B55180(EnAn* this, PlayState* play) { this->actor.child = this->unk_218; this->msgEventScript = func_80B54DF4(this, play); - if ((this->scheduleResult == ANJU_SCH_1) || (this->scheduleResult == ANJU_SCH_3) || (this->scheduleResult == ANJU_SCH_12) || (this->scheduleResult == ANJU_SCH_13) || (this->scheduleResult == ANJU_SCH_17) || (this->scheduleResult == ANJU_SCH_16) || (this->scheduleResult == ANJU_SCH_28) || (this->scheduleResult == ANJU_SCH_2A) || (this->scheduleResult == ANJU_SCH_2B) || (this->scheduleResult == ANJU_SCH_2C) || (this->scheduleResult == ANJU_SCH_2D) || (this->scheduleResult == ANJU_SCH_2F) || (this->scheduleResult == ANJU_SCH_30) || (this->scheduleResult == ANJU_SCH_31) || (this->scheduleResult == ANJU_SCH_34) || (this->scheduleResult == ANJU_SCH_35)) { + if ((this->scheduleResult == ANJU_SCH_1) || (this->scheduleResult == ANJU_SCH_3) || + (this->scheduleResult == ANJU_SCH_12) || (this->scheduleResult == ANJU_SCH_13) || + (this->scheduleResult == ANJU_SCH_17) || (this->scheduleResult == ANJU_SCH_16) || + (this->scheduleResult == ANJU_SCH_28) || (this->scheduleResult == ANJU_SCH_2A) || + (this->scheduleResult == ANJU_SCH_2B) || (this->scheduleResult == ANJU_SCH_2C) || + (this->scheduleResult == ANJU_SCH_2D) || (this->scheduleResult == ANJU_SCH_2F) || + (this->scheduleResult == ANJU_SCH_30) || (this->scheduleResult == ANJU_SCH_31) || + (this->scheduleResult == ANJU_SCH_34) || (this->scheduleResult == ANJU_SCH_35)) { this->unk_360 |= 0x20; } @@ -1596,7 +1414,8 @@ s32 func_80B552E4(EnAn* this, PlayState* play) { u16 temp_v0 = play->csCtx.scriptIndex; s32 ret = false; - if ((play->csCtx.state != 0) && (play->sceneId == 0x61) && (gSaveContext.sceneLayer == 0) && ((temp_v0 == 0) || (temp_v0 == 1))) { + if ((play->csCtx.state != 0) && (play->sceneId == 0x61) && (gSaveContext.sceneLayer == 0) && + ((temp_v0 == 0) || (temp_v0 == 1))) { if (this->unk_3B0 == 0) { this->unk_38A = ENAN_FACE_0; this->faceIndex = ENAN_FACE_0; @@ -1771,129 +1590,140 @@ s32 func_80B55914(EnAn* this, PlayState* play) { if (player->stateFlags1 & PLAYER_STATE1_40) { this->unk_360 |= 0x400; if (this->unk_362 != sp22) { - switch (sp22) { /* switch 3; irregular */ - case 0x28E5: /* switch 3 */ + switch (sp22) { + case 0x28E5: EnAn_ChangeAnim(this, play, ENAN_ANIM_5); this->unk_360 &= 0xDFFF; break; - case 0x28BA: /* switch 3 */ - case 0x28D1: /* switch 3 */ + + case 0x28BA: + case 0x28D1: EnAn_ChangeAnim(this, play, ENAN_ANIM_5); break; - case 0x28AF: /* switch 3 */ - case 0x28C1: /* switch 3 */ + + case 0x28AF: + case 0x28C1: EnAn_ChangeAnim(this, play, ENAN_ANIM_1); break; - case 0x28BC: /* switch 3 */ + + case 0x28BC: EnAn_ChangeAnim(this, play, ENAN_ANIM_2); break; - case 0x28C6: /* switch 3 */ + + case 0x28C6: EnAn_ChangeAnim(this, play, ENAN_ANIM_15); break; - case 0x28F5: /* switch 3 */ + + case 0x28F5: EnAn_ChangeAnim(this, play, ENAN_ANIM_10); break; - case 0x28F7: /* switch 3 */ - case 0x28F8: /* switch 3 */ + + case 0x28F7: + case 0x28F8: EnAn_ChangeAnim(this, play, ENAN_ANIM_21); break; - case 0x28EB: /* switch 3 */ + + case 0x28EB: if (this->animIndex != ENAN_ANIM_20) { this->unk_360 &= 0xBFDF; this->unk_360 |= 0x200; EnAn_ChangeAnim(this, play, ENAN_ANIM_20); } break; - case 0x28A4: /* switch 3 */ - case 0x28A9: /* switch 3 */ - case 0x28BE: /* switch 3 */ - case 0x28C0: /* switch 3 */ + + case 0x28A4: + case 0x28A9: + case 0x28BE: + case 0x28C0: case 0x295E: this->unk_18C = func_80B556F8; this->unk_396 = 0; break; - case 0x28E6: /* switch 3 */ + + case 0x28E6: this->unk_360 &= 0xDFFF; this->unk_18C = func_80B55860; this->unk_396 = 0; break; - case 0x1885: /* switch 3 */ - case 0x28A0: /* switch 3 */ - case 0x28A3: /* switch 3 */ - case 0x28A5: /* switch 3 */ - case 0x28B1: /* switch 3 */ - case 0x28D2: /* switch 3 */ - case 0x28D9: /* switch 3 */ - case 0x28DC: /* switch 3 */ - case 0x28DE: /* switch 3 */ + + case 0x1885: + case 0x28A0: + case 0x28A3: + case 0x28A5: + case 0x28B1: + case 0x28D2: + case 0x28D9: + case 0x28DC: + case 0x28DE: this->unk_18C = func_80B557AC; this->unk_396 = 0; break; - case 0x28A1: /* switch 3 */ - case 0x28A2: /* switch 3 */ - case 0x28A6: /* switch 3 */ - case 0x28A7: /* switch 3 */ - case 0x28A8: /* switch 3 */ - case 0x28AA: /* switch 3 */ - case 0x28AB: /* switch 3 */ - case 0x28AC: /* switch 3 */ - case 0x28AD: /* switch 3 */ - case 0x28AE: /* switch 3 */ - case 0x28B0: /* switch 3 */ - case 0x28B2: /* switch 3 */ - case 0x28B3: /* switch 3 */ - case 0x28B4: /* switch 3 */ - case 0x28B5: /* switch 3 */ - case 0x28B6: /* switch 3 */ - case 0x28B7: /* switch 3 */ - case 0x28B8: /* switch 3 */ - case 0x28B9: /* switch 3 */ - case 0x28BB: /* switch 3 */ - case 0x28BD: /* switch 3 */ - case 0x28BF: /* switch 3 */ - case 0x28C2: /* switch 3 */ - case 0x28C3: /* switch 3 */ - case 0x28C4: /* switch 3 */ - case 0x28C5: /* switch 3 */ - case 0x28C7: /* switch 3 */ - case 0x28C8: /* switch 3 */ - case 0x28C9: /* switch 3 */ - case 0x28CA: /* switch 3 */ - case 0x28CB: /* switch 3 */ - case 0x28CC: /* switch 3 */ - case 0x28CD: /* switch 3 */ - case 0x28CE: /* switch 3 */ - case 0x28CF: /* switch 3 */ - case 0x28D0: /* switch 3 */ - case 0x28D3: /* switch 3 */ - case 0x28D4: /* switch 3 */ - case 0x28D5: /* switch 3 */ - case 0x28D6: /* switch 3 */ - case 0x28D7: /* switch 3 */ - case 0x28D8: /* switch 3 */ - case 0x28DA: /* switch 3 */ - case 0x28DB: /* switch 3 */ - case 0x28DD: /* switch 3 */ - case 0x28DF: /* switch 3 */ - case 0x28E0: /* switch 3 */ - case 0x28E1: /* switch 3 */ - case 0x28E2: /* switch 3 */ - case 0x28E3: /* switch 3 */ - case 0x28E4: /* switch 3 */ - case 0x28E7: /* switch 3 */ - case 0x28E8: /* switch 3 */ - case 0x28E9: /* switch 3 */ - case 0x28EA: /* switch 3 */ - case 0x28EC: /* switch 3 */ - case 0x28ED: /* switch 3 */ - case 0x28EE: /* switch 3 */ - case 0x28EF: /* switch 3 */ - case 0x28F0: /* switch 3 */ - case 0x28F1: /* switch 3 */ - case 0x28F2: /* switch 3 */ - case 0x28F3: /* switch 3 */ - case 0x28F4: /* switch 3 */ - case 0x28F6: /* switch 3 */ + + case 0x28A1: + case 0x28A2: + case 0x28A6: + case 0x28A7: + case 0x28A8: + case 0x28AA: + case 0x28AB: + case 0x28AC: + case 0x28AD: + case 0x28AE: + case 0x28B0: + case 0x28B2: + case 0x28B3: + case 0x28B4: + case 0x28B5: + case 0x28B6: + case 0x28B7: + case 0x28B8: + case 0x28B9: + case 0x28BB: + case 0x28BD: + case 0x28BF: + case 0x28C2: + case 0x28C3: + case 0x28C4: + case 0x28C5: + case 0x28C7: + case 0x28C8: + case 0x28C9: + case 0x28CA: + case 0x28CB: + case 0x28CC: + case 0x28CD: + case 0x28CE: + case 0x28CF: + case 0x28D0: + case 0x28D3: + case 0x28D4: + case 0x28D5: + case 0x28D6: + case 0x28D7: + case 0x28D8: + case 0x28DA: + case 0x28DB: + case 0x28DD: + case 0x28DF: + case 0x28E0: + case 0x28E1: + case 0x28E2: + case 0x28E3: + case 0x28E4: + case 0x28E7: + case 0x28E8: + case 0x28E9: + case 0x28EA: + case 0x28EC: + case 0x28ED: + case 0x28EE: + case 0x28EF: + case 0x28F0: + case 0x28F1: + case 0x28F2: + case 0x28F3: + case 0x28F4: + case 0x28F6: default: if (this->animIndex == ENAN_ANIM_16) { EnAn_ChangeAnim(this, play, ENAN_ANIM_15); @@ -1910,82 +1740,91 @@ s32 func_80B55914(EnAn* this, PlayState* play) { break; } - switch (sp22) { /* switch 4; irregular */ - case 0x28F5: /* switch 4 */ + switch (sp22) { + case 0x28F5: this->unk_38A = ENAN_FACE_0; /* fallthrough */ - case 0x28A5: /* switch 4 */ - case 0x28AA: /* switch 4 */ - case 0x28F8: /* switch 4 */ + case 0x28A5: + case 0x28AA: + case 0x28F8: this->faceIndex = ENAN_FACE_0; this->unk_38E = 8; break; - case 0x1885: /* switch 4 */ - case 0x28A0: /* switch 4 */ - case 0x28A6: /* switch 4 */ - case 0x28AF: /* switch 4 */ - case 0x28C1: /* switch 4 */ + + case 0x1885: + case 0x28A0: + case 0x28A6: + case 0x28AF: + case 0x28C1: this->faceIndex = ENAN_FACE_3; this->unk_38E = 8; break; - case 0x28A2: /* switch 4 */ - case 0x28B3: /* switch 4 */ - case 0x28B6: /* switch 4 */ - case 0x28BA: /* switch 4 */ - case 0x28BE: /* switch 4 */ - case 0x28CE: /* switch 4 */ - case 0x28D0: /* switch 4 */ - case 0x28D6: /* switch 4 */ - case 0x28E5: /* switch 4 */ - case 0x28E7: /* switch 4 */ - case 0x28ED: /* switch 4 */ + + case 0x28A2: + case 0x28B3: + case 0x28B6: + case 0x28BA: + case 0x28BE: + case 0x28CE: + case 0x28D0: + case 0x28D6: + case 0x28E5: + case 0x28E7: + case 0x28ED: this->faceIndex = ENAN_FACE_1; this->unk_38E = 8; break; - case 0x28AD: /* switch 4 */ + + case 0x28AD: this->faceIndex = ENAN_FACE_8; this->unk_38E = 8; break; - case 0x28C0: /* switch 4 */ - case 0x28D7: /* switch 4 */ - case 0x28DE: /* switch 4 */ + + case 0x28C0: + case 0x28D7: + case 0x28DE: this->faceIndex = ENAN_FACE_2; this->unk_38E = 8; break; - case 0x28E6: /* switch 4 */ - case 0x28F7: /* switch 4 */ + + case 0x28E6: + case 0x28F7: this->faceIndex = ENAN_FACE_6; this->unk_38E = 8; break; - case 0x28A3: /* switch 4 */ - case 0x28B1: /* switch 4 */ - case 0x28B8: /* switch 4 */ - case 0x28C6: /* switch 4 */ - case 0x28CA: /* switch 4 */ - case 0x28CC: /* switch 4 */ - case 0x28D5: /* switch 4 */ - case 0x28E2: /* switch 4 */ - case 0x28E3: /* switch 4 */ - case 0x28E4: /* switch 4 */ + + case 0x28A3: + case 0x28B1: + case 0x28B8: + case 0x28C6: + case 0x28CA: + case 0x28CC: + case 0x28D5: + case 0x28E2: + case 0x28E3: + case 0x28E4: this->faceIndex = ENAN_FACE_4; this->unk_38E = 8; break; - case 0x28EC: /* switch 4 */ + + case 0x28EC: this->unk_38A = ENAN_FACE_5; /* fallthrough */ - case 0x28DC: /* switch 4 */ - case 0x28EB: /* switch 4 */ - case 0x28F2: /* switch 4 */ - case 0x28F9: /* switch 4 */ + case 0x28DC: + case 0x28EB: + case 0x28F2: + case 0x28F9: this->faceIndex = ENAN_FACE_5; this->unk_38E = 8; break; - case 0x28F6: /* switch 4 */ + + case 0x28F6: this->faceIndex = ENAN_FACE_9; this->unk_38E = 8; break; - case 0x28A4: /* switch 4 */ - case 0x28A9: /* switch 4 */ + + case 0x28A4: + case 0x28A9: this->faceIndex = ENAN_FACE_7; this->unk_38E = 8; break; @@ -2052,8 +1891,8 @@ s32 func_80B55D98(EnAn* this, PlayState* play, ScheduleOutput* scheduleOutput, u if ((var_v1 != NULL) && (var_v1->update != NULL)) { if (this->unk_1DC != NULL) { temp_v0_3 = Lib_SegmentedToVirtual(this->unk_1DC->points); - Math_Vec3s_ToVec3f(&sp3C, &temp_v0_3[this->unk_1DC->count-2]); - Math_Vec3s_ToVec3f(&sp30, &temp_v0_3[this->unk_1DC->count-1]); + Math_Vec3s_ToVec3f(&sp3C, &temp_v0_3[this->unk_1DC->count - 2]); + Math_Vec3s_ToVec3f(&sp30, &temp_v0_3[this->unk_1DC->count - 1]); this->actor.shape.shadowDraw = NULL; this->actor.world.rot.y = Math_Vec3f_Yaw(&sp3C, &sp30); Math_Vec3f_Copy(&this->actor.world.pos, &sp30); @@ -2083,9 +1922,11 @@ s32 func_80B55F8C(PlayState* play) { Player* player = GET_PLAYER(play); s32 var_v1 = false; - if ((Player_GetMask(play) == PLAYER_MASK_KAFEIS_MASK) && CHECK_WEEKEVENTREG(WEEKEVENTREG_PROMISED_MIDNIGHT_MEETING)) { + if ((Player_GetMask(play) == PLAYER_MASK_KAFEIS_MASK) && + CHECK_WEEKEVENTREG(WEEKEVENTREG_PROMISED_MIDNIGHT_MEETING)) { var_v1 = true; - } else if ((player->transformation == PLAYER_FORM_HUMAN) && CHECK_WEEKEVENTREG(WEEKEVENTREG_PROMISED_MIDNIGHT_MEETING)) { + } else if ((player->transformation == PLAYER_FORM_HUMAN) && + CHECK_WEEKEVENTREG(WEEKEVENTREG_PROMISED_MIDNIGHT_MEETING)) { var_v1 = true; } @@ -2245,7 +2086,7 @@ s32 func_80B56418(EnAn* this, PlayState* play, ScheduleOutput* scheduleOutput) { var_v1_2 = scheduleOutput->time0; } - if (scheduleOutput->time1 < var_v1_2) { + if (scheduleOutput->time1 < var_v1_2) { this->unk_1F0 = (var_v1_2 - scheduleOutput->time1) + 0xFFFF; } else { this->unk_1F0 = scheduleOutput->time1 - var_v1_2; @@ -2394,8 +2235,8 @@ s32 func_80B56880(EnAn* this, PlayState* play, ScheduleOutput* scheduleOutput) { if ((this->unk_1DC != NULL) && (this->unk_1DC->count >= 2)) { temp_v0_2 = Lib_SegmentedToVirtual(this->unk_1DC->points); - Math_Vec3s_ToVec3f(&sp40, &temp_v0_2[this->unk_1DC->count-1]); - Math_Vec3s_ToVec3f(&sp34, &temp_v0_2[this->unk_1DC->count-2]); + Math_Vec3s_ToVec3f(&sp40, &temp_v0_2[this->unk_1DC->count - 1]); + Math_Vec3s_ToVec3f(&sp34, &temp_v0_2[this->unk_1DC->count - 2]); this->actor.world.rot.y = Math_Vec3f_Yaw(&sp34, &sp40); @@ -2644,7 +2485,7 @@ s32 func_80B56EB4(EnAn* this, PlayState* play) { if (!SubS_InCsMode(play) && (this->unk_384 != 0)) { if ((sp44 != NULL) && (sp44->knobDoor.dyna.actor.update != NULL)) { - if ((this->unk_37A / (f32) this->unk_378) <= 0.9f) { + if ((this->unk_37A / (f32)this->unk_378) <= 0.9f) { sp44->unk_1A7 = this->unk_215; } else { sp44->unk_1A7 = 0; @@ -2682,7 +2523,8 @@ s32 func_80B5702C(EnAn* this, PlayState* play) { if (!(this->unk_360 & 8)) { sp58 = gZeroVec3f; - SubS_TimePathing_Update(this->unk_1DC, &this->unk_1EC, &this->unk_1FC, this->unk_1F4, this->unk_1F0, &this->unk_1F8, sp7C, &sp58, this->unk_384); + SubS_TimePathing_Update(this->unk_1DC, &this->unk_1EC, &this->unk_1FC, this->unk_1F4, this->unk_1F0, + &this->unk_1F8, sp7C, &sp58, this->unk_384); SubS_TimePathing_ComputeInitialY(play, this->unk_1DC, this->unk_1F8, &sp58); this->actor.world.pos.y = sp58.y; this->unk_360 |= 8; @@ -2700,7 +2542,8 @@ s32 func_80B5702C(EnAn* this, PlayState* play) { } this->unk_1E0 = gZeroVec3f; - if (SubS_TimePathing_Update(this->unk_1DC, &this->unk_1EC, &this->unk_1FC, this->unk_1F4, this->unk_1F0, &this->unk_1F8, sp7C, &this->unk_1E0, this->unk_384)) { + if (SubS_TimePathing_Update(this->unk_1DC, &this->unk_1EC, &this->unk_1FC, this->unk_1F4, this->unk_1F0, + &this->unk_1F8, sp7C, &this->unk_1E0, this->unk_384)) { this->unk_360 |= 0x10; } else { sp70 = this->actor.world.pos; @@ -2915,7 +2758,8 @@ void func_80B57718(EnAn* this, PlayState* play) { void func_80B577F0(EnAn* this, PlayState* play) { ActorShape_Init(&this->actor.shape, 0.0f, NULL, 14.0f); - SkelAnime_InitFlex(play, &this->skelAnime, &object_an1_Skel_012618, NULL, this->jointTable, this->morphTable, OBJECT_AN1_LIMB_MAX); + SkelAnime_InitFlex(play, &this->skelAnime, &object_an1_Skel_012618, NULL, this->jointTable, this->morphTable, + OBJECT_AN1_LIMB_MAX); this->animIndex = ENAN_ANIM_NONE; EnAn_ChangeAnim(this, play, ENAN_ANIM_1); @@ -2950,7 +2794,9 @@ void func_80B578F8(EnAn* this, PlayState* play) { if (this->scheduleResult != ANJU_SCH_19) { EnAn_ProcessScheduleOutput(this, play, &scheduleOutput); } - } else if (!Schedule_RunScript(play, sScheduleScript, &scheduleOutput) || ((this->scheduleResult != scheduleOutput.result) && (EnAn_ProcessScheduleOutput(this, play, &scheduleOutput) == 0))) { + } else if (!Schedule_RunScript(play, sScheduleScript, &scheduleOutput) || + ((this->scheduleResult != scheduleOutput.result) && + (EnAn_ProcessScheduleOutput(this, play, &scheduleOutput) == 0))) { this->actor.shape.shadowDraw = NULL; this->actor.flags &= ~ACTOR_FLAG_TARGETABLE; scheduleOutput.result = ANJU_SCH_NONE; @@ -2964,7 +2810,6 @@ void func_80B578F8(EnAn* this, PlayState* play) { func_80B57718(this, play); } - void func_80B57A44(EnAn* this, PlayState* play) { if (func_8010BF58(&this->actor, play, this->msgEventScript, this->msgEventFunc, &this->msgScriptResumePos) != 0) { SubS_SetOfferMode(&this->unk_360, 3U, 7U); @@ -2974,7 +2819,9 @@ void func_80B57A44(EnAn* this, PlayState* play) { this->unk_388 = 0x14; this->msgScriptResumePos = 0; this->actionFunc = func_80B578F8; - } else if ((this->scheduleResult != ANJU_SCH_1) && (this->scheduleResult != 3) && (this->scheduleResult != ANJU_SCH_C) && (this->scheduleResult != ANJU_SCH_E) && (this->scheduleResult != ANJU_SCH_19)) { + } else if ((this->scheduleResult != ANJU_SCH_1) && (this->scheduleResult != 3) && + (this->scheduleResult != ANJU_SCH_C) && (this->scheduleResult != ANJU_SCH_E) && + (this->scheduleResult != ANJU_SCH_19)) { if ((this->unk_218 != NULL) && (this->unk_218->update != NULL)) { s32 temp; Vec3f sp38; @@ -2990,11 +2837,14 @@ void func_80B57A44(EnAn* this, PlayState* play) { } void func_80B57B48(EnAn* this, PlayState* play) { - s32 sp30[] = { ENAN_ANIM_0, ENAN_ANIM_11, ENAN_ANIM_34, ENAN_ANIM_25, ENAN_ANIM_26, ENAN_ANIM_28, ENAN_ANIM_30, ENAN_ANIM_32, ENAN_ANIM_33, ENAN_ANIM_0 }; + s32 sp30[] = { + ENAN_ANIM_0, ENAN_ANIM_11, ENAN_ANIM_34, ENAN_ANIM_25, ENAN_ANIM_26, + ENAN_ANIM_28, ENAN_ANIM_30, ENAN_ANIM_32, ENAN_ANIM_33, ENAN_ANIM_0, + }; u16 temp_v1; s32 temp_v0; // sp28 - if(0) {} + if (0) {} if (Cutscene_IsCueInChannel(play, 0x22DU)) { temp_v0 = Cutscene_GetCueChannel(play, 0x22DU); @@ -3012,10 +2862,8 @@ void func_80B57B48(EnAn* this, PlayState* play) { EnAn_ChangeAnim(this, play, sp30[temp_v1]); } - if ((this->animIndex == ENAN_ANIM_26) || - (this->animIndex == ENAN_ANIM_28) || - (this->animIndex == ENAN_ANIM_30) || - (this->animIndex == ENAN_ANIM_34)) { + if ((this->animIndex == ENAN_ANIM_26) || (this->animIndex == ENAN_ANIM_28) || + (this->animIndex == ENAN_ANIM_30) || (this->animIndex == ENAN_ANIM_34)) { if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { EnAn_ChangeAnim(this, play, this->animIndex + 1); } @@ -3132,7 +2980,8 @@ void EnAn_TransformLimbDraw(PlayState* play, s32 limbIndex, Actor* thisx) { } if (limbIndex == OBJECT_AN1_LIMB_09) { - SubS_UpdateLimb(this->unk_37C + 0x4000, this->unk_37E + this->actor.shape.rot.y + 0x4000, &this->unk_240, &this->unk_258, stepRot, overrideRot); + SubS_UpdateLimb(this->unk_37C + 0x4000, this->unk_37E + this->actor.shape.rot.y + 0x4000, &this->unk_240, + &this->unk_258, stepRot, overrideRot); Matrix_Pop(); Matrix_Translate(this->unk_240.x, this->unk_240.y, this->unk_240.z, MTXMODE_NEW); Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); @@ -3172,7 +3021,9 @@ void EnAn_Draw(Actor* thisx, PlayState* play) { gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(D_80B58EEC[this->eyeTexIndex])); gSPSegment(POLY_OPA_DISP++, 0x09, Lib_SegmentedToVirtual(D_80B58EE0[this->mouthTexIndex])); - SkelAnime_DrawTransformFlexOpa(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, NULL, EnAn_PostLimbDraw, EnAn_TransformLimbDraw, &this->actor); + SkelAnime_DrawTransformFlexOpa(play, this->skelAnime.skeleton, this->skelAnime.jointTable, + this->skelAnime.dListCount, NULL, EnAn_PostLimbDraw, EnAn_TransformLimbDraw, + &this->actor); CLOSE_DISPS(play->state.gfxCtx); }