diff --git a/spec b/spec index 5f8c616e5..cb6eca1e1 100644 --- a/spec +++ b/spec @@ -3785,7 +3785,6 @@ beginseg name "ovl_En_An" compress include "build/src/overlays/actors/ovl_En_An/z_en_an.o" - include "build/data/ovl_En_An/ovl_En_An.data.o" include "build/data/ovl_En_An/ovl_En_An.reloc.o" endseg 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 184692dac..1c8fa0881 100644 --- a/src/overlays/actors/ovl_En_An/z_en_an.c +++ b/src/overlays/actors/ovl_En_An/z_en_an.c @@ -27,7 +27,559 @@ void func_80B57A44(EnAn* this, PlayState* play); extern AnimationInfoS D_80B58BF4[]; -#if 0 + +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), + /* 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), + /* 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), + /* 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), + /* 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), + /* 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), + /* 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), + /* 0x0BF */ SCHEDULE_CMD_RET_NONE(), + /* 0x0C0 */ SCHEDULE_CMD_RET_TIME(23, 15, 0, 0, 49), + /* 0x0C6 */ SCHEDULE_CMD_RET_TIME(23, 10, 23, 15, 31), + /* 0x0CC */ SCHEDULE_CMD_RET_TIME(21, 5, 21, 10, 30), + /* 0x0D2 */ SCHEDULE_CMD_RET_TIME(20, 30, 21, 5, 48), + /* 0x0D8 */ SCHEDULE_CMD_RET_TIME(20, 20, 20, 30, 19), + /* 0x0DE */ SCHEDULE_CMD_RET_TIME(19, 50, 20, 20, 47), + /* 0x0E4 */ SCHEDULE_CMD_RET_TIME(16, 30, 19, 50, 18), + /* 0x0EA */ SCHEDULE_CMD_RET_TIME(16, 10, 16, 30, 17), + /* 0x0F0 */ SCHEDULE_CMD_RET_TIME(14, 18, 16, 10, 18), + /* 0x0F6 */ SCHEDULE_CMD_RET_TIME(14, 8, 14, 18, 16), + /* 0x0FC */ SCHEDULE_CMD_RET_TIME(13, 50, 14, 8, 18), + /* 0x102 */ SCHEDULE_CMD_RET_TIME(13, 20, 13, 50, 46), + /* 0x108 */ SCHEDULE_CMD_RET_TIME(13, 15, 13, 20, 29), + /* 0x10E */ SCHEDULE_CMD_RET_TIME(12, 55, 13, 0, 28), + /* 0x114 */ SCHEDULE_CMD_RET_TIME(12, 25, 12, 55, 45), + /* 0x11A */ SCHEDULE_CMD_RET_TIME(12, 20, 12, 25, 27), + /* 0x120 */ SCHEDULE_CMD_RET_TIME(12, 15, 12, 20, 44), + /* 0x126 */ SCHEDULE_CMD_RET_TIME(12, 0, 12, 15, 21), + /* 0x12C */ SCHEDULE_CMD_RET_TIME(11, 55, 12, 0, 43), + /* 0x132 */ SCHEDULE_CMD_RET_TIME(11, 50, 11, 55, 26), + /* 0x138 */ SCHEDULE_CMD_RET_TIME(11, 30, 11, 50, 42), + /* 0x13E */ SCHEDULE_CMD_RET_TIME(11, 10, 11, 30, 14), + /* 0x144 */ SCHEDULE_CMD_RET_TIME(10, 55, 11, 10, 40), + /* 0x14A */ SCHEDULE_CMD_RET_TIME( 6, 0, 10, 55, 18), + /* 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), + /* 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), + /* 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), + /* 0x1A9 */ SCHEDULE_CMD_RET_NONE(), + /* 0x1AA */ SCHEDULE_CMD_RET_TIME(21, 30, 23, 0, 24), + /* 0x1B0 */ SCHEDULE_CMD_RET_TIME(21, 0, 21, 5, 30), + /* 0x1B6 */ SCHEDULE_CMD_RET_TIME(20, 30, 21, 0, 48), + /* 0x1BC */ SCHEDULE_CMD_RET_TIME(20, 20, 20, 30, 19), + /* 0x1C2 */ SCHEDULE_CMD_RET_TIME(19, 50, 20, 20, 47), + /* 0x1C8 */ SCHEDULE_CMD_RET_TIME(18, 0, 19, 50, 18), + /* 0x1CE */ SCHEDULE_CMD_RET_TIME(17, 55, 18, 0, 35), + /* 0x1D4 */ SCHEDULE_CMD_RET_TIME(17, 30, 17, 55, 51), + /* 0x1DA */ SCHEDULE_CMD_RET_TIME(17, 24, 17, 30, 34), + /* 0x1E0 */ SCHEDULE_CMD_RET_TIME(11, 29, 11, 39, 33), + /* 0x1E6 */ SCHEDULE_CMD_RET_TIME(11, 9, 11, 29, 50), + /* 0x1EC */ SCHEDULE_CMD_RET_TIME(11, 3, 11, 9, 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), + /* 0x1FC */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(11, 39, 12, 25, 0x233 - 0x202), + /* 0x202 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(12, 25, 13, 15, 0x22D - 0x208), + /* 0x208 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(15, 55, 16, 45, 0x227 - 0x20E), + /* 0x20E */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(16, 45, 17, 24, 0x221 - 0x214), + /* 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, 38), + /* 0x221 */ SCHEDULE_CMD_RET_TIME(16, 45, 17, 24, 59), + /* 0x227 */ SCHEDULE_CMD_RET_TIME(15, 55, 16, 45, 58), + /* 0x22D */ SCHEDULE_CMD_RET_TIME(12, 25, 13, 15, 55), + /* 0x233 */ SCHEDULE_CMD_RET_TIME(11, 39, 12, 25, 54), + /* 0x239 */ SCHEDULE_CMD_RET_TIME(11, 29, 11, 39, 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), + /* 0x249 */ SCHEDULE_CMD_CHECK_TIME_RANGE_S(12, 25, 13, 15, 0x268 - 0x24F), + /* 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, 63), + /* 0x262 */ SCHEDULE_CMD_RET_TIME(15, 55, 16, 45, 62), + /* 0x268 */ SCHEDULE_CMD_RET_TIME(12, 25, 13, 15, 61), + /* 0x26E */ SCHEDULE_CMD_RET_TIME(11, 39, 12, 25, 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, 57), + /* 0x291 */ SCHEDULE_CMD_RET_TIME(13, 45, 15, 25, 3), + /* 0x297 */ SCHEDULE_CMD_RET_TIME(13, 15, 13, 45, 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), + /* 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), + /* 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), + /* 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), + /* 0x31D */ SCHEDULE_CMD_RET_NONE(), + /* 0x31E */ SCHEDULE_CMD_RET_TIME(21, 30, 23, 0, 24), + /* 0x324 */ SCHEDULE_CMD_RET_TIME(21, 5, 21, 10, 30), + /* 0x32A */ SCHEDULE_CMD_RET_TIME(20, 30, 21, 5, 48), + /* 0x330 */ SCHEDULE_CMD_RET_TIME(20, 20, 20, 30, 19), + /* 0x336 */ SCHEDULE_CMD_RET_TIME(19, 50, 20, 20, 47), + /* 0x33C */ SCHEDULE_CMD_RET_TIME(13, 50, 19, 50, 18), + /* 0x342 */ SCHEDULE_CMD_RET_TIME(13, 20, 13, 50, 46), + /* 0x348 */ SCHEDULE_CMD_RET_TIME(13, 15, 13, 20, 29), + /* 0x34E */ SCHEDULE_CMD_RET_TIME(12, 55, 13, 0, 28), + /* 0x354 */ SCHEDULE_CMD_RET_TIME(12, 25, 12, 55, 45), + /* 0x35A */ SCHEDULE_CMD_RET_TIME(12, 20, 12, 25, 27), + /* 0x360 */ SCHEDULE_CMD_RET_TIME(12, 15, 12, 20, 44), + /* 0x366 */ SCHEDULE_CMD_RET_TIME(12, 0, 12, 15, 21), + /* 0x36C */ SCHEDULE_CMD_RET_TIME(11, 55, 12, 0, 43), + /* 0x372 */ SCHEDULE_CMD_RET_TIME(11, 50, 11, 55, 26), + /* 0x378 */ SCHEDULE_CMD_RET_TIME(11, 30, 11, 50, 42), + /* 0x37E */ SCHEDULE_CMD_RET_TIME(11, 10, 11, 30, 14), + /* 0x384 */ SCHEDULE_CMD_RET_TIME(10, 55, 11, 10, 40), + /* 0x38A */ SCHEDULE_CMD_RET_TIME( 6, 0, 10, 55, 18), + /* 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), + /* 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), + /* 0x3BC */ SCHEDULE_CMD_RET_NONE(), + /* 0x3BD */ SCHEDULE_CMD_RET_TIME(11, 50, 12, 0, 39), + /* 0x3C3 */ SCHEDULE_CMD_RET_TIME(11, 30, 11, 50, 53), + /* 0x3C9 */ SCHEDULE_CMD_RET_TIME(11, 25, 11, 30, 36), + /* 0x3CF */ SCHEDULE_CMD_RET_TIME(11, 0, 11, 25, 52), + /* 0x3D5 */ SCHEDULE_CMD_RET_TIME( 6, 0, 11, 0, 22), + /* 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), + /* 0x3E5 */ SCHEDULE_CMD_RET_NONE(), + /* 0x3E6 */ SCHEDULE_CMD_RET_TIME(18, 0, 6, 0, 12), + /* 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), + /* 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), + /* 0x41B */ SCHEDULE_CMD_RET_NONE(), + /* 0x41C */ SCHEDULE_CMD_RET_TIME( 5, 0, 6, 0, 1), + /* 0x422 */ SCHEDULE_CMD_RET_TIME(18, 0, 5, 0, 1), + /* 0x428 */ SCHEDULE_CMD_RET_TIME(11, 50, 12, 0, 39), + /* 0x42E */ SCHEDULE_CMD_RET_TIME(11, 30, 11, 50, 53), + /* 0x434 */ SCHEDULE_CMD_RET_TIME(11, 25, 11, 30, 36), + /* 0x43A */ SCHEDULE_CMD_RET_TIME(11, 0, 11, 25, 52), + /* 0x440 */ SCHEDULE_CMD_RET_TIME( 6, 0, 11, 0, 22), + /* 0x446 */ SCHEDULE_CMD_RET_NONE(), + /* 0x447 */ SCHEDULE_CMD_RET_NONE(), +}; + +s32 D_80B58618[0x40] = { + -1, + 0xA, + -1, + 0, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + -1, + 0, + -1, + 0xA, + 0xA, + 0xA, + 0xB, + -1, + 4, + 0x16, + 0xF, + -1, + -1, + 3, + 6, + 8, + 9, + 0xD, + 0xE, + 0x10, + 0x12, + 0x13, + 0x15, + 0x17, + 0, + 5, + 0x19, + 0, + 1, + 2, + 4, + 5, + 7, + 0xA, + 0xB, + 0xC, + 0xF, + 0x11, + 0x14, + 0x16, + 0x18, + 1, + 2, + 0, + 1, + 3, + 4, + 0, + 1, + 2, + 3, +}; +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, +}; +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, +}; +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, +}; +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, +}; +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, +}; +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, +}; +s32 D_80B589FC[2] = { 0x0E28D62D, 0x10C10 }; +s32 D_80B58A04[8] = { + 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, +}; +s32 D_80B58ABC[2] = { 0x0E28D02D, 0x10C10 }; +s32 D_80B58AC4[9] = { + 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, +}; +s32 D_80B58B3C[0x10] = { + 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 }; +s32 D_80B58B90[3] = { 0x0E291B2D, 0x10C12, 0x10000000 }; + ActorInit En_An_InitVars = { ACTOR_EN_AN, ACTORCAT_NPC, @@ -50,7 +602,70 @@ static ColliderCylinderInit D_80B58BBC = { // sColChkInfoInit static CollisionCheckInfoInit2 D_80B58BE8 = { 0, 0, 0, 0, MASS_IMMOVABLE }; -#endif + +AnimationInfoS D_80B58BF4[0x24] = { + { (AnimationHeader* )0x06013E1C, 1.0f, 0, -1, 0, 0 }, + { (AnimationHeader* )0x06008B6C, 1.0f, 0, -1, 0, 0 }, + { (AnimationHeader* )0x06008B6C, 1.0f, 0, -1, 0, -6 }, + { (AnimationHeader* )0x0600544C, 1.0f, 0, -1, 2, 0 }, + { (AnimationHeader* )0x0600544C, 1.0f, 0, -1, 2, -6 }, + { (AnimationHeader* )0x060026B4, 1.0f, 0, -1, 2, 0 }, + { (AnimationHeader* )0x06001E74, 1.0f, 0, -1, 2, 0 }, + { (AnimationHeader* )0x06013048, 1.0f, 0, -1, 0, 0 }, + { (AnimationHeader* )0x06013048, 1.0f, 0, -1, 0, 0 }, + { (AnimationHeader* )0x060071E8, 1.0f, 0, -1, 0, 0 }, + { (AnimationHeader* )0x060071E8, 1.0f, 0, -1, 0, -6 }, + { (AnimationHeader* )0x06007E08, 1.0f, 0, -1, 0, 0 }, + { (AnimationHeader* )0x060065C8, 1.0f, 0, -1, 0, 0 }, + { (AnimationHeader* )0x06001090, 1.0f, 0, -1, 2, 0 }, + { (AnimationHeader* )0x0600144C, 1.0f, 0, -1, 2, 0 }, + { (AnimationHeader* )0x0600341C, 1.0f, 0, -1, 0, 0 }, + { (AnimationHeader* )0x06003EA8, 1.0f, 0, -1, 0, 0 }, + { (AnimationHeader* )0x060028DC, 1.0f, 0, -1, 0, 0 }, + { (AnimationHeader* )0x060042CC, 1.0f, 0, -1, 0, 0 }, + { (AnimationHeader* )0x060038A0, 1.0f, 0, -1, 2, 0 }, + { (AnimationHeader* )0x06001B80, 1.0f, 0, -1, 0, 0 }, + { (AnimationHeader* )0x0600201C, 1.0f, 0, -1, 0, 0 }, + { (AnimationHeader* )0x06002A4C, 1.0f, 0, -1, 0, 0 }, + { (AnimationHeader* )0x060012C0, 1.0f, 0, -1, 0, 0 }, + { (AnimationHeader* )0x060038A0, -1.0f, 0, -1, 2, 0 }, + { (AnimationHeader* )0x06006CC0, 1.0f, 0, -1, 0, 0 }, + { (AnimationHeader* )0x06007E3C, 1.0f, 0, -1, 2, 0 }, + { (AnimationHeader* )0x060088C0, 1.0f, 0, -1, 0, 0 }, + { (AnimationHeader* )0x060013C8, 1.0f, 0, -1, 2, 0 }, + { (AnimationHeader* )0x06002550, 1.0f, 0, -1, 0, 0 }, + { (AnimationHeader* )0x0600353C, 1.0f, 0, -1, 2, 0 }, + { (AnimationHeader* )0x06004498, 1.0f, 0, -1, 0, 0 }, + { (AnimationHeader* )0x060060B4, 1.0f, 0, -1, 2, 0 }, + { (AnimationHeader* )0x0600041C, 1.0f, 0, -1, 2, 0 }, + { (AnimationHeader* )0x06004A78, 1.0f, 0, -1, 2, 0 }, + { (AnimationHeader* )0x0600506C, 1.0f, 0, -1, 0, 0 }, +}; +Vec3f D_80B58E34 = { 0.0f, 0.0f, 8.0f }; +s16 D_80B58E40[0xA] = { 0, 2, 0, 1, 2, 0, 1, 2, 1, 1 }; +Vec3f D_80B58E54 = { 190.0f, -130.0f, 0.0f }; +Vec3s D_80B58E60 = { 0, 0, 0x4168 }; +Vec3f D_80B58E68 = { 450.0f, 700.0f, -760.0f }; +Vec3s D_80B58E74 = { 0x238C, 0, -0x3FFC }; +Vec3f D_80B58E7C = { 905.0f, 260.0f, -64.0f }; +Vec3s D_80B58E88 = { 0, 0, 0 }; +Vec3f D_80B58E90 = { -508.0f, 210.0f, -162.0f }; +Vec3s D_80B58E9C = { 0, 0x3FFC, 0 }; +Vec3s D_80B58EA4 = { 0, -0x2AAD, 0 }; +s32 D_80B58EAC[0xA] = { 0, 0xB, 0x22, 0x19, 0x1A, 0x1C, 0x1E, 0x20, 0x21, 0 }; +Vec3f D_80B58ED4 = { 1000.0f, 0.0f, 0.0f }; +void* D_80B58EE0[3] = { (void* )0x0600E6E0, (void* )0x0600F7A0, (void* )0x060101A0 }; +void* D_80B58EEC[9] = { + (void* )0x0600E1E0, + (void* )0x0600EFA0, + (void* )0x0600F3A0, + (void* )0x0600EFA0, + (void* )0x0600FDA0, + (void* )0x0600F9A0, + (void* )0x060103A0, + NULL, + NULL, +}; extern ColliderCylinderInit D_80B58BBC; extern CollisionCheckInfoInit2 D_80B58BE8; @@ -2228,7 +2843,7 @@ void func_80B577F0(EnAn* this, PlayState* play) { this->actionFunc(this, play); } -extern u8 D_80B581D0[]; +extern u8 sScheduleScript[]; void func_80B578F8(EnAn* this, PlayState* play) { ScheduleOutput sp20; @@ -2245,7 +2860,7 @@ void func_80B578F8(EnAn* this, PlayState* play) { if (this->unk_200 != 0x19) { func_80B56D28(this, play, &sp20); } - } else if ((Schedule_RunScript(play, D_80B581D0, &sp20) == 0) || ((this->unk_200 != sp20.result) && (func_80B56D28(this, play, &sp20) == 0))) { + } else if ((Schedule_RunScript(play, sScheduleScript, &sp20) == 0) || ((this->unk_200 != sp20.result) && (func_80B56D28(this, play, &sp20) == 0))) { this->actor.shape.shadowDraw = NULL; this->actor.flags &= ~ACTOR_FLAG_TARGETABLE; sp20.result = 0; @@ -2284,8 +2899,8 @@ void func_80B57A44(EnAn* this, PlayState* play) { } } +extern s32 D_80B58EAC[]; #if 0 -//extern s32 D_80B58EAC[0xA]; void func_80B57B48(EnAn* this, PlayState* play) { s32 sp30[0xA]; diff --git a/tools/disasm/variables.txt b/tools/disasm/variables.txt index b1b5b726b..cde420f3f 100644 --- a/tools/disasm/variables.txt +++ b/tools/disasm/variables.txt @@ -14495,7 +14495,7 @@ 0x80B534A4:("D_80B534A4","f32","",0x4), 0x80B534A8:("D_80B534A8","f32","",0x4), 0x80B534AC:("D_80B534AC","f32","",0x4), - 0x80B581D0:("D_80B581D0","UNK_TYPE1","",0x1), + 0x80B581D0:("sScheduleScript","UNK_TYPE1","",0x1), 0x80B58618:("D_80B58618","UNK_TYPE1","",0x1), 0x80B58718:("D_80B58718","UNK_TYPE1","",0x1), 0x80B58784:("D_80B58784","UNK_TYPE1","",0x1),