diff --git a/include/enums.h b/include/enums.h index fbc737becd..6e1f8c7436 100644 --- a/include/enums.h +++ b/include/enums.h @@ -2183,380 +2183,380 @@ enum ItemTargetFlags { }; enum PlayerSprites { - SPR_Mario_1 = 0x1, - SPR_Mario_2 = 0x2, - SPR_Mario_3 = 0x3, - SPR_Mario_4 = 0x4, - SPR_Mario_5 = 0x5, - SPR_Mario_6 = 0x6, - SPR_Mario_7 = 0x7, - SPR_Mario_8 = 0x8, - SPR_Mario_9 = 0x9, - SPR_Peach_A = 0xA, - SPR_Peach_B = 0xB, - SPR_Peach_C = 0xC, - SPR_Peach_D = 0xD, + SPR_Mario1 = 0x1, + SPR_Mario1_Back = 0x2, + SPR_MarioB1 = 0x3, + SPR_MarioB2 = 0x4, + SPR_MarioB3 = 0x5, + SPR_MarioW1 = 0x6, + SPR_MarioW1_Back = 0x7, + SPR_MarioW2 = 0x8, + SPR_MarioW3 = 0x9, + SPR_Peach1 = 0xA, + SPR_Peach1_Back = 0xB, + SPR_Peach2 = 0xC, + SPR_Peach3 = 0xD, }; // TODO: extract player sprite + animations enum PlayerAnims { - ANIM_Mario_StandStill = 0x00010000, - ANIM_Mario_CrouchStill = 0x00010001, - ANIM_Mario_10002 = 0x00010002, - ANIM_Mario_AnimPanting = 0x00010003, - ANIM_Mario_Walking = 0x00010004, - ANIM_Mario_Running = 0x00010005, - ANIM_Mario_BeforeJump = 0x00010006, - ANIM_Mario_AnimMidairStill = 0x00010007, - ANIM_Mario_AnimMidair = 0x00010008, - ANIM_Mario_10009 = 0x00010009, - ANIM_Mario_1000A = 0x0001000A, - ANIM_Mario_1000B = 0x0001000B, - ANIM_Mario_1000C = 0x0001000C, - ANIM_Mario_1000D = 0x0001000D, - ANIM_Mario_StunnedStill = 0x0001000E, - ANIM_Mario_DeadStill = 0x0001000F, - ANIM_Mario_10010 = 0x00010010, - ANIM_Mario_Spinning = 0x00010011, - ANIM_Mario_Flailing = 0x00010012, - ANIM_Mario_SitStill = 0x00010013, - ANIM_Mario_Crouch = 0x00010014, - ANIM_Mario_StoneStill = 0x00010015, - ANIM_Mario_Throw = 0x00010016, - ANIM_Mario_FallBack = 0x00010017, - ANIM_Mario_FallDown = 0x00010018, - ANIM_Mario_Scared = 0x00010019, - ANIM_Mario_HurtFoot = 0x0001001A, - ANIM_Mario_RunPanic = 0x0001001B, - ANIM_Mario_Eat = 0x0001001C, - ANIM_Mario_StickOutTongue = 0x0001001D, - ANIM_Mario_AnimPlant = 0x0001001E, - ANIM_Mario_GotItem = 0x0001001F, - ANIM_Mario_ReadyJump = 0x00010020, - ANIM_Mario_Thinking = 0x00010021, - ANIM_Mario_LostBalance = 0x00010022, - ANIM_Mario_ShockStill = 0x00010023, - ANIM_Mario_10024 = 0x00010024, - ANIM_Mario_Drink = 0x00010025, - ANIM_Mario_Squish = 0x00010026, - ANIM_Mario_RunThinking = 0x00010027, - ANIM_Mario_Question = 0x00010028, - ANIM_Mario_NodYes = 0x00010029, - ANIM_Mario_1002A = 0x0001002A, - ANIM_Mario_1002B = 0x0001002B, - ANIM_Mario_AnimPray = 0x0001002C, - ANIM_Mario_1002D = 0x0001002D, - ANIM_Mario_1002E = 0x0001002E, - ANIM_Mario_Charred = 0x0001002F, - ANIM_Mario_GetUp = 0x00010030, - ANIM_Mario_DustOff = 0x00010031, - ANIM_Mario_ThumbsUp = 0x00010032, - ANIM_Mario_10033 = 0x00010033, - ANIM_Mario_30000 = 0x00030000, - ANIM_Mario_30001 = 0x00030001, - ANIM_Mario_30002 = 0x00030002, - ANIM_Mario_30003 = 0x00030003, - ANIM_Mario_30004 = 0x00030004, - ANIM_Mario_30005 = 0x00030005, - ANIM_Mario_30006 = 0x00030006, - ANIM_Mario_30007 = 0x00030007, - ANIM_Mario_30008 = 0x00030008, - ANIM_Mario_30009 = 0x00030009, - ANIM_Mario_3000A = 0x0003000A, - ANIM_Mario_3000B = 0x0003000B, - ANIM_Mario_3000C = 0x0003000C, - ANIM_Mario_3000D = 0x0003000D, - ANIM_Mario_3000E = 0x0003000E, - ANIM_Mario_3000F = 0x0003000F, - ANIM_Mario_30010 = 0x00030010, - ANIM_Mario_30011 = 0x00030011, - ANIM_Mario_30012 = 0x00030012, - ANIM_Mario_30013 = 0x00030013, - ANIM_Mario_30014 = 0x00030014, - ANIM_Mario_30015 = 0x00030015, - ANIM_Mario_30016 = 0x00030016, - ANIM_Mario_30017 = 0x00030017, - ANIM_Mario_30018 = 0x00030018, - ANIM_Mario_30019 = 0x00030019, - ANIM_Mario_3001A = 0x0003001A, - ANIM_Mario_3001B = 0x0003001B, - ANIM_Mario_3001C = 0x0003001C, - ANIM_Mario_3001D = 0x0003001D, - ANIM_Mario_3001E = 0x0003001E, - ANIM_Mario_3001F = 0x0003001F, - ANIM_Mario_30020 = 0x00030020, - ANIM_Mario_30021 = 0x00030021, - ANIM_Mario_40000 = 0x00040000, - ANIM_Mario_40001 = 0x00040001, - ANIM_Mario_40002 = 0x00040002, - ANIM_Mario_40003 = 0x00040003, - ANIM_Mario_40004 = 0x00040004, - ANIM_Mario_40005 = 0x00040005, - ANIM_Mario_40006 = 0x00040006, - ANIM_Mario_40007 = 0x00040007, - ANIM_Mario_40008 = 0x00040008, - ANIM_Mario_40009 = 0x00040009, - ANIM_Mario_4000A = 0x0004000A, - ANIM_Mario_4000B = 0x0004000B, - ANIM_Mario_4000C = 0x0004000C, - ANIM_Mario_4000D = 0x0004000D, - ANIM_Mario_4000E = 0x0004000E, - ANIM_Mario_4000F = 0x0004000F, - ANIM_Mario_40010 = 0x00040010, - ANIM_Mario_40011 = 0x00040011, - ANIM_Mario_40012 = 0x00040012, - ANIM_Mario_40013 = 0x00040013, - ANIM_Mario_40014 = 0x00040014, - ANIM_Mario_40015 = 0x00040015, - ANIM_Mario_40016 = 0x00040016, - ANIM_Mario_40017 = 0x00040017, - ANIM_Mario_40018 = 0x00040018, - ANIM_Mario_40019 = 0x00040019, - ANIM_Mario_4001A = 0x0004001A, - ANIM_Mario_4001B = 0x0004001B, - ANIM_Mario_4001C = 0x0004001C, - ANIM_Mario_4001D = 0x0004001D, - ANIM_Mario_4001E = 0x0004001E, - ANIM_Mario_4001F = 0x0004001F, - ANIM_Mario_40020 = 0x00040020, - ANIM_Mario_40021 = 0x00040021, - ANIM_Mario_40022 = 0x00040022, - ANIM_Mario_40023 = 0x00040023, - ANIM_Mario_40024 = 0x00040024, - ANIM_Mario_40025 = 0x00040025, - ANIM_Mario_40026 = 0x00040026, - ANIM_Mario_40027 = 0x00040027, - ANIM_Mario_40028 = 0x00040028, - ANIM_Mario_40029 = 0x00040029, - ANIM_Mario_4002A = 0x0004002A, - ANIM_Mario_4002B = 0x0004002B, - ANIM_Mario_50000 = 0x00050000, - ANIM_Mario_50001 = 0x00050001, - ANIM_Mario_50002 = 0x00050002, - ANIM_Mario_50003 = 0x00050003, - ANIM_Mario_50004 = 0x00050004, - ANIM_Mario_50005 = 0x00050005, - ANIM_Mario_50006 = 0x00050006, - ANIM_Mario_50007 = 0x00050007, - ANIM_Mario_50008 = 0x00050008, - ANIM_Mario_50009 = 0x00050009, - ANIM_Mario_60000 = 0x00060000, - ANIM_Mario_60001 = 0x00060001, - ANIM_Mario_60002 = 0x00060002, - ANIM_Mario_60003 = 0x00060003, - ANIM_Mario_60004 = 0x00060004, - ANIM_Mario_60005 = 0x00060005, - ANIM_Mario_60006 = 0x00060006, - ANIM_Mario_60007 = 0x00060007, - ANIM_Mario_60008 = 0x00060008, - ANIM_Mario_60009 = 0x00060009, - ANIM_Mario_6000A = 0x0006000A, - ANIM_Mario_6000B = 0x0006000B, - ANIM_Mario_6000C = 0x0006000C, - ANIM_Mario_6000D = 0x0006000D, - ANIM_Mario_6000E = 0x0006000E, - ANIM_Mario_6000F = 0x0006000F, - ANIM_Mario_60010 = 0x00060010, - ANIM_Mario_60011 = 0x00060011, - ANIM_Mario_60012 = 0x00060012, - ANIM_Mario_60013 = 0x00060013, - ANIM_Mario_60014 = 0x00060014, - ANIM_Mario_60015 = 0x00060015, - ANIM_Mario_60016 = 0x00060016, - ANIM_Mario_60017 = 0x00060017, - ANIM_Mario_60018 = 0x00060018, - ANIM_Mario_60019 = 0x00060019, - ANIM_Mario_6001A = 0x0006001A, - ANIM_Mario_6001B = 0x0006001B, - ANIM_Mario_6001C = 0x0006001C, - ANIM_Mario_80000 = 0x00080000, - ANIM_Mario_80001 = 0x00080001, - ANIM_Mario_80002 = 0x00080002, - ANIM_Mario_80003 = 0x00080003, - ANIM_Mario_80004 = 0x00080004, - ANIM_Mario_80005 = 0x00080005, - ANIM_Mario_80006 = 0x00080006, - ANIM_Mario_80007 = 0x00080007, - ANIM_Mario_80008 = 0x00080008, - ANIM_Mario_80009 = 0x00080009, - ANIM_Mario_8000A = 0x0008000A, - ANIM_Mario_8000B = 0x0008000B, - ANIM_Mario_8000C = 0x0008000C, - ANIM_Mario_8000D = 0x0008000D, - ANIM_Mario_8000E = 0x0008000E, - ANIM_Mario_8000F = 0x0008000F, - ANIM_Mario_80010 = 0x00080010, - ANIM_Mario_80011 = 0x00080011, - ANIM_Mario_80012 = 0x00080012, - ANIM_Mario_80013 = 0x00080013, - ANIM_Mario_80014 = 0x00080014, - ANIM_Mario_80015 = 0x00080015, - ANIM_Mario_80016 = 0x00080016, - ANIM_Mario_80017 = 0x00080017, - ANIM_Mario_80018 = 0x00080018, - ANIM_Mario_80019 = 0x00080019, - ANIM_Mario_8001A = 0x0008001A, - ANIM_Mario_8001B = 0x0008001B, - ANIM_Mario_8001C = 0x0008001C, - ANIM_Mario_8001D = 0x0008001D, - ANIM_Mario_8001E = 0x0008001E, - ANIM_Mario_8001F = 0x0008001F, - ANIM_Mario_80020 = 0x00080020, - ANIM_Mario_80021 = 0x00080021, - ANIM_Mario_80022 = 0x00080022, - ANIM_Mario_80023 = 0x00080023, - ANIM_Mario_80024 = 0x00080024, - ANIM_Mario_80025 = 0x00080025, - ANIM_Mario_80026 = 0x00080026, - ANIM_Mario_80027 = 0x00080027, - ANIM_Mario_90000 = 0x00090000, - ANIM_Mario_90001 = 0x00090001, - ANIM_Mario_90002 = 0x00090002, - ANIM_Mario_90003 = 0x00090003, - ANIM_Mario_90004 = 0x00090004, - ANIM_Mario_90005 = 0x00090005, - ANIM_Peach_A0000 = 0x000A0000, - ANIM_Peach_A0001 = 0x000A0001, - ANIM_Peach_A0002 = 0x000A0002, - ANIM_Peach_A0003 = 0x000A0003, - ANIM_Peach_A0004 = 0x000A0004, - ANIM_Peach_A0005 = 0x000A0005, - ANIM_Peach_A0006 = 0x000A0006, - ANIM_Peach_A0007 = 0x000A0007, - ANIM_Peach_A0008 = 0x000A0008, - ANIM_Peach_A0009 = 0x000A0009, - ANIM_Peach_A000A = 0x000A000A, - ANIM_Peach_A000B = 0x000A000B, - ANIM_Peach_A000C = 0x000A000C, - ANIM_Peach_A000D = 0x000A000D, - ANIM_Peach_A000E = 0x000A000E, - ANIM_Peach_A000F = 0x000A000F, - ANIM_Peach_A0010 = 0x000A0010, - ANIM_Peach_A0011 = 0x000A0011, - ANIM_Peach_A0012 = 0x000A0012, - ANIM_Peach_A0013 = 0x000A0013, - ANIM_Peach_A0014 = 0x000A0014, - ANIM_Peach_A0015 = 0x000A0015, - ANIM_Peach_A0016 = 0x000A0016, - ANIM_Peach_A0017 = 0x000A0017, - ANIM_Peach_A0018 = 0x000A0018, - ANIM_Peach_A0019 = 0x000A0019, - ANIM_Peach_A001A = 0x000A001A, - ANIM_Peach_A001B = 0x000A001B, - ANIM_Peach_A001C = 0x000A001C, - ANIM_Peach_A001D = 0x000A001D, - ANIM_Peach_A001E = 0x000A001E, - ANIM_Peach_A001F = 0x000A001F, - ANIM_Peach_A0020 = 0x000A0020, - ANIM_Peach_A0021 = 0x000A0021, - ANIM_Peach_A0022 = 0x000A0022, - ANIM_Peach_A0023 = 0x000A0023, - ANIM_Peach_A0024 = 0x000A0024, - ANIM_Peach_A0025 = 0x000A0025, - ANIM_Peach_A0026 = 0x000A0026, - ANIM_Peach_A0027 = 0x000A0027, - ANIM_Peach_A0028 = 0x000A0028, - ANIM_Peach_A0029 = 0x000A0029, - ANIM_Peach_A002A = 0x000A002A, - ANIM_Peach_A002B = 0x000A002B, - ANIM_Peach_A002C = 0x000A002C, - ANIM_Peach_A002D = 0x000A002D, - ANIM_Peach_A002E = 0x000A002E, - ANIM_Peach_A002F = 0x000A002F, - ANIM_Peach_A0030 = 0x000A0030, - ANIM_Peach_A0031 = 0x000A0031, - ANIM_Peach_A0032 = 0x000A0032, - ANIM_Peach_A0033 = 0x000A0033, - ANIM_Peach_A0034 = 0x000A0034, - ANIM_Peach_A0035 = 0x000A0035, - ANIM_Peach_A0036 = 0x000A0036, - ANIM_Peach_A0037 = 0x000A0037, - ANIM_Peach_A0038 = 0x000A0038, - ANIM_Peach_A0039 = 0x000A0039, - ANIM_Peach_A003A = 0x000A003A, - ANIM_Peach_A003B = 0x000A003B, - ANIM_Peach_A003C = 0x000A003C, - ANIM_Peach_A003D = 0x000A003D, - ANIM_Peach_A003E = 0x000A003E, - ANIM_Peach_A003F = 0x000A003F, - ANIM_Peach_A0040 = 0x000A0040, - ANIM_Peach_A0041 = 0x000A0041, - ANIM_Peach_A0042 = 0x000A0042, - ANIM_Peach_A0043 = 0x000A0043, - ANIM_Peach_A0044 = 0x000A0044, - ANIM_Peach_A0045 = 0x000A0045, - ANIM_Peach_A0046 = 0x000A0046, - ANIM_Peach_A0047 = 0x000A0047, - ANIM_Peach_A0048 = 0x000A0048, - ANIM_Peach_A0049 = 0x000A0049, - ANIM_Peach_A004A = 0x000A004A, - ANIM_Peach_A004B = 0x000A004B, - ANIM_Peach_A004C = 0x000A004C, - ANIM_Peach_A004D = 0x000A004D, - ANIM_Peach_A004E = 0x000A004E, - ANIM_Peach_C0000 = 0x000C0000, - ANIM_Peach_C0001 = 0x000C0001, - ANIM_Peach_C0002 = 0x000C0002, - ANIM_Peach_C0003 = 0x000C0003, - ANIM_Peach_C0004 = 0x000C0004, - ANIM_Peach_C0005 = 0x000C0005, - ANIM_Peach_C0006 = 0x000C0006, - ANIM_Peach_C0007 = 0x000C0007, - ANIM_Peach_C0008 = 0x000C0008, - ANIM_Peach_C0009 = 0x000C0009, - ANIM_Peach_C000A = 0x000C000A, - ANIM_Peach_C000B = 0x000C000B, - ANIM_Peach_C000C = 0x000C000C, - ANIM_Peach_C000D = 0x000C000D, - ANIM_Peach_C000E = 0x000C000E, - ANIM_Peach_C000F = 0x000C000F, - ANIM_Peach_C0010 = 0x000C0010, - ANIM_Peach_C0011 = 0x000C0011, - ANIM_Peach_C0012 = 0x000C0012, - ANIM_Peach_C0013 = 0x000C0013, - ANIM_Peach_C0014 = 0x000C0014, - ANIM_Peach_C0015 = 0x000C0015, - ANIM_Peach_C0016 = 0x000C0016, - ANIM_Peach_C0017 = 0x000C0017, - ANIM_Peach_C0018 = 0x000C0018, - ANIM_Peach_C0019 = 0x000C0019, - ANIM_Peach_C001A = 0x000C001A, - ANIM_Peach_C001B = 0x000C001B, - ANIM_Peach_C001C = 0x000C001C, - ANIM_Peach_C001D = 0x000C001D, - ANIM_Peach_C001E = 0x000C001E, - ANIM_Peach_C001F = 0x000C001F, - ANIM_Peach_C0020 = 0x000C0020, - ANIM_Peach_C0021 = 0x000C0021, - ANIM_Peach_C0022 = 0x000C0022, - ANIM_Peach_C0023 = 0x000C0023, - ANIM_Peach_C0024 = 0x000C0024, - ANIM_Peach_C0025 = 0x000C0025, - ANIM_Peach_C0026 = 0x000C0026, - ANIM_Peach_C0027 = 0x000C0027, - ANIM_Peach_C0028 = 0x000C0028, - ANIM_Peach_D0000 = 0x000D0000, - ANIM_Peach_D0001 = 0x000D0001, - ANIM_Peach_D0002 = 0x000D0002, - ANIM_Peach_D0003 = 0x000D0003, - ANIM_Peach_D0004 = 0x000D0004, - ANIM_Peach_D0005 = 0x000D0005, - ANIM_Peach_D0006 = 0x000D0006, - ANIM_Peach_D0007 = 0x000D0007, - ANIM_Peach_D0008 = 0x000D0008, - ANIM_Peach_D0009 = 0x000D0009, - ANIM_Peach_D000A = 0x000D000A, - ANIM_Peach_D000B = 0x000D000B, - ANIM_Peach_D000C = 0x000D000C, - ANIM_Peach_D000D = 0x000D000D, - ANIM_Peach_D000E = 0x000D000E, - ANIM_Peach_D000F = 0x000D000F, - ANIM_Peach_D0010 = 0x000D0010, - ANIM_Peach_D0011 = 0x000D0011, - ANIM_Peach_D0012 = 0x000D0012, - ANIM_Peach_D0013 = 0x000D0013, - ANIM_Peach_D0014 = 0x000D0014, - ANIM_Peach_D0015 = 0x000D0015, + ANIM_Mario1_Still = 0x00010000, + ANIM_Mario1_TiredStill = 0x00010001, + ANIM_Mario1_Idle = 0x00010002, + ANIM_Mario1_TiredIdle = 0x00010003, + ANIM_Mario1_Walk = 0x00010004, + ANIM_Mario1_Run = 0x00010005, + ANIM_Mario1_BeforeJump = 0x00010006, + ANIM_Mario1_Jump = 0x00010007, + ANIM_Mario1_Fall = 0x00010008, + ANIM_Mario1_Land = 0x00010009, + ANIM_Mario1_Sit = 0x0001000A, + ANIM_Mario1_SpinJump = 0x0001000B, + ANIM_Mario1_SpinFall = 0x0001000C, + ANIM_Mario1_SpinLand = 0x0001000D, + ANIM_Mario1_Frozen = 0x0001000E, + ANIM_Mario1_Fallen = 0x0001000F, + ANIM_Mario1_Spin = 0x00010010, + ANIM_Mario1_SpeedySpin = 0x00010011, + ANIM_Mario1_SpinAttack = 0x00010012, + ANIM_Mario1_SitUnused = 0x00010013, + ANIM_Mario1_Crouch = 0x00010014, + ANIM_Mario1_CrouchBurnt = 0x00010015, + ANIM_Mario1_Throw = 0x00010016, + ANIM_Mario1_Hurt = 0x00010017, + ANIM_Mario1_FallDown = 0x00010018, + ANIM_Mario1_TouchedFire = 0x00010019, + ANIM_Mario1_HurtFoot = 0x0001001A, + ANIM_Mario1_PanicRun = 0x0001001B, + ANIM_Mario1_Eat = 0x0001001C, + ANIM_Mario1_StickOutTongue = 0x0001001D, + ANIM_Mario1_PlantFireFlower = 0x0001001E, + ANIM_Mario1_UsePower = 0x0001001F, + ANIM_Mario1_FightingStance = 0x00010020, + ANIM_Mario1_Thinking = 0x00010021, + ANIM_Mario1_Dizzy = 0x00010022, + ANIM_Mario1_VacantStare = 0x00010023, + ANIM_Mario1_GetItem = 0x00010024, + ANIM_Mario1_Drink = 0x00010025, + ANIM_Mario1_Squish = 0x00010026, + ANIM_Mario1_ThinkingRun = 0x00010027, + ANIM_Mario1_Question = 0x00010028, + ANIM_Mario1_NodYes = 0x00010029, + ANIM_Mario1_LookUp = 0x0001002A, + ANIM_Mario1_Flail = 0x0001002B, + ANIM_Mario1_Pray = 0x0001002C, + ANIM_Mario1_Chuckle = 0x0001002D, + ANIM_Mario1_FallBack = 0x0001002E, + ANIM_Mario1_Burnt = 0x0001002F, + ANIM_Mario1_GetUp = 0x00010030, + ANIM_Mario1_DustOff = 0x00010031, + ANIM_Mario1_ThumbsUp = 0x00010032, + ANIM_Mario1_TossItem = 0x00010033, + ANIM_MarioB1_Stomp = 0x00030000, + ANIM_MarioB1_Trip = 0x00030001, + ANIM_MarioB1_Dying = 0x00030002, + ANIM_MarioB1_SleepStill = 0x00030003, + ANIM_MarioB1_Sleep = 0x00030004, + ANIM_MarioB1_SickStill = 0x00030005, + ANIM_MarioB1_Sick = 0x00030006, + ANIM_MarioB1_ReadyToDrink = 0x00030007, + ANIM_MarioB1_ApplyCream = 0x00030008, + ANIM_MarioB1_AdjustCap = 0x00030009, + ANIM_MarioB1_FingerWag = 0x0003000A, + ANIM_MarioB1_JumpForJoy = 0x0003000B, + ANIM_MarioB1_Leeching = 0x0003000C, + ANIM_MarioB1_Smash1_Begin = 0x0003000D, + ANIM_MarioB1_Smash1_PullBack = 0x0003000E, + ANIM_MarioB1_Smash1_Hold1 = 0x0003000F, + ANIM_MarioB1_Smash1_Hold2 = 0x00030010, + ANIM_MarioB1_Smash1_PreSwing = 0x00030011, + ANIM_MarioB1_Smash1_Swing = 0x00030012, + ANIM_MarioB1_Smash1_Spin = 0x00030013, + ANIM_MarioB1_Smash2_Begin = 0x00030014, + ANIM_MarioB1_Smash2_PullBack = 0x00030015, + ANIM_MarioB1_Smash2_Hold1 = 0x00030016, + ANIM_MarioB1_Smash2_Hold2 = 0x00030017, + ANIM_MarioB1_Smash2_PreSwing = 0x00030018, + ANIM_MarioB1_Smash2_Swing = 0x00030019, + ANIM_MarioB1_Smash2_Spin = 0x0003001A, + ANIM_MarioB1_Smash3_Begin = 0x0003001B, + ANIM_MarioB1_Smash3_PullBack = 0x0003001C, + ANIM_MarioB1_Smash3_Hold1 = 0x0003001D, + ANIM_MarioB1_Smash3_Hold2 = 0x0003001E, + ANIM_MarioB1_Smash3_PreSwing = 0x0003001F, + ANIM_MarioB1_Smash3_Swing = 0x00030020, + ANIM_MarioB1_Smash3_Spin = 0x00030021, + ANIM_MarioB2_SpinSmash1_Begin = 0x00040000, + ANIM_MarioB2_SpinSmash1_Raise = 0x00040001, + ANIM_MarioB2_SpinSmash1_Hold1 = 0x00040002, + ANIM_MarioB2_SpinSmash1_Hold2 = 0x00040003, + ANIM_MarioB2_SpinSmash1_PreSwing = 0x00040004, + ANIM_MarioB2_SpinSmash1_Swing = 0x00040005, + ANIM_MarioB2_SpinSmash2_Begin = 0x00040006, + ANIM_MarioB2_SpinSmash2_Raise = 0x00040007, + ANIM_MarioB2_SpinSmash2_Hold1 = 0x00040008, + ANIM_MarioB2_SpinSmash2_Hold2 = 0x00040009, + ANIM_MarioB2_SpinSmash2_PreSwing = 0x0004000A, + ANIM_MarioB2_SpinSmash2_Swing = 0x0004000B, + ANIM_MarioB2_SpinSmash3_Begin = 0x0004000C, + ANIM_MarioB2_SpinSmash3_Raise = 0x0004000D, + ANIM_MarioB2_SpinSmash3_Hold1 = 0x0004000E, + ANIM_MarioB2_SpinSmash3_Hold2 = 0x0004000F, + ANIM_MarioB2_SpinSmash3_PreSwing = 0x00040010, + ANIM_MarioB2_SpinSmash3_Swing = 0x00040011, + ANIM_MarioB2_Hammer1 = 0x00040012, + ANIM_MarioB2_Hammer2 = 0x00040013, + ANIM_MarioB2_Hammer3 = 0x00040014, + ANIM_MarioB2_DustyHammer = 0x00040015, + ANIM_MarioB2_HammerThrow1_Begin = 0x00040016, + ANIM_MarioB2_HammerThrow1_Raise = 0x00040017, + ANIM_MarioB2_HammerThrow1_Hold1 = 0x00040018, + ANIM_MarioB2_HammerThrow1_Hold2 = 0x00040019, + ANIM_MarioB2_HammerThrow1_PreThrow = 0x0004001A, + ANIM_MarioB2_HammerThrow1_Throw = 0x0004001B, + ANIM_MarioB2_HammerThrow2_Begin = 0x0004001C, + ANIM_MarioB2_HammerThrow2_Raise = 0x0004001D, + ANIM_MarioB2_HammerThrow2_Hold1 = 0x0004001E, + ANIM_MarioB2_HammerThrow2_Hold2 = 0x0004001F, + ANIM_MarioB2_HammerThrow2_PreThrow = 0x00040020, + ANIM_MarioB2_HammerThrow2_Throw = 0x00040021, + ANIM_MarioB2_HammerThrow3_Begin = 0x00040022, + ANIM_MarioB2_HammerThrow3_Raise = 0x00040023, + ANIM_MarioB2_HammerThrow3_Hold1 = 0x00040024, + ANIM_MarioB2_HammerThrow3_Hold2 = 0x00040025, + ANIM_MarioB2_HammerThrow3_PreThrow = 0x00040026, + ANIM_MarioB2_HammerThrow3_Throw = 0x00040027, + ANIM_MarioB2_BerserkIdle = 0x00040028, + ANIM_MarioB2_BerserkStill = 0x00040029, + ANIM_MarioB2_Inert = 0x0004002A, + ANIM_MarioB2_InertTired = 0x0004002B, + ANIM_MarioB3_Hustled = 0x00050000, + ANIM_MarioB3_Petrified = 0x00050001, + ANIM_MarioB3_StoneBurnt = 0x00050002, + ANIM_MarioB3_BurnHurt = 0x00050003, + ANIM_MarioB3_Hammer1_Charging = 0x00050004, + ANIM_MarioB3_Hammer1_Charged = 0x00050005, + ANIM_MarioB3_Hammer2_Charging = 0x00050006, + ANIM_MarioB3_Hammer2_Charged = 0x00050007, + ANIM_MarioB3_Hammer3_Charging = 0x00050008, + ANIM_MarioB3_Hammer3_Charged = 0x00050009, + ANIM_MarioW1_Carry = 0x00060000, + ANIM_MarioW1_CarryAbove = 0x00060001, + ANIM_MarioW1_CarryRun = 0x00060002, + ANIM_MarioW1_CarryAboveRun = 0x00060003, + ANIM_MarioW1_PushToward = 0x00060004, + ANIM_MarioW1_TakeItem = 0x00060005, + ANIM_MarioW1_PlaceItem = 0x00060006, + ANIM_MarioW1_PlaceRecord = 0x00060007, + ANIM_MarioW1_TakeItemSquashed = 0x00060008, + ANIM_MarioW1_JumpWatt = 0x00060009, + ANIM_MarioW1_FallWatt = 0x0006000A, + ANIM_MarioW1_LandWatt = 0x0006000B, + ANIM_MarioW1_Lift = 0x0006000C, + ANIM_MarioW1_Lift_Back = 0x0006000D, + ANIM_MarioW1_Toss = 0x0006000E, + ANIM_MarioW1_Toss_Back = 0x0006000F, + ANIM_MarioW1_Smash1_Miss = 0x00060010, + ANIM_MarioW1_Smash1_Miss_Back = 0x00060011, + ANIM_MarioW1_Smash1_Hit = 0x00060012, + ANIM_MarioW1_Smash1_Hit_Back = 0x00060013, + ANIM_MarioW1_Smash2_Miss = 0x00060014, + ANIM_MarioW1_Smash2_Miss_Back = 0x00060015, + ANIM_MarioW1_Smash2_Hit = 0x00060016, + ANIM_MarioW1_Smash2_Hit_Back = 0x00060017, + ANIM_MarioW1_Smash3_Miss = 0x00060018, + ANIM_MarioW1_Smash3_Miss_Back = 0x00060019, + ANIM_MarioW1_Smash3_Hit = 0x0006001A, + ANIM_MarioW1_Smash3_Hit_Back = 0x0006001B, + ANIM_MarioW1_PunchAir_Back = 0x0006001C, + ANIM_MarioW2_Carried = 0x00080000, + ANIM_MarioW2_FallenPivotable = 0x00080001, + ANIM_MarioW2_TouchedLava = 0x00080002, + ANIM_MarioW2_Collapse = 0x00080003, + ANIM_MarioW2_PraiseTheSun = 0x00080004, + ANIM_MarioW2_HangSwingingLegs = 0x00080005, + ANIM_MarioW2_Hang = 0x00080006, + ANIM_MarioW2_SpeakUp = 0x00080007, + ANIM_MarioW2_IdleYawning = 0x00080008, + ANIM_MarioW2_LayingDown = 0x00080009, + ANIM_MarioW2_Shocked = 0x0008000A, + ANIM_MarioW2_PleaseComeBack = 0x0008000B, + ANIM_MarioW2_LookClosely = 0x0008000C, + ANIM_MarioW2_HoldOnto = 0x0008000D, + ANIM_MarioW2_RideLaki = 0x0008000E, + ANIM_MarioW2_RideSushie = 0x0008000F, + ANIM_MarioW2_DiveSushie = 0x00080010, + ANIM_MarioW2_TouchNose = 0x00080011, + ANIM_MarioW2_PanicHoverStill = 0x00080012, + ANIM_MarioW2_PanicHover = 0x00080013, + ANIM_MarioW2_Jump = 0x00080014, + ANIM_MarioW2_JumpHitHead = 0x00080015, + ANIM_MarioW2_Surprise = 0x00080016, + ANIM_MarioW2_Flail = 0x00080017, + ANIM_MarioW2_PanicStill = 0x00080018, + ANIM_MarioW2_Panic = 0x00080019, + ANIM_MarioW2_Thrown = 0x0008001A, + ANIM_MarioW2_DeepExhale = 0x0008001B, + ANIM_MarioW2_NodYesTwice = 0x0008001C, + ANIM_MarioW2_SleepStanding = 0x0008001D, + ANIM_MarioW2_JoltAwake = 0x0008001E, + ANIM_MarioW2_FlailArms = 0x0008001F, + ANIM_MarioW2_PushSide = 0x00080020, + ANIM_MarioW2_LookUpWalk = 0x00080021, + ANIM_MarioW2_LookAround = 0x00080022, + ANIM_MarioW2_SitStill = 0x00080023, + ANIM_MarioW2_SitIdle = 0x00080024, + ANIM_MarioW2_SitNodYes = 0x00080025, + ANIM_MarioW2_HoldLetter = 0x00080026, + ANIM_MarioW2_ReadLetter = 0x00080027, + ANIM_MarioW3_ShakeHead = 0x00090000, + ANIM_MarioW3_ShakeHeadHard = 0x00090001, + ANIM_MarioW3_8bit_Still = 0x00090002, + ANIM_MarioW3_8bit_Run = 0x00090003, + ANIM_MarioW3_8bit_TurnAround = 0x00090004, + ANIM_MarioW3_8bit_Jump = 0x00090005, + ANIM_Peach_A0000 = 0x000A0000, + ANIM_Peach_A0001 = 0x000A0001, + ANIM_Peach_A0002 = 0x000A0002, + ANIM_Peach_A0003 = 0x000A0003, + ANIM_Peach_A0004 = 0x000A0004, + ANIM_Peach_A0005 = 0x000A0005, + ANIM_Peach_A0006 = 0x000A0006, + ANIM_Peach_A0007 = 0x000A0007, + ANIM_Peach_A0008 = 0x000A0008, + ANIM_Peach_A0009 = 0x000A0009, + ANIM_Peach_A000A = 0x000A000A, + ANIM_Peach_A000B = 0x000A000B, + ANIM_Peach_A000C = 0x000A000C, + ANIM_Peach_A000D = 0x000A000D, + ANIM_Peach_A000E = 0x000A000E, + ANIM_Peach_A000F = 0x000A000F, + ANIM_Peach_A0010 = 0x000A0010, + ANIM_Peach_A0011 = 0x000A0011, + ANIM_Peach_A0012 = 0x000A0012, + ANIM_Peach_A0013 = 0x000A0013, + ANIM_Peach_A0014 = 0x000A0014, + ANIM_Peach_A0015 = 0x000A0015, + ANIM_Peach_A0016 = 0x000A0016, + ANIM_Peach_A0017 = 0x000A0017, + ANIM_Peach_A0018 = 0x000A0018, + ANIM_Peach_A0019 = 0x000A0019, + ANIM_Peach_A001A = 0x000A001A, + ANIM_Peach_A001B = 0x000A001B, + ANIM_Peach_A001C = 0x000A001C, + ANIM_Peach_A001D = 0x000A001D, + ANIM_Peach_A001E = 0x000A001E, + ANIM_Peach_A001F = 0x000A001F, + ANIM_Peach_A0020 = 0x000A0020, + ANIM_Peach_A0021 = 0x000A0021, + ANIM_Peach_A0022 = 0x000A0022, + ANIM_Peach_A0023 = 0x000A0023, + ANIM_Peach_A0024 = 0x000A0024, + ANIM_Peach_A0025 = 0x000A0025, + ANIM_Peach_A0026 = 0x000A0026, + ANIM_Peach_A0027 = 0x000A0027, + ANIM_Peach_A0028 = 0x000A0028, + ANIM_Peach_A0029 = 0x000A0029, + ANIM_Peach_A002A = 0x000A002A, + ANIM_Peach_A002B = 0x000A002B, + ANIM_Peach_A002C = 0x000A002C, + ANIM_Peach_A002D = 0x000A002D, + ANIM_Peach_A002E = 0x000A002E, + ANIM_Peach_A002F = 0x000A002F, + ANIM_Peach_A0030 = 0x000A0030, + ANIM_Peach_A0031 = 0x000A0031, + ANIM_Peach_A0032 = 0x000A0032, + ANIM_Peach_A0033 = 0x000A0033, + ANIM_Peach_A0034 = 0x000A0034, + ANIM_Peach_A0035 = 0x000A0035, + ANIM_Peach_A0036 = 0x000A0036, + ANIM_Peach_A0037 = 0x000A0037, + ANIM_Peach_A0038 = 0x000A0038, + ANIM_Peach_A0039 = 0x000A0039, + ANIM_Peach_A003A = 0x000A003A, + ANIM_Peach_A003B = 0x000A003B, + ANIM_Peach_A003C = 0x000A003C, + ANIM_Peach_A003D = 0x000A003D, + ANIM_Peach_A003E = 0x000A003E, + ANIM_Peach_A003F = 0x000A003F, + ANIM_Peach_A0040 = 0x000A0040, + ANIM_Peach_A0041 = 0x000A0041, + ANIM_Peach_A0042 = 0x000A0042, + ANIM_Peach_A0043 = 0x000A0043, + ANIM_Peach_A0044 = 0x000A0044, + ANIM_Peach_A0045 = 0x000A0045, + ANIM_Peach_A0046 = 0x000A0046, + ANIM_Peach_A0047 = 0x000A0047, + ANIM_Peach_A0048 = 0x000A0048, + ANIM_Peach_A0049 = 0x000A0049, + ANIM_Peach_A004A = 0x000A004A, + ANIM_Peach_A004B = 0x000A004B, + ANIM_Peach_A004C = 0x000A004C, + ANIM_Peach_A004D = 0x000A004D, + ANIM_Peach_A004E = 0x000A004E, + ANIM_Peach_C0000 = 0x000C0000, + ANIM_Peach_C0001 = 0x000C0001, + ANIM_Peach_C0002 = 0x000C0002, + ANIM_Peach_C0003 = 0x000C0003, + ANIM_Peach_C0004 = 0x000C0004, + ANIM_Peach_C0005 = 0x000C0005, + ANIM_Peach_C0006 = 0x000C0006, + ANIM_Peach_C0007 = 0x000C0007, + ANIM_Peach_C0008 = 0x000C0008, + ANIM_Peach_C0009 = 0x000C0009, + ANIM_Peach_C000A = 0x000C000A, + ANIM_Peach_C000B = 0x000C000B, + ANIM_Peach_C000C = 0x000C000C, + ANIM_Peach_C000D = 0x000C000D, + ANIM_Peach_C000E = 0x000C000E, + ANIM_Peach_C000F = 0x000C000F, + ANIM_Peach_C0010 = 0x000C0010, + ANIM_Peach_C0011 = 0x000C0011, + ANIM_Peach_C0012 = 0x000C0012, + ANIM_Peach_C0013 = 0x000C0013, + ANIM_Peach_C0014 = 0x000C0014, + ANIM_Peach_C0015 = 0x000C0015, + ANIM_Peach_C0016 = 0x000C0016, + ANIM_Peach_C0017 = 0x000C0017, + ANIM_Peach_C0018 = 0x000C0018, + ANIM_Peach_C0019 = 0x000C0019, + ANIM_Peach_C001A = 0x000C001A, + ANIM_Peach_C001B = 0x000C001B, + ANIM_Peach_C001C = 0x000C001C, + ANIM_Peach_C001D = 0x000C001D, + ANIM_Peach_C001E = 0x000C001E, + ANIM_Peach_C001F = 0x000C001F, + ANIM_Peach_C0020 = 0x000C0020, + ANIM_Peach_C0021 = 0x000C0021, + ANIM_Peach_C0022 = 0x000C0022, + ANIM_Peach_C0023 = 0x000C0023, + ANIM_Peach_C0024 = 0x000C0024, + ANIM_Peach_C0025 = 0x000C0025, + ANIM_Peach_C0026 = 0x000C0026, + ANIM_Peach_C0027 = 0x000C0027, + ANIM_Peach_C0028 = 0x000C0028, + ANIM_Peach_D0000 = 0x000D0000, + ANIM_Peach_D0001 = 0x000D0001, + ANIM_Peach_D0002 = 0x000D0002, + ANIM_Peach_D0003 = 0x000D0003, + ANIM_Peach_D0004 = 0x000D0004, + ANIM_Peach_D0005 = 0x000D0005, + ANIM_Peach_D0006 = 0x000D0006, + ANIM_Peach_D0007 = 0x000D0007, + ANIM_Peach_D0008 = 0x000D0008, + ANIM_Peach_D0009 = 0x000D0009, + ANIM_Peach_D000A = 0x000D000A, + ANIM_Peach_D000B = 0x000D000B, + ANIM_Peach_D000C = 0x000D000C, + ANIM_Peach_D000D = 0x000D000D, + ANIM_Peach_D000E = 0x000D000E, + ANIM_Peach_D000F = 0x000D000F, + ANIM_Peach_D0010 = 0x000D0010, + ANIM_Peach_D0011 = 0x000D0011, + ANIM_Peach_D0012 = 0x000D0012, + ANIM_Peach_D0013 = 0x000D0013, + ANIM_Peach_D0014 = 0x000D0014, + ANIM_Peach_D0015 = 0x000D0015, }; enum AmbientSounds { @@ -2677,7 +2677,7 @@ enum Phases { PHASE_EXECUTE_ACTION = 0, PHASE_FIRST_STRIKE = 1, PHASE_RUN_AWAY_START = 3, - PHASE_RUN_AWAY_RESET = 4, + PHASE_DEATH = 4, PHASE_CELEBRATE = 5, PHASE_USE_DEFEND = 6, PHASE_RUN_AWAY_FAIL = 7, @@ -2766,7 +2766,7 @@ enum Events { EVENT_BLOCK = 0x0000001A, EVENT_SPIKE_TAUNT = 0x0000001B, EVENT_BURN_TAUNT = 0x0000001C, - EVENT_1D = 0x0000001D, + EVENT_INVUNERABLE_TAUNT = 0x0000001D, EVENT_1E = 0x0000001E, EVENT_AIR_LIFT_FAILED = 0x0000001F, EVENT_DEATH = 0x00000020, @@ -3356,7 +3356,7 @@ enum DamageTypes { DAMAGE_TYPE_WATER = 0x00000004, DAMAGE_TYPE_ICE = 0x00000008, DAMAGE_TYPE_MAGIC = 0x00000010, - DAMAGE_TYPE_SHOCK = 0x00000020, + DAMAGE_TYPE_SHOCK = 0x00000020, DAMAGE_TYPE_SMASH = 0x00000040, DAMAGE_TYPE_JUMP = 0x00000080, DAMAGE_TYPE_COSMIC = 0x00000100, diff --git a/include/functions.h b/include/functions.h index fb5fa5e7df..4b340c92e7 100644 --- a/include/functions.h +++ b/include/functions.h @@ -623,8 +623,8 @@ s32 make_item_entity_at_player(s32 itemID, s32 arg1, s32 pickupMsgFlags); void set_action_state(s32 actionState); s32 get_collider_flags(s32 colliderID); -void suggest_player_anim_setUnkFlag(AnimID anim); -void suggest_player_anim_clearUnkFlag(AnimID anim); +void suggest_player_anim_always_forward(AnimID anim); +void suggest_player_anim_allow_backward(AnimID anim); void subtract_hp(s32 amt); void draw_status_ui(void); void open_status_menu_long(void); diff --git a/include/script_api/battle.h b/include/script_api/battle.h index 23d0816602..6dae92289e 100644 --- a/include/script_api/battle.h +++ b/include/script_api/battle.h @@ -332,7 +332,7 @@ extern EvtScript EVS_PlayerFirstStrike; extern EvtScript EVS_StartDefend; extern EvtScript EVS_RunAwayStart; extern EvtScript EVS_RunAwayFail; -extern EvtScript EVS_RunAwayReset; +extern EvtScript EVS_PlayerDies; extern EvtScript EVS_PlayEatFX; extern EvtScript EVS_PlayDrinkFX; extern EvtScript EVS_UseLifeShroom; diff --git a/src/16F740.c b/src/16F740.c index fffdc1412f..7fccfbfe71 100644 --- a/src/16F740.c +++ b/src/16F740.c @@ -2378,7 +2378,7 @@ void btl_state_update_defeat(void) { btl_cam_use_preset(BTL_CAM_PRESET_25); btl_cam_target_actor(ACTOR_PLAYER); - battleStatus->battlePhase = PHASE_RUN_AWAY_RESET; + battleStatus->battlePhase = PHASE_DEATH; script = start_script(&EVS_Mario_HandlePhase, EVT_PRIORITY_A, 0); player->takeTurnScript = script; player->takeTurnScriptID = script->id; diff --git a/src/17D6A0.c b/src/17D6A0.c index 7fd4e535c7..1b61fbf80b 100644 --- a/src/17D6A0.c +++ b/src/17D6A0.c @@ -26,40 +26,40 @@ extern ActorBlueprint battle_partner_twink; PlayerCelebrationAnimOptions D_80280FC0 = { 10, 90, { - 50, 196619, - 50, ANIM_Mario_1002D, + 50, ANIM_MarioB1_JumpForJoy, + 50, ANIM_Mario1_Chuckle, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 50, ANIM_Mario_DustOff, - 50, ANIM_Mario_DustOff, + 50, ANIM_Mario1_DustOff, + 50, ANIM_Mario1_DustOff, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 50, ANIM_Mario_ThumbsUp, - 50, ANIM_Mario_ThumbsUp, + 50, ANIM_Mario1_ThumbsUp, + 50, ANIM_Mario1_ThumbsUp, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 50, ANIM_Mario_3000A, - 50, ANIM_Mario_3000A, + 50, ANIM_MarioB1_FingerWag, + 50, ANIM_MarioB1_FingerWag, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 80, ANIM_Mario_3000A, - 20, ANIM_Mario_3000B, + 80, ANIM_MarioB1_FingerWag, + 20, ANIM_MarioB1_JumpForJoy, 0, 0, 0, 0, 0, 0, @@ -2211,71 +2211,71 @@ ActorOffsets bActorOffsets[ACTOR_TYPE_COUNT] = { }; u32 bMarioIdleAnims[] = { - STATUS_NORMAL, ANIM_Mario_Walking, - STATUS_DANGER, ANIM_Mario_AnimPanting, - STATUS_STONE, ANIM_Mario_50001, - STATUS_SLEEP, ANIM_Mario_30004, - STATUS_DIZZY, ANIM_Mario_30006, - STATUS_STOP, ANIM_Mario_StandStill, - STATUS_HUSTLE, ANIM_Mario_Running, - STATUS_BERSERK, ANIM_Mario_40028, - STATUS_PARALYZE, ANIM_Mario_30004, - STATUS_FROZEN, ANIM_Mario_StunnedStill, - STATUS_TRANSPARENT, ANIM_Mario_10002, - STATUS_TURN_DONE, ANIM_Mario_StandStill, - STATUS_13, ANIM_Mario_40029, - STATUS_14, ANIM_Mario_4002A, - STATUS_15, ANIM_Mario_30003, - STATUS_18, ANIM_Mario_30005, - STATUS_16, ANIM_Mario_CrouchStill, - STATUS_THINKING, ANIM_Mario_Thinking, - STATUS_WEARY, ANIM_Mario_1000D, + STATUS_NORMAL, ANIM_Mario1_Walk, + STATUS_DANGER, ANIM_Mario1_TiredIdle, + STATUS_STONE, ANIM_MarioB3_Petrified, + STATUS_SLEEP, ANIM_MarioB1_Sleep, + STATUS_DIZZY, ANIM_MarioB1_Sick, + STATUS_STOP, ANIM_Mario1_Still, + STATUS_HUSTLE, ANIM_Mario1_Run, + STATUS_BERSERK, ANIM_MarioB2_BerserkIdle, + STATUS_PARALYZE, ANIM_MarioB1_Sleep, + STATUS_FROZEN, ANIM_Mario1_Frozen, + STATUS_TRANSPARENT, ANIM_Mario1_Idle, + STATUS_TURN_DONE, ANIM_Mario1_Still, + STATUS_13, ANIM_MarioB2_BerserkStill, + STATUS_14, ANIM_MarioB2_Inert, + STATUS_15, ANIM_MarioB1_SleepStill, + STATUS_18, ANIM_MarioB1_SickStill, + STATUS_16, ANIM_Mario1_TiredStill, + STATUS_THINKING, ANIM_Mario1_Thinking, + STATUS_WEARY, ANIM_Mario1_SpinLand, STATUS_END }; s32 bMarioDefendAnims[] = { - STATUS_NORMAL, ANIM_Mario_Crouch, - STATUS_DANGER, ANIM_Mario_AnimPanting, - STATUS_STONE, ANIM_Mario_50001, - STATUS_SLEEP, ANIM_Mario_30004, - STATUS_DIZZY, ANIM_Mario_30006, - STATUS_STOP, ANIM_Mario_StandStill, - STATUS_HUSTLE, ANIM_Mario_Crouch, - STATUS_BERSERK, ANIM_Mario_Crouch, - STATUS_PARALYZE, ANIM_Mario_30004, - STATUS_FROZEN, ANIM_Mario_StunnedStill, - STATUS_TRANSPARENT, ANIM_Mario_10002, - STATUS_TURN_DONE, ANIM_Mario_StandStill, - STATUS_13, ANIM_Mario_40029, - STATUS_14, ANIM_Mario_4002A, - STATUS_15, ANIM_Mario_30003, - STATUS_18, ANIM_Mario_30005, - STATUS_16, ANIM_Mario_CrouchStill, - STATUS_THINKING, ANIM_Mario_Thinking, - STATUS_WEARY, ANIM_Mario_1000D, + STATUS_NORMAL, ANIM_Mario1_Crouch, + STATUS_DANGER, ANIM_Mario1_TiredIdle, + STATUS_STONE, ANIM_MarioB3_Petrified, + STATUS_SLEEP, ANIM_MarioB1_Sleep, + STATUS_DIZZY, ANIM_MarioB1_Sick, + STATUS_STOP, ANIM_Mario1_Still, + STATUS_HUSTLE, ANIM_Mario1_Crouch, + STATUS_BERSERK, ANIM_Mario1_Crouch, + STATUS_PARALYZE, ANIM_MarioB1_Sleep, + STATUS_FROZEN, ANIM_Mario1_Frozen, + STATUS_TRANSPARENT, ANIM_Mario1_Idle, + STATUS_TURN_DONE, ANIM_Mario1_Still, + STATUS_13, ANIM_MarioB2_BerserkStill, + STATUS_14, ANIM_MarioB2_Inert, + STATUS_15, ANIM_MarioB1_SleepStill, + STATUS_18, ANIM_MarioB1_SickStill, + STATUS_16, ANIM_Mario1_TiredStill, + STATUS_THINKING, ANIM_Mario1_Thinking, + STATUS_WEARY, ANIM_Mario1_SpinLand, STATUS_END }; s32 bMarioHideAnims[] = { - STATUS_NORMAL, ANIM_Mario_Crouch, - STATUS_DANGER, ANIM_Mario_AnimPanting, - STATUS_STONE, ANIM_Mario_50001, - STATUS_SLEEP, ANIM_Mario_30004, - STATUS_DIZZY, ANIM_Mario_30006, - STATUS_STOP, ANIM_Mario_StandStill, - STATUS_HUSTLE, ANIM_Mario_8000E, - STATUS_BERSERK, ANIM_Mario_8000E, - STATUS_PARALYZE, ANIM_Mario_30004, - STATUS_FROZEN, ANIM_Mario_StunnedStill, - STATUS_TRANSPARENT, ANIM_Mario_10002, - STATUS_TURN_DONE, ANIM_Mario_Crouch, - STATUS_13, ANIM_Mario_40029, - STATUS_14, ANIM_Mario_4002A, - STATUS_15, ANIM_Mario_30003, - STATUS_18, ANIM_Mario_30005, - STATUS_16, ANIM_Mario_CrouchStill, - STATUS_THINKING, ANIM_Mario_Thinking, - STATUS_WEARY, ANIM_Mario_1000D, + STATUS_NORMAL, ANIM_Mario1_Crouch, + STATUS_DANGER, ANIM_Mario1_TiredIdle, + STATUS_STONE, ANIM_MarioB3_Petrified, + STATUS_SLEEP, ANIM_MarioB1_Sleep, + STATUS_DIZZY, ANIM_MarioB1_Sick, + STATUS_STOP, ANIM_Mario1_Still, + STATUS_HUSTLE, ANIM_MarioW2_RideLaki, + STATUS_BERSERK, ANIM_MarioW2_RideLaki, + STATUS_PARALYZE, ANIM_MarioB1_Sleep, + STATUS_FROZEN, ANIM_Mario1_Frozen, + STATUS_TRANSPARENT, ANIM_Mario1_Idle, + STATUS_TURN_DONE, ANIM_Mario1_Crouch, + STATUS_13, ANIM_MarioB2_BerserkStill, + STATUS_14, ANIM_MarioB2_Inert, + STATUS_15, ANIM_MarioB1_SleepStill, + STATUS_18, ANIM_MarioB1_SickStill, + STATUS_16, ANIM_Mario1_TiredStill, + STATUS_THINKING, ANIM_Mario1_Thinking, + STATUS_WEARY, ANIM_Mario1_SpinLand, STATUS_END }; diff --git a/src/17FEB0.c b/src/17FEB0.c index 9af285c210..5a8b22c64e 100644 --- a/src/17FEB0.c +++ b/src/17FEB0.c @@ -231,7 +231,7 @@ HitResult calc_item_damage_enemy(void) { wasStatusInflicted = TRUE; } if (targetPart->eventFlags & ACTOR_EVENT_FLAG_80000) { - dispatchEvent = EVENT_1D; + dispatchEvent = EVENT_INVUNERABLE_TAUNT; } hitResult = HIT_RESULT_HIT; } diff --git a/src/18C790.c b/src/18C790.c index 214bfe0f28..407f6fbfd4 100644 --- a/src/18C790.c +++ b/src/18C790.c @@ -1050,7 +1050,7 @@ void btl_state_update_celebration(void) { break; } - set_animation(0, 0, ANIM_Mario_30009); + set_animation(0, 0, ANIM_MarioB1_AdjustCap); if (partner != NULL) { script = start_script(partner->takeTurnSource, EVT_PRIORITY_A, 0); @@ -1148,7 +1148,7 @@ void btl_state_update_celebration(void) { } bFadeToBlackAmt = 0; btl_cam_set_params(1, 270, 100, 8, 0, 0x2400, 0, 100); - set_animation(0, 0, ANIM_Mario_30009); + set_animation(0, 0, ANIM_MarioB1_AdjustCap); if (partner != NULL) { set_animation(ACTOR_PARTNER, 0, D_80284154[playerData->currentPartner]); } @@ -1161,7 +1161,7 @@ void btl_state_update_celebration(void) { if (CelebrateSubstateTime != 0) { CelebrateSubstateTime--; if (CelebrateSubstateTime == 0) { - set_animation(0, 0, ANIM_Mario_Walking); + set_animation(0, 0, ANIM_Mario1_Walk); } } else { player->yaw = 0.0f; diff --git a/src/18F340.c b/src/18F340.c index 9029738fbd..a32ce877ba 100644 --- a/src/18F340.c +++ b/src/18F340.c @@ -66,7 +66,7 @@ API_CALLABLE(ActivateDefend) { deduct_current_move_fp(); gBattleStatus.flags1 |= BS_FLAGS1_PLAYER_DEFENDING; actorPart->idleAnimations = bMarioDefendAnims; - set_animation(0, 0, ANIM_Mario_Crouch); + set_animation(0, 0, ANIM_Mario1_Crouch); return ApiStatus_DONE2; } @@ -668,32 +668,32 @@ EvtScript EVS_MarioEnterStage = { EVT_SWITCH(LVar0) EVT_CASE_GT(50) EVT_CALL(SetGoalToHome, ACTOR_SELF) - EVT_CALL(SetAnimation, ACTOR_SELF, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_SELF, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 25) - EVT_CALL(SetAnimation, ACTOR_SELF, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_SELF, 0, ANIM_Mario1_Idle) EVT_CASE_GT(20) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0)) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_BeforeJump) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_BeforeJump) EVT_CALL(func_80273444, 18, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_BeforeJump) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_BeforeJump) EVT_WAIT(7) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CASE_DEFAULT EVT_CALL(SetGoalToHome, ACTOR_SELF) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CHILD_THREAD EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) EVT_END_CHILD_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_162) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GetUp) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_GetUp) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_DustOff) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_DustOff) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_END_SWITCH EVT_RETURN EVT_END @@ -739,8 +739,8 @@ EvtScript EVS_Mario_HandlePhase = { EVT_EXEC_WAIT(EVS_RunAwayStart) EVT_CASE_EQ(PHASE_RUN_AWAY_FAIL) EVT_EXEC_WAIT(EVS_RunAwayFail) - EVT_CASE_EQ(PHASE_RUN_AWAY_RESET) - EVT_EXEC_WAIT(EVS_RunAwayReset) + EVT_CASE_EQ(PHASE_DEATH) + EVT_EXEC_WAIT(EVS_PlayerDies) EVT_CASE_EQ(PHASE_USE_LIFE_SHROOM) EVT_EXEC_WAIT(EVS_UseLifeShroom) EVT_CASE_EQ(PHASE_USE_DEFEND) @@ -848,10 +848,10 @@ EvtScript EVS_Player_HandleEvent = { EVT_SUB(LVar0, 60) EVT_ADD(LVar1, 40) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(0.1)) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_HurtFoot, ANIM_Mario_HurtFoot, ANIM_Mario_HurtFoot) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_HurtFoot, ANIM_Mario1_HurtFoot, ANIM_Mario1_HurtFoot) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_80273444, 5, 0, 1) - EVT_SET_CONST(LVar1, ANIM_Mario_HurtFoot) + EVT_SET_CONST(LVar1, ANIM_Mario1_HurtFoot) EVT_SET(LVar2, 0) EVT_EXEC_WAIT(D_802988F0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -880,7 +880,7 @@ EvtScript EVS_Player_HandleEvent = { EVT_SUB(LVar0, 60) EVT_ADD(LVar1, 40) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(0.1)) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_50003, ANIM_Mario_50003, ANIM_Mario_50003) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_MarioB3_BurnHurt, ANIM_MarioB3_BurnHurt, ANIM_MarioB3_BurnHurt) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_80273444, 5, 0, 1) EVT_CHILD_THREAD @@ -896,7 +896,7 @@ EvtScript EVS_Player_HandleEvent = { EVT_ADD(LVar7, 5) EVT_CALL(PlayEffect, EFFECT_RING_BLAST, 0, LVar5, LVar6, LVar7, EVT_FLOAT(1.5), 15, 0, 0, 0, 0, 0, 0, 0) EVT_END_CHILD_THREAD - EVT_SET_CONST(LVar1, ANIM_Mario_50003) + EVT_SET_CONST(LVar1, ANIM_MarioB3_BurnHurt) EVT_SET(LVar2, 0) EVT_EXEC_WAIT(D_802988F0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -925,11 +925,11 @@ EvtScript EVS_Player_HandleEvent = { EVT_SUB(LVar0, 60) EVT_ADD(LVar1, 40) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(0.1)) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_HurtFoot, ANIM_Mario_HurtFoot, ANIM_Mario_HurtFoot) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_HurtFoot, ANIM_Mario1_HurtFoot, ANIM_Mario1_HurtFoot) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_80273444, 5, 0, 1) EVT_CALL(ShowShockEffect, -127) - EVT_SET_CONST(LVar1, ANIM_Mario_HurtFoot) + EVT_SET_CONST(LVar1, ANIM_Mario1_HurtFoot) EVT_SET(LVar2, 0) EVT_EXEC_WAIT(D_802988F0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -953,82 +953,82 @@ EvtScript EVS_Player_HandleEvent = { EVT_CASE_EQ(EVENT_LUCKY) EVT_CALL(DoesMarioStatusPreventHappyAnimation) EVT_IF_EQ(LVar0, FALSE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30009) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_AdjustCap) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_ELSE EVT_WAIT(30) EVT_END_IF EVT_CASE_EQ(EVENT_RECOVER_STATUS) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.8)) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_10009) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_80273444, 15, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CASE_EQ(EVENT_32) EVT_WAIT(10) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.8)) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_10009) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_80273444, 15, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CASE_OR_EQ(EVENT_HIT_COMBO) EVT_CASE_OR_EQ(EVENT_HIT) - EVT_SET_CONST(LVar1, ANIM_Mario_FallBack) + EVT_SET_CONST(LVar1, ANIM_Mario1_Hurt) EVT_SET(LVar2, 0) EVT_EXEC_WAIT(D_80298724) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) EVT_CASE_OR_EQ(EVENT_IMMUNE) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208C) - EVT_SET_CONST(LVar1, ANIM_Mario_10002) + EVT_SET_CONST(LVar1, ANIM_Mario1_Idle) EVT_EXEC_WAIT(D_80298948) EVT_END_CASE_GROUP EVT_CASE_OR_EQ(EVENT_18) EVT_CASE_OR_EQ(EVENT_BLOCK) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208C) EVT_SET_CONST(LVar0, 1) - EVT_SET_CONST(LVar1, ANIM_Mario_Crouch) + EVT_SET_CONST(LVar1, ANIM_Mario1_Crouch) EVT_EXEC_WAIT(D_80298948) EVT_WAIT(10) EVT_END_CASE_GROUP EVT_CASE_EQ(EVENT_BURN_HIT) - EVT_SET_CONST(LVar1, ANIM_Mario_50003) + EVT_SET_CONST(LVar1, ANIM_MarioB3_BurnHurt) EVT_SET(LVar2, 0) EVT_EXEC_WAIT(D_802988F0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CASE_EQ(EVENT_FIRE_DEATH) - EVT_SET_CONST(LVar1, ANIM_Mario_50003) + EVT_SET_CONST(LVar1, ANIM_MarioB3_BurnHurt) EVT_SET(LVar2, 0) EVT_EXEC_WAIT(D_802988F0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_RETURN EVT_CASE_EQ(EVENT_DEATH) - EVT_SET_CONST(LVar1, ANIM_Mario_FallBack) + EVT_SET_CONST(LVar1, ANIM_Mario1_Hurt) EVT_SET(LVar2, 0) EVT_EXEC_WAIT(D_802988F0) EVT_RETURN EVT_CASE_EQ(EVENT_RECOVER_FROM_KO) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.8)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar7, LVar8, LVar9) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_BeforeJump) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_BeforeJump) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar7, LVar8, LVar9) EVT_CALL(func_80273444, 15, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_BeforeJump) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_BeforeJump) EVT_CASE_DEFAULT EVT_END_SWITCH EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) @@ -1051,7 +1051,7 @@ EvtScript EVS_PlayerCelebrate = { }; EvtScript EVS_RunAwayNoCommand = { - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_50000) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB3_Hustled) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_15D) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 30) EVT_WAIT(1) @@ -1083,7 +1083,7 @@ EvtScript EVS_RunAwayNoCommand = { EVT_WAIT(15) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.8)) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_10009) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_80273444, 8, 0, 0) EVT_CALL(func_80260DD8) @@ -1098,7 +1098,7 @@ EvtScript EVS_RunAwayNoCommand = { EVT_CHILD_THREAD EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) EVT_END_CHILD_THREAD - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30001) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Trip) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_162) EVT_CALL(SetGoalPos, ACTOR_PLAYER, -100, 0, 10) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(10.0)) @@ -1123,9 +1123,9 @@ EvtScript EVS_RunAwayNoCommand = { EVT_END_LOOP EVT_WAIT(15) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_DUST_OFF) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GetUp) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_GetUp) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_DustOff) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_DustOff) EVT_CHILD_THREAD EVT_WAIT(7) EVT_LOOP(2) @@ -1160,7 +1160,7 @@ EvtScript EVS_RunAwayStart = { EVT_CALL(action_command_flee_init, LVar0) EVT_CALL(SetupMashMeter, 1, 100, 0, 0, 0, 0) EVT_CALL(func_80260E38) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_50000) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB3_Hustled) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_15D) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 30) EVT_WAIT(1) @@ -1196,7 +1196,7 @@ EvtScript EVS_RunAwayStart = { EVT_WAIT(30) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.8)) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_10009) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_80273444, 8, 0, 0) EVT_CALL(GetActionSuccess, LVar0) @@ -1212,7 +1212,7 @@ EvtScript EVS_RunAwayStart = { EVT_CHILD_THREAD EVT_CALL(ShakeCam, 1, 0, 5, EVT_FLOAT(1.0)) EVT_END_CHILD_THREAD - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30001) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Trip) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_162) EVT_CALL(SetGoalPos, ACTOR_PLAYER, -100, 0, 10) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(10.0)) @@ -1237,9 +1237,9 @@ EvtScript EVS_RunAwayStart = { EVT_END_LOOP EVT_WAIT(15) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_DUST_OFF) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GetUp) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_GetUp) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_DustOff) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_DustOff) EVT_CHILD_THREAD EVT_WAIT(7) EVT_LOOP(2) @@ -1264,18 +1264,18 @@ EvtScript EVS_RunAwayFail = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 0) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_RETURN EVT_END }; -EvtScript EVS_RunAwayReset = { +EvtScript EVS_PlayerDies = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Dying) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_24) EVT_WAIT(15) EVT_CALL(EnablePlayerBlur, 1) @@ -1325,7 +1325,7 @@ EvtScript D_80287404 = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208D) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 18) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) @@ -1346,7 +1346,7 @@ EvtScript D_80287404 = { EVT_ELSE EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208D) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_WAIT(4) EVT_ADD(LVar1, 45) EVT_SET(LVar3, LVar1) @@ -1369,7 +1369,7 @@ EvtScript D_80287708 = { EVT_CALL(SetBattleCamZoom, 248) EVT_CALL(MoveBattleCamOver, 30) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 45) EVT_CALL(MakeItemEntity, LVarA, LVar0, LVar1, LVar2, 1, 0) @@ -1387,9 +1387,9 @@ EvtScript D_80287834 = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_RETURN EVT_END @@ -1402,7 +1402,7 @@ EvtScript EVS_PlayEatFX = { EVT_WAIT(10) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Eat) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Eat) EVT_WAIT(45) EVT_RETURN EVT_END @@ -1415,7 +1415,7 @@ EvtScript EVS_PlayDrinkFX = { EVT_WAIT(10) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Drink) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Drink) EVT_WAIT(45) EVT_RETURN EVT_END @@ -1549,12 +1549,12 @@ EvtScript EVS_UseLifeShroom = { EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_SET(LVar1, 0) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_10009) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_80273444, 20, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) EVT_WAIT(4) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_WAIT(10) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_CALL(RestorePreDefeatState) @@ -1610,12 +1610,12 @@ EvtScript EVS_MerleeAttackBonus = { EVT_WAIT(15) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_10009) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_80273444, 18, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) EVT_WAIT(4) - EVT_CALL(SetAnimation, ACTOR_SELF, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_SELF, 0, ANIM_Mario1_Idle) EVT_CALL(ShowMessageBox, 0, 60) EVT_CALL(WaitForMessageBoxDone) EVT_EXEC_WAIT(EVS_MerleeRunOut) @@ -1663,12 +1663,12 @@ EvtScript EVS_MerleeDefenseBonus = { EVT_ELSE EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_10009) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_80273444, 18, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) EVT_WAIT(4) - EVT_CALL(SetAnimation, ACTOR_SELF, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_SELF, 0, ANIM_Mario1_Idle) EVT_END_IF EVT_CALL(ShowMessageBox, 1, 60) EVT_CALL(WaitForMessageBoxDone) @@ -1713,12 +1713,12 @@ EvtScript EVS_MerleeExpBonus = { EVT_WAIT(15) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_10009) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_80273444, 18, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) EVT_WAIT(4) - EVT_CALL(SetAnimation, ACTOR_SELF, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_SELF, 0, ANIM_Mario1_Idle) EVT_CALL(ShowMessageBox, 2, 60) EVT_CALL(WaitForMessageBoxDone) EVT_EXEC_WAIT(EVS_MerleeRunOut) @@ -1729,7 +1729,7 @@ EvtScript EVS_MerleeExpBonus = { EvtScript EVS_PlayerHappy = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(UseBattleCamPresetWait, BTL_CAM_PRESET_C) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_ThumbsUp) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_ThumbsUp) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_802619E8, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 0) @@ -1773,7 +1773,7 @@ EvtScript EVS_PlayerHappy = { EVT_END_LOOP EVT_END_IF EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_SELF, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_SELF, 0, ANIM_Mario1_Idle) EVT_CALL(func_80261B40) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_RETURN diff --git a/src/415D90.c b/src/415D90.c index a261fa8628..959af44ecf 100644 --- a/src/415D90.c +++ b/src/415D90.c @@ -2415,7 +2415,7 @@ void btl_state_update_player_menu(void) { break; case BTL_SUBSTATE_PLAYER_MENU_CHOOSE_CATEGORY: if (battleStatus->hustleTurns != 0) { - set_animation(ACTOR_PLAYER, 0, ANIM_Mario_RunThinking); + set_animation(ACTOR_PLAYER, 0, ANIM_Mario1_ThinkingRun); } else { set_animation(ACTOR_PLAYER, 0, func_80265D44(STATUS_THINKING)); } @@ -2438,7 +2438,7 @@ void btl_state_update_player_menu(void) { if (D_802ACC60 != 0) { D_802ACC60--; } else if (submenuResult != 0) { - set_animation(ACTOR_PLAYER, 0, ANIM_Mario_Walking); + set_animation(ACTOR_PLAYER, 0, ANIM_Mario1_Walk); battleStatus->lastPlayerMenuSelection[BTL_MENU_IDX_MAIN] = battleStatus->currentSubmenu = battle_menu_submenuIDs[submenuResult - 1]; for (i = 0; i < ARRAY_COUNT(battleStatus->submenuMoves); i++) { battleStatus->submenuMoves[i] = 0; diff --git a/src/77480.c b/src/77480.c index eb8ee516cc..8dab719e46 100644 --- a/src/77480.c +++ b/src/77480.c @@ -797,27 +797,32 @@ s32 get_overriding_player_anim(s32 anim) { PlayerStatus* playerStatus = &gPlayerStatus; PartnerActionStatus* partnerActionStatus = &gPartnerActionStatus; - if (playerStatus->actionState == ACTION_STATE_USE_SPINNING_FLOWER && anim != ANIM_Mario_1002B && anim != ANIM_Mario_AnimMidairStill) { + if (playerStatus->actionState == ACTION_STATE_USE_SPINNING_FLOWER + && anim != ANIM_Mario1_Flail + && anim != ANIM_Mario1_Jump + ) { return -1; } if (partnerActionStatus->partnerActionState != PARTNER_ACTION_NONE) { - if (partnerActionStatus->actingPartner == PARTNER_LAKILESTER && anim == ANIM_Mario_10002) { - anim = ANIM_Mario_8000E; + if (partnerActionStatus->actingPartner == PARTNER_LAKILESTER && anim == ANIM_Mario1_Idle) { + anim = ANIM_MarioW2_RideLaki; } - if (partnerActionStatus->partnerActionState != PARTNER_ACTION_NONE && partnerActionStatus->actingPartner == PARTNER_BOW) { - if (anim != ANIM_Mario_Crouch && anim != ANIM_Mario_10002) { - return -1; - } + if (partnerActionStatus->partnerActionState != PARTNER_ACTION_NONE + && partnerActionStatus->actingPartner == PARTNER_BOW + && anim != ANIM_Mario1_Crouch + && anim != ANIM_Mario1_Idle + ) { + return -1; } } - if (anim == ANIM_Mario_ThumbsUp && partnerActionStatus->partnerActionState == PARTNER_ACTION_USE) { + if (anim == ANIM_Mario1_ThumbsUp && partnerActionStatus->partnerActionState == PARTNER_ACTION_USE) { return -1; } - if (anim == ANIM_Mario_6000C || anim == ANIM_Peach_C0010 || anim == ANIM_Mario_10002) { + if (anim == ANIM_MarioW1_Lift || anim == ANIM_Peach_C0010 || anim == ANIM_Mario1_Idle) { if (!(playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS)) { if (!func_800DFCF4()) { return -1; @@ -835,14 +840,14 @@ s32 get_overriding_player_anim(s32 anim) { } } - if (anim == ANIM_Mario_80003) { + if (anim == ANIM_MarioW2_Collapse) { exec_ShakeCam1(0, 0, 2); } return anim; } -void suggest_player_anim_clearUnkFlag(AnimID anim) { +void suggest_player_anim_allow_backward(AnimID anim) { PlayerStatus* playerStatus = &gPlayerStatus; AnimID newAnim = get_overriding_player_anim(anim); @@ -861,7 +866,7 @@ void force_player_anim(AnimID anim) { playerStatus->flags &= ~PS_FLAG_FACE_FORWARDS; } -void suggest_player_anim_setUnkFlag(AnimID anim) { +void suggest_player_anim_always_forward(AnimID anim) { PlayerStatus* playerStatus = &gPlayerStatus; AnimID newAnim = get_overriding_player_anim(anim); @@ -1366,20 +1371,20 @@ void player_update_sprite(void) { if (playerStatus->actionState != ACTION_STATE_TORNADO_JUMP && !(playerStatus->flags & PS_FLAG_ROTATION_LOCKED)) { playerStatus->spriteFacingAngle = angle + D_800F7B48; trueAnim = playerStatus->anim; - if (!(playerStatus->flags & PS_FLAG_FACE_FORWARDS) && - (sprIndex == SPR_Mario_1 || sprIndex == SPR_Mario_6 || sprIndex == SPR_Peach_A) && - fabsf(get_clamped_angle_diff(cameraYaw, playerStatus->currentYaw)) < 60.0f) - { + if (!(playerStatus->flags & PS_FLAG_FACE_FORWARDS) + && (sprIndex == SPR_Mario1 || sprIndex == SPR_MarioW1 || sprIndex == SPR_Peach1) + && fabsf(get_clamped_angle_diff(cameraYaw, playerStatus->currentYaw)) < 60.0f + ) { trueAnim = get_player_back_anim(trueAnim); } playerStatus->trueAnimation = trueAnim; playerStatus->currentYaw = playerStatus->targetYaw; } else { trueAnim = playerStatus->anim; - if (!(playerStatus->flags & PS_FLAG_FACE_FORWARDS) && - (sprIndex == SPR_Mario_1 || sprIndex == SPR_Mario_6 || sprIndex == SPR_Peach_A) && - playerStatus->spriteFacingAngle < 350.0f && playerStatus->spriteFacingAngle > 190.0f) - { + if (!(playerStatus->flags & PS_FLAG_FACE_FORWARDS) + && (sprIndex == SPR_Mario1 || sprIndex == SPR_MarioW1 || sprIndex == SPR_Peach1) + && playerStatus->spriteFacingAngle < 350.0f && playerStatus->spriteFacingAngle > 190.0f + ) { trueAnim = get_player_back_anim(trueAnim); } playerStatus->trueAnimation = trueAnim; @@ -1401,39 +1406,39 @@ s32 get_player_back_anim(s32 anim) { s32 sprIndex = (anim >> 16) & 0xff; s32 outAnim = 0; - if (sprIndex != SPR_Mario_1) { - if (sprIndex != SPR_Mario_6 && sprIndex != SPR_Peach_A) { + if (sprIndex != SPR_Mario1) { + if (sprIndex != SPR_MarioW1 && sprIndex != SPR_Peach1) { return anim; } - if (sprIndex == SPR_Mario_1) { - if (anim > ANIM_Mario_1000C) { + if (sprIndex == SPR_Mario1) { + if (anim > ANIM_Mario1_SpinFall) { return anim; } - } else if (sprIndex == SPR_Mario_6) { - if (anim == ANIM_Mario_6000C) { - outAnim = ANIM_Mario_6000D; - } else if (anim == ANIM_Mario_6000E) { - outAnim = ANIM_Mario_6000F; - } else if (anim == ANIM_Mario_60010) { - outAnim = ANIM_Mario_60011; - } else if (anim == ANIM_Mario_60012) { - outAnim = ANIM_Mario_60013; - } else if (anim == ANIM_Mario_60014) { - outAnim = ANIM_Mario_60015; - } else if (anim == ANIM_Mario_60016) { - outAnim = ANIM_Mario_60017; - } else if (anim == ANIM_Mario_60018) { - outAnim = ANIM_Mario_60019; - } else if (anim == ANIM_Mario_6001A) { - outAnim = ANIM_Mario_6001B; + } else if (sprIndex == SPR_MarioW1) { + if (anim == ANIM_MarioW1_Lift) { + outAnim = ANIM_MarioW1_Lift_Back; + } else if (anim == ANIM_MarioW1_Toss) { + outAnim = ANIM_MarioW1_Toss_Back; + } else if (anim == ANIM_MarioW1_Smash1_Miss) { + outAnim = ANIM_MarioW1_Smash1_Miss_Back; + } else if (anim == ANIM_MarioW1_Smash1_Hit) { + outAnim = ANIM_MarioW1_Smash1_Hit_Back; + } else if (anim == ANIM_MarioW1_Smash2_Miss) { + outAnim = ANIM_MarioW1_Smash2_Miss_Back; + } else if (anim == ANIM_MarioW1_Smash2_Hit) { + outAnim = ANIM_MarioW1_Smash2_Hit_Back; + } else if (anim == ANIM_MarioW1_Smash3_Miss) { + outAnim = ANIM_MarioW1_Smash3_Miss_Back; + } else if (anim == ANIM_MarioW1_Smash3_Hit) { + outAnim = ANIM_MarioW1_Smash3_Hit_Back; } - } else if (sprIndex == SPR_Peach_A) { + } else if (sprIndex == SPR_Peach1) { if (anim > ANIM_Peach_A0006) { outAnim = anim + 1; } } - } else if (anim > ANIM_Mario_1000C) { + } else if (anim > ANIM_Mario1_SpinFall) { return anim; } diff --git a/src/7bb60_len_41b0.c b/src/7bb60_len_41b0.c index ff238d241a..2a458427bc 100644 --- a/src/7bb60_len_41b0.c +++ b/src/7bb60_len_41b0.c @@ -152,11 +152,11 @@ void handle_switch_hit(void) { playerStatus->position.y = groundPosY; if (colliderID >= 0) { if (!(playerStatus->animFlags & PA_FLAG_USING_WATT)) { - anim = ANIM_Mario_10009; + anim = ANIM_Mario1_Land; } else { - anim = ANIM_Mario_6000B; + anim = ANIM_MarioW1_LandWatt; } - suggest_player_anim_clearUnkFlag(anim); + suggest_player_anim_allow_backward(anim); enable_player_input(); phys_player_land(); } diff --git a/src/C50A0.c b/src/C50A0.c index 2c71f0f732..130a4d2407 100644 --- a/src/C50A0.c +++ b/src/C50A0.c @@ -2662,7 +2662,7 @@ block_47: // TODO required to match itemEntity->position.x = playerStatus->position.x; itemEntity->position.y = playerStatus->position.y + playerStatus->colliderHeight; itemEntity->position.z = playerStatus->position.z; - suggest_player_anim_setUnkFlag(ANIM_Mario_6000C); + suggest_player_anim_always_forward(ANIM_MarioW1_Lift); } if (gItemTable[itemEntity->itemID].typeFlags & ITEM_TYPE_FLAG_GEAR) { @@ -2685,7 +2685,7 @@ block_47: // TODO required to match (itemEntity->flags & ITEM_ENTITY_FLAG_4000000) || (itemEntity->pickupMsgFlags & 2)) { - suggest_player_anim_setUnkFlag(ANIM_Mario_6000C); + suggest_player_anim_always_forward(ANIM_MarioW1_Lift); } } @@ -2857,7 +2857,7 @@ block_47: // TODO required to match sort_items(); add_item(itemEntity->itemID); } - suggest_player_anim_setUnkFlag(ANIM_Mario_6000C); + suggest_player_anim_always_forward(ANIM_MarioW1_Lift); func_801363A0(itemEntity); set_window_update(WINDOW_ID_12, (s32) basic_window_update); D_801568E4 = 50; @@ -2879,7 +2879,7 @@ block_47: // TODO required to match } break; case 15: - suggest_player_anim_setUnkFlag(ANIM_Mario_10002); + suggest_player_anim_always_forward(ANIM_Mario1_Idle); set_time_freeze_mode(TIME_FREEZE_NORMAL); enable_player_input(); partner_enable_input(); diff --git a/src/battle/area/arn/actor/tubbas_heart.c b/src/battle/area/arn/actor/tubbas_heart.c index eb182aef47..d7adb9d7ad 100644 --- a/src/battle/area/arn/actor/tubbas_heart.c +++ b/src/battle/area/arn/actor/tubbas_heart.c @@ -591,7 +591,7 @@ EvtScript N(802255D8) = { EVT_CALL(PlaySound, SOUND_20FC) EVT_END_THREAD EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002B) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Flail) EVT_WAIT(30) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -601,7 +601,7 @@ EvtScript N(802255D8) = { EVT_CALL(MoveBattleCamOver, 50) EVT_WAIT(56) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_3DB) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000C) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Leeching) EVT_WAIT(37) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_3DB) EVT_WAIT(22) diff --git a/src/battle/area/flo2/actor/huff_n_puff.c b/src/battle/area/flo2/actor/huff_n_puff.c index a4fab96477..61eafe14ca 100644 --- a/src/battle/area/flo2/actor/huff_n_puff.c +++ b/src/battle/area/flo2/actor/huff_n_puff.c @@ -5397,7 +5397,7 @@ EvtScript N(attackTuffPuffs) = { EVT_END_LOOP EVT_CALL(SetActorYaw, ACTOR_PLAYER, 0) EVT_END_THREAD - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_10009) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_Land) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.5)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) diff --git a/src/battle/area/hos/actor/magikoopa.c b/src/battle/area/hos/actor/magikoopa.c index ca4464c44e..48d832115f 100644 --- a/src/battle/area/hos/actor/magikoopa.c +++ b/src/battle/area/hos/actor/magikoopa.c @@ -1684,7 +1684,7 @@ EvtScript N(electrify) = { EVT_CALL(N(UnkFunc52), LVar0, LVar3) EVT_IF_EQ(LVar3, 0) EVT_CALL(GetStatusFlags, LVar0, LVar4) - EVT_IF_NOT_FLAG(LVar4, 0x4002000) + EVT_IF_NOT_FLAG(LVar4, STATUS_FLAG_TRANSPARENT | STATUS_FLAG_STATIC) EVT_SET(LVar8, LVar0) EVT_CALL(SetBattleVar, 2, LVar1) EVT_GOTO(100) @@ -1801,7 +1801,7 @@ EvtScript N(vanish) = { EVT_CALL(N(UnkFunc52), LVar0, LVar3) EVT_IF_EQ(LVar3, 0) EVT_CALL(GetStatusFlags, LVar0, LVar4) - EVT_IF_NOT_FLAG(LVar4, 0x4002000) + EVT_IF_NOT_FLAG(LVar4, STATUS_FLAG_TRANSPARENT | STATUS_FLAG_STATIC) EVT_SET(LVar8, LVar0) EVT_CALL(SetBattleVar, 2, LVar1) EVT_GOTO(100) diff --git a/src/battle/area/isk_part_2/actor/tutankoopa.c b/src/battle/area/isk_part_2/actor/tutankoopa.c index 0f8bcef38b..9404840aa5 100644 --- a/src/battle/area/isk_part_2/actor/tutankoopa.c +++ b/src/battle/area/isk_part_2/actor/tutankoopa.c @@ -681,19 +681,19 @@ EvtScript N(8021D81C) = { EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SLEEP | STATUS_FLAG_FROZEN | STATUS_FLAG_FEAR | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP | STATUS_FLAG_TRANSPARENT) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002B) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Flail) EVT_WAIT(49) EVT_CALL(PlaySound, SOUND_20E9) EVT_WAIT(5) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Tutankoopa_Anim05) EVT_WAIT(8) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Crouch) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Crouch) EVT_WAIT(5) EVT_CALL(StartRumble, 10) EVT_CALL(PlaySound, SOUND_20EA) EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(4.0)) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Question) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Question) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_PLAY_EFFECT(EFFECT_EMOTE, 2, 0, LVar0, LVar1, LVar2, 20, 315, 30, 0, 0) @@ -759,7 +759,7 @@ EvtScript N(8021DDE8) = { EVT_END_THREAD EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_SLEEP | STATUS_FLAG_FROZEN | STATUS_FLAG_FEAR | STATUS_FLAG_PARALYZE | STATUS_FLAG_DIZZY | STATUS_FLAG_STONE | STATUS_FLAG_STOP) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_ThumbsUp) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_ThumbsUp) EVT_END_IF EVT_CALL(SetActorVar, ACTOR_SELF, 13, 1) EVT_CALL(SetGoalToTarget, ACTOR_SELF) diff --git a/src/battle/area/iwa/actor/buzzar.c b/src/battle/area/iwa/actor/buzzar.c index 0ce0654163..734be4a3d7 100644 --- a/src/battle/area/iwa/actor/buzzar.c +++ b/src/battle/area/iwa/actor/buzzar.c @@ -459,7 +459,7 @@ EvtScript N(8021BEBC) = { EVT_IF_NOT_FLAG(LVar1, STATUS_FLAG_STONE) EVT_THREAD EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002E) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_FallBack) EVT_SET(LVar0, 0) EVT_SET(LVar1, 3) EVT_LOOP(90) @@ -906,7 +906,7 @@ EvtScript N(8021DF2C) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Buzzar_Anim16) EVT_CALL(N(StartRumbleWithParams), 180, 20) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002B) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Flail) EVT_CALL(ShowMessageBox, BTL_MSG_40, 90) EVT_THREAD EVT_LOOP(90) @@ -936,7 +936,7 @@ EvtScript N(8021DF2C) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Buzzar_Anim01) EVT_WAIT(2) EVT_KILL_THREAD(LVarA) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_10009) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_Land) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.8)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -944,7 +944,7 @@ EvtScript N(8021DF2C) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerFallToGoal, 15) EVT_WAIT(8) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_WAIT(8) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -961,7 +961,7 @@ EvtScript N(8021DF2C) = { EVT_CALL(MoveBattleCamOver, 200) EVT_WAIT(39) EVT_WAIT(10) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_RunPanic, ANIM_Mario_RunPanic, ANIM_Mario_RunPanic) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_PanicRun, ANIM_Mario1_PanicRun, ANIM_Mario1_PanicRun) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.2)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) diff --git a/src/battle/area/jan/actor/jungle_fuzzy.c b/src/battle/area/jan/actor/jungle_fuzzy.c index fe12bff9c2..79e76285e6 100644 --- a/src/battle/area/jan/actor/jungle_fuzzy.c +++ b/src/battle/area/jan/actor/jungle_fuzzy.c @@ -437,7 +437,7 @@ EvtScript N(leechAttack) = { EVT_SET(LVarD, 0) EVT_LOOP(5) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000C) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Leeching) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Jungle_Bite) EVT_SET(LocalFlag(0), 0) diff --git a/src/battle/area/kmr_part_2/actor/goomba_king.c b/src/battle/area/kmr_part_2/actor/goomba_king.c index c25675f193..fcfc9f2efc 100644 --- a/src/battle/area/kmr_part_2/actor/goomba_king.c +++ b/src/battle/area/kmr_part_2/actor/goomba_king.c @@ -671,9 +671,9 @@ EvtScript N(nextTurn_802229C4) = { EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 180) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Question) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Question) EVT_CALL(ActorSpeak, MSG_CH0_00CE, ACTOR_PARTNER, 0, -1, -1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_NodYes) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_NodYes) EVT_WAIT(15) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 0) EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, TRUE) diff --git a/src/battle/area/kmr_part_3/actor/jr_troopa.c b/src/battle/area/kmr_part_3/actor/jr_troopa.c index 556bcf650b..521cfbf653 100644 --- a/src/battle/area/kmr_part_3/actor/jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/jr_troopa.c @@ -172,7 +172,7 @@ EvtScript N(80222C78) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_WAIT(15) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 30) EVT_WAIT(1) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 60) @@ -393,7 +393,7 @@ EvtScript N(nextTurn_80223D2C) = { EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) EVT_WAIT(15) EVT_CALL(func_802535B4, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_THREAD EVT_SET(LVar1, 0) EVT_WAIT(8) @@ -406,7 +406,7 @@ EvtScript N(nextTurn_80223D2C) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_Punch) EVT_CALL(ActorSpeak, MSG_CH0_00AF, ACTOR_PARTNER, 0, 0x009D0008, 0x009D0001) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_Idle) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_NodYes) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_NodYes) EVT_WAIT(10) EVT_THREAD EVT_SET(LVar1, 180) @@ -429,7 +429,7 @@ EvtScript N(nextTurn_80223D2C) = { EVT_CALL(SetActorVar, ACTOR_SELF, 2, 2) EVT_EXEC_WAIT(N(80222C08)) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_THREAD EVT_SET(LVar1, 0) EVT_LOOP(5) @@ -441,7 +441,7 @@ EvtScript N(nextTurn_80223D2C) = { EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE) EVT_CALL(ActorSpeak, MSG_CH0_00B0, ACTOR_PARTNER, 0, 0x009D0008, 0x009D0001) EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, TRUE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_ThumbsUp) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_ThumbsUp) EVT_WAIT(20) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 0) EVT_WAIT(4) diff --git a/src/battle/area/kpa2/actor/bowser_intro.c b/src/battle/area/kpa2/actor/bowser_intro.c index 680c90793a..dd15df8666 100644 --- a/src/battle/area/kpa2/actor/bowser_intro.c +++ b/src/battle/area/kpa2/actor/bowser_intro.c @@ -196,15 +196,15 @@ EvtScript N(nextTurn) = { EVT_CALL(MoveBattleCamOver, 20) EVT_WAIT(20) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 180) - EVT_CALL(SpeakToPlayer, 0x00000000, ANIM_ParadePeach_Talk, ANIM_ParadePeach_IdleRaisedArms, 5, MSG_Intro_0057) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair) + EVT_CALL(SpeakToPlayer, ACTOR_PLAYER, ANIM_ParadePeach_Talk, ANIM_ParadePeach_IdleRaisedArms, 5, MSG_Intro_0057) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_Fall) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(5.0)) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.5)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000B) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_JumpForJoy) EVT_WAIT(24) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_WAIT(10) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 0) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) @@ -441,7 +441,7 @@ EvtScript N(attackFireBreath) = { EVT_CALL(SetNpcAnimation, 0x00000000, ANIM_ParadePeach_HorrorLoop) EVT_LOOP(68) EVT_CALL(GetAnimation, ACTOR_PLAYER, 0, LVar0) - EVT_IF_EQ(LVar0, ANIM_Mario_FallDown) + EVT_IF_EQ(LVar0, ANIM_Mario1_FallDown) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) diff --git a/src/battle/area/kpa2/actor/bowser_phase_2.c b/src/battle/area/kpa2/actor/bowser_phase_2.c index 3accbf839a..28bde3dd65 100644 --- a/src/battle/area/kpa2/actor/bowser_phase_2.c +++ b/src/battle/area/kpa2/actor/bowser_phase_2.c @@ -300,7 +300,7 @@ EvtScript N(handleEvent) = { EVT_SET_CONST(LVar1, ANIM_BattleBowser_Hurt) EVT_EXEC_WAIT(DoNormalHit) EVT_WAIT(1000) - EVT_CASE_EQ(EVENT_1D) + EVT_CASE_EQ(EVENT_INVUNERABLE_TAUNT) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) EVT_IF_NOT_FLAG(LVar3, STATUS_FLAG_SHRINK) EVT_SET(LVar3, 60) diff --git a/src/battle/area/kpa2/actor/bowser_phase_3.c b/src/battle/area/kpa2/actor/bowser_phase_3.c index 492328ca76..a64a6d199b 100644 --- a/src/battle/area/kpa2/actor/bowser_phase_3.c +++ b/src/battle/area/kpa2/actor/bowser_phase_3.c @@ -435,7 +435,7 @@ EvtScript N(handleEvent) = { EVT_SET_CONST(LVar1, ANIM_BattleBowser_Hurt) EVT_EXEC_WAIT(DoNormalHit) EVT_WAIT(1000) - EVT_CASE_EQ(EVENT_1D) + EVT_CASE_EQ(EVENT_INVUNERABLE_TAUNT) EVT_SET(LVar1, ANIM_BattleBowser_Idle) EVT_EXEC_WAIT(N(onImmune)) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleBowser_Idle) diff --git a/src/battle/area/kzn2/actor/lava_piranha.c b/src/battle/area/kzn2/actor/lava_piranha.c index df1534b181..f84a2a6465 100644 --- a/src/battle/area/kzn2/actor/lava_piranha.c +++ b/src/battle/area/kzn2/actor/lava_piranha.c @@ -1484,7 +1484,7 @@ EvtScript N(onDeath) = { EVT_END_THREAD EVT_CALL(N(StartRumbleWithParams), 80, 300) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_WAIT(20) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_263) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -1508,7 +1508,7 @@ EvtScript N(onDeath) = { EVT_WAIT(40) EVT_THREAD EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002B) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Flail) EVT_WAIT(40) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_END_THREAD @@ -1935,8 +1935,8 @@ EvtScript N(ignite) = { EVT_CALL(SetDefenseTable, ACTOR_ENEMY0, 2, EVT_PTR(N(defenseTable_fiery))) EVT_CALL(SetPartEventBits, ACTOR_ENEMY0, 1, ACTOR_EVENT_FLAG_FIREY, TRUE) EVT_CALL(SetPartEventBits, ACTOR_ENEMY0, 2, ACTOR_EVENT_FLAG_FIREY, TRUE) - EVT_CALL(SetActorVar, ACTOR_ENEMY0, 7, 0x00790004) - EVT_CALL(SetActorVar, ACTOR_ENEMY0, 8, 0x0079000A) + EVT_CALL(SetActorVar, ACTOR_ENEMY0, 7, ANIM_LavaPiranha_Anim04) + EVT_CALL(SetActorVar, ACTOR_ENEMY0, 8, ANIM_LavaPiranha_Anim0A) EVT_CALL(SetActorVar, ACTOR_ENEMY0, 5, 1) EVT_CALL(ForceHomePos, ACTOR_SELF, 61, 61, 0) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_40000, FALSE) diff --git a/src/battle/area/mac/actor/master3.c b/src/battle/area/mac/actor/master3.c index 55605383e4..54023e02c0 100644 --- a/src/battle/area/mac/actor/master3.c +++ b/src/battle/area/mac/actor/master3.c @@ -572,7 +572,7 @@ EvtScript N(tripleStrike3) = { EVT_CALL(EnablePlayerBlur, 1) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(0.3)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_FallBack, ANIM_Mario_FallBack, ANIM_Mario_FallBack) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Hurt, ANIM_Mario1_Hurt, ANIM_Mario1_Hurt) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_80273444, 50, 0, 0) EVT_CALL(EnablePlayerBlur, 0) diff --git a/src/battle/area/mim/actor/forest_fuzzy.c b/src/battle/area/mim/actor/forest_fuzzy.c index c020ef6d75..81d508be2a 100644 --- a/src/battle/area/mim/actor/forest_fuzzy.c +++ b/src/battle/area/mim/actor/forest_fuzzy.c @@ -394,7 +394,7 @@ EvtScript N(80219054) = { EVT_END_IF EVT_WAIT(10) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000C) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Leeching) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Forest_Bite) EVT_WAIT(21) diff --git a/src/battle/area/nok/actor/kent_c_koopa.c b/src/battle/area/nok/actor/kent_c_koopa.c index d2be16ea11..90ea953af8 100644 --- a/src/battle/area/nok/actor/kent_c_koopa.c +++ b/src/battle/area/nok/actor/kent_c_koopa.c @@ -642,7 +642,7 @@ EvtScript N(shellToss_KentC) = { EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_TRANSPARENT | STATUS_FLAGS_IMMOBILIZED) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002B) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Flail) EVT_END_IF EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) EVT_CALL(SetBattleCamTarget, -25, 60, 0) @@ -677,7 +677,7 @@ EvtScript N(shellToss_KentC) = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(GetStatusFlags, ACTOR_PLAYER, LVar0) EVT_IF_NOT_FLAG(LVar0, STATUS_FLAG_TRANSPARENT | STATUS_FLAGS_IMMOBILIZED) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002B) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Flail) EVT_END_IF EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/area/omo2_1/actor/shy_squad.c b/src/battle/area/omo2_1/actor/shy_squad.c index 82f675c8d4..69b8031693 100644 --- a/src/battle/area/omo2_1/actor/shy_squad.c +++ b/src/battle/area/omo2_1/actor/shy_squad.c @@ -1364,7 +1364,7 @@ EvtScript N(flee) = { EVT_GOTO(0) EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002B) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Flail) EVT_LABEL(1) EVT_WAIT(1) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -1373,7 +1373,7 @@ EvtScript N(flee) = { EVT_IF_GT(LVar0, LVar3) EVT_GOTO(1) EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002B) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Flail) EVT_SET(LVar7, 0) EVT_LOOP(40) EVT_ADD(LVar7, 36) @@ -1383,7 +1383,7 @@ EvtScript N(flee) = { EVT_CALL(SetActorRotation, ACTOR_PLAYER, 0, LVar7, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(SetActorRotation, ACTOR_PLAYER, 0, 0, 0) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_END_THREAD diff --git a/src/battle/area/tik2/actor/blooper_baby.c b/src/battle/area/tik2/actor/blooper_baby.c index f40541e27a..bc45ecbc07 100644 --- a/src/battle/area/tik2/actor/blooper_baby.c +++ b/src/battle/area/tik2/actor/blooper_baby.c @@ -477,7 +477,7 @@ EvtScript N(takeTurn) = { EVT_CALL(action_command_stop_leech_start, 0, 32767, 3) EVT_LOOP(5) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000C) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Leeching) EVT_SET(LocalFlag(0), 0) EVT_LOOP(10) EVT_CALL(GetActionSuccessCopy, LVar1) diff --git a/src/battle/area/tik2/actor/electro_blooper.c b/src/battle/area/tik2/actor/electro_blooper.c index 70bb7e4cef..6e8941e5ee 100644 --- a/src/battle/area/tik2/actor/electro_blooper.c +++ b/src/battle/area/tik2/actor/electro_blooper.c @@ -431,7 +431,7 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) EVT_CASE_OR_EQ(EVENT_IMMUNE) EVT_CASE_OR_EQ(EVENT_AIR_LIFT_FAILED) - EVT_CASE_OR_EQ(EVENT_1D) + EVT_CASE_OR_EQ(EVENT_INVUNERABLE_TAUNT) EVT_CASE_OR_EQ(EVENT_1E) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Blooper_Anim00) diff --git a/src/battle/area/tik2/actor/super_blooper.c b/src/battle/area/tik2/actor/super_blooper.c index bc194c40fe..5cea1d87aa 100644 --- a/src/battle/area/tik2/actor/super_blooper.c +++ b/src/battle/area/tik2/actor/super_blooper.c @@ -382,7 +382,7 @@ EvtScript N(handleEvent) = { EVT_CASE_OR_EQ(EVENT_ZERO_DAMAGE) EVT_CASE_OR_EQ(EVENT_IMMUNE) EVT_CASE_OR_EQ(EVENT_AIR_LIFT_FAILED) - EVT_CASE_OR_EQ(EVENT_1D) + EVT_CASE_OR_EQ(EVENT_INVUNERABLE_TAUNT) EVT_CASE_OR_EQ(EVENT_1E) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Blooper_Anim00) diff --git a/src/battle/area/trd_part_3/actor/eldstar.c b/src/battle/area/trd_part_3/actor/eldstar.c index b5cb8b0322..741099c18c 100644 --- a/src/battle/area/trd_part_3/actor/eldstar.c +++ b/src/battle/area/trd_part_3/actor/eldstar.c @@ -205,7 +205,7 @@ EvtScript N(EVS_ManageTutorial) = { EVT_CALL(SetBattleFlagBits, BS_FLAGS1_TUTORIAL_BATTLE, TRUE) EVT_CALL(func_80218158_4CF308) EVT_CALL(WaitForState, BATTLE_STATE_PLAYER_MENU) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_WAIT(15) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(ActorSpeak, MSG_CH1_0114, ACTOR_SELF, 1, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle) @@ -214,24 +214,24 @@ EvtScript N(EVS_ManageTutorial) = { EVT_CALL(SetGoalPos, ACTOR_SELF, -110, 100, 0) EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, EASING_COS_IN_OUT) EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_END_THREAD EVT_WAIT(10) EVT_CALL(func_802180C8_4CF278) EVT_WAIT(120) EVT_CALL(func_802180E8_4CF298) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, EASING_COS_IN_OUT) EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) EVT_CALL(ActorSpeak, MSG_CH1_0115, ACTOR_SELF, 1, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_CALL(func_802180C8_4CF278) EVT_WAIT(120) EVT_CALL(func_802180E8_4CF298) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(ActorSpeak, MSG_CH1_0116, ACTOR_SELF, 1, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle) EVT_WAIT(10) EVT_CALL(SetBattleMenuDisableFlags, BTL_MENU_DISABLED_STAR_POWERS) @@ -266,11 +266,11 @@ EvtScript N(EVS_ManageTutorial) = { EVT_CALL(ActorSpeak, MSG_CH1_0117, ACTOR_SELF, 1, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle) EVT_WAIT(10) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_CALL(func_802180C8_4CF278) EVT_WAIT(120) EVT_CALL(func_802180E8_4CF298) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(ActorSpeak, MSG_CH1_0118, ACTOR_SELF, 1, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle) EVT_WAIT(10) EVT_CALL(SetBattleState, BATTLE_STATE_END_TURN) @@ -284,15 +284,15 @@ EvtScript N(EVS_ManageTutorial) = { EVT_CALL(SetGoalPos, ACTOR_SELF, -110, 100, 0) EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, EASING_COS_IN_OUT) EVT_CALL(EnableActorBlur, ACTOR_SELF, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_END_THREAD EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_CALL(func_802180C8_4CF278) EVT_WAIT(120) EVT_CALL(func_802180E8_4CF298) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(EnableActorBlur, ACTOR_SELF, 1) EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, EASING_COS_IN_OUT) @@ -334,11 +334,11 @@ EvtScript N(EVS_ManageTutorial) = { EVT_CALL(ActorSpeak, MSG_CH1_011C, ACTOR_SELF, 1, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle) EVT_WAIT(10) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_CALL(func_802180C8_4CF278) EVT_WAIT(120) EVT_CALL(func_802180E8_4CF298) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(ActorSpeak, MSG_CH1_011D, ACTOR_SELF, 1, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle) EVT_CALL(WaitForState, BATTLE_STATE_0) EVT_CALL(SetBattleState, BATTLE_STATE_END_TRAINING_BATTLE) diff --git a/src/battle/common/actor/fuzzy.inc.c b/src/battle/common/actor/fuzzy.inc.c index c34bee0cec..f4fd2cffff 100644 --- a/src/battle/common/actor/fuzzy.inc.c +++ b/src/battle/common/actor/fuzzy.inc.c @@ -327,7 +327,7 @@ EvtScript N(takeTurn) = { EVT_END_IF EVT_WAIT(10) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000C) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Leeching) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzy_Bite) EVT_WAIT(21) diff --git a/src/battle/common/actor/swoopula.inc.c b/src/battle/common/actor/swoopula.inc.c index f2f601b126..b1f559dd8a 100644 --- a/src/battle/common/actor/swoopula.inc.c +++ b/src/battle/common/actor/swoopula.inc.c @@ -549,14 +549,14 @@ EvtScript N(takeTurn_flying) = { EVT_WAIT(30) EVT_END_LOOP EVT_ELSE - EVT_CALL(ShowMessageBox, BTL_MSG_31, 0x00007FFF) + EVT_CALL(ShowMessageBox, BTL_MSG_31, 0x7FFF) EVT_CALL(ShowActionHud, TRUE) EVT_CALL(LoadActionCommand, ACTION_COMMAND_STOP_LEECH) EVT_CALL(action_command_stop_leech_init) EVT_CALL(SetupMashMeter, 1, 30, 0, 0, 0, 0) EVT_WAIT(10) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) - EVT_CALL(action_command_stop_leech_start, 0, 32767, 3) + EVT_CALL(action_command_stop_leech_start, 0, 0x7FFF, 3) EVT_SET(LVarD, 0) EVT_LOOP(5) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Gray_Anim02) @@ -574,7 +574,7 @@ EvtScript N(takeTurn_flying) = { EVT_BREAK_LOOP EVT_END_IF EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000C) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Leeching) EVT_LOOP(2) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) @@ -1023,7 +1023,7 @@ EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_BREAK_LOOP EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000C) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Leeching) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3E0) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) diff --git a/src/battle/common/move/HammerSupport.inc.c b/src/battle/common/move/HammerSupport.inc.c index 37b0d06fb5..ae290d09d3 100644 --- a/src/battle/common/move/HammerSupport.inc.c +++ b/src/battle/common/move/HammerSupport.inc.c @@ -14,7 +14,7 @@ EvtScript N(EVS_HammerSupport_A) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_26) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(5.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) EVT_RETURN EVT_END @@ -24,7 +24,7 @@ EvtScript N(EVS_HammerSupport_B) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, -33, 0, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_26) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(5.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) EVT_RETURN EVT_END @@ -37,14 +37,14 @@ EvtScript N(EVS_HammerSupport_C) = { EVT_LOOP(10) EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) EVT_IF_EQ(LVar0, TRUE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_ADD(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000D) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_Begin) EVT_END_LOOP - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000D) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_Begin) EVT_SWITCH(LVar1) EVT_CASE_LT(3) EVT_WAIT(4) @@ -68,14 +68,14 @@ EvtScript N(EVS_HammerSupport_D) = { EVT_LOOP(10) EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) EVT_IF_EQ(LVar0, TRUE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_ADD(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30014) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash2_Begin) EVT_END_LOOP - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30014) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash2_Begin) EVT_SWITCH(LVar1) EVT_CASE_LT(3) EVT_WAIT(4) @@ -99,14 +99,14 @@ EvtScript N(EVS_HammerSupport_E) = { EVT_LOOP(10) EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) EVT_IF_EQ(LVar0, TRUE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_ADD(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001B) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash3_Begin) EVT_END_LOOP - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001B) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash3_Begin) EVT_SWITCH(LVar1) EVT_CASE_LT(3) EVT_WAIT(4) @@ -128,18 +128,18 @@ EvtScript N(EVS_HammerSupport_F) = { EVT_CALL(SetBattleCamOffsetZ, 8) EVT_CALL(InitTargetIterator) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000E) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_PullBack) EVT_WAIT(4) EVT_CALL(action_command_hammer_start, 0, 36, 3) EVT_CALL(SetActionResult, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000F) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_Hold1) EVT_SET(LVar1, 0) EVT_LOOP(30) EVT_WAIT(1) EVT_CALL(GetActionResult, LVar0) EVT_IF_NE(LVar0, 0) EVT_IF_NE(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30010) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_Hold2) EVT_SET(LVar1, 1) EVT_END_IF EVT_END_IF @@ -154,9 +154,9 @@ EvtScript N(EVS_HammerSupport_F) = { EVT_IF_EQ(LVar0, TRUE) EVT_GOTO(0) EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30011) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_PreSwing) EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30012) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_Swing) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_44) EVT_RETURN EVT_END @@ -169,13 +169,13 @@ EvtScript N(EVS_Hammer_ReturnHome_A) = { EVT_CALL(func_802693F0) EVT_WAIT(20) EVT_CALL(EnablePlayerBlur, -1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_WAIT(5) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_RETURN EVT_END }; @@ -185,13 +185,13 @@ EvtScript N(EVS_Hammer_ReturnHome_B) = { EVT_CALL(func_802693F0) EVT_WAIT(20) EVT_CALL(EnablePlayerBlur, -1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_WAIT(5) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_RETURN EVT_END }; @@ -202,13 +202,13 @@ EvtScript N(EVS_Hammer_ReturnHome_C) = { EVT_CALL(func_802693F0) EVT_WAIT(20) EVT_CALL(EnablePlayerBlur, -1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_WAIT(5) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_RETURN EVT_END }; @@ -225,11 +225,11 @@ EvtScript N(EVS_UseBasicHammer) = { EVT_CALL(SetBattleCamOffsetZ, 8) EVT_CALL(InitTargetIterator) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000E) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_PullBack) EVT_WAIT(4) EVT_CALL(N(IsBerserkerEquipped)) EVT_IF_NE(LVar0, HIT_RESULT_HIT) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000F) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_Hold1) EVT_CALL(GetActionCommandMode, LVar0) EVT_IF_LT(LVar0, 2) EVT_CALL(N(ShouldMovesAutoSucceed)) @@ -252,7 +252,7 @@ EvtScript N(EVS_UseBasicHammer) = { EVT_CALL(GetActionResult, LVar0) EVT_IF_NE(LVar0, 0) EVT_IF_NE(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30010) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_Hold2) EVT_SET(LVar1, 1) EVT_END_IF EVT_END_IF @@ -273,10 +273,10 @@ EvtScript N(EVS_UseBasicHammer) = { EVT_ELSE EVT_CALL(action_command_hammer_start, 0, LVar1, 3) EVT_CALL(SetActionResult, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000F) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_Hold1) EVT_SUB(LVar1, 10) EVT_WAIT(LVar1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30010) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_Hold2) EVT_WAIT(5) EVT_END_IF EVT_CALL(GetActionCommandMode, LVar0) @@ -290,10 +290,10 @@ EvtScript N(EVS_UseBasicHammer) = { EVT_WAIT(1) EVT_END_LOOP EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30011) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_PreSwing) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2115) EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30012) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_Swing) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2118) EVT_RETURN EVT_END @@ -311,11 +311,11 @@ EvtScript N(EVS_UseSuperHammer) = { EVT_CALL(SetBattleCamOffsetZ, 8) EVT_CALL(InitTargetIterator) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30015) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash2_PullBack) EVT_WAIT(4) EVT_CALL(N(IsBerserkerEquipped)) EVT_IF_EQ(LVar0, TRUE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30016) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash2_Hold1) EVT_CALL(N(ShouldMovesAutoSucceed)) EVT_IF_EQ(LVar0, HIT_RESULT_HIT) EVT_LOOP(45) @@ -335,7 +335,7 @@ EvtScript N(EVS_UseSuperHammer) = { EVT_CALL(GetActionResult, LVar0) EVT_IF_NE(LVar0, 0) EVT_IF_NE(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30017) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash2_Hold2) EVT_SET(LVar1, 1) EVT_END_IF EVT_END_IF @@ -353,16 +353,16 @@ EvtScript N(EVS_UseSuperHammer) = { EVT_ELSE EVT_CALL(action_command_hammer_start, 0, LVar1, 3) EVT_CALL(SetActionResult, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30016) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash2_Hold1) EVT_SUB(LVar1, 10) EVT_WAIT(LVar1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30017) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash2_Hold2) EVT_WAIT(5) EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30018) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash2_PreSwing) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2116) EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30019) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash2_Swing) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2119) EVT_RETURN EVT_END @@ -380,11 +380,11 @@ EvtScript N(EVS_UseUltraHammer) = { EVT_CALL(SetBattleCamOffsetZ, 8) EVT_CALL(InitTargetIterator) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001C) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash3_PullBack) EVT_WAIT(4) EVT_CALL(N(IsBerserkerEquipped)) EVT_IF_EQ(LVar0, TRUE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001D) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash3_Hold1) EVT_CALL(N(ShouldMovesAutoSucceed)) EVT_IF_EQ(LVar0, HIT_RESULT_HIT) EVT_LOOP(45) @@ -404,7 +404,7 @@ EvtScript N(EVS_UseUltraHammer) = { EVT_CALL(GetActionResult, LVar0) EVT_IF_NE(LVar0, 0) EVT_IF_NE(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001E) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash3_Hold2) EVT_SET(LVar1, 1) EVT_END_IF EVT_END_IF @@ -422,16 +422,16 @@ EvtScript N(EVS_UseUltraHammer) = { EVT_ELSE EVT_CALL(action_command_hammer_start, 0, LVar1, 3) EVT_CALL(SetActionResult, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001D) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash3_Hold1) EVT_SUB(LVar1, 10) EVT_WAIT(LVar1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001E) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash3_Hold2) EVT_WAIT(5) EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001F) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash3_PreSwing) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2117) EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30020) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash3_Swing) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211A) EVT_RETURN EVT_END @@ -449,9 +449,9 @@ EvtScript N(EVS_Hammer_UseBasicQuake) = { EVT_CALL(AddBattleCamZoom, 80) EVT_CALL(InitTargetIterator) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000E) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_PullBack) EVT_WAIT(8) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3000F) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_Hold1) EVT_CALL(N(ShouldMovesAutoSucceed)) EVT_IF_EQ(LVar0, 0) EVT_LOOP(45) @@ -471,7 +471,7 @@ EvtScript N(EVS_Hammer_UseBasicQuake) = { EVT_CALL(GetActionResult, LVar0) EVT_IF_NE(LVar0, 0) EVT_IF_NE(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30010) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_Hold2) EVT_SET(LVar1, 1) EVT_END_IF EVT_END_IF @@ -487,9 +487,9 @@ EvtScript N(EVS_Hammer_UseBasicQuake) = { EVT_GOTO(0) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2115) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30011) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_PreSwing) EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30012) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash1_Swing) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2118) EVT_RETURN EVT_END @@ -507,9 +507,9 @@ EvtScript N(EVS_Hammer_UseSuperQuake) = { EVT_CALL(AddBattleCamZoom, 80) EVT_CALL(InitTargetIterator) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30015) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash2_PullBack) EVT_WAIT(8) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30016) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash2_Hold1) EVT_CALL(N(ShouldMovesAutoSucceed)) EVT_IF_EQ(LVar0, 0) EVT_LOOP(45) @@ -536,9 +536,9 @@ EvtScript N(EVS_Hammer_UseSuperQuake) = { EVT_GOTO(0) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2116) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30018) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash2_PreSwing) EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30019) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash2_Swing) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2119) EVT_RETURN EVT_END @@ -556,9 +556,9 @@ EvtScript N(EVS_Hammer_UseUltraQuake) = { EVT_CALL(AddBattleCamZoom, 80) EVT_CALL(InitTargetIterator) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001C) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash3_PullBack) EVT_WAIT(8) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001D) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash3_Hold1) EVT_CALL(N(ShouldMovesAutoSucceed)) EVT_IF_EQ(LVar0, 0) EVT_LOOP(45) @@ -585,9 +585,9 @@ EvtScript N(EVS_Hammer_UseUltraQuake) = { EVT_GOTO(0) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2117) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_3001F) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash3_PreSwing) EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30020) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Smash3_Swing) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_211A) EVT_RETURN EVT_END diff --git a/src/battle/common/move/JumpSupport.inc.c b/src/battle/common/move/JumpSupport.inc.c index 810335bf7b..6289c85a48 100644 --- a/src/battle/common/move/JumpSupport.inc.c +++ b/src/battle/common/move/JumpSupport.inc.c @@ -10,7 +10,7 @@ s32 N(D_802A10F0)[] = { #include "world/common/todo/UnkMoveFunc1.inc.c" EvtScript N(EVS_CheckForAPress) = { - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_BeforeJump) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_BeforeJump) EVT_LOOP(5) EVT_CALL(CheckButtonPress, BUTTON_A, LVar0) EVT_IF_EQ(LVar0, TRUE) @@ -36,12 +36,12 @@ EvtScript N(EVS_JumpSupport_A) = { EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar3, LVar4, LVar5) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_26) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(5.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(CancelablePlayerRunToGoal, 0, LVar0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_EXEC_WAIT(N(EVS_CheckForAPress)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_BeforeJump) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_BeforeJump) EVT_RETURN EVT_END }; @@ -108,23 +108,23 @@ EvtScript N(EVS_JumpSupport_E) = { EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 40) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_10009) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.3)) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkMoveFunc1)) EVT_CALL(func_80273444, LVar0, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) EVT_WAIT(1) EVT_CALL(AddGoalPos, ACTOR_PLAYER, -20, 0, 0) EVT_CALL(func_80273444, 6, 0, 2) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) EVT_WAIT(5) EVT_CALL(EnablePlayerBlur, -1) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_RETURN EVT_END }; @@ -138,22 +138,22 @@ EvtScript N(EVS_JumpSupport_F) = { EVT_SUB(LVar0, 50) EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_10009) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(0.8)) EVT_CALL(N(UnkMoveFunc1)) EVT_CALL(func_80273444, LVar0, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) EVT_WAIT(1) EVT_CALL(AddGoalPos, ACTOR_PLAYER, -30, 0, 0) EVT_CALL(func_80273444, 6, 0, 2) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) EVT_WAIT(2) EVT_CALL(EnablePlayerBlur, -1) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_RETURN EVT_END }; @@ -167,22 +167,22 @@ EvtScript N(EVS_JumpSupport_G) = { EVT_SUB(LVar0, 40) EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_10009) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(N(UnkMoveFunc1)) EVT_CALL(func_80273444, LVar0, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) EVT_WAIT(1) EVT_CALL(AddGoalPos, ACTOR_PLAYER, -20, 0, 0) EVT_CALL(func_80273444, 6, 0, 2) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) EVT_WAIT(2) EVT_CALL(EnablePlayerBlur, -1) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_RETURN EVT_END }; @@ -196,22 +196,22 @@ EvtScript N(EVS_JumpSupport_H) = { EVT_SUB(LVar0, 60) EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_10009) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(0.8)) EVT_CALL(N(UnkMoveFunc1)) EVT_CALL(func_80273444, LVar0, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) EVT_WAIT(1) EVT_CALL(AddGoalPos, ACTOR_PLAYER, -20, 0, 0) EVT_CALL(func_80273444, 6, 0, 2) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) EVT_WAIT(2) EVT_CALL(EnablePlayerBlur, -1) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_RETURN EVT_END }; @@ -228,7 +228,7 @@ EvtScript N(EVS_JumpSupport_I) = { EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_FallBack, ANIM_Mario_FallBack, ANIM_Mario_10009) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Hurt, ANIM_Mario1_Hurt, ANIM_Mario1_Land) EVT_CALL(N(UnkMoveFunc1)) EVT_CALL(func_80273444, LVar0, 0, 0) EVT_CHILD_THREAD @@ -247,23 +247,23 @@ EvtScript N(EVS_JumpSupport_I) = { EVT_END_CHILD_THREAD EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(func_80273444, 4, 0, 2) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_RETURN EVT_END }; EvtScript N(EVS_JumpSupport_J) = { - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, 0, 0, ANIM_Mario_1000C) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, 0, 0, ANIM_Mario1_SpinFall) EVT_CALL(PlayerLandJump) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1000C) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_SpinFall) EVT_WAIT(2) EVT_CHILD_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_END_CHILD_THREAD EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_162) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GetUp) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_GetUp) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_DustOff) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_DustOff) EVT_WAIT(20) EVT_CALL(SetBattleFlagBits, BS_FLAGS1_100, FALSE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) @@ -272,9 +272,9 @@ EvtScript N(EVS_JumpSupport_J) = { EVT_CALL(func_80276EFC) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_RETURN EVT_END }; @@ -287,7 +287,7 @@ EvtScript N(EVS_JumpSupport_K) = { EVT_CALL(action_command_jump_start, LVarA, 3) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_30000) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) EVT_CALL(func_80274A18, LVarA, 0) EVT_RETURN EVT_END @@ -305,7 +305,7 @@ EvtScript N(EVS_JumpSupport_L) = { EVT_CALL(action_command_jump_start, LVarB, 3) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_37) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) EVT_CALL(func_802752AC, LVarA, 0) EVT_WAIT(7) EVT_CALL(DidActionSucceed, LVar0) @@ -331,14 +331,14 @@ EvtScript N(EVS_JumpSupport_M) = { EVT_CALL(action_command_jump_start, LVarB, 3) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_38) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_80000, ANIM_Mario_30000) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_MarioW2_Carried, ANIM_MarioB1_Stomp) EVT_CALL(func_80275F00, LVarA, 0) EVT_CALL(CloseActionCommandInfo) EVT_SET(LVar9, 0) EVT_CALL(DidActionSucceed, LVar0) EVT_IF_GT(LVar0, 0) EVT_SET(LVar9, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30000) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Stomp) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, -2, 0) EVT_WAIT(2) diff --git a/src/battle/common/move/StarBeamSupport.inc.c b/src/battle/common/move/StarBeamSupport.inc.c index 81536922d3..d7903488fe 100644 --- a/src/battle/common/move/StarBeamSupport.inc.c +++ b/src/battle/common/move/StarBeamSupport.inc.c @@ -11,7 +11,7 @@ EvtScript N(802A24F0) = { EVT_IF_EQ(LVarA, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 16) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) @@ -24,13 +24,13 @@ EvtScript N(802A24F0) = { EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(FadeBackgroundToBlack)) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) EVT_WAIT(10) EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -66,7 +66,7 @@ EvtScript N(beforeUsePower) = { EVT_IF_EQ(LVarA, ACTOR_PLAYER) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 16) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) @@ -79,13 +79,13 @@ EvtScript N(beforeUsePower) = { EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(UnkBackgroundFunc2)) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) EVT_WAIT(10) EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -228,9 +228,9 @@ EvtScript N(afterUsePower) = { EVT_WAIT(15) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_ELSE EVT_CALL(N(UnkBackgroundFunc)) EVT_WAIT(15) diff --git a/src/battle/common/move/UseItem.inc.c b/src/battle/common/move/UseItem.inc.c index e730a37207..86c024e345 100644 --- a/src/battle/common/move/UseItem.inc.c +++ b/src/battle/common/move/UseItem.inc.c @@ -6,7 +6,7 @@ EvtScript N(UseItemWithEffect) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208D) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 18) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) @@ -27,7 +27,7 @@ EvtScript N(UseItemWithEffect) = { EVT_ELSE EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_208D) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_WAIT(4) EVT_ADD(LVar1, 45) EVT_SET(LVar3, LVar1) @@ -50,7 +50,7 @@ EvtScript N(UseItem) = { EVT_CALL(SetBattleCamZoom, 248) EVT_CALL(MoveBattleCamOver, 30) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 45) EVT_CALL(MakeItemEntity, LVarA, LVar0, LVar1, LVar2, ITEM_SPAWN_MODE_DECORATION, 0) @@ -68,9 +68,9 @@ EvtScript N(PlayerGoHome) = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_RETURN EVT_END @@ -83,7 +83,7 @@ EvtScript N(EatItem) = { EVT_WAIT(10) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Eat) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Eat) EVT_WAIT(45) EVT_RETURN EVT_END @@ -96,7 +96,7 @@ EvtScript N(DrinkItem) = { EVT_WAIT(10) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Drink) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Drink) EVT_WAIT(45) EVT_RETURN EVT_END diff --git a/src/battle/move/hammer/attack.c b/src/battle/move/hammer/attack.c index 5a76f0d9f5..32adcb6ab5 100644 --- a/src/battle/move/hammer/attack.c +++ b/src/battle/move/hammer/attack.c @@ -135,19 +135,19 @@ EvtScript N(EVS_UseMove1) = { EVT_SWITCH(LVar1) EVT_CASE_EQ(0) EVT_SET(LVar9, 1) - EVT_SET_CONST(LVarA, ANIM_Mario_3000F) - EVT_SET_CONST(LVarB, ANIM_Mario_30011) - EVT_SET_CONST(LVarC, ANIM_Mario_30012) + EVT_SET_CONST(LVarA, ANIM_MarioB1_Smash1_Hold1) + EVT_SET_CONST(LVarB, ANIM_MarioB1_Smash1_PreSwing) + EVT_SET_CONST(LVarC, ANIM_MarioB1_Smash1_Swing) EVT_CASE_EQ(1) EVT_SET(LVar9, 2) - EVT_SET_CONST(LVarA, ANIM_Mario_30016) - EVT_SET_CONST(LVarB, ANIM_Mario_30017) - EVT_SET_CONST(LVarC, ANIM_Mario_30019) + EVT_SET_CONST(LVarA, ANIM_MarioB1_Smash2_Hold1) + EVT_SET_CONST(LVarB, ANIM_MarioB1_Smash2_Hold2) + EVT_SET_CONST(LVarC, ANIM_MarioB1_Smash2_Swing) EVT_CASE_EQ(2) EVT_SET(LVar9, 3) - EVT_SET_CONST(LVarA, ANIM_Mario_3001D) - EVT_SET_CONST(LVarB, ANIM_Mario_3001E) - EVT_SET_CONST(LVarC, ANIM_Mario_30020) + EVT_SET_CONST(LVarA, ANIM_MarioB1_Smash3_Hold1) + EVT_SET_CONST(LVarB, ANIM_MarioB1_Smash3_Hold2) + EVT_SET_CONST(LVarC, ANIM_MarioB1_Smash3_Swing) EVT_END_SWITCH EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) diff --git a/src/battle/move/hammer/hammer_charge_0.c b/src/battle/move/hammer/hammer_charge_0.c index 098cad7d8d..b289e21cbc 100644 --- a/src/battle/move/hammer/hammer_charge_0.c +++ b/src/battle/move/hammer/hammer_charge_0.c @@ -192,7 +192,7 @@ EvtScript N(EVS_802A3948) = { EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) EVT_WAIT(8) EVT_END_THREAD - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_50004) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer1_Charging) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_802A11CC_74F2FC, LVar0, LVar1, LVar2, EVT_FLOAT(1.2)) EVT_WAIT(3) @@ -212,12 +212,12 @@ EvtScript N(EVS_802A3948) = { EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_50005, ANIM_Mario_50005, ANIM_Mario_50005) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer1_Charged, ANIM_MarioB3_Hammer1_Charged, ANIM_MarioB3_Hammer1_Charged) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_80273444, 20, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) EVT_WAIT(4) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_CALL(ShowVariableMessageBox, BTL_MSG_04, 60, 1) EVT_ELSE @@ -243,7 +243,7 @@ EvtScript N(EVS_802A3C90) = { EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) EVT_WAIT(8) EVT_END_THREAD - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_50006) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer2_Charging) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_802A11CC_74F2FC, LVar0, LVar1, LVar2, EVT_FLOAT(1.2)) EVT_WAIT(3) @@ -263,12 +263,12 @@ EvtScript N(EVS_802A3C90) = { EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_50007, ANIM_Mario_50007, ANIM_Mario_50007) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer2_Charged, ANIM_MarioB3_Hammer2_Charged, ANIM_MarioB3_Hammer2_Charged) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_80273444, 20, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) EVT_WAIT(4) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_CALL(ShowVariableMessageBox, BTL_MSG_04, 60, 1) EVT_ELSE @@ -294,7 +294,7 @@ EvtScript N(EVS_802A3FD8) = { EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) EVT_WAIT(8) EVT_END_THREAD - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_50008) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer3_Charging) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_802A11CC_74F2FC, LVar0, LVar1, LVar2, EVT_FLOAT(1.2)) EVT_WAIT(3) @@ -314,12 +314,12 @@ EvtScript N(EVS_802A3FD8) = { EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_50009, ANIM_Mario_50009, ANIM_Mario_50009) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer3_Charged, ANIM_MarioB3_Hammer3_Charged, ANIM_MarioB3_Hammer3_Charged) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_80273444, 20, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) EVT_WAIT(4) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_CALL(ShowVariableMessageBox, BTL_MSG_04, 60, 1) EVT_ELSE diff --git a/src/battle/move/hammer/hammer_charge_1.c b/src/battle/move/hammer/hammer_charge_1.c index bc4ec879ea..53a5706a3a 100644 --- a/src/battle/move/hammer/hammer_charge_1.c +++ b/src/battle/move/hammer/hammer_charge_1.c @@ -201,7 +201,7 @@ EvtScript N(EVS_802A39C8) = { EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) EVT_WAIT(8) EVT_END_THREAD - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_50004) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer1_Charging) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkMoveFunc2), LVar0, LVar1, LVar2, EVT_FLOAT(1.2)) EVT_WAIT(3) @@ -221,12 +221,12 @@ EvtScript N(EVS_802A39C8) = { EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_50005, ANIM_Mario_50005, ANIM_Mario_50005) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer1_Charged, ANIM_MarioB3_Hammer1_Charged, ANIM_MarioB3_Hammer1_Charged) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_80273444, 20, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) EVT_WAIT(4) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_CALL(func_802A12FC_7598AC) EVT_CALL(ShowVariableMessageBox, LVar0, 60, 2) @@ -253,7 +253,7 @@ EvtScript N(EVS_802A3D1C) = { EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) EVT_WAIT(8) EVT_END_THREAD - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_50006) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer2_Charging) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkMoveFunc2), LVar0, LVar1, LVar2, EVT_FLOAT(1.2)) EVT_WAIT(3) @@ -273,12 +273,12 @@ EvtScript N(EVS_802A3D1C) = { EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_50007, ANIM_Mario_50007, ANIM_Mario_50007) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer2_Charged, ANIM_MarioB3_Hammer2_Charged, ANIM_MarioB3_Hammer2_Charged) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_80273444, 20, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) EVT_WAIT(4) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_CALL(func_802A12FC_7598AC) EVT_CALL(ShowVariableMessageBox, LVar0, 60, 2) @@ -305,7 +305,7 @@ EvtScript N(EVS_802A4070) = { EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) EVT_WAIT(8) EVT_END_THREAD - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_50008) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer3_Charging) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkMoveFunc2), LVar0, LVar1, LVar2, EVT_FLOAT(1.2)) EVT_WAIT(3) @@ -325,12 +325,12 @@ EvtScript N(EVS_802A4070) = { EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_50009, ANIM_Mario_50009, ANIM_Mario_50009) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer3_Charged, ANIM_MarioB3_Hammer3_Charged, ANIM_MarioB3_Hammer3_Charged) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_80273444, 20, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) EVT_WAIT(4) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_CALL(func_802A12FC_7598AC) EVT_CALL(ShowVariableMessageBox, LVar0, 60, 2) diff --git a/src/battle/move/hammer/hammer_charge_2.c b/src/battle/move/hammer/hammer_charge_2.c index f7c2ed60fc..bc03370ce7 100644 --- a/src/battle/move/hammer/hammer_charge_2.c +++ b/src/battle/move/hammer/hammer_charge_2.c @@ -201,7 +201,7 @@ EvtScript N(EVS_802A39C8) = { EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) EVT_WAIT(8) EVT_END_THREAD - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_50004) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer1_Charging) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkMoveFunc3), LVar0, LVar1, LVar2, EVT_FLOAT(1.2)) EVT_WAIT(3) @@ -221,12 +221,12 @@ EvtScript N(EVS_802A39C8) = { EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_50005, ANIM_Mario_50005, ANIM_Mario_50005) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer1_Charged, ANIM_MarioB3_Hammer1_Charged, ANIM_MarioB3_Hammer1_Charged) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_80273444, 20, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) EVT_WAIT(4) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(func_802A12FC_75E8CC) EVT_CALL(ShowVariableMessageBox, LVar0, 60, 3) EVT_ELSE @@ -251,7 +251,7 @@ EvtScript N(EVS_802A3CF4) = { EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) EVT_WAIT(8) EVT_END_THREAD - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_50006) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer2_Charging) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkMoveFunc3), LVar0, LVar1, LVar2, EVT_FLOAT(1.2)) EVT_WAIT(3) @@ -271,12 +271,12 @@ EvtScript N(EVS_802A3CF4) = { EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_50007, ANIM_Mario_50007, ANIM_Mario_50007) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer2_Charged, ANIM_MarioB3_Hammer2_Charged, ANIM_MarioB3_Hammer2_Charged) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_80273444, 20, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) EVT_WAIT(4) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(func_802A12FC_75E8CC) EVT_CALL(ShowVariableMessageBox, LVar0, 60, 3) EVT_ELSE @@ -301,7 +301,7 @@ EvtScript N(EVS_802A4020) = { EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) EVT_WAIT(8) EVT_END_THREAD - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_50008) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer3_Charging) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkMoveFunc3), LVar0, LVar1, LVar2, EVT_FLOAT(1.2)) EVT_WAIT(3) @@ -321,12 +321,12 @@ EvtScript N(EVS_802A4020) = { EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_50009, ANIM_Mario_50009, ANIM_Mario_50009) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_MarioB3_Hammer3_Charged, ANIM_MarioB3_Hammer3_Charged, ANIM_MarioB3_Hammer3_Charged) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_80273444, 20, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) EVT_WAIT(4) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(func_802A12FC_75E8CC) EVT_CALL(ShowVariableMessageBox, LVar0, 60, 3) EVT_ELSE diff --git a/src/battle/move/hammer/hammer_throw.c b/src/battle/move/hammer/hammer_throw.c index c0b7952731..b99d3d9221 100644 --- a/src/battle/move/hammer/hammer_throw.c +++ b/src/battle/move/hammer/hammer_throw.c @@ -65,14 +65,14 @@ EvtScript N(EVS_802A3E5C) = { EVT_LOOP(10) EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) EVT_IF_EQ(LVar0, TRUE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_ADD(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40016) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_HammerThrow1_Begin) EVT_END_LOOP - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40016) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_HammerThrow1_Begin) EVT_SWITCH(LVar1) EVT_CASE_LT(3) EVT_WAIT(4) @@ -96,14 +96,14 @@ EvtScript N(EVS_802A3FE0) = { EVT_LOOP(10) EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) EVT_IF_EQ(LVar0, TRUE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_ADD(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_4001C) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_HammerThrow2_Begin) EVT_END_LOOP - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_4001C) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_HammerThrow2_Begin) EVT_SWITCH(LVar1) EVT_CASE_LT(3) EVT_WAIT(4) @@ -127,14 +127,14 @@ EvtScript N(EVS_802A4164) = { EVT_LOOP(10) EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) EVT_IF_EQ(LVar0, TRUE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_ADD(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40022) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_HammerThrow3_Begin) EVT_END_LOOP - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40022) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_HammerThrow3_Begin) EVT_SWITCH(LVar1) EVT_CASE_LT(3) EVT_WAIT(4) @@ -154,7 +154,7 @@ EvtScript N(EVS_802A4164) = { EvtScript N(EVS_UseMove_Impl) = { EVT_CALL(LoadActionCommand, ACTION_COMMAND_SMASH) EVT_CALL(action_command_hammer_init) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 16) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) @@ -179,17 +179,17 @@ EvtScript N(EVS_UseMove_Impl) = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40017) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_HammerThrow1_Raise) EVT_WAIT(4) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40018) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_HammerThrow1_Hold1) EVT_CASE_EQ(1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_4001D) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_HammerThrow2_Raise) EVT_WAIT(4) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_4001E) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_HammerThrow2_Hold1) EVT_CASE_EQ(2) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40023) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_HammerThrow3_Raise) EVT_WAIT(4) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40024) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_HammerThrow3_Hold1) EVT_END_SWITCH EVT_CALL(GetActionCommandMode, LVar0) EVT_IF_GT(LVar0, 0) @@ -215,11 +215,11 @@ EvtScript N(EVS_UseMove_Impl) = { EVT_CALL(GetMenuSelection, LVar3, LVar4, LVar5) EVT_SWITCH(LVar4) EVT_CASE_EQ(0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40019) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_HammerThrow1_Hold2) EVT_CASE_EQ(1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_4001F) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_HammerThrow2_Hold2) EVT_CASE_EQ(2) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40025) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_HammerThrow3_Hold2) EVT_END_SWITCH EVT_SET(LVar1, 1) EVT_END_IF @@ -234,11 +234,11 @@ EvtScript N(EVS_UseMove_Impl) = { EVT_CALL(GetMenuSelection, LVar3, LVar4, LVar5) EVT_SWITCH(LVar4) EVT_CASE_EQ(0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40019) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_HammerThrow1_Hold2) EVT_CASE_EQ(1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_4001F) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_HammerThrow2_Hold2) EVT_CASE_EQ(2) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40025) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_HammerThrow3_Hold2) EVT_END_SWITCH EVT_WAIT(30) EVT_END_IF @@ -255,13 +255,13 @@ EvtScript N(EVS_UseMove_Impl) = { EVT_CALL(GetMenuSelection, LVar0, LVar1, LVar2) EVT_SWITCH(LVar1) EVT_CASE_EQ(0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_4001B) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_HammerThrow1_Throw) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2115) EVT_CASE_EQ(1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40021) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_HammerThrow2_Throw) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2116) EVT_CASE_EQ(2) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40027) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_HammerThrow3_Throw) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2117) EVT_END_SWITCH EVT_WAIT(3) @@ -310,7 +310,7 @@ EvtScript N(EVS_UseMove_Impl) = { EVT_ADD(LVar2, 5) EVT_CALL(VirtualEntityJumpTo, LVarA, LVar0, LVar1, LVar2, 20) EVT_END_SWITCH - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(PlayerTestEnemy, LVar3, DAMAGE_TYPE_SMASH | DAMAGE_TYPE_NO_CONTACT, 25, 0, 0, 16) EVT_IF_EQ(LVar3, HIT_RESULT_MISS) EVT_CALL(VirtualEntityLandJump, LVarA) diff --git a/src/battle/move/hammer/mega_quake.c b/src/battle/move/hammer/mega_quake.c index f01c23d4e0..004e68b913 100644 --- a/src/battle/move/hammer/mega_quake.c +++ b/src/battle/move/hammer/mega_quake.c @@ -203,7 +203,7 @@ EvtScript N(EVS_802A3238) = { EVT_END_IF EVT_THREAD EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_END_THREAD EVT_WAIT(10) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_B)) diff --git a/src/battle/move/hammer/power_quake.c b/src/battle/move/hammer/power_quake.c index 7d56a2a8a5..18169d388d 100644 --- a/src/battle/move/hammer/power_quake.c +++ b/src/battle/move/hammer/power_quake.c @@ -152,7 +152,7 @@ EvtScript N(EVS_802A3168) = { EVT_END_IF EVT_THREAD EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_END_THREAD EVT_WAIT(10) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_B)) diff --git a/src/battle/move/hammer/quake_hammer.c b/src/battle/move/hammer/quake_hammer.c index d22d75b3d5..57f9e1cf26 100644 --- a/src/battle/move/hammer/quake_hammer.c +++ b/src/battle/move/hammer/quake_hammer.c @@ -137,7 +137,7 @@ EvtScript N(EVS_802A3168) = { EVT_END_IF EVT_THREAD EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_END_THREAD EVT_WAIT(10) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_B)) diff --git a/src/battle/move/hammer/spin_smash.c b/src/battle/move/hammer/spin_smash.c index b04869653b..10d90f7107 100644 --- a/src/battle/move/hammer/spin_smash.c +++ b/src/battle/move/hammer/spin_smash.c @@ -67,14 +67,14 @@ EvtScript N(EVS_UseMove1_Impl) = { EVT_LOOP(10) EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) EVT_IF_EQ(LVar0, TRUE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_ADD(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40000) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash1_Begin) EVT_END_LOOP - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40000) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash1_Begin) EVT_SWITCH(LVar1) EVT_CASE_LT(3) EVT_WAIT(4) @@ -93,9 +93,9 @@ EvtScript N(EVS_UseMove1_Impl) = { EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40001) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash1_Raise) EVT_WAIT(8) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash1_Hold1) EVT_CALL(N(ShouldMovesAutoSucceed)) EVT_IF_EQ(LVar0, HIT_RESULT_HIT) EVT_LOOP(45) @@ -114,7 +114,7 @@ EvtScript N(EVS_UseMove1_Impl) = { EVT_CALL(GetActionResult, LVar0) EVT_IF_NE(LVar0, 0) EVT_IF_NE(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40003) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash1_Hold2) EVT_SET(LVar1, 1) EVT_END_IF EVT_END_IF @@ -129,9 +129,9 @@ EvtScript N(EVS_UseMove1_Impl) = { EVT_IF_EQ(LVar0, 0) EVT_GOTO(0) EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40004) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash1_PreSwing) EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40005) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash1_Swing) EVT_WAIT(3) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_46) EVT_CALL(StartRumble, 7) @@ -139,7 +139,7 @@ EvtScript N(EVS_UseMove1_Impl) = { EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_WAIT(25) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) EVT_RETURN @@ -157,7 +157,7 @@ EvtScript N(EVS_UseMove1_Impl) = { EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_B)) EVT_RETURN EVT_END_CASE_GROUP @@ -174,7 +174,7 @@ EvtScript N(EVS_UseMove1_Impl) = { EVT_END_LOOP EVT_END_THREAD EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 0) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_B)) EVT_RETURN @@ -190,14 +190,14 @@ EvtScript N(EVS_UseMove2_Impl) = { EVT_LOOP(10) EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) EVT_IF_EQ(LVar0, TRUE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_ADD(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40006) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash2_Begin) EVT_END_LOOP - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40006) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash2_Begin) EVT_SWITCH(LVar1) EVT_CASE_LT(3) EVT_WAIT(4) @@ -215,9 +215,9 @@ EvtScript N(EVS_UseMove2_Impl) = { EVT_CALL(AddGoalPos, ACTOR_PLAYER, 0, 0, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40007) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash2_Raise) EVT_WAIT(8) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40008) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash2_Hold1) EVT_CALL(N(ShouldMovesAutoSucceed)) EVT_IF_EQ(LVar0, FALSE) EVT_LOOP(45) @@ -236,7 +236,7 @@ EvtScript N(EVS_UseMove2_Impl) = { EVT_CALL(GetActionResult, LVar0) EVT_IF_NE(LVar0, 0) EVT_IF_NE(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40009) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash2_Hold2) EVT_SET(LVar1, 1) EVT_END_IF EVT_END_IF @@ -251,9 +251,9 @@ EvtScript N(EVS_UseMove2_Impl) = { EVT_IF_EQ(LVar0, 0) EVT_GOTO(0) EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_4000A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash2_PreSwing) EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_4000B) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash2_Swing) EVT_WAIT(3) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_46) EVT_CALL(StartRumble, 8) @@ -261,7 +261,7 @@ EvtScript N(EVS_UseMove2_Impl) = { EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_WAIT(25) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) EVT_RETURN @@ -279,7 +279,7 @@ EvtScript N(EVS_UseMove2_Impl) = { EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_B)) EVT_RETURN EVT_END_CASE_GROUP @@ -297,7 +297,7 @@ EvtScript N(EVS_UseMove2_Impl) = { EVT_END_THREAD EVT_WAIT(10) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_B)) EVT_RETURN EVT_END @@ -312,14 +312,14 @@ EvtScript N(EVS_UseMove3_Impl) = { EVT_LOOP(10) EVT_CALL(CheckButtonDown, BUTTON_STICK_LEFT, LVar0) EVT_IF_EQ(LVar0, TRUE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_BREAK_LOOP EVT_END_IF EVT_WAIT(1) EVT_ADD(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_4000C) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash3_Begin) EVT_END_LOOP - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_4000C) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash3_Begin) EVT_SWITCH(LVar1) EVT_CASE_LT(3) EVT_WAIT(4) @@ -335,9 +335,9 @@ EvtScript N(EVS_UseMove3_Impl) = { EVT_CALL(InitTargetIterator) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_43) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_10B) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_4000D) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash3_Raise) EVT_WAIT(8) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_4000E) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash3_Hold1) EVT_CALL(N(ShouldMovesAutoSucceed)) EVT_IF_EQ(LVar0, FALSE) EVT_LOOP(45) @@ -356,7 +356,7 @@ EvtScript N(EVS_UseMove3_Impl) = { EVT_CALL(GetActionResult, LVar0) EVT_IF_NE(LVar0, 0) EVT_IF_NE(LVar1, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_4000F) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash3_Hold2) EVT_SET(LVar1, 1) EVT_END_IF EVT_END_IF @@ -366,14 +366,14 @@ EvtScript N(EVS_UseMove3_Impl) = { EVT_END_IF EVT_END_LOOP EVT_LABEL(0) - EVT_WAIT(1) - EVT_CALL(GetActionSuccess, LVar0) - EVT_IF_EQ(LVar0, 0) - EVT_GOTO(0) - EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40010) + EVT_WAIT(1) + EVT_CALL(GetActionSuccess, LVar0) + EVT_IF_EQ(LVar0, 0) + EVT_GOTO(0) + EVT_END_IF + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash3_PreSwing) EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_40011) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB2_SpinSmash3_Swing) EVT_WAIT(3) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_46) EVT_CALL(StartRumble, 9) @@ -381,7 +381,7 @@ EvtScript N(EVS_UseMove3_Impl) = { EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_SMASH, 25, 0, 0, 16) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_WAIT(25) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_C)) EVT_RETURN @@ -399,7 +399,7 @@ EvtScript N(EVS_UseMove3_Impl) = { EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_B)) EVT_RETURN EVT_END_CASE_GROUP @@ -417,7 +417,7 @@ EvtScript N(EVS_UseMove3_Impl) = { EVT_END_THREAD EVT_WAIT(10) EVT_CALL(SetActorYaw, ACTOR_PLAYER, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_EXEC_WAIT(N(EVS_Hammer_ReturnHome_B)) EVT_RETURN EVT_END diff --git a/src/battle/move/item/coconut.c b/src/battle/move/item/coconut.c index d555dd2d60..9adc2f5d76 100644 --- a/src/battle/move/item/coconut.c +++ b/src/battle/move/item/coconut.c @@ -51,7 +51,7 @@ EvtScript N(EVS_UseItem) = { EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) EVT_CALL(MoveBattleCamOver, 15) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Throw) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Throw) EVT_CALL(PlaySound, SOUND_THROW) EVT_WAIT(3) EVT_CALL(CreateVirtualEntity, LVarA, EVT_PTR(N(modelCommandList))) diff --git a/src/battle/move/item/dried_shroom.c b/src/battle/move/item/dried_shroom.c index 7f811fc920..f74ebf0433 100644 --- a/src/battle/move/item/dried_shroom.c +++ b/src/battle/move/item/dried_shroom.c @@ -34,7 +34,7 @@ EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_DRIED_SHROOM) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_EXEC_WAIT(N(EatItem)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_StickOutTongue) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_StickOutTongue) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 0) EVT_ADD(LVar1, 35) @@ -48,7 +48,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar2, 5) EVT_CALL(ShowRecoveryShimmer, LVar0, LVar1, LVar2, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_WAIT(20) EVT_EXEC_WAIT(N(PlayerGoHome)) EVT_RETURN diff --git a/src/battle/move/item/dusty_hammer.c b/src/battle/move/item/dusty_hammer.c index 7fc9a51091..bcdb6932b8 100644 --- a/src/battle/move/item/dusty_hammer.c +++ b/src/battle/move/item/dusty_hammer.c @@ -50,7 +50,7 @@ EvtScript N(EVS_UseItem) = { EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) EVT_CALL(MoveBattleCamOver, 15) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Throw) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Throw) EVT_CALL(PlaySound, SOUND_THROW) EVT_WAIT(3) EVT_CALL(CreateVirtualEntity, LVarA, EVT_PTR(N(EMS_DustyHammer))) diff --git a/src/battle/move/item/egg_missile.c b/src/battle/move/item/egg_missile.c index 12d431ec20..3b17821a63 100644 --- a/src/battle/move/item/egg_missile.c +++ b/src/battle/move/item/egg_missile.c @@ -152,7 +152,7 @@ EvtScript N(EVS_UseItem) = { EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) EVT_CALL(MoveBattleCamOver, 15) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Throw) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Throw) EVT_CALL(PlaySound, SOUND_THROW) EVT_WAIT(3) EVT_CALL(CreateVirtualEntity, LVarA, EVT_PTR(N(EMS_EggMissile))) diff --git a/src/battle/move/item/electro_pop.c b/src/battle/move/item/electro_pop.c index fd1cba7233..d117379540 100644 --- a/src/battle/move/item/electro_pop.c +++ b/src/battle/move/item/electro_pop.c @@ -109,11 +109,11 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(ShowStartRecoveryShimmer, LVar0, LVar1, LVar2, LVar3) EVT_CALL(N(AddFP), LVar3) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_ThumbsUp) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_ThumbsUp) EVT_WAIT(30) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(ShowRecoveryShimmer, LVar0, LVar1, LVar2, LVar3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_WAIT(20) EVT_CALL(ShowMessageBox, BTL_MSG_10, 60) EVT_CALL(WaitForMessageBoxDone) diff --git a/src/battle/move/item/fire_flower.c b/src/battle/move/item/fire_flower.c index fddb0bdc02..dd0dc6c9c9 100644 --- a/src/battle/move/item/fire_flower.c +++ b/src/battle/move/item/fire_flower.c @@ -43,10 +43,10 @@ EvtScript N(EVS_UseItem) = { EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(N(FadeBackgroundToBlack)) EVT_CALL(PlaySound, SOUND_377) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPlant) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_PlantFireFlower) EVT_THREAD EVT_WAIT(50) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_END_THREAD EVT_WAIT(35) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -60,10 +60,10 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 10) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(2.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_END_THREAD EVT_THREAD EVT_CALL(N(func_802A123C_716E9C), LVar3, LVar4, LVar5) diff --git a/src/battle/move/item/food.c b/src/battle/move/item/food.c index 192a701e3a..fe1cc7cdb3 100644 --- a/src/battle/move/item/food.c +++ b/src/battle/move/item/food.c @@ -116,10 +116,10 @@ EvtScript N(EVS_FeedPartner) = { EVT_SET(LVar1, LVarF) EVT_EXEC_WAIT(N(UseItem)) EVT_SET(LVarE, LVarA) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Throw) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Throw) EVT_THREAD EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_END_THREAD EVT_CALL(CreateVirtualEntity, LVarA, EVT_PTR(D_80283EE8)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -197,7 +197,7 @@ EvtScript N(EVS_UseItem) = { EVT_EXEC_WAIT(N(DrinkItem)) EVT_END_IF EVT_IF_EQ(LVarF, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_StickOutTongue) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_StickOutTongue) EVT_END_IF EVT_IF_GT(LVarB, 0) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -228,14 +228,14 @@ EvtScript N(EVS_UseItem) = { EVT_END_IF EVT_IF_EQ(LVarF, 0) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_ThumbsUp) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_ThumbsUp) EVT_WAIT(30) EVT_ELSE EVT_WAIT(30) EVT_END_IF EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(ShowRecoveryShimmer, LVar0, LVar1, LVar2, LVarB) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_WAIT(20) EVT_EXEC_WAIT(N(PlayerGoHome)) EVT_RETURN diff --git a/src/battle/move/item/fright_jar.c b/src/battle/move/item/fright_jar.c index 030be481ba..af73b06722 100644 --- a/src/battle/move/item/fright_jar.c +++ b/src/battle/move/item/fright_jar.c @@ -36,7 +36,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 50) EVT_END_THREAD - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Crouch) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Crouch) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_367) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -40) @@ -75,7 +75,7 @@ EvtScript N(EVS_UseItem) = { EVT_GOTO(0) EVT_END_IF EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Walking) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Walk) EVT_CALL(N(func_802A12D4_72BBE4)) EVT_WAIT(20) EVT_EXEC_WAIT(N(PlayerGoHome)) diff --git a/src/battle/move/item/hustle_drink.c b/src/battle/move/item/hustle_drink.c index c9b62a3006..c0f20e72a2 100644 --- a/src/battle/move/item/hustle_drink.c +++ b/src/battle/move/item/hustle_drink.c @@ -44,7 +44,7 @@ EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_HUSTLE_DRINK) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_EXEC_WAIT(N(DrinkItem)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Squish) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Squish) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 25) EVT_CALL(ShowStartRecoveryShimmer, LVar0, LVar1, LVar2, 5) @@ -102,7 +102,7 @@ EvtScript N(EVS_UseItem) = { EVT_WAIT(1) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_WAIT(1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_END_THREAD EVT_LOOP(10) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_369) @@ -111,7 +111,7 @@ EvtScript N(EVS_UseItem) = { EVT_WAIT(4) EVT_END_LOOP EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 20) EVT_WAIT(20) diff --git a/src/battle/move/item/insecticide_herb.c b/src/battle/move/item/insecticide_herb.c index a0ca4dce7f..a8c48f82b7 100644 --- a/src/battle/move/item/insecticide_herb.c +++ b/src/battle/move/item/insecticide_herb.c @@ -96,7 +96,7 @@ EvtScript N(EVS_UseItem) = { EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) EVT_CALL(MoveBattleCamOver, 15) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Throw) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Throw) EVT_CALL(PlaySound, SOUND_THROW) EVT_WAIT(3) EVT_CALL(CreateVirtualEntity, LVarA, EVT_PTR(N(modelCommandList))) diff --git a/src/battle/move/item/life_shroom.c b/src/battle/move/item/life_shroom.c index 4eb72fbfdf..8e1736fed0 100644 --- a/src/battle/move/item/life_shroom.c +++ b/src/battle/move/item/life_shroom.c @@ -106,10 +106,10 @@ EvtScript N(script6) = { EVT_SET(LVar1, LVarF) EVT_EXEC_WAIT(N(UseItem)) EVT_SET(LVarE, LVarA) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Throw) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Throw) EVT_THREAD EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_END_THREAD EVT_CALL(CreateVirtualEntity, LVarA, EVT_PTR(D_80283EE8)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -192,11 +192,11 @@ EvtScript N(EVS_UseItem) = { EVT_ADD(LVar1, 25) EVT_CALL(ShowStartRecoveryShimmer, LVar0, LVar1, LVar2, LVar3) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_ThumbsUp) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_ThumbsUp) EVT_WAIT(30) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(ShowRecoveryShimmer, LVar0, LVar1, LVar2, LVar3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_WAIT(20) EVT_EXEC_WAIT(N(PlayerGoHome)) EVT_RETURN diff --git a/src/battle/move/item/mushroom.c b/src/battle/move/item/mushroom.c index a00a0d9bc4..224d2866e5 100644 --- a/src/battle/move/item/mushroom.c +++ b/src/battle/move/item/mushroom.c @@ -105,10 +105,10 @@ EvtScript N(script6) = { EVT_SET(LVar1, LVarF) EVT_EXEC_WAIT(N(UseItem)) EVT_SET(LVarE, LVarA) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Throw) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Throw) EVT_THREAD EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_END_THREAD EVT_CALL(CreateVirtualEntity, LVarA, EVT_PTR(D_80283EE8)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -182,7 +182,7 @@ EvtScript N(EVS_UseItem) = { EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_EXEC_WAIT(N(EatItem)) EVT_IF_EQ(LVarF, 1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_StickOutTongue) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_StickOutTongue) EVT_END_IF EVT_IF_GT(LVarB, 0) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -207,14 +207,14 @@ EvtScript N(EVS_UseItem) = { EVT_END_IF EVT_IF_EQ(LVarF, 0) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_ThumbsUp) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_ThumbsUp) EVT_WAIT(30) EVT_ELSE EVT_WAIT(30) EVT_END_IF EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(ShowRecoveryShimmer, LVar0, LVar1, LVar2, LVarB) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_WAIT(20) EVT_EXEC_WAIT(N(PlayerGoHome)) EVT_RETURN diff --git a/src/battle/move/item/pebble.c b/src/battle/move/item/pebble.c index 2ef261db39..4b876d83bf 100644 --- a/src/battle/move/item/pebble.c +++ b/src/battle/move/item/pebble.c @@ -50,7 +50,7 @@ EvtScript N(EVS_UseItem) = { EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) EVT_CALL(MoveBattleCamOver, 15) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Throw) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Throw) EVT_CALL(PlaySound, SOUND_THROW) EVT_WAIT(3) EVT_CALL(CreateVirtualEntity, LVarA, EVT_PTR(N(modelCommandList))) diff --git a/src/battle/move/item/please_come_back.c b/src/battle/move/item/please_come_back.c index f560f99ce8..e57fa97aed 100644 --- a/src/battle/move/item/please_come_back.c +++ b/src/battle/move/item/please_come_back.c @@ -10,13 +10,13 @@ EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_DIZZY_DIAL) //@bug should be ITEM_PLEASE_COME_BACK EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_10009) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.8)) EVT_CALL(func_80273444, 4, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_8000B) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioW2_PleaseComeBack) EVT_WAIT(8) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_RETURN EVT_END }; diff --git a/src/battle/move/item/pow_block.c b/src/battle/move/item/pow_block.c index 48cc2147e7..62b8e6b4ff 100644 --- a/src/battle/move/item/pow_block.c +++ b/src/battle/move/item/pow_block.c @@ -63,7 +63,7 @@ EvtScript N(EVS_UseItem) = { EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, -30, 65, 20, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, -40, 60, 20, 0, 0, 0) EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 2, -40, 55, 20, 0, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_WAIT(20) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 20) @@ -91,15 +91,15 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 30) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerRunToGoal, 0) EVT_WAIT(5) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_10009) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(0.6)) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_80273444, 20, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(InitTargetIterator) diff --git a/src/battle/move/item/repel_gel.c b/src/battle/move/item/repel_gel.c index b412a585e3..8f787d4830 100644 --- a/src/battle/move/item/repel_gel.c +++ b/src/battle/move/item/repel_gel.c @@ -24,9 +24,9 @@ EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_REPEL_GEL) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_375) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30008) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_ApplyCream) EVT_WAIT(45) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 3, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0) diff --git a/src/battle/move/item/sleepy_sheep.c b/src/battle/move/item/sleepy_sheep.c index 37ec01a769..453f8e3de3 100644 --- a/src/battle/move/item/sleepy_sheep.c +++ b/src/battle/move/item/sleepy_sheep.c @@ -315,7 +315,7 @@ EvtScript N(EVS_UseItem) = { EVT_END_LOOP EVT_END_THREAD EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 32) EVT_CALL(ShowEmote, 0x00000000, EMOTE_QUESTION, -45, 20, EMOTER_POS, LVar0, LVar1, LVar2, 10) @@ -343,7 +343,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 20) EVT_WAIT(8) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_1002B, ANIM_Mario_1002B, ANIM_Mario_AnimMidair) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Flail, ANIM_Mario1_Flail, ANIM_Mario1_Fall) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.8)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -380,7 +380,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(VirtualEntityJumpTo, LVarA, LVar0, LVar1, LVar2, 0) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_HIT_BLOCK) EVT_THREAD - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_ShockStill) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_VacantStare) EVT_CALL(SetActorScale, ACTOR_PLAYER, EVT_FLOAT(1.2), EVT_FLOAT(0.9), EVT_FLOAT(1.0)) EVT_WAIT(1) EVT_CALL(SetActorScale, ACTOR_PLAYER, EVT_FLOAT(1.3), EVT_FLOAT(0.8), EVT_FLOAT(1.0)) @@ -396,7 +396,7 @@ EvtScript N(EVS_UseItem) = { EVT_ADD(LVar0, 60) EVT_CALL(VirtualEntityJumpTo, LVarA, LVar0, LVar1, LVar2, 0) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 2, LVar0, LVar1, LVar2, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_ADD(LVar0, 20) EVT_CALL(VirtualEntityJumpTo, LVarA, LVar0, LVar1, LVar2, 0) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 2, LVar0, LVar1, LVar2, 0, 0) diff --git a/src/battle/move/item/snowman_doll.c b/src/battle/move/item/snowman_doll.c index 359000280e..5e0a67ae7c 100644 --- a/src/battle/move/item/snowman_doll.c +++ b/src/battle/move/item/snowman_doll.c @@ -101,7 +101,7 @@ EvtScript N(EVS_UseItem) = { EVT_IF_NE(LVar0, -1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_WAIT(30) EVT_CALL(N(func_802A13B8_71C1E8)) EVT_EXEC_WAIT(N(PlayerGoHome)) diff --git a/src/battle/move/item/stone_cap.c b/src/battle/move/item/stone_cap.c index 5d024d441c..51290d88b0 100644 --- a/src/battle/move/item/stone_cap.c +++ b/src/battle/move/item/stone_cap.c @@ -54,9 +54,9 @@ EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_STONE_CAP) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_CALL(PlaySound, SOUND_361) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30009) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_AdjustCap) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Crouch) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Crouch) EVT_CALL(GetItemPower, ITEM_STONE_CAP, LVar0, LVar1) EVT_CALL(PlaySound, SOUND_362) EVT_CALL(N(func_802A123C_7217DC)) diff --git a/src/battle/move/item/strange_cake.c b/src/battle/move/item/strange_cake.c index cc901c4c02..199e766e50 100644 --- a/src/battle/move/item/strange_cake.c +++ b/src/battle/move/item/strange_cake.c @@ -282,19 +282,19 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(ShowStartRecoveryShimmer, LVar0, LVar1, LVar2, LVar3) EVT_CALL(N(AddFP), LVar3) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_ThumbsUp) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_ThumbsUp) EVT_WAIT(30) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(ShowRecoveryShimmer, LVar0, LVar1, LVar2, LVar3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_ELSE EVT_SET_CONST(LVarA, ITEM_STRANGE_CAKE) EVT_SET(LVar1, 0) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_EXEC_WAIT(N(EatItem)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_END_IF EVT_WAIT(10) EVT_THREAD @@ -318,7 +318,7 @@ EvtScript N(EVS_UseItem) = { }; EvtScript N(script7) = { - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_PLAY_EFFECT(EFFECT_SNAKING_STATIC, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0) @@ -331,7 +331,7 @@ EvtScript N(script7) = { }; EvtScript N(script8) = { - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 6, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 30, 0) @@ -344,7 +344,7 @@ EvtScript N(script8) = { }; EvtScript N(script9) = { - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_30004) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_MarioB1_Sleep) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(GetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_EXEC(DoSleepHit) diff --git a/src/battle/move/item/super_soda.c b/src/battle/move/item/super_soda.c index 8e3b311379..e3d93d4f67 100644 --- a/src/battle/move/item/super_soda.c +++ b/src/battle/move/item/super_soda.c @@ -109,10 +109,10 @@ EvtScript N(script6) = { EVT_SET(LVar1, LVarF) EVT_EXEC_WAIT(N(UseItem)) EVT_SET(LVarE, LVarA) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Throw) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Throw) EVT_THREAD EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_END_THREAD EVT_CALL(CreateVirtualEntity, LVarA, EVT_PTR(D_80283EE8)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) @@ -178,7 +178,7 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(GetOwnerTarget, LVar0, LVar1) EVT_IF_EQ(LVar0, 0) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_2095) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Drink) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Drink) EVT_WAIT(45) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 0) @@ -190,9 +190,9 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(ShowStartRecoveryShimmer, LVar0, LVar1, LVar2, 5) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_ThumbsUp) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_ThumbsUp) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(ShowRecoveryShimmer, LVar0, LVar1, LVar2, 5) EVT_CALL(InitTargetIterator) diff --git a/src/battle/move/item/tasty_tonic.c b/src/battle/move/item/tasty_tonic.c index d9451a6055..8558457935 100644 --- a/src/battle/move/item/tasty_tonic.c +++ b/src/battle/move/item/tasty_tonic.c @@ -48,9 +48,9 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(ShowStartRecoveryShimmer, LVar0, LVar1, LVar2, 10) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_ThumbsUp) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_ThumbsUp) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar2, 5) EVT_CALL(ShowRecoveryShimmer, LVar0, LVar1, LVar2, 10) diff --git a/src/battle/move/item/thunder_bolt.c b/src/battle/move/item/thunder_bolt.c index c4bd7ee4f2..fd99b4b39d 100644 --- a/src/battle/move/item/thunder_bolt.c +++ b/src/battle/move/item/thunder_bolt.c @@ -82,7 +82,7 @@ EvtScript N(EVS_UseItem) = { EVT_WAIT(5) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) EVT_CALL(MoveBattleCamOver, 20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_WAIT(30) EVT_CALL(battle_item_thunder_bolt_func_802A1420_722F60) EVT_EXEC_WAIT(battle_item_thunder_bolt_PlayerGoHome) diff --git a/src/battle/move/item/thunder_rage.c b/src/battle/move/item/thunder_rage.c index 51bbe98a8b..fb0eb0d6b6 100644 --- a/src/battle/move/item/thunder_rage.c +++ b/src/battle/move/item/thunder_rage.c @@ -87,7 +87,7 @@ EvtScript N(EVS_UseItem) = { EVT_END_IF EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_D) EVT_CALL(MoveBattleCamOver, 20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_WAIT(30) EVT_CALL(N(func_802A12D4_71B474)) EVT_EXEC_WAIT(N(PlayerGoHome)) diff --git a/src/battle/move/item/ultra_shroom.c b/src/battle/move/item/ultra_shroom.c index 69be54ef08..c488d49b17 100644 --- a/src/battle/move/item/ultra_shroom.c +++ b/src/battle/move/item/ultra_shroom.c @@ -45,12 +45,12 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(ShowStartRecoveryShimmer, LVar0, LVar1, LVar2, 10) EVT_CALL(N(HealPlayer10)) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_ThumbsUp) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_ThumbsUp) EVT_WAIT(30) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar2, 5) EVT_CALL(ShowRecoveryShimmer, LVar0, LVar1, LVar2, 10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_WAIT(20) EVT_EXEC_WAIT(N(PlayerGoHome)) EVT_RETURN diff --git a/src/battle/move/item/unknown_item.c b/src/battle/move/item/unknown_item.c index 57b2b3fd46..b986406870 100644 --- a/src/battle/move/item/unknown_item.c +++ b/src/battle/move/item/unknown_item.c @@ -43,12 +43,12 @@ EvtScript N(EVS_UseItem) = { EVT_CALL(ShowStartRecoveryShimmer, LVar0, LVar1, LVar2, 20) EVT_CALL(N(HealPlayer20)) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_ThumbsUp) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_ThumbsUp) EVT_WAIT(30) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar2, 5) EVT_CALL(ShowRecoveryShimmer, LVar0, LVar1, LVar2, 20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_WAIT(20) EVT_EXEC_WAIT(N(PlayerGoHome)) EVT_RETURN diff --git a/src/battle/move/item/volt_shroom.c b/src/battle/move/item/volt_shroom.c index 67cffeae34..90e18a8d5c 100644 --- a/src/battle/move/item/volt_shroom.c +++ b/src/battle/move/item/volt_shroom.c @@ -21,7 +21,7 @@ EvtScript N(EVS_UseItem) = { EVT_SET_CONST(LVarA, ITEM_VOLT_SHROOM) EVT_EXEC_WAIT(N(UseItemWithEffect)) EVT_EXEC_WAIT(N(EatItem)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_SET(LVar3, 20) EVT_CALL(MultiplyByActorScale, LVar3) diff --git a/src/battle/move/jump/attack.c b/src/battle/move/jump/attack.c index 8aeb9f8b2f..5b2830a2e7 100644 --- a/src/battle/move/jump/attack.c +++ b/src/battle/move/jump/attack.c @@ -103,7 +103,7 @@ EvtScript N(EVS_UseMove0_ImplA) = { EVT_CALL(ShowActionHud, FALSE) EVT_CALL(action_command_jump_start, 24, 3) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_1000C) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) EVT_CALL(func_80274A18, 24, 3) EVT_WAIT(1) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) @@ -155,7 +155,7 @@ EvtScript N(EVS_UseMove0_ImplB) = { EVT_CALL(action_command_jump_start, 37, 3) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(EnablePlayerBlur, 1) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) EVT_CALL(func_802752AC, 20, 4) EVT_WAIT(7) EVT_CALL(func_802752AC, 3, 5) @@ -210,7 +210,7 @@ EvtScript N(EVS_UseMove0_ImplC) = { EVT_CALL(action_command_jump_start, 25, 3) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(EnablePlayerBlur, 1) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000C) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) EVT_CALL(func_80275F00, 25, 4) EVT_CALL(EnablePlayerBlur, -1) EVT_WAIT(1) @@ -260,7 +260,7 @@ EvtScript N(EVS_UseMove1_ImplA) = { EVT_SET(LVarA, LVar0) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_30000) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) EVT_CALL(func_80274A18, LVarA, 0) EVT_CALL(N(GetJumpDamage)) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) @@ -280,7 +280,7 @@ EvtScript N(EVS_UseMove1_ImplB) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_C)) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_37) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) EVT_CALL(func_802752AC, LVarA, 0) EVT_WAIT(7) EVT_CALL(func_802752AC, 3, 1) @@ -303,7 +303,7 @@ EvtScript N(EVS_UseMove1_ImplC) = { EVT_EXEC_WAIT(N(EVS_JumpSupport_D)) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_38) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_30000) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_MarioB1_Stomp) EVT_CALL(func_80275F00, LVarA, 0) EVT_SET(LVarA, 4) EVT_CALL(func_80275F00, LVarA, 1) @@ -373,7 +373,7 @@ EvtScript N(EVS_UseMove2_ImplA) = { EVT_CALL(ShowActionHud, FALSE) EVT_CALL(action_command_jump_start, 24, 3) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_1000C) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) EVT_CALL(func_80274A18, 24, 3) EVT_WAIT(1) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) @@ -425,7 +425,7 @@ EvtScript N(EVS_UseMove2_ImplB) = { EVT_CALL(action_command_jump_start, 37, 3) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(EnablePlayerBlur, 1) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) EVT_CALL(func_802752AC, 20, 4) EVT_WAIT(7) EVT_CALL(func_802752AC, 3, 5) @@ -482,7 +482,7 @@ EvtScript N(EVS_UseMove2_ImplC) = { EVT_CALL(action_command_jump_start, 25, 3) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(EnablePlayerBlur, 1) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000C) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) EVT_CALL(func_80275F00, 25, 4) EVT_CALL(EnablePlayerBlur, -1) EVT_WAIT(1) @@ -503,7 +503,7 @@ EvtScript N(EVS_802A4018) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(AddGoalPos, ACTOR_PLAYER, -5, 10, 0) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_30000) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) EVT_CALL(func_80274A18, LVarA, 0) EVT_CALL(GetActionCommandMode, LVar0) EVT_IF_EQ(LVar0, 2) @@ -557,7 +557,7 @@ EvtScript N(EVS_802A4018) = { EVT_CALL(ShowActionHud, FALSE) EVT_CALL(action_command_jump_start, 24, 3) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_1000C) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) EVT_CALL(func_80274A18, 24, 3) EVT_WAIT(1) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) diff --git a/src/battle/move/jump/auto_jump.c b/src/battle/move/jump/auto_jump.c index d3681def25..0d2e71df3a 100644 --- a/src/battle/move/jump/auto_jump.c +++ b/src/battle/move/jump/auto_jump.c @@ -78,7 +78,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(ShowActionHud, FALSE) EVT_CALL(action_command_jump_start, 24, 3) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_1000C) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) EVT_CALL(func_80274A18, 24, 3) EVT_WAIT(1) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) @@ -130,7 +130,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(action_command_jump_start, 37, 3) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(EnablePlayerBlur, 1) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) EVT_CALL(func_802752AC, 20, 4) EVT_WAIT(7) EVT_CALL(func_802752AC, 3, 5) @@ -185,7 +185,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(action_command_jump_start, 25, 3) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(EnablePlayerBlur, 1) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000C) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) EVT_CALL(func_80275F00, 25, 4) EVT_CALL(EnablePlayerBlur, 0) EVT_WAIT(1) diff --git a/src/battle/move/jump/auto_multibounce.c b/src/battle/move/jump/auto_multibounce.c index 0c201d9b43..90340db63c 100644 --- a/src/battle/move/jump/auto_multibounce.c +++ b/src/battle/move/jump/auto_multibounce.c @@ -94,7 +94,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_ADD(LVarA, 5) EVT_CALL(action_command_jump_start, LVarA, 3) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_1000C) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) EVT_IF_EQ(LVarF, 1) EVT_CALL(func_80274A18, LVarA, 3) EVT_ELSE @@ -235,7 +235,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) EVT_CALL(EnablePlayerBlur, 1) EVT_IF_EQ(LVarF, 1) EVT_CALL(func_802752AC, 20, 3) @@ -381,7 +381,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(action_command_jump_start, 25, 3) EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000C) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) EVT_IF_EQ(LVarF, 1) EVT_CALL(func_80275F00, 25, 2) EVT_ELSE diff --git a/src/battle/move/jump/d_down_jump.c b/src/battle/move/jump/d_down_jump.c index f14a6e08ff..f76a0cc565 100644 --- a/src/battle/move/jump/d_down_jump.c +++ b/src/battle/move/jump/d_down_jump.c @@ -87,7 +87,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(ShowActionHud, FALSE) EVT_CALL(action_command_jump_start, 24, 3) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_1000C) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) EVT_CALL(func_80274A18, 24, 3) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(func_802A10E4_781A04), LVar0, LVar1, LVar2) @@ -145,7 +145,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(action_command_jump_start, 37, 3) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(EnablePlayerBlur, 1) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) EVT_CALL(func_802752AC, 20, 4) EVT_WAIT(7) EVT_CALL(func_802752AC, 3, 5) @@ -206,7 +206,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(action_command_jump_start, 25, 3) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(EnablePlayerBlur, 1) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000C) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) EVT_CALL(func_80275F00, 25, 4) EVT_CALL(EnablePlayerBlur, 0) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) diff --git a/src/battle/move/jump/demo_power_bounce.c b/src/battle/move/jump/demo_power_bounce.c index f1d23e90d4..2678bd4041 100644 --- a/src/battle/move/jump/demo_power_bounce.c +++ b/src/battle/move/jump/demo_power_bounce.c @@ -68,7 +68,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(action_command_jump_start, LVarA, 1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_30000) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) EVT_CALL(func_80274A18, LVarA, 0) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) @@ -130,7 +130,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(action_command_jump_start, LVarA, 5) EVT_END_SWITCH EVT_SUB(LVarD, 1) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_1000C) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_IF_EQ(LVarF, 0) EVT_CALL(func_80274A18, 24, 3) @@ -204,7 +204,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(action_command_jump_start, LVarA, 1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_30000) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) EVT_CALL(func_80274A18, LVarA, 0) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) @@ -261,7 +261,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_END_SWITCH EVT_SUB(LVarD, 1) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) EVT_CALL(EnablePlayerBlur, 1) EVT_IF_EQ(LVarF, 0) EVT_CALL(func_802752AC, 20, 3) @@ -340,7 +340,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(action_command_jump_start, LVarA, 1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_30000) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) EVT_CALL(func_80274A18, LVarA, 0) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) @@ -398,7 +398,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_SUB(LVarD, 1) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(EnablePlayerBlur, 1) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000C) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) EVT_IF_EQ(LVarF, 0) EVT_CALL(func_80275F00, 25, 2) EVT_ELSE diff --git a/src/battle/move/jump/dizzy_stomp.c b/src/battle/move/jump/dizzy_stomp.c index 378fc16855..cb4aa5b921 100644 --- a/src/battle/move/jump/dizzy_stomp.c +++ b/src/battle/move/jump/dizzy_stomp.c @@ -65,7 +65,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(ShowActionHud, FALSE) EVT_CALL(action_command_jump_start, 24, 3) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_1000C) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) EVT_CALL(func_80274A18, 24, 3) EVT_WAIT(1) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) @@ -117,7 +117,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(action_command_jump_start, 37, 3) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(EnablePlayerBlur, 1) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) EVT_CALL(func_802752AC, 20, 4) EVT_WAIT(7) EVT_CALL(func_802752AC, 3, 5) @@ -172,7 +172,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(action_command_jump_start, 25, 3) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(EnablePlayerBlur, 1) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000C) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) EVT_CALL(func_80275F00, 25, 4) EVT_CALL(EnablePlayerBlur, 0) EVT_WAIT(1) diff --git a/src/battle/move/jump/earthquake_jump.c b/src/battle/move/jump/earthquake_jump.c index aec5bb39a2..1f0147225a 100644 --- a/src/battle/move/jump/earthquake_jump.c +++ b/src/battle/move/jump/earthquake_jump.c @@ -56,9 +56,9 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(AddGoalPos, ACTOR_PLAYER, -30, 0, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_26) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(5.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(CancelablePlayerRunToGoal, 0, LVar0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(AddGoalPos, ACTOR_PLAYER, 30, 0, 0) EVT_EXEC_WAIT(N(EVS_JumpSupport_B)) @@ -67,7 +67,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(action_command_jump_start, LVarB, 3) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) EVT_CALL(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_30000, ANIM_Mario_30000) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_MarioB1_Stomp, ANIM_MarioB1_Stomp) EVT_CALL(func_80274A18, LVarA, 0) EVT_CHILD_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.2)) @@ -154,7 +154,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CASE_DEFAULT EVT_CALL(action_command_jump_start, LVarA, 5) EVT_END_SWITCH - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_1000C) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) EVT_CALL(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) EVT_IF_EQ(LVarF, 0) EVT_CALL(func_80274A18, 24, 3) @@ -274,20 +274,20 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(AddGoalPos, ACTOR_PLAYER, -30, 0, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_26) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(5.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(CancelablePlayerRunToGoal, 0, LVar0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(AddGoalPos, ACTOR_PLAYER, 30, 0, 0) EVT_EXEC_WAIT(N(EVS_CheckForAPress)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_BeforeJump) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_BeforeJump) EVT_EXEC_WAIT(N(EVS_JumpSupport_B)) EVT_SET(LVarB, LVarA) EVT_ADD(LVarB, 2) EVT_CALL(action_command_jump_start, LVarB, 3) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) EVT_CALL(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_30000, ANIM_Mario_30000) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_MarioB1_Stomp, ANIM_MarioB1_Stomp) EVT_CALL(func_80274A18, LVarA, 0) EVT_CHILD_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.2)) @@ -375,7 +375,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(action_command_jump_start, LVarA, 5) EVT_END_SWITCH EVT_CALL(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) EVT_CALL(EnablePlayerBlur, 1) EVT_IF_EQ(LVarF, 0) EVT_CALL(func_802752AC, 20, 3) @@ -500,20 +500,20 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(AddGoalPos, ACTOR_PLAYER, -30, 0, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_26) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(5.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(CancelablePlayerRunToGoal, 0, LVar0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(AddGoalPos, ACTOR_PLAYER, 30, 0, 0) EVT_EXEC_WAIT(N(EVS_CheckForAPress)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_BeforeJump) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_BeforeJump) EVT_EXEC_WAIT(N(EVS_JumpSupport_B)) EVT_SET(LVarB, LVarA) EVT_ADD(LVarB, 2) EVT_CALL(action_command_jump_start, LVarB, 3) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) EVT_CALL(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_30000, ANIM_Mario_30000) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_MarioB1_Stomp, ANIM_MarioB1_Stomp) EVT_CALL(func_80274A18, LVarA, 0) EVT_CHILD_THREAD EVT_CALL(ShakeCam, CAM_BATTLE, 0, 2, EVT_FLOAT(0.2)) @@ -602,7 +602,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_END_SWITCH EVT_CALL(SetGoalPos, ACTOR_PLAYER, 30, 0, 0) EVT_CALL(EnablePlayerBlur, 1) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000C) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) EVT_IF_EQ(LVarF, 0) EVT_CALL(func_80275F00, 25, 2) EVT_ELSE diff --git a/src/battle/move/jump/jump_charge_0.c b/src/battle/move/jump/jump_charge_0.c index f8ed4a33ce..16b10794e3 100644 --- a/src/battle/move/jump/jump_charge_0.c +++ b/src/battle/move/jump/jump_charge_0.c @@ -56,7 +56,7 @@ EvtScript N(EVS_UseMove0) = { EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) EVT_WAIT(8) EVT_END_CHILD_THREAD - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_ReadyJump) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_FightingStance) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(func_802A120C_74D77C), LVar0, LVar1, LVar2, EVT_FLOAT(1.2)) EVT_WAIT(3) @@ -77,12 +77,12 @@ EvtScript N(EVS_UseMove0) = { EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_10009) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_80273444, 20, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) EVT_WAIT(4) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_CALL(ShowVariableMessageBox, BTL_MSG_06, 60, 1) EVT_ELSE @@ -97,9 +97,9 @@ EvtScript N(EVS_UseMove0) = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_RETURN EVT_END }; diff --git a/src/battle/move/jump/jump_charge_1.c b/src/battle/move/jump/jump_charge_1.c index 8f2c49f2a1..bf56377da3 100644 --- a/src/battle/move/jump/jump_charge_1.c +++ b/src/battle/move/jump/jump_charge_1.c @@ -65,7 +65,7 @@ EvtScript N(EVS_UseMove0) = { EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) EVT_WAIT(8) EVT_END_CHILD_THREAD - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_ReadyJump) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_FightingStance) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkMoveFunc2), LVar0, LVar1, LVar2, EVT_FLOAT(1.2)) EVT_WAIT(3) @@ -86,12 +86,12 @@ EvtScript N(EVS_UseMove0) = { EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_10009) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_80273444, 20, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) EVT_WAIT(4) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_CALL(N(func_802A133C_75CCBC)) EVT_CALL(ShowVariableMessageBox, LVar0, 60, 2) @@ -107,9 +107,9 @@ EvtScript N(EVS_UseMove0) = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_RETURN EVT_END }; diff --git a/src/battle/move/jump/jump_charge_2.c b/src/battle/move/jump/jump_charge_2.c index 2e9cced075..03a703c4fd 100644 --- a/src/battle/move/jump/jump_charge_2.c +++ b/src/battle/move/jump/jump_charge_2.c @@ -65,7 +65,7 @@ EvtScript N(EVS_UseMove0) = { EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_156) EVT_WAIT(8) EVT_END_CHILD_THREAD - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_ReadyJump) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_FightingStance) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkMoveFunc3), LVar0, LVar1, LVar2, EVT_FLOAT(1.2)) EVT_WAIT(3) @@ -86,12 +86,12 @@ EvtScript N(EVS_UseMove0) = { EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_10009) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_80273444, 20, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) EVT_WAIT(4) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(N(func_802A133C_761C5C)) EVT_CALL(ShowVariableMessageBox, LVar0, 60, 3) EVT_ELSE @@ -105,9 +105,9 @@ EvtScript N(EVS_UseMove0) = { EVT_END_IF EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_RETURN EVT_END }; diff --git a/src/battle/move/jump/multibounce.c b/src/battle/move/jump/multibounce.c index 5f24708308..6d4cd21fcc 100644 --- a/src/battle/move/jump/multibounce.c +++ b/src/battle/move/jump/multibounce.c @@ -39,7 +39,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(action_command_jump_start, LVarA, 1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_30000) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) EVT_CALL(func_80274A18, LVarA, 0) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) @@ -107,7 +107,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_ADD(LVarA, 5) EVT_CALL(action_command_jump_start, LVarA, 3) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_1000C) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) EVT_IF_EQ(LVarF, 1) EVT_CALL(func_80274A18, LVarA, 3) EVT_ELSE @@ -190,7 +190,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(action_command_jump_start, LVarA, 1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_30000) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) EVT_CALL(func_80274A18, LVarA, 0) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) @@ -257,7 +257,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) EVT_CALL(EnablePlayerBlur, 1) EVT_IF_EQ(LVarF, 1) EVT_CALL(func_802752AC, 20, 3) @@ -346,7 +346,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(action_command_jump_start, LVarA, 1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_30000) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) EVT_CALL(func_80274A18, LVarA, 0) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) @@ -412,7 +412,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(action_command_jump_start, 25, 3) EVT_CALL(ChooseNextTarget, ITER_NEXT, LVar0) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000C) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) EVT_IF_EQ(LVarF, 1) EVT_CALL(func_80275F00, 25, 2) EVT_ELSE diff --git a/src/battle/move/jump/power_bounce.c b/src/battle/move/jump/power_bounce.c index e9f40cc6f8..7465990020 100644 --- a/src/battle/move/jump/power_bounce.c +++ b/src/battle/move/jump/power_bounce.c @@ -87,7 +87,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(action_command_jump_start, LVarA, 1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_30000) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) EVT_CALL(func_80274A18, LVarA, 0) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) @@ -150,7 +150,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(action_command_jump_start, LVarA, 5) EVT_END_SWITCH EVT_SUB(LVarD, 1) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_1000C) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_IF_EQ(LVarF, 0) EVT_CALL(func_80274A18, 24, 3) @@ -229,7 +229,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(action_command_jump_start, LVarA, 1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_30000) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) EVT_CALL(func_80274A18, LVarA, 0) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) @@ -287,7 +287,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_END_SWITCH EVT_SUB(LVarD, 1) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) EVT_CALL(EnablePlayerBlur, 1) EVT_IF_EQ(LVarF, 0) EVT_CALL(func_802752AC, 20, 3) @@ -371,7 +371,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(action_command_jump_start, LVarA, 1) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_34) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_30000) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_MarioB1_Stomp) EVT_CALL(func_80274A18, LVarA, 0) EVT_CALL(PlayerTestEnemy, LVar0, DAMAGE_TYPE_JUMP, 0, 0, 1, 0) EVT_IF_EQ(LVar0, HIT_RESULT_MISS) @@ -430,7 +430,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_SUB(LVarD, 1) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(EnablePlayerBlur, 1) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000C) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) EVT_IF_EQ(LVarF, 0) EVT_CALL(func_80275F00, 25, 2) EVT_ELSE diff --git a/src/battle/move/jump/shrink_stomp.c b/src/battle/move/jump/shrink_stomp.c index fa8a60bb36..3b5720226c 100644 --- a/src/battle/move/jump/shrink_stomp.c +++ b/src/battle/move/jump/shrink_stomp.c @@ -65,7 +65,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(ShowActionHud, FALSE) EVT_CALL(action_command_jump_start, 24, 3) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_1000C) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) EVT_CALL(func_80274A18, 24, 3) EVT_WAIT(1) EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_15A) @@ -117,7 +117,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(action_command_jump_start, 37, 3) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(EnablePlayerBlur, 1) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) EVT_CALL(func_802752AC, 20, 4) EVT_WAIT(7) EVT_CALL(func_802752AC, 3, 5) @@ -172,7 +172,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(action_command_jump_start, 25, 3) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(EnablePlayerBlur, 1) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000C) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) EVT_CALL(func_80275F00, 25, 4) EVT_CALL(EnablePlayerBlur, 0) EVT_WAIT(1) diff --git a/src/battle/move/jump/sleep_stomp.c b/src/battle/move/jump/sleep_stomp.c index c1b754919a..bfb5cad0af 100644 --- a/src/battle/move/jump/sleep_stomp.c +++ b/src/battle/move/jump/sleep_stomp.c @@ -65,7 +65,7 @@ EvtScript N(EVS_UseMove_ImplA) = { EVT_CALL(ShowActionHud, FALSE) EVT_CALL(action_command_jump_start, 24, 3) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_1000C) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_SpinFall) EVT_CALL(func_80274A18, 24, 3) EVT_WAIT(1) EVT_CALL(SetActorSounds, ACTOR_PLAYER, ACTOR_SOUND_HURT, SOUND_15A, SOUND_0) @@ -117,7 +117,7 @@ EvtScript N(EVS_UseMove_ImplB) = { EVT_CALL(action_command_jump_start, 37, 3) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(EnablePlayerBlur, 1) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000A, ANIM_Mario_1000B) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Sit, ANIM_Mario1_SpinJump) EVT_CALL(func_802752AC, 20, 4) EVT_WAIT(7) EVT_CALL(func_802752AC, 3, 5) @@ -172,7 +172,7 @@ EvtScript N(EVS_UseMove_ImplC) = { EVT_CALL(action_command_jump_start, 25, 3) EVT_CALL(SetGoalToTarget, ACTOR_PLAYER) EVT_CALL(EnablePlayerBlur, 1) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidairStill, ANIM_Mario_1000C) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Jump, ANIM_Mario1_SpinFall) EVT_CALL(func_80275F00, 25, 4) EVT_CALL(EnablePlayerBlur, 0) EVT_WAIT(1) diff --git a/src/battle/move/star_power/chill_out.c b/src/battle/move/star_power/chill_out.c index c054c55159..9ab5abf3a2 100644 --- a/src/battle/move/star_power/chill_out.c +++ b/src/battle/move/star_power/chill_out.c @@ -104,7 +104,7 @@ EvtScript N(802A18F0) = { EVT_IF_EQ(LVarA, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 16) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) @@ -117,13 +117,13 @@ EvtScript N(802A18F0) = { EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(FadeBackgroundToBlack)) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) EVT_WAIT(10) EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -159,7 +159,7 @@ EvtScript N(802A1C88) = { EVT_IF_EQ(LVarA, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 16) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) @@ -172,13 +172,13 @@ EvtScript N(802A1C88) = { EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(UnkBackgroundFunc2)) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) EVT_WAIT(10) EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -321,9 +321,9 @@ EvtScript N(802A267C) = { EVT_WAIT(15) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_ELSE EVT_CALL(N(UnkBackgroundFunc)) EVT_WAIT(15) diff --git a/src/battle/move/star_power/focus.c b/src/battle/move/star_power/focus.c index c658a1d649..eef795e4f1 100644 --- a/src/battle/move/star_power/focus.c +++ b/src/battle/move/star_power/focus.c @@ -53,7 +53,7 @@ EvtScript N(802A1630) = { EVT_IF_EQ(LVarA, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 16) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) @@ -66,13 +66,13 @@ EvtScript N(802A1630) = { EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(FadeBackgroundToBlack)) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) EVT_WAIT(10) EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -108,7 +108,7 @@ EvtScript N(802A19C8) = { EVT_IF_EQ(LVarA, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 16) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) @@ -121,13 +121,13 @@ EvtScript N(802A19C8) = { EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(UnkBackgroundFunc2)) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) EVT_WAIT(10) EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -270,9 +270,9 @@ EvtScript N(802A23BC) = { EVT_WAIT(15) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_ELSE EVT_CALL(N(UnkBackgroundFunc)) EVT_WAIT(15) @@ -308,9 +308,9 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(func_80276EFC) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_ELSE EVT_CALL(PlaySound, SOUND_2053) EVT_CALL(func_802A15B0_78A410) diff --git a/src/battle/move/star_power/lullaby.c b/src/battle/move/star_power/lullaby.c index 990a16011a..f1f53f8b10 100644 --- a/src/battle/move/star_power/lullaby.c +++ b/src/battle/move/star_power/lullaby.c @@ -39,7 +39,7 @@ EvtScript N(802A1620) = { EVT_IF_EQ(LVarA, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 16) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) @@ -52,13 +52,13 @@ EvtScript N(802A1620) = { EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(FadeBackgroundToBlack)) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) EVT_WAIT(10) EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -94,7 +94,7 @@ EvtScript N(802A19B8) = { EVT_IF_EQ(LVarA, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 16) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) @@ -107,13 +107,13 @@ EvtScript N(802A19B8) = { EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(UnkBackgroundFunc2)) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) EVT_WAIT(10) EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -256,9 +256,9 @@ EvtScript N(802A23AC) = { EVT_WAIT(15) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_ELSE EVT_CALL(N(UnkBackgroundFunc)) EVT_WAIT(15) diff --git a/src/battle/move/star_power/peach_focus.c b/src/battle/move/star_power/peach_focus.c index e5a638b5ad..a80d221d2c 100644 --- a/src/battle/move/star_power/peach_focus.c +++ b/src/battle/move/star_power/peach_focus.c @@ -18,7 +18,7 @@ EvtScript N(802A1530) = { EVT_IF_EQ(LVarA, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 16) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) @@ -31,13 +31,13 @@ EvtScript N(802A1530) = { EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(FadeBackgroundToBlack)) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) EVT_WAIT(10) EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -73,7 +73,7 @@ EvtScript N(802A18C8) = { EVT_IF_EQ(LVarA, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 16) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) @@ -86,13 +86,13 @@ EvtScript N(802A18C8) = { EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(UnkBackgroundFunc2)) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) EVT_WAIT(10) EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -235,9 +235,9 @@ EvtScript N(802A22BC) = { EVT_WAIT(15) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_ELSE EVT_CALL(N(UnkBackgroundFunc)) EVT_WAIT(15) diff --git a/src/battle/move/star_power/refresh.c b/src/battle/move/star_power/refresh.c index a0d9c15b41..29dafa2d0f 100644 --- a/src/battle/move/star_power/refresh.c +++ b/src/battle/move/star_power/refresh.c @@ -126,7 +126,7 @@ EvtScript N(802A1A70) = { EVT_IF_EQ(LVarA, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 16) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) @@ -139,13 +139,13 @@ EvtScript N(802A1A70) = { EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(FadeBackgroundToBlack)) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) EVT_WAIT(10) EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -181,7 +181,7 @@ EvtScript N(802A1E08) = { EVT_IF_EQ(LVarA, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 16) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) @@ -194,13 +194,13 @@ EvtScript N(802A1E08) = { EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(UnkBackgroundFunc2)) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) EVT_WAIT(10) EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -343,9 +343,9 @@ EvtScript N(802A27FC) = { EVT_WAIT(15) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_ELSE EVT_CALL(N(UnkBackgroundFunc)) EVT_WAIT(15) diff --git a/src/battle/move/star_power/smooch.c b/src/battle/move/star_power/smooch.c index 66a7014792..c2f8141c6c 100644 --- a/src/battle/move/star_power/smooch.c +++ b/src/battle/move/star_power/smooch.c @@ -25,7 +25,7 @@ EvtScript N(802A1630) = { EVT_IF_EQ(LVarA, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 16) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) @@ -38,13 +38,13 @@ EvtScript N(802A1630) = { EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(FadeBackgroundToBlack)) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) EVT_WAIT(10) EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -80,7 +80,7 @@ EvtScript N(802A19C8) = { EVT_IF_EQ(LVarA, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 16) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) @@ -93,13 +93,13 @@ EvtScript N(802A19C8) = { EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(UnkBackgroundFunc2)) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) EVT_WAIT(10) EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -242,9 +242,9 @@ EvtScript N(802A23BC) = { EVT_WAIT(15) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_ELSE EVT_CALL(N(UnkBackgroundFunc)) EVT_WAIT(15) @@ -323,7 +323,7 @@ EvtScript N(EVS_UsePower) = { EVT_ADD(LVar0, 25) EVT_CALL(NpcFlyTo, NPC_BTL_SPIRIT, LVar0, LVar1, LVar2, 10, 0, EASING_COS_IN_OUT) EVT_END_THREAD - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002E) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_FallBack) EVT_WAIT(12) EVT_THREAD EVT_EXEC_WAIT(N(802A1F6C)) @@ -373,7 +373,7 @@ EvtScript N(EVS_UsePower) = { EVT_WAIT(1) EVT_CALL(SetActorScale, ACTOR_SELF, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) EVT_WAIT(1) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_END_THREAD EVT_LOOP(10) EVT_WAIT(3) @@ -395,17 +395,17 @@ EvtScript N(EVS_UsePower) = { EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_10009) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_80273444, 20, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) EVT_WAIT(4) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_RETURN EVT_END }; diff --git a/src/battle/move/star_power/star_storm.c b/src/battle/move/star_power/star_storm.c index 1a4b329da4..40926db11d 100644 --- a/src/battle/move/star_power/star_storm.c +++ b/src/battle/move/star_power/star_storm.c @@ -39,7 +39,7 @@ EvtScript N(802A16F0) = { EVT_IF_EQ(LVarA, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 16) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) @@ -52,13 +52,13 @@ EvtScript N(802A16F0) = { EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(FadeBackgroundToBlack)) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) EVT_WAIT(10) EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -94,7 +94,7 @@ EvtScript N(802A1A88) = { EVT_IF_EQ(LVarA, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 16) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) @@ -107,13 +107,13 @@ EvtScript N(802A1A88) = { EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(UnkBackgroundFunc2)) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) EVT_WAIT(10) EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -256,9 +256,9 @@ EvtScript N(802A247C) = { EVT_WAIT(15) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_ELSE EVT_CALL(N(UnkBackgroundFunc)) EVT_WAIT(15) diff --git a/src/battle/move/star_power/time_out.c b/src/battle/move/star_power/time_out.c index 8d656dc84f..9ebb1102c8 100644 --- a/src/battle/move/star_power/time_out.c +++ b/src/battle/move/star_power/time_out.c @@ -11,7 +11,7 @@ EvtScript N(802A1520) = { EVT_IF_EQ(LVarA, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 16) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) @@ -24,13 +24,13 @@ EvtScript N(802A1520) = { EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(FadeBackgroundToBlack)) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) EVT_WAIT(10) EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -66,7 +66,7 @@ EvtScript N(802A18B8) = { EVT_IF_EQ(LVarA, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 16) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) @@ -79,13 +79,13 @@ EvtScript N(802A18B8) = { EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(UnkBackgroundFunc2)) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) EVT_WAIT(10) EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -228,9 +228,9 @@ EvtScript N(802A22AC) = { EVT_WAIT(15) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_ELSE EVT_CALL(N(UnkBackgroundFunc)) EVT_WAIT(15) diff --git a/src/battle/move/star_power/twink_dash.c b/src/battle/move/star_power/twink_dash.c index 9146eaaae6..4049aa350a 100644 --- a/src/battle/move/star_power/twink_dash.c +++ b/src/battle/move/star_power/twink_dash.c @@ -30,7 +30,7 @@ EvtScript N(802A15B0) = { EVT_IF_EQ(LVarA, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 16) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) @@ -43,13 +43,13 @@ EvtScript N(802A15B0) = { EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(FadeBackgroundToBlack)) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) EVT_WAIT(10) EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -85,7 +85,7 @@ EvtScript N(802A1948) = { EVT_IF_EQ(LVarA, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 16) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) @@ -98,13 +98,13 @@ EvtScript N(802A1948) = { EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(UnkBackgroundFunc2)) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) EVT_WAIT(10) EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -247,9 +247,9 @@ EvtScript N(802A233C) = { EVT_WAIT(15) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_ELSE EVT_CALL(N(UnkBackgroundFunc)) EVT_WAIT(15) diff --git a/src/battle/move/star_power/up_and_away.c b/src/battle/move/star_power/up_and_away.c index 947c4b3c0a..27e3d5fa9c 100644 --- a/src/battle/move/star_power/up_and_away.c +++ b/src/battle/move/star_power/up_and_away.c @@ -72,7 +72,7 @@ EvtScript N(802A16D0) = { EVT_IF_EQ(LVarA, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 16) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) @@ -85,13 +85,13 @@ EvtScript N(802A16D0) = { EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(FadeBackgroundToBlack)) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) EVT_WAIT(10) EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -127,7 +127,7 @@ EvtScript N(802A1A68) = { EVT_IF_EQ(LVarA, 0) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 16) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) @@ -140,13 +140,13 @@ EvtScript N(802A1A68) = { EVT_CALL(N(UnkStarFunc1), LVar0, LVar1, LVar2) EVT_CALL(N(UnkBackgroundFunc2)) EVT_WAIT(20) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_AnimPray) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Pray) EVT_WAIT(10) EVT_CALL(PlaySound, SOUND_2051) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(N(UnkStarFunc2), LVar0, LVar1, LVar2) EVT_WAIT(30) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_1002A) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_LookUp) EVT_ELSE EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_69) EVT_WAIT(10) @@ -289,9 +289,9 @@ EvtScript N(802A245C) = { EVT_WAIT(15) EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_ELSE EVT_CALL(N(UnkBackgroundFunc)) EVT_WAIT(15) diff --git a/src/battle/partner/bow.c b/src/battle/partner/bow.c index 8cc25efb65..278e15c8b2 100644 --- a/src/battle/partner/bow.c +++ b/src/battle/partner/bow.c @@ -696,7 +696,7 @@ EvtScript N(outtaSight) = { EVT_CALL(FlyToGoal, ACTOR_PARTNER, 20, 0, EASING_LINEAR) EVT_CALL(N(IsPartnerImmobile)) EVT_IF_EQ(LVar0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Crouch) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Crouch) EVT_END_IF EVT_CALL(PlaySoundAtActor, ACTOR_PARTNER, SOUND_BOW_VANISH) EVT_SET(LVar0, 255) diff --git a/src/battle/partner/lakilester.c b/src/battle/partner/lakilester.c index 3a9a9f60d8..910ed09ac1 100644 --- a/src/battle/partner/lakilester.c +++ b/src/battle/partner/lakilester.c @@ -1132,12 +1132,12 @@ EvtScript N(cloudNine_normal) = { EVT_ADD(LVar2, -5) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(4.0)) EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_ReadyJump) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_FightingStance) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_80273444, 18, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_ReadyJump) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_FightingStance) EVT_WAIT(3) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(action_command_water_block_start, 0, 97, 3) EVT_CALL(AddBattleCamZoom, -75) EVT_CALL(MoveBattleCamOver, 100) @@ -1172,20 +1172,20 @@ EvtScript N(cloudNine_normal) = { EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_ReadyJump) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_FightingStance) EVT_SET(LVar1, 0) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(PlayerFallToGoal, 10) EVT_CALL(SetAnimation, ACTOR_PARTNER, -1, ANIM_BattleLakilester_Walk) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_ReadyJump) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_FightingStance) EVT_WAIT(7) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_THREAD EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_CALL(SetActorFlagBits, ACTOR_PLAYER, ACTOR_FLAG_20000000, FALSE) EVT_END_THREAD EVT_THREAD @@ -1293,9 +1293,9 @@ EvtScript N(cloudNine_immobile) = { EVT_THREAD EVT_CALL(SetGoalToHome, ACTOR_PLAYER) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(8.0)) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_Running) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Run) EVT_CALL(PlayerRunToGoal, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_END_THREAD EVT_THREAD EVT_CALL(SetGoalToHome, ACTOR_PARTNER) diff --git a/src/battle/partner/watt.c b/src/battle/partner/watt.c index ed2e0c6cf4..93a895f65d 100644 --- a/src/battle/partner/watt.c +++ b/src/battle/partner/watt.c @@ -1087,7 +1087,7 @@ EvtScript N(8023AE8C) = { EVT_CALL(SetActionHudPrepareTime, 0) EVT_CALL(SetActorFlagBits, ACTOR_PLAYER, ACTOR_FLAG_20000000, TRUE) EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_GotItem) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_UsePower) EVT_WAIT(5) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_19) EVT_CALL(SetBattleCamTarget, -125, 42, 0) @@ -1134,12 +1134,12 @@ EvtScript N(8023AE8C) = { EVT_CALL(SetActorJumpGravity, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(SetActorSpeed, ACTOR_PLAYER, EVT_FLOAT(1.0)) EVT_CALL(GetActorPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) - EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario_AnimMidairStill, ANIM_Mario_AnimMidair, ANIM_Mario_10009) + EVT_CALL(SetJumpAnimations, ACTOR_PLAYER, 0, ANIM_Mario1_Jump, ANIM_Mario1_Fall, ANIM_Mario1_Land) EVT_CALL(SetGoalPos, ACTOR_PLAYER, LVar0, LVar1, LVar2) EVT_CALL(func_80273444, 20, 0, 0) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10009) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Land) EVT_WAIT(4) - EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario_10002) + EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Idle) EVT_END_THREAD EVT_WAIT(30) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) diff --git a/src/battle/use_star_powers.c b/src/battle/use_star_powers.c index 0cd450ba63..d02dce56ca 100644 --- a/src/battle/use_star_powers.c +++ b/src/battle/use_star_powers.c @@ -42,10 +42,10 @@ BattleMoveEntry StarPowersTable[] = { s32 D_8029C890[][5] = { [PARTNER_NONE] { - ANIM_Mario_GotItem, - ANIM_Mario_AnimPray, - ANIM_Mario_1002A, - ANIM_Mario_Running, + ANIM_Mario1_UsePower, + ANIM_Mario1_Pray, + ANIM_Mario1_LookUp, + ANIM_Mario1_Run, 0, }, [PARTNER_GOOMBARIO] { diff --git a/src/encounter.c b/src/encounter.c index fffcb97ceb..b148c44185 100644 --- a/src/encounter.c +++ b/src/encounter.c @@ -1691,7 +1691,7 @@ void update_encounters_post_battle(void) { } } if (!(currentEncounter->flags & ENCOUNTER_STATUS_FLAG_1) && !D_8009A63C && currentEncounter->battleStartCountdown == 0 && D_8009A670 == 0) { - suggest_player_anim_clearUnkFlag(0x10032); + suggest_player_anim_allow_backward(0x10032); } gEncounterSubState = ENCOUNTER_SUBSTATE_POST_BATTLE_WON_WAIT; break; @@ -1728,7 +1728,7 @@ void update_encounters_post_battle(void) { } if (!hasDefeatScript) { if (!(currentEncounter->flags & ENCOUNTER_STATUS_FLAG_1) && !D_8009A63C && currentEncounter->battleStartCountdown == 1) { - suggest_player_anim_clearUnkFlag(ANIM_Mario_ThumbsUp); + suggest_player_anim_allow_backward(ANIM_Mario1_ThumbsUp); } encounter = currentEncounter->currentEncounter; for (i = 0; i < encounter->count; i++) { @@ -1790,7 +1790,7 @@ void update_encounters_post_battle(void) { enable_player_input(); partner_enable_input(); if (!D_8009A63C) { - suggest_player_anim_clearUnkFlag(ANIM_Mario_10002); + suggest_player_anim_allow_backward(ANIM_Mario1_Idle); } set_screen_overlay_params_front(255, -1.0f); resume_all_group(EVT_GROUP_10); @@ -1923,8 +1923,8 @@ void update_encounters_post_battle(void) { break; } } - if (!D_8009A63C && playerStatus->anim == ANIM_Mario_50000) { - suggest_player_anim_clearUnkFlag(ANIM_Mario_10002); + if (!D_8009A63C && playerStatus->anim == ANIM_MarioB3_Hustled) { + suggest_player_anim_allow_backward(ANIM_Mario1_Idle); } resume_all_group(EVT_GROUP_10); gEncounterState = ENCOUNTER_STATE_NEUTRAL; @@ -1932,7 +1932,7 @@ void update_encounters_post_battle(void) { gEncounterSubState = ENCOUNTER_SUBSTATE_NEUTRAL; break; case ENCOUNTER_SUBSTATE_POST_BATTLE_LOST_INIT: - suggest_player_anim_clearUnkFlag(ANIM_Mario_80009); + suggest_player_anim_allow_backward(ANIM_MarioW2_LayingDown); encounter = currentEncounter->currentEncounter; for (i = 0; i < encounter->count; i++) { enemy = encounter->enemy[i]; diff --git a/src/entity/BlueWarpPipe.c b/src/entity/BlueWarpPipe.c index 0f7a0052c4..dcf4e325c2 100644 --- a/src/entity/BlueWarpPipe.c +++ b/src/entity/BlueWarpPipe.c @@ -115,7 +115,7 @@ void entity_BlueWarpPipe_enter_pipe_init(Entity* bluePipe) { pipeData->timer = 25; playerStatus->renderMode = RENDER_MODE_ALPHATEST; - func_802DDFF8(ANIM_Mario_10002, FOLD_TYPE_5, 2, 1, 1, 0, 0); + func_802DDFF8(ANIM_Mario1_Idle, FOLD_TYPE_5, 2, 1, 1, 0, 0); sfx_play_sound(SOUND_ENTER_PIPE); disable_player_shadow(); } @@ -130,7 +130,7 @@ void entity_BlueWarpPipe_enter_pipe_update(Entity* entity) { if (pipeData->timer == -1) { playerStatus->renderMode = RENDER_MODE_ALPHATEST; playerStatus->position.y -= 50.0f; - func_802DDFF8(ANIM_Mario_10002, 0, 0, 0, 0, 0, 0); + func_802DDFF8(ANIM_Mario1_Idle, 0, 0, 0, 0, 0, 0); exec_entity_commandlist(entity); } } diff --git a/src/entity/Chest.c b/src/entity/Chest.c index 5709ef9eda..5da91ed511 100644 --- a/src/entity/Chest.c +++ b/src/entity/Chest.c @@ -330,7 +330,7 @@ void entity_GiantChest_open(Entity* entity) { chest->giveItemHeightInterpPhase = 180.0f; chest->state++; if (chest->itemID != 0) { - suggest_player_anim_setUnkFlag(ANIM_Mario_6000C); + suggest_player_anim_always_forward(ANIM_MarioW1_Lift); sin_cos_rad(DEG_TO_RAD(90.0f - gCameras[CAM_DEFAULT].currentYaw), &sinRight, &cosRight); sin_cos_rad(DEG_TO_RAD(180.0f - gCameras[CAM_DEFAULT].currentYaw), &sinFwd, &cosFwd); horizontalOffset = 0.0f; @@ -414,7 +414,7 @@ void entity_GiantChest_await_got_item(Entity* entity) { if (data->gotItemDone) { exec_entity_commandlist(entity); remove_item_entity_by_index(data->itemEntityIndex); - suggest_player_anim_clearUnkFlag(ANIM_Mario_10002); + suggest_player_anim_allow_backward(ANIM_Mario1_Idle); enable_player_input(); data->itemID = -1; } diff --git a/src/entity/default/Padlock.c b/src/entity/default/Padlock.c index 881891e8c1..54316b3479 100644 --- a/src/entity/default/Padlock.c +++ b/src/entity/default/Padlock.c @@ -60,7 +60,7 @@ void entity_Padlock_push_player(Entity* entity) { if (entity->collisionFlags & ENTITY_COLLISION_PLAYER_TOUCH_FLOOR) { if (data->pushSpeed == 0.0f) { - suggest_player_anim_clearUnkFlag(ANIM_Mario_Running); + suggest_player_anim_allow_backward(ANIM_Mario1_Run); } data->pushSpeed += 0.5; diff --git a/src/entity/jan_iwa/Plants1.c b/src/entity/jan_iwa/Plants1.c index d620c2c3cc..926981470a 100644 --- a/src/entity/jan_iwa/Plants1.c +++ b/src/entity/jan_iwa/Plants1.c @@ -309,7 +309,7 @@ void entity_CymbalPlant_idle(Entity* entity) { if (--data->timer == 0) { data->state++; func_802DDEE4(PLAYER_SPRITE_MAIN, -1, 0, 0, 0, 0, 0, 0); - func_802DDFF8(ANIM_Mario_10002, 5, 19, 1, 1, 0, 0); + func_802DDFF8(ANIM_Mario1_Idle, 5, 19, 1, 1, 0, 0); } break; case 3: diff --git a/src/entity/jan_iwa/Plants2.c b/src/entity/jan_iwa/Plants2.c index 13b9c993ea..ea5f9c542b 100644 --- a/src/entity/jan_iwa/Plants2.c +++ b/src/entity/jan_iwa/Plants2.c @@ -149,7 +149,7 @@ void func_802BC2B4_E2EBE4(Entity* entity) { gPlayerStatus.prevActionState = 0; gPlayerStatus.actionState = 0; gPlayerStatus.flags &= ~PS_FLAG_ACTION_STATE_CHANGED; - suggest_player_anim_setUnkFlag(ANIM_Mario_8001F); + suggest_player_anim_always_forward(ANIM_MarioW2_FlailArms); } void func_802BC308_E2EC38(Entity* entity) { diff --git a/src/evt/player_api.c b/src/evt/player_api.c index 71cc0876a8..293840b133 100644 --- a/src/evt/player_api.c +++ b/src/evt/player_api.c @@ -110,7 +110,7 @@ ApiStatus SetPlayerAnimation(Evt* script, s32 isInitialCall) { gPlayerStatus.anim = playerNpc->currentAnim = anim; - if (gPlayerStatus.anim == ANIM_Mario_80003) { + if (gPlayerStatus.anim == ANIM_MarioW2_Collapse) { exec_ShakeCam1(0, 0, 2); } @@ -258,14 +258,14 @@ s32 player_jump(Evt* script, s32 isInitialCall, s32 mode) { if (mode == 0) { if (!(playerStatus->animFlags & PA_FLAG_8BIT_MARIO)) { if (!(playerStatus->animFlags & PA_FLAG_USING_WATT)) { - anim = ANIM_Mario_AnimMidairStill; + anim = ANIM_Mario1_Jump; } else { - anim = ANIM_Mario_60009; + anim = ANIM_MarioW1_JumpWatt; } } else { - anim = ANIM_Mario_90005; + anim = ANIM_MarioW3_8bit_Jump; } - suggest_player_anim_clearUnkFlag(anim); + suggest_player_anim_allow_backward(anim); sfx_play_sound_at_player(SOUND_JUMP_2081, SOUND_SPACE_MODE_0); } script->functionTemp[0] = 1; @@ -279,14 +279,14 @@ s32 player_jump(Evt* script, s32 isInitialCall, s32 mode) { if (mode == 0 && jumpVelocity > 0.0f && playerNpc->jumpVelocity <= 0.0f) { if (!(playerStatus->animFlags & PA_FLAG_8BIT_MARIO)) { if (!(playerStatus->animFlags & PA_FLAG_USING_WATT)) { - anim = ANIM_Mario_AnimMidair; + anim = ANIM_Mario1_Fall; } else { - anim = ANIM_Mario_6000A; + anim = ANIM_MarioW1_FallWatt; } } else { - anim = ANIM_Mario_90005; + anim = ANIM_MarioW3_8bit_Jump; } - suggest_player_anim_clearUnkFlag(anim); + suggest_player_anim_allow_backward(anim); } playerStatus->position.x = playerNpc->pos.x; @@ -305,14 +305,14 @@ s32 player_jump(Evt* script, s32 isInitialCall, s32 mode) { if (mode == 0) { if (!(playerStatus->animFlags & PA_FLAG_8BIT_MARIO)) { if (!(playerStatus->animFlags & PA_FLAG_USING_WATT)) { - anim = ANIM_Mario_10009; + anim = ANIM_Mario1_Land; } else { - anim = ANIM_Mario_6000B; + anim = ANIM_MarioW1_LandWatt; } } else { - anim = ANIM_Mario_AnimPanting; + anim = ANIM_Mario1_TiredIdle; } - suggest_player_anim_clearUnkFlag(anim); + suggest_player_anim_allow_backward(anim); func_8003D660(playerNpc, 2); } diff --git a/src/sprite.c b/src/sprite.c index 8129476b50..ae863a6bf8 100644 --- a/src/sprite.c +++ b/src/sprite.c @@ -91,31 +91,30 @@ Gfx D_802DF490[] = { f32 spr_animUpdateTimeScale = 1.0f; #define MARIO_SPRITE_COMMON_BITS \ - 1 << SPR_Mario_1 \ - | 1 << SPR_Mario_2 \ + 1 << SPR_Mario1 \ + | 1 << SPR_Mario1_Back \ #define MARIO_SPRITE_WORLD_BITS \ MARIO_SPRITE_COMMON_BITS \ - | 1 << SPR_Mario_6 \ - | 1 << SPR_Mario_7 \ - | 1 << SPR_Mario_8 \ - | 1 << SPR_Mario_9 + | 1 << SPR_MarioW1 \ + | 1 << SPR_MarioW1_Back \ + | 1 << SPR_MarioW2 \ + | 1 << SPR_MarioW3 #define MARIO_SPRITE_BATTLE_BITS \ MARIO_SPRITE_COMMON_BITS \ - | 1 << SPR_Mario_3 \ - | 1 << SPR_Mario_4 \ - | 1 << SPR_Mario_5 + | 1 << SPR_MarioB1 \ + | 1 << SPR_MarioB2 \ + | 1 << SPR_MarioB3 #define PEACH_SPRITE_BITS \ - 1 << SPR_Peach_A \ - | 1 << SPR_Peach_B \ - | 1 << SPR_Peach_C \ - | 1 << SPR_Peach_D \ + 1 << SPR_Peach1 \ + | 1 << SPR_Peach1_Back \ + | 1 << SPR_Peach2 \ + | 1 << SPR_Peach3 \ // TODO(player raster splat header generation): // - macroify rasterSize based on the biggest raster -// - OR values of a generated player raster name enum together for initiallyLoaded bits PlayerSpriteSet spr_playerSpriteSets[] = { [PLAYER_SPRITES_MARIO_WORLD] { 6, 0x700, MARIO_SPRITE_WORLD_BITS }, [PLAYER_SPRITES_MARIO_REFLECT_FLOOR] { 18, 0x700, MARIO_SPRITE_WORLD_BITS }, @@ -792,7 +791,7 @@ void spr_init_sprites(s32 playerSpriteSet) { spr_init_player_raster_cache((&spr_playerSpriteSets[playerSpriteSet])->cacheSize, (&spr_playerSpriteSets[playerSpriteSet])->rasterSize); - for (i = 1; i <= SPR_Peach_D; i++) { + for (i = 1; i <= SPR_Peach3; i++) { if ((loadedFlags >> i) & 1) { spr_load_player_sprite(i); } diff --git a/src/world/action/hammer.c b/src/world/action/hammer.c index 089e336370..229c734bf8 100644 --- a/src/world/action/hammer.c +++ b/src/world/action/hammer.c @@ -30,12 +30,12 @@ s32 action_hammer_is_swinging_away(s32 animID) { // back facing swing anims switch (animID) { - case ANIM_Mario_60011: - case ANIM_Mario_60013: - case ANIM_Mario_60015: - case ANIM_Mario_60017: - case ANIM_Mario_60019: - case ANIM_Mario_6001B: + case ANIM_MarioW1_Smash1_Miss_Back: + case ANIM_MarioW1_Smash1_Hit_Back: + case ANIM_MarioW1_Smash2_Miss_Back: + case ANIM_MarioW1_Smash2_Hit_Back: + case ANIM_MarioW1_Smash3_Miss_Back: + case ANIM_MarioW1_Smash3_Hit_Back: return TRUE; } return FALSE; @@ -243,28 +243,28 @@ void action_update_hammer(void) { if (gPlayerData.hammerLevel == 2) { soundID = SOUND_2117; - anim = ANIM_Mario_6001A; + anim = ANIM_MarioW1_Smash3_Hit; if (HammerHit->hitID < 0) { soundID = SOUND_2117; - anim = ANIM_Mario_60018; + anim = ANIM_MarioW1_Smash3_Miss; } } else if (gPlayerData.hammerLevel == 1) { soundID = SOUND_2116; - anim = ANIM_Mario_60016; + anim = ANIM_MarioW1_Smash2_Hit; if (HammerHit->hitID < 0) { soundID = SOUND_2116; - anim = ANIM_Mario_60014; + anim = ANIM_MarioW1_Smash2_Miss; } } else { soundID = SOUND_2115; - anim = ANIM_Mario_60012; + anim = ANIM_MarioW1_Smash1_Hit; if (HammerHit->hitID < 0) { soundID = SOUND_2115; - anim = ANIM_Mario_60010; + anim = ANIM_MarioW1_Smash1_Miss; } } - suggest_player_anim_clearUnkFlag(anim); + suggest_player_anim_allow_backward(anim); sfx_play_sound_at_player(soundID, SOUND_SPACE_MODE_0); HammerHit->unk_0C = 0; HammerHit->unk_14 = 0; diff --git a/src/world/action/hit_fire.c b/src/world/action/hit_fire.c index 89c23adbee..6ceb17feb6 100644 --- a/src/world/action/hit_fire.c +++ b/src/world/action/hit_fire.c @@ -18,7 +18,7 @@ void action_update_hit_fire(void) { playerStatus->animFlags |= PA_FLAG_INTERRUPT_USE_PARTNER; playerStatus->flags |= (PS_FLAG_HIT_FIRE | PS_FLAG_FLYING); - suggest_player_anim_setUnkFlag(ANIM_Mario_Scared); + suggest_player_anim_always_forward(ANIM_Mario1_TouchedFire); playerStatus->actionSubstate = SUBSTATE_FLYING; playerStatus->gravityIntegrator[0] = 18.3473f; diff --git a/src/world/action/hit_lava.c b/src/world/action/hit_lava.c index 61b8222245..a9e7efc305 100644 --- a/src/world/action/hit_lava.c +++ b/src/world/action/hit_lava.c @@ -67,7 +67,7 @@ void action_update_hit_lava(void) { if (playerStatus->hazardType == HAZARD_TYPE_LAVA) { fx_smoke_burst(0, playerStatus->position.x, playerStatus->position.y, playerStatus->position.z, 1.0f, 40); } - suggest_player_anim_setUnkFlag(ANIM_Mario_80002); + suggest_player_anim_always_forward(ANIM_MarioW2_TouchedLava); playerStatus->gravityIntegrator[1] = 0.0f; playerStatus->timeInAir = 0; playerStatus->peakJumpTime = 0; @@ -174,7 +174,7 @@ void action_update_hit_lava(void) { phys_adjust_cam_on_landing(); gCameras[CAM_DEFAULT].moveFlags &= ~CAMERA_MOVE_FLAG_2; sfx_play_sound_at_player(SOUND_3FB, SOUND_SPACE_MODE_0); - suggest_player_anim_setUnkFlag(ANIM_Mario_8001A); + suggest_player_anim_always_forward(ANIM_MarioW2_Thrown); playerStatus->flags &= ~PS_FLAG_HIT_FIRE; playerStatus->flags &= ~PS_FLAG_FLYING; playerStatus->hazardType = HAZARD_TYPE_NONE; diff --git a/src/world/action/idle.c b/src/world/action/idle.c index 1e5782c21e..7a4badcb31 100644 --- a/src/world/action/idle.c +++ b/src/world/action/idle.c @@ -60,15 +60,15 @@ void action_update_idle(void) { playerStatus->pitch = 0.0f; if (playerStatus->animFlags & PA_FLAG_8BIT_MARIO) { - anim = ANIM_Mario_90002; + anim = ANIM_MarioW3_8bit_Still; } else if (!(playerStatus->animFlags & PA_FLAG_USING_WATT)) { - anim = ANIM_Mario_10002; + anim = ANIM_Mario1_Idle; } else if (playerStatus->prevActionState == ACTION_STATE_IDLE) { - anim = ANIM_Mario_60005; + anim = ANIM_MarioW1_TakeItem; } else { - anim = ANIM_Mario_60007; + anim = ANIM_MarioW1_PlaceRecord; } - suggest_player_anim_clearUnkFlag(anim); + suggest_player_anim_allow_backward(anim); } if (playerStatus->animFlags & PA_FLAG_RAISED_ARMS) { @@ -112,9 +112,9 @@ void action_update_idle_peach(void) { if (!(playerStatus->animFlags & PA_FLAG_INVISIBLE)) { if (!(gGameStatusPtr->peachFlags & PEACH_STATUS_FLAG_DEPRESSED)) { - suggest_player_anim_clearUnkFlag(IdlePeachAnims[gGameStatusPtr->peachBakingIngredient]); + suggest_player_anim_allow_backward(IdlePeachAnims[gGameStatusPtr->peachBakingIngredient]); } else { - suggest_player_anim_clearUnkFlag(ANIM_Peach_C000E); + suggest_player_anim_allow_backward(ANIM_Peach_C000E); } } else { peach_set_disguise_anim(BasicPeachDisguiseAnims[gPlayerStatus.peachDisguise].idle); @@ -129,7 +129,7 @@ void action_update_idle_peach(void) { if (playerStatus->currentStateTime > 1800) { // begin first yawm playerStatus->actionSubstate++; - suggest_player_anim_clearUnkFlag(ANIM_Peach_C0003); + suggest_player_anim_allow_backward(ANIM_Peach_C0003); return; } playerStatus->currentStateTime++; @@ -140,7 +140,7 @@ void action_update_idle_peach(void) { if (playerStatus->animNotifyValue != 0) { playerStatus->actionSubstate++; playerStatus->currentStateTime = 0; - suggest_player_anim_clearUnkFlag(ANIM_Peach_A0001); + suggest_player_anim_allow_backward(ANIM_Peach_A0001); } break; case SUBSTATE_DELAY_SLEEP: @@ -148,16 +148,16 @@ void action_update_idle_peach(void) { playerStatus->currentStateTime++; if (playerStatus->currentStateTime > 200) { playerStatus->actionSubstate++; - suggest_player_anim_clearUnkFlag(ANIM_Peach_C0003); + suggest_player_anim_allow_backward(ANIM_Peach_C0003); } break; case SUBSTATE_IDLE_SLEEP: // peach is asleep if (playerStatus->flags & (PS_FLAG_NO_STATIC_COLLISION | PS_FLAG_INPUT_DISABLED)) { - suggest_player_anim_clearUnkFlag(ANIM_Peach_A0001); + suggest_player_anim_allow_backward(ANIM_Peach_A0001); playerStatus->actionSubstate = SUBSTATE_IDLE_DEFAULT; } else if (playerStatus->animNotifyValue != 0) { - suggest_player_anim_clearUnkFlag(ANIM_Peach_C0004); + suggest_player_anim_allow_backward(ANIM_Peach_C0004); } break; } diff --git a/src/world/action/jump.c b/src/world/action/jump.c index 249b68ae51..cea9bcbcb7 100644 --- a/src/world/action/jump.c +++ b/src/world/action/jump.c @@ -25,13 +25,13 @@ void initialize_jump(void) { phys_init_integrator_for_current_state(); if (playerStatus->animFlags & PA_FLAG_8BIT_MARIO) { - anim = ANIM_Mario_90005; + anim = ANIM_MarioW3_8bit_Jump; } else if (!(playerStatus->animFlags & (PA_FLAG_USING_WATT | PA_FLAG_WATT_IN_HANDS))) { - anim = ANIM_Mario_AnimMidairStill; + anim = ANIM_Mario1_Jump; } else { - anim = ANIM_Mario_60009; + anim = ANIM_MarioW1_JumpWatt; } - suggest_player_anim_clearUnkFlag(anim); + suggest_player_anim_allow_backward(anim); collisionStatus->lastTouchedFloor = collisionStatus->currentFloor; collisionStatus->currentFloor = -1; @@ -62,13 +62,13 @@ void action_update_jump(void) { } if (playerStatus->animFlags & PA_FLAG_8BIT_MARIO) { - anim = ANIM_Mario_90005; + anim = ANIM_MarioW3_8bit_Jump; } else if (!(playerStatus->animFlags & (PA_FLAG_USING_WATT | PA_FLAG_WATT_IN_HANDS))) { - anim = ANIM_Mario_AnimMidairStill; + anim = ANIM_Mario1_Jump; } else { - anim = ANIM_Mario_60009; + anim = ANIM_MarioW1_JumpWatt; } - suggest_player_anim_clearUnkFlag(anim); + suggest_player_anim_allow_backward(anim); playerStatus->timeInAir++; } @@ -99,12 +99,12 @@ void action_update_landing_on_switch(void) { playerStatus->flags |= PS_FLAG_FALLING; if (!(playerStatus->animFlags & (PA_FLAG_USING_WATT | PA_FLAG_WATT_IN_HANDS))) { - anim = ANIM_Mario_AnimMidair; + anim = ANIM_Mario1_Fall; } else { - anim = ANIM_Mario_6000A; + anim = ANIM_MarioW1_FallWatt; } - suggest_player_anim_clearUnkFlag(anim); + suggest_player_anim_allow_backward(anim); gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_IGNORE_PLAYER_Y; } @@ -126,13 +126,13 @@ void action_update_falling(void) { playerStatus->flags |= PS_FLAG_FALLING; if (playerStatus->animFlags & PA_FLAG_8BIT_MARIO) { - anim = ANIM_Mario_90005; + anim = ANIM_MarioW3_8bit_Jump; } else if (!(playerStatus->animFlags & (PA_FLAG_USING_WATT | PA_FLAG_WATT_IN_HANDS))) { - anim = ANIM_Mario_AnimMidair; + anim = ANIM_Mario1_Fall; } else { - anim = ANIM_Mario_6000A; + anim = ANIM_MarioW1_FallWatt; } - suggest_player_anim_clearUnkFlag(anim); + suggest_player_anim_allow_backward(anim); gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_IGNORE_PLAYER_Y; } playerStatus->timeInAir++; @@ -184,12 +184,12 @@ void action_update_peach_falling(void) { playerStatus->flags |= PS_FLAG_FALLING; if (!(playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS)) { - anim = ANIM_Mario_AnimMidair; + anim = ANIM_Mario1_Fall; } else { anim = ANIM_Peach_A0006; } - suggest_player_anim_clearUnkFlag(anim); + suggest_player_anim_allow_backward(anim); gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_IGNORE_PLAYER_Y; } playerStatus->timeInAir++; @@ -205,7 +205,7 @@ void action_update_peach_step_down(void) { gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_IGNORE_PLAYER_Y; if (playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS) { - suggest_player_anim_clearUnkFlag(ANIM_Peach_A0006); + suggest_player_anim_allow_backward(ANIM_Peach_A0006); } } playerStatus->timeInAir++; diff --git a/src/world/action/knockback.c b/src/world/action/knockback.c index 84558c5389..b7272e6a3b 100644 --- a/src/world/action/knockback.c +++ b/src/world/action/knockback.c @@ -15,7 +15,7 @@ void action_update_knockback(void) { if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { playerStatus->flags &= ~PS_FLAG_ACTION_STATE_CHANGED; - suggest_player_anim_setUnkFlag(ANIM_Mario_FallBack); + suggest_player_anim_always_forward(ANIM_Mario1_Hurt); playerStatus->flags |= PS_FLAG_FLYING; diff --git a/src/world/action/land.c b/src/world/action/land.c index 67826b5429..b98a30e90b 100644 --- a/src/world/action/land.c +++ b/src/world/action/land.c @@ -36,14 +36,14 @@ void action_update_land(void) { playerStatus->landPos.z = playerStatus->position.z; if (playerStatus->animFlags & PA_FLAG_8BIT_MARIO) { - anim = ANIM_Mario_90002; + anim = ANIM_MarioW3_8bit_Still; } else if (!(playerStatus->animFlags & PA_FLAG_USING_WATT)) { - anim = ANIM_Mario_10009; + anim = ANIM_Mario1_Land; } else { - anim = ANIM_Mario_6000B; + anim = ANIM_MarioW1_LandWatt; } - suggest_player_anim_clearUnkFlag(anim); + suggest_player_anim_allow_backward(anim); sfx_play_sound_at_player(SOUND_161 | SOUND_ID_STOP, SOUND_SPACE_MODE_0); sfx_play_sound_at_player(SOUND_SOFT_LAND, SOUND_SPACE_MODE_0); diff --git a/src/world/action/misc.c b/src/world/action/misc.c index fc7056d091..2a269177dd 100644 --- a/src/world/action/misc.c +++ b/src/world/action/misc.c @@ -156,7 +156,7 @@ void action_update_first_strike(void) { playerStatus->peakJumpTime = 0; playerStatus->currentSpeed = 0.0f; playerStatus->pitch = 0.0f; - suggest_player_anim_setUnkFlag(ANIM_Mario_FallBack); + suggest_player_anim_always_forward(ANIM_Mario1_Hurt); playerStatus->currentStateTime = 30; } @@ -177,7 +177,7 @@ void action_update_raise_arms(void) { playerStatus->actionSubstate = 0; playerStatus->currentSpeed = 0.0f; playerStatus->pitch = 0.0f; - suggest_player_anim_setUnkFlag(ANIM_Mario_GotItem); + suggest_player_anim_always_forward(ANIM_Mario1_UsePower); } if (!(playerStatus->animFlags & PA_FLAG_RAISED_ARMS)) { @@ -200,9 +200,9 @@ void action_update_pushing_block(void) { player_input_to_move_vector(&angle, &magnitude); if (((angle >= 45.0f) && (angle <= 135.0f)) || ((angle >= 225.0f) && (angle <= 315.0f))) { - suggest_player_anim_setUnkFlag(ANIM_Mario_80020); + suggest_player_anim_always_forward(ANIM_MarioW2_PushSide); } else { - suggest_player_anim_clearUnkFlag(ANIM_Mario_60004); + suggest_player_anim_allow_backward(ANIM_MarioW1_PushToward); } } @@ -227,10 +227,10 @@ void action_update_talk(void) { playerStatus->unk_60 = 0; if (!(playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS)) { - suggest_player_anim_setUnkFlag(ANIM_Mario_80007); + suggest_player_anim_always_forward(ANIM_MarioW2_SpeakUp); } else if (playerStatus->peachItemHeld == 0) { if (!(playerStatus->animFlags & PA_FLAG_INVISIBLE)) { - suggest_player_anim_setUnkFlag(ANIM_Peach_C0000); + suggest_player_anim_always_forward(ANIM_Peach_C0000); } else { peach_set_disguise_anim(BasicPeachDisguiseAnims[playerStatus->peachDisguise].talk); } @@ -243,7 +243,7 @@ void action_update_talk(void) { playerStatus->currentStateTime--; } else if (playerStatus->peachItemHeld == 0) { if (!(playerStatus->animFlags & PA_FLAG_INVISIBLE)) { - suggest_player_anim_setUnkFlag(ANIM_Peach_A0001); + suggest_player_anim_always_forward(ANIM_Peach_A0001); } else { peach_set_disguise_anim(BasicPeachDisguiseAnims[playerStatus->peachDisguise].idle); } diff --git a/src/world/action/slide.c b/src/world/action/slide.c index 5688db963f..c50c67346c 100644 --- a/src/world/action/slide.c +++ b/src/world/action/slide.c @@ -55,7 +55,7 @@ void action_update_sliding(void) { D_802B6794 = 0.0f; D_802B6798 = 0.0f; D_802B679C = 0; - suggest_player_anim_clearUnkFlag(ANIM_Mario_1000A); + suggest_player_anim_allow_backward(ANIM_Mario1_Sit); sfx_play_sound_at_player(SOUND_167, SOUND_SPACE_MODE_0); gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_IGNORE_PLAYER_Y; } @@ -120,7 +120,7 @@ void action_update_sliding(void) { playerStatus->currentSpeed -= speed; if (playerStatus->currentSpeed <= 0.0f) { sfx_play_sound_at_player(SOUND_DUST_OFF, SOUND_SPACE_MODE_0); - suggest_player_anim_setUnkFlag(ANIM_Mario_DustOff); + suggest_player_anim_always_forward(ANIM_Mario1_DustOff); playerStatus->actionSubstate = SUBSTATE_DUST_OFF; playerStatus->currentStateTime = 15; playerStatus->currentSpeed = 0.0f; @@ -148,7 +148,7 @@ void action_update_sliding(void) { playerStatus->position.y = player_check_collision_below(player_fall_distance(), &hitID); if (hitID >= 0) { SlideLaunchSpeed = -1; - suggest_player_anim_setUnkFlag(ANIM_Mario_80003); + suggest_player_anim_always_forward(ANIM_MarioW2_Collapse); sfx_play_sound_at_player(SOUND_162, SOUND_SPACE_MODE_0); playerStatus->actionSubstate++; // SUBSTATE_CRASH } @@ -159,7 +159,7 @@ void action_update_sliding(void) { playerStatus->currentSpeed = 0.0f; } if (playerStatus->animNotifyValue != 0) { - suggest_player_anim_setUnkFlag(ANIM_Mario_GetUp); + suggest_player_anim_always_forward(ANIM_Mario1_GetUp); playerStatus->actionSubstate++; // SUBSTATE_GET_UP } break; @@ -169,7 +169,7 @@ void action_update_sliding(void) { playerStatus->currentSpeed = 0.0f; } if (playerStatus->animNotifyValue != 0) { - suggest_player_anim_setUnkFlag(ANIM_Mario_DustOff); + suggest_player_anim_always_forward(ANIM_Mario1_DustOff); sfx_play_sound_at_player(SOUND_DUST_OFF, SOUND_SPACE_MODE_0); playerStatus->currentStateTime = 15; playerStatus->actionSubstate++; // SUBSTATE_DUST_OFF diff --git a/src/world/action/sneaky_parasol.c b/src/world/action/sneaky_parasol.c index f395ad5b9f..3dfc8d97c6 100644 --- a/src/world/action/sneaky_parasol.c +++ b/src/world/action/sneaky_parasol.c @@ -119,11 +119,11 @@ void action_update_parasol(void) { case SUBSTATE_DISGUISE_INIT: if (playerStatus->flipYaw[CAM_DEFAULT] == 0) { if (peach_disguise_check_overlaps() < 0) { - suggest_player_anim_clearUnkFlag(ANIM_Peach_C0024); + suggest_player_anim_allow_backward(ANIM_Peach_C0024); sfx_play_sound_at_player(SOUND_92, SOUND_SPACE_MODE_0); playerStatus->actionSubstate++; // SUBSTATE_USE_PARASOL } else { - suggest_player_anim_clearUnkFlag(ANIM_Peach_C0027); + suggest_player_anim_allow_backward(ANIM_Peach_C0027); playerStatus->actionSubstate = SUBSTATE_BLOCKED; playerStatus->currentStateTime = 10; transformation->disguiseTime = 0; @@ -131,7 +131,7 @@ void action_update_parasol(void) { } case SUBSTATE_USE_PARASOL: if (--playerStatus->currentStateTime == 0) { - suggest_player_anim_clearUnkFlag(ANIM_Peach_C0025); + suggest_player_anim_allow_backward(ANIM_Peach_C0025); playerStatus->actionSubstate = SUBSTATE_PUT_AWAY; if (transformation->npc == NULL) { playerStatus->actionSubstate = SUBSTATE_FAILED; diff --git a/src/world/action/spin.c b/src/world/action/spin.c index 8992553c9f..ebc6cdc405 100644 --- a/src/world/action/spin.c +++ b/src/world/action/spin.c @@ -79,18 +79,18 @@ void action_update_spin(void) { } effectType = -1; - anim = ANIM_Mario_10010; + anim = ANIM_Mario1_Spin; if (spinFlags) { if (spinFlags & SPIN_TYPE_ATTACK) { effectType = 2; - anim = ANIM_Mario_Flailing; + anim = ANIM_Mario1_SpinAttack; } else if (spinFlags & SPIN_TYPE_DIZZY) { effectType = 4; - anim = ANIM_Mario_10010; + anim = ANIM_Mario1_Spin; } else if (spinFlags & SPIN_TYPE_SPEEDY) { effectType = 0; - anim = ANIM_Mario_Spinning; + anim = ANIM_Mario1_SpeedySpin; } } @@ -108,7 +108,7 @@ void action_update_spin(void) { } sfx_play_sound_at_player(playerSpinState->spinSoundID, SOUND_SPACE_MODE_0); - suggest_player_anim_setUnkFlag(anim); + suggest_player_anim_always_forward(anim); if ((clamp_angle(playerStatus->targetYaw - gCameras[gCurrentCameraID].currentYaw) <= 180.0f)) { playerStatus->spinRate = playerSpinState->spinRate; @@ -256,21 +256,21 @@ void action_update_spin(void) { playerStatus->currentStateTime = 2; playerStatus->actionSubstate = SUBSTATE_SPIN_2; playerStatus->flags &= ~PS_FLAG_SPINNING; - suggest_player_anim_clearUnkFlag(ANIM_Mario_10002); + suggest_player_anim_allow_backward(ANIM_Mario1_Idle); } else if (angle < playerStatus->spriteFacingAngle) { if (playerStatus->spriteFacingAngle >= 180.0f && angle < 180.0f) { playerStatus->spriteFacingAngle = 180.0f; playerStatus->currentStateTime = 2; playerStatus->actionSubstate = SUBSTATE_SPIN_2; playerStatus->flags &= ~PS_FLAG_SPINNING; - suggest_player_anim_clearUnkFlag(ANIM_Mario_10002); + suggest_player_anim_allow_backward(ANIM_Mario1_Idle); } } else if (playerStatus->spriteFacingAngle <= 0.0f && angle < 90.0f) { playerStatus->spriteFacingAngle = 0.0f; playerStatus->currentStateTime = 2; playerStatus->actionSubstate = SUBSTATE_SPIN_2; playerStatus->flags &= ~PS_FLAG_SPINNING; - suggest_player_anim_clearUnkFlag(ANIM_Mario_10002); + suggest_player_anim_allow_backward(ANIM_Mario1_Idle); } playerStatus->spriteFacingAngle = clamp_angle(playerStatus->spriteFacingAngle); } diff --git a/src/world/action/spin_jump.c b/src/world/action/spin_jump.c index 9d33129df2..e8583044d1 100644 --- a/src/world/action/spin_jump.c +++ b/src/world/action/spin_jump.c @@ -35,7 +35,7 @@ void action_update_spin_jump(void) { playerStatus->currentSpeed = 0.0f; RotationRate = 0.0f; playerStatus->gravityIntegrator[0] = 5.2f; - suggest_player_anim_clearUnkFlag(ANIM_Mario_1000A); + suggest_player_anim_allow_backward(ANIM_Mario1_Sit); disable_player_input(); playerStatus->flags |= PS_FLAG_SPECIAL_JUMP; gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_IGNORE_PLAYER_Y; @@ -92,7 +92,7 @@ void action_update_spin_jump(void) { playerStatus->gravityIntegrator[2] = 0.4704f; playerStatus->gravityIntegrator[3] = -1.1904f; playerStatus->gravityIntegrator[0] = playerStatus->gravityIntegrator[1]; - suggest_player_anim_clearUnkFlag(ANIM_Mario_1000B); + suggest_player_anim_allow_backward(ANIM_Mario1_SpinJump); } break; case SUBSTATE_DESCEND: @@ -128,7 +128,7 @@ void action_update_spin_jump(void) { playerStatus->gravityIntegrator[2] = 0.4704f; playerStatus->gravityIntegrator[3] = -1.1904f; playerStatus->gravityIntegrator[0] = 10.0f; - suggest_player_anim_clearUnkFlag(ANIM_Mario_1000B); + suggest_player_anim_allow_backward(ANIM_Mario1_SpinJump); playerStatus->actionState = ACTION_STATE_SPIN_POUND; playerStatus->timeInAir = 0; playerStatus->poundImpactDelay = 12; diff --git a/src/world/action/step_up.c b/src/world/action/step_up.c index d4d8cd4cc5..912f7da8d5 100644 --- a/src/world/action/step_up.c +++ b/src/world/action/step_up.c @@ -38,11 +38,11 @@ void action_update_step_up(void) { phys_adjust_cam_on_landing(); if (!(playerStatus->animFlags & PA_FLAG_USING_PEACH_PHYSICS)) { if (!(playerStatus->animFlags & PA_FLAG_USING_WATT)) { - anim = ANIM_Mario_Walking; + anim = ANIM_Mario1_Walk; } else { - anim = ANIM_Mario_60000; + anim = ANIM_MarioW1_Carry; } - suggest_player_anim_clearUnkFlag(anim); + suggest_player_anim_allow_backward(anim); } else { func_802B6198_E24768(); } @@ -79,9 +79,9 @@ void action_update_step_up(void) { void func_802B6198_E24768(void) { if (!(gPlayerStatus.animFlags & PA_FLAG_INVISIBLE)) { if (!(gGameStatusPtr->peachFlags & PEACH_STATUS_FLAG_DEPRESSED)) { - suggest_player_anim_clearUnkFlag(StepUpPeachAnims[gGameStatusPtr->peachBakingIngredient]); + suggest_player_anim_allow_backward(StepUpPeachAnims[gGameStatusPtr->peachBakingIngredient]); } else { - suggest_player_anim_clearUnkFlag(ANIM_Peach_D000D); + suggest_player_anim_allow_backward(ANIM_Peach_D000D); } } else { peach_set_disguise_anim(BasicPeachDisguiseAnims[gPlayerStatus.peachDisguise].walk); @@ -93,7 +93,7 @@ void action_update_step_up_peach(void) { if (playerStatus->flags & PS_FLAG_ACTION_STATE_CHANGED) { playerStatus->flags &= ~PS_FLAG_ACTION_STATE_CHANGED; - suggest_player_anim_clearUnkFlag(ANIM_Peach_A0005); + suggest_player_anim_allow_backward(ANIM_Peach_A0005); playerStatus->currentStateTime = 8; } diff --git a/src/world/action/tornado_jump.c b/src/world/action/tornado_jump.c index 2ef5bade6f..e0c17fc512 100644 --- a/src/world/action/tornado_jump.c +++ b/src/world/action/tornado_jump.c @@ -38,7 +38,7 @@ void action_update_tornado_jump(void) { playerStatus->gravityIntegrator[1] = -7.38624f; playerStatus->gravityIntegrator[2] = 3.44694f; playerStatus->gravityIntegrator[3] = -0.75f; - suggest_player_anim_setUnkFlag(ANIM_Mario_80000); + suggest_player_anim_always_forward(ANIM_MarioW2_Carried); disable_player_input(); playerStatus->flags |= PS_FLAG_SPECIAL_JUMP; gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_IGNORE_PLAYER_Y; diff --git a/src/world/action/use_munchlesia.c b/src/world/action/use_munchlesia.c index 0a24a3647f..06065bbc9b 100644 --- a/src/world/action/use_munchlesia.c +++ b/src/world/action/use_munchlesia.c @@ -29,7 +29,7 @@ void action_update_use_munchlesia(void) { switch (playerStatus->actionSubstate) { case SUBSTATE_INIT: - suggest_player_anim_clearUnkFlag(ANIM_Mario_1002E); + suggest_player_anim_allow_backward(ANIM_Mario1_FallBack); D_802B62E0 = 32; Munchlesia_LaunchVelocity = 16.0f; Munchlesia_LateralVelocity = 4.0f; @@ -59,7 +59,7 @@ void action_update_use_munchlesia(void) { hitPosY = player_check_collision_below(Munchlesia_LaunchVelocity, &colliderID); if (colliderID >= 0) { sfx_play_sound_at_player(SOUND_162, SOUND_SPACE_MODE_0); - suggest_player_anim_setUnkFlag(ANIM_Mario_80003); + suggest_player_anim_always_forward(ANIM_MarioW2_Collapse); playerStatus->position.y = hitPosY; D_802B62E0 = 10; playerStatus->actionSubstate++; // SUBSTATE_CRASH @@ -67,7 +67,7 @@ void action_update_use_munchlesia(void) { break; case SUBSTATE_CRASH: if (playerStatus->animNotifyValue != 0) { - suggest_player_anim_setUnkFlag(ANIM_Mario_GetUp); + suggest_player_anim_always_forward(ANIM_Mario1_GetUp); playerStatus->actionSubstate = SUBSTATE_GET_UP; playerStatus->currentStateTime = 15; break; diff --git a/src/world/action/use_spinning_flower.c b/src/world/action/use_spinning_flower.c index 6826aa1f60..957052381e 100644 --- a/src/world/action/use_spinning_flower.c +++ b/src/world/action/use_spinning_flower.c @@ -75,7 +75,7 @@ void action_update_use_spinning_flower(void) { SpinningFlower_EntityIndex = -1; } if (!(playerStatus->animFlags & (PA_FLAG_USING_WATT | PA_FLAG_WATT_IN_HANDS))) { - suggest_player_anim_clearUnkFlag(ANIM_Mario_1002B); + suggest_player_anim_allow_backward(ANIM_Mario1_Flail); } } @@ -131,7 +131,7 @@ void action_update_use_spinning_flower(void) { } if (gGameStatusPtr->pressedButtons[0] & BUTTON_Z && !(playerStatus->animFlags & (PA_FLAG_USING_WATT | PA_FLAG_WATT_IN_HANDS))) { - suggest_player_anim_setUnkFlag(ANIM_Mario_AnimMidairStill); + suggest_player_anim_always_forward(ANIM_Mario1_Jump); playerStatus->actionSubstate = SUBSTATE_SPIN_UP; playerStatus->currentStateTime = 30; D_802B6EE0 = 0.0f; diff --git a/src/world/action/use_tweester.c b/src/world/action/use_tweester.c index aa940a4d37..b114d15c99 100644 --- a/src/world/action/use_tweester.c +++ b/src/world/action/use_tweester.c @@ -22,7 +22,7 @@ void action_update_use_tweester(void) { disable_player_static_collisions(); disable_player_input(); playerStatus->flags |= (PS_FLAG_ROTATION_LOCKED | PS_FLAG_FLYING); - suggest_player_anim_clearUnkFlag(ANIM_Mario_8001F); + suggest_player_anim_allow_backward(ANIM_MarioW2_FlailArms); playerStatus->actionSubstate = SUBSTATE_LAUNCH; mem_clear(PlayerTweesterPhysics, sizeof(*PlayerTweesterPhysics)); PlayerTweesterPhysics->radius = fabsf(dist2D(playerStatus->position.x, playerStatus->position.z, entity->position.x, entity->position.z)); diff --git a/src/world/action/walk.c b/src/world/action/walk.c index ba67bb8de3..81a3f5b89b 100644 --- a/src/world/action/walk.c +++ b/src/world/action/walk.c @@ -52,15 +52,15 @@ void action_update_walk(void) { } if (playerStatus->animFlags & PA_FLAG_8BIT_MARIO) { - anim = ANIM_Mario_90003; + anim = ANIM_MarioW3_8bit_Run; } else if (!(playerStatus->animFlags & PA_FLAG_USING_WATT)) { - anim = ANIM_Mario_Walking; + anim = ANIM_Mario1_Walk; } else { - anim = ANIM_Mario_60000; + anim = ANIM_MarioW1_Carry; } - suggest_player_anim_clearUnkFlag(anim); + suggest_player_anim_allow_backward(anim); } if (playerStatus->flags & PS_FLAG_CUTSCENE_MOVEMENT) { @@ -137,15 +137,15 @@ void action_update_run(void) { playerStatus->currentSpeed = playerStatus->runSpeed; } if (playerStatus->animFlags & PA_FLAG_8BIT_MARIO) { - anim = ANIM_Mario_90003; + anim = ANIM_MarioW3_8bit_Run; } else { if (!(playerStatus->animFlags & PA_FLAG_USING_WATT)) { - anim = ANIM_Mario_Running; + anim = ANIM_Mario1_Run; } else { - anim = ANIM_Mario_60002; + anim = ANIM_MarioW1_CarryRun; } } - suggest_player_anim_clearUnkFlag(anim); + suggest_player_anim_allow_backward(anim); } if (playerStatus->flags & PS_FLAG_CUTSCENE_MOVEMENT) { @@ -207,10 +207,10 @@ void action_update_run(void) { void func_802B6550_E23C30(void) { if (!(gPlayerStatus.animFlags & PA_FLAG_INVISIBLE)) { if (!(gGameStatusPtr->peachFlags & PEACH_STATUS_FLAG_DEPRESSED)) { - suggest_player_anim_clearUnkFlag(WalkPeachAnims[gGameStatusPtr->peachBakingIngredient]); + suggest_player_anim_allow_backward(WalkPeachAnims[gGameStatusPtr->peachBakingIngredient]); return; } - suggest_player_anim_clearUnkFlag(ANIM_Peach_D000D); + suggest_player_anim_allow_backward(ANIM_Peach_D000D); return; } peach_set_disguise_anim(BasicPeachDisguiseAnims[gPlayerStatus.peachDisguise].walk); @@ -269,12 +269,12 @@ static void action_update_run_peach(void) { gameStatus = gGameStatusPtr; if (!(gameStatus->peachFlags & PEACH_STATUS_FLAG_DEPRESSED)) { if (!gameStatus->peachBakingIngredient) { - suggest_player_anim_clearUnkFlag(ANIM_Peach_A0003); + suggest_player_anim_allow_backward(ANIM_Peach_A0003); } else { - suggest_player_anim_clearUnkFlag(WalkPeachAnims[gameStatus->peachBakingIngredient]); + suggest_player_anim_allow_backward(WalkPeachAnims[gameStatus->peachBakingIngredient]); } } else { - suggest_player_anim_clearUnkFlag(ANIM_Peach_D000D); + suggest_player_anim_allow_backward(ANIM_Peach_D000D); } } else { peach_set_disguise_anim(BasicPeachDisguiseAnims[playerStatus->peachDisguise].run); diff --git a/src/world/area_arn/arn_03/arn_03_3_npc.c b/src/world/area_arn/arn_03/arn_03_3_npc.c index eed6665b41..006be5ad8d 100644 --- a/src/world/area_arn/arn_03/arn_03_3_npc.c +++ b/src/world/area_arn/arn_03/arn_03_3_npc.c @@ -26,9 +26,9 @@ EvtScript N(EVS_NpcInteract_Boo_01) = { EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Boo_Tan_Talk, ANIM_Boo_Tan_Idle, 0, MSG_CH3_0077) EVT_CASE_GE(STORY_CH5_STAR_SPRIT_DEPARTED) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Boo_Tan_Talk, ANIM_Boo_Tan_Idle, 0, MSG_CH3_0078) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_WAIT(20) EVT_CALL(EndSpeech, NPC_SELF, ANIM_Boo_Tan_Talk, ANIM_Boo_Tan_Idle, 0) EVT_END_SWITCH @@ -247,7 +247,7 @@ EvtScript N(80242C60) = { EVT_SET(MV_Unk_03, 0) EVT_THREAD EVT_WAIT(25) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80017) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Flail) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Boo_Tan_Cower) EVT_LOOP(0) EVT_IF_EQ(MV_Unk_02, 1) @@ -255,7 +255,7 @@ EvtScript N(80242C60) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Boo_Tan_Idle) EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_Boo_05, ANIM_Boo_Tan_Spook) diff --git a/src/world/area_arn/arn_07/arn_07_2_main.c b/src/world/area_arn/arn_07/arn_07_2_main.c index 6bbf813e1f..6cb521a6b7 100644 --- a/src/world/area_arn/arn_07/arn_07_2_main.c +++ b/src/world/area_arn/arn_07/arn_07_2_main.c @@ -31,7 +31,7 @@ EvtScript N(EVS_SpawnStarCard) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(12) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_END_THREAD EVT_THREAD EVT_WAIT(50) @@ -41,7 +41,7 @@ EvtScript N(EVS_SpawnStarCard) = { EVT_CALL(N(StarSpiritEffectFunc4), 1) EVT_THREAD EVT_WAIT(80) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_ADD(LVar1, 100) EVT_CALL(SetCamDistance, CAM_DEFAULT, LVar1) @@ -93,7 +93,7 @@ EvtScript N(EVS_RespawnStarCard) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(12) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_END_THREAD EVT_THREAD EVT_WAIT(50) @@ -103,7 +103,7 @@ EvtScript N(EVS_RespawnStarCard) = { EVT_CALL(N(StarSpiritEffectFunc4), 1) EVT_THREAD EVT_WAIT(80) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_ADD(LVar1, 100) EVT_CALL(SetCamDistance, CAM_DEFAULT, LVar1) diff --git a/src/world/area_arn/arn_07/arn_07_5_npc.c b/src/world/area_arn/arn_07/arn_07_5_npc.c index c4b914e0b3..b79f870c8e 100644 --- a/src/world/area_arn/arn_07/arn_07_5_npc.c +++ b/src/world/area_arn/arn_07/arn_07_5_npc.c @@ -30,7 +30,7 @@ EvtScript N(EVS_Scene_TubbaRelents) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(SetPanTarget, CAM_DEFAULT, 250, 0, -46) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldTubba_Anim08) EVT_CALL(SetNpcYaw, NPC_SELF, 90) EVT_WAIT(10) @@ -90,7 +90,7 @@ EvtScript N(EVS_Scene_BossDefeated) = { EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_WAIT(5) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldTubba_Anim0F) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldTubba_Anim12, ANIM_WorldTubba_Anim08, 0, MSG_CH3_00CC) EVT_THREAD @@ -450,7 +450,7 @@ EvtScript N(EVS_Scene_SkolarRescued) = { EVT_CALL(EnableNpcAI, NPC_Skolar, FALSE) EVT_CALL(SetNpcAnimation, NPC_Skolar, ANIM_WorldSkolar_Leap) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_GotItem) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_UsePower) EVT_CALL(PlaySoundAtPlayer, SOUND_139, SOUND_SPACE_MODE_0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SET(LVar3, LVar1) @@ -469,7 +469,7 @@ EvtScript N(EVS_Scene_SkolarRescued) = { EVT_ADD(LVar1, 20) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 30) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SetNpcAnimation, NPC_Skolar, ANIM_WorldSkolar_Idle) EVT_CALL(EnableNpcAI, NPC_Skolar, TRUE) EVT_CALL(N(UpgradeStarPowerCh3)) @@ -533,11 +533,11 @@ EvtScript N(EVS_Scene_SkolarRescued) = { EVT_CALL(PlaySoundAtNpc, NPC_Skolar, SOUND_2045, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_WAIT(90) EVT_CALL(ResetCam, CAM_DEFAULT, 3) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_SET(GB_StoryProgress, STORY_CH3_STAR_SPRIT_DEPARTED) EVT_EXEC(N(EVS_SetupMusic)) EVT_CALL(EnablePartnerAI) diff --git a/src/world/area_arn/arn_08/arn_08_3_well.c b/src/world/area_arn/arn_08/arn_08_3_well.c index 8db1112f2e..34360a6dee 100644 --- a/src/world/area_arn/arn_08/arn_08_3_well.c +++ b/src/world/area_arn/arn_08/arn_08_3_well.c @@ -7,7 +7,7 @@ API_CALLABLE(N(AwaitPlayerFallDist)) { if (isInitialCall) { script->functionTemp[0] = 0; - suggest_player_anim_clearUnkFlag(ANIM_Mario_AnimMidairStill); + suggest_player_anim_allow_backward(ANIM_Mario1_Jump); } fallSpeed = player_fall_distance(); diff --git a/src/world/area_arn/arn_09/arn_09_4_launch.c b/src/world/area_arn/arn_09/arn_09_4_launch.c index 9ae9389b4c..ce3129e72b 100644 --- a/src/world/area_arn/arn_09/arn_09_4_launch.c +++ b/src/world/area_arn/arn_09/arn_09_4_launch.c @@ -11,7 +11,7 @@ EvtScript N(EVS_LaunchPlayer) = { EVT_CALL(SetPlayerActionState, ACTION_STATE_LAUNCH) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.5)) EVT_CALL(PlayerJump, 50, 0, 0, 16) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_SET(AF_ARN_01, FALSE) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN diff --git a/src/world/area_arn/arn_11/arn_11_2_main.c b/src/world/area_arn/arn_11/arn_11_2_main.c index 35f3e37de5..2bc6dc1244 100644 --- a/src/world/area_arn/arn_11/arn_11_2_main.c +++ b/src/world/area_arn/arn_11/arn_11_2_main.c @@ -20,17 +20,17 @@ EvtScript N(EVS_Scene_MeetHeart) = { EVT_CALL(PlayerMoveTo, 6, 0, 0) EVT_CALL(SpeakToPlayer, NPC_TubbasHeart, ANIM_TubbasHeart_Anim0B, ANIM_TubbasHeart_Anim01, 0, MSG_CH3_00BF) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_WAIT(40) EVT_CALL(SpeakToPlayer, NPC_TubbasHeart, ANIM_TubbasHeart_Anim0B, ANIM_TubbasHeart_Anim01, 0, MSG_CH3_00C0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_90000) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW3_ShakeHead) EVT_WAIT(30) EVT_CALL(SpeakToPlayer, NPC_TubbasHeart, ANIM_TubbasHeart_Anim0B, ANIM_TubbasHeart_Anim01, 0, MSG_CH3_00C1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_90000) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW3_ShakeHead) EVT_THREAD EVT_CALL(SetNpcJumpscale, NPC_TubbasHeart, EVT_FLOAT(2.5)) EVT_CALL(GetNpcPos, NPC_TubbasHeart, LVar0, LVar1, LVar2) @@ -42,7 +42,7 @@ EvtScript N(EVS_Scene_MeetHeart) = { EVT_END_THREAD EVT_WAIT(40) EVT_CALL(SpeakToPlayer, NPC_TubbasHeart, ANIM_TubbasHeart_Anim0B, ANIM_TubbasHeart_Anim01, 0, MSG_CH3_00C2) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_90000) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW3_ShakeHead) EVT_WAIT(10) EVT_CALL(SetNpcVar, NPC_TubbasHeart, 0, 1) EVT_CALL(DisablePlayerInput, FALSE) diff --git a/src/world/area_dgb/dgb_00/dgb_00_3_npc.c b/src/world/area_dgb/dgb_00/dgb_00_3_npc.c index 7f675f2b95..aca1b85df3 100644 --- a/src/world/area_dgb/dgb_00/dgb_00_3_npc.c +++ b/src/world/area_dgb/dgb_00/dgb_00_3_npc.c @@ -294,11 +294,11 @@ EvtScript N(EVS_Scene_EscapeFromTubba) = { EVT_EXEC_GET_TID(N(EVS_LeaderBooShivering), LVarA) EVT_CALL(SpeakToPlayer, NPC_Boo_01, ANIM_Boo_Tan_Talk, ANIM_Boo_Tan_Idle, 0, MSG_CH3_00DF) EVT_KILL_THREAD(LVarA) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_WAIT(20) EVT_CALL(SpeakToPlayer, NPC_Boo_01, ANIM_Boo_Tan_Talk, ANIM_Boo_Tan_Idle, 0, MSG_CH3_00E0) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) EVT_WAIT(20) EVT_CALL(SpeakToPlayer, NPC_Boo_01, ANIM_Boo_Tan_Talk, ANIM_Boo_Tan_Idle, 0, MSG_CH3_00E1) EVT_CALL(DisablePartnerAI, 0) @@ -517,7 +517,7 @@ EvtScript N(EVS_Scene_ThrownOutBySentinel) = { EVT_END_THREAD EVT_CALL(SetPlayerPos, 320, 50, -160) EVT_CALL(InterpPlayerYaw, 270, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80017) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Flail) EVT_CALL(SetNpcPos, NPC_Sentinel, 320, 70, -158) EVT_CALL(InterpNpcYaw, NPC_Sentinel, 270, 0) EVT_CALL(SetNpcAnimation, NPC_Sentinel, ANIM_Sentinel_Anim08) @@ -569,7 +569,7 @@ EvtScript N(EVS_Scene_ThrownOutBySentinel) = { EVT_CALL(SetPlayerJumpscale, 0) EVT_CALL(PlayerJump1, 175, 0, -35, 10) EVT_CALL(PlaySoundAtNpc, NPC_Sentinel, SOUND_162, SOUND_SPACE_MODE_0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80003) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Collapse) EVT_THREAD EVT_WAIT(2) EVT_PLAY_EFFECT(EFFECT_EMOTE, 3, 0, 175, 0, -35, 20, -20, 30, 0) @@ -608,27 +608,27 @@ EvtScript N(EVS_Scene_ThrownOutBySentinel) = { EVT_END_SWITCH EVT_CALL(EnablePartnerAI) EVT_WAIT(5) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_GetUp) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_GetUp) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_DustOff) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_DustOff) EVT_WAIT(7) EVT_CALL(PlaySoundAtPlayer, SOUND_DUST_OFF, SOUND_SPACE_MODE_0) EVT_WAIT(8) EVT_CALL(PlaySoundAtPlayer, SOUND_DUST_OFF, SOUND_SPACE_MODE_0) EVT_WAIT(15) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001B) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_DeepExhale) EVT_WAIT(25) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(InterpPlayerYaw, 45, 0) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimMidairStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Jump) EVT_CALL(SetPlayerJumpscale, 1) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(PlayerJump1, LVar0, 0, LVar2, 10) EVT_CALL(PlayerJump1, LVar0, 0, LVar2, 10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) diff --git a/src/world/area_dgb/dgb_01/dgb_01_3_bridges.c b/src/world/area_dgb/dgb_01/dgb_01_3_bridges.c index 6487572ea7..6deb5c5689 100644 --- a/src/world/area_dgb/dgb_01/dgb_01_3_bridges.c +++ b/src/world/area_dgb/dgb_01/dgb_01_3_bridges.c @@ -19,7 +19,7 @@ EvtScript N(EVS_Scene_TubbaSmashBridges) = { EVT_CALL(InitAnimatedModels) EVT_WAIT(1) EVT_CALL(InterruptUsePartner) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8000A) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Shocked) EVT_THREAD EVT_CALL(PlaySoundAtNpc, NPC_Tubba, SOUND_20F6, SOUND_SPACE_MODE_0) EVT_WAIT(5) @@ -100,18 +100,18 @@ EvtScript N(EVS_Scene_TubbaSmashBridges) = { EVT_WAIT(1) EVT_CALL(SetGroupVisibility, MODEL_g96, MODEL_GROUP_HIDDEN) EVT_CALL(SetGroupVisibility, MODEL_g87, MODEL_GROUP_HIDDEN) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80013) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_PanicHover) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.5)) EVT_CALL(PlayerJump1, 121, 210, 0, 60) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001F) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_FlailArms) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_RunPanic) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_PanicRun) EVT_CALL(SetPlayerSpeed, EVT_FLOAT(8.0)) EVT_CALL(PlayerMoveTo, 412, -29, 0) EVT_WAIT(10) EVT_CALL(InterpPlayerYaw, 270, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_CLEAR_BITS, COLLIDER_after, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(DisablePlayerPhysics, FALSE) EVT_END_THREAD diff --git a/src/world/area_dgb/dgb_11/dgb_11_3_entity.c b/src/world/area_dgb/dgb_11/dgb_11_3_entity.c index ba44826fda..5e2331e5f6 100644 --- a/src/world/area_dgb/dgb_11/dgb_11_3_entity.c +++ b/src/world/area_dgb/dgb_11/dgb_11_3_entity.c @@ -61,10 +61,10 @@ EvtScript N(EVS_UseSpring) = { EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(SetPlayerPos, LVar0, 165, LVar2) EVT_KILL_THREAD(LVarB) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80015) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_JumpHitHead) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(1.0)) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.0)) EVT_CALL(PlayerJump1, 375, 25, -250, 10) EVT_CALL(N(PlaySpringAnimation)) diff --git a/src/world/area_dgb/dgb_14/dgb_14_2_main.c b/src/world/area_dgb/dgb_14/dgb_14_2_main.c index 71d071f649..20664ab8cc 100644 --- a/src/world/area_dgb/dgb_14/dgb_14_2_main.c +++ b/src/world/area_dgb/dgb_14/dgb_14_2_main.c @@ -47,9 +47,9 @@ EvtScript N(EVS_EnterMap) = { EVT_EXEC_WAIT(EnterDoubleDoor) EVT_IF_EQ(AF_DGB_01, TRUE) EVT_WAIT(5) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001D) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SleepStanding) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_IF EVT_CALL(DisablePlayerInput, FALSE) EVT_END_SWITCH diff --git a/src/world/area_dgb/dgb_18/dgb_18_3_npc.c b/src/world/area_dgb/dgb_18/dgb_18_3_npc.c index 2c30c326a8..0238e9fbf7 100644 --- a/src/world/area_dgb/dgb_18/dgb_18_3_npc.c +++ b/src/world/area_dgb/dgb_18/dgb_18_3_npc.c @@ -60,11 +60,11 @@ EvtScript N(EVS_Scene_TubbaFallsAsleep) = { EVT_END_THREAD EVT_CALL(FadeOutMusic, 0, 500) EVT_LOOP(3) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001E) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_JoltAwake) EVT_CALL(PlaySoundAt, SOUND_20F6, SOUND_SPACE_MODE_0, 382, 0, 218) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(10) EVT_END_LOOP EVT_LOOP(2) @@ -82,7 +82,7 @@ EvtScript N(EVS_Scene_TubbaFallsAsleep) = { EVT_CALL(SetNpcPos, NPC_PARTNER, 765, 0, 180) EVT_CALL(InterpPlayerYaw, 270, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8000C) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_LookClosely) EVT_CALL(PlaySoundAtCollider, COLLIDER_deilittw, SOUND_CREAKY_DOOR_OPEN, SOUND_SPACE_MODE_0) EVT_CALL(MakeLerp, 0, 80, 10, EASING_LINEAR) EVT_LOOP(0) diff --git a/src/world/area_dro/dro_01/dro_01_4_shop.c b/src/world/area_dro/dro_01/dro_01_4_shop.c index 3cf15676b2..b8e81bf788 100644 --- a/src/world/area_dro/dro_01/dro_01_4_shop.c +++ b/src/world/area_dro/dro_01/dro_01_4_shop.c @@ -75,9 +75,9 @@ EvtScript N(EVS_SecretPurcahseOrder_Moustafa) = { EVT_EXEC_WAIT(N(EVS_JumpToPlayer)) EVT_IF_LT(GB_StoryProgress, STORY_CH2_BOUGHT_SECRET_ITEMS) EVT_CALL(SpeakToPlayer, NPC_Mouser_ShopOwner, ANIM_Mouser_Purple_Talk, ANIM_Mouser_Purple_Idle, 0, MSG_CH2_0087) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_WAIT(30) EVT_END_IF EVT_CALL(SpeakToPlayer, NPC_Mouser_ShopOwner, ANIM_Mouser_Purple_Talk, ANIM_Mouser_Purple_Idle, 0, MSG_CH2_0088) diff --git a/src/world/area_dro/dro_01/npc_composer.c b/src/world/area_dro/dro_01/npc_composer.c index 3ddf455635..a10a2fd416 100644 --- a/src/world/area_dro/dro_01/npc_composer.c +++ b/src/world/area_dro/dro_01/npc_composer.c @@ -15,9 +15,9 @@ EvtScript N(EVS_NpcInteract_Composer) = { EVT_IF_EQ(GF_DRO01_Gift_ToldComposerAboutMelody, FALSE) EVT_IF_LT(GB_StoryProgress, STORY_CH7_BEGAN_PEACH_MISSION) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Composer_Talk, ANIM_Musician_Composer_Idle, 0, MSG_CH2_0085) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Musician_Composer_Talk, ANIM_Musician_Composer_Idle, 0, MSG_CH2_0086) EVT_SET(GF_DRO01_Gift_ToldComposerAboutMelody, TRUE) EVT_RETURN diff --git a/src/world/area_dro/dro_01/npc_hint_dryite.c b/src/world/area_dro/dro_01/npc_hint_dryite.c index 4e4425d8fe..88b8ebc4eb 100644 --- a/src/world/area_dro/dro_01/npc_hint_dryite.c +++ b/src/world/area_dro/dro_01/npc_hint_dryite.c @@ -47,11 +47,11 @@ EvtScript N(EVS_Scene_TreeOrbitReaction) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(5.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SpeakToPlayer, NPC_Dryite_03, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_0079) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SpeakToPlayer, NPC_Dryite_03, ANIM_Dryite_Green_Talk, ANIM_Dryite_Green_Idle, 0, MSG_CH2_007A) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) diff --git a/src/world/area_dro/dro_02/dro_02_5_npc.c b/src/world/area_dro/dro_02/dro_02_5_npc.c index 5314560e89..7f0cb9dd17 100644 --- a/src/world/area_dro/dro_02/dro_02_5_npc.c +++ b/src/world/area_dro/dro_02/dro_02_5_npc.c @@ -317,12 +317,12 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { EVT_CALL(PlayerMoveTo, -187, -267, 0) EVT_CALL(InterpPlayerYaw, 230, 1) EVT_CALL(HidePlayerShadow, TRUE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(func_802D286C, 0x800) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 5, 7, 1, 1, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 5, 7, 1, 1, 0) EVT_THREAD EVT_WAIT(60) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001D) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SleepStanding) EVT_END_THREAD EVT_WAIT(20) EVT_THREAD @@ -339,7 +339,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { EvtScript N(EVS_ToadHouse_ReturnFromRest) = { EVT_CALL(HidePlayerShadow, FALSE) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 0, 0, 0, 0, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 0, 0, 0, 0, 0) EVT_CALL(SetPlayerPos, -187, 0, -240) EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) EVT_CALL(PlayerMoveTo, -168, -195, 0) diff --git a/src/world/area_dro/dro_02/npc_merlee.c b/src/world/area_dro/dro_02/npc_merlee.c index 97af483f9b..d70d670b94 100644 --- a/src/world/area_dro/dro_02/npc_merlee.c +++ b/src/world/area_dro/dro_02/npc_merlee.c @@ -724,7 +724,7 @@ EvtScript N(EVS_PerformRitual) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetPlayerPos, RITUAL_VAR_POS_X, RITUAL_VAR_POS_Y, RITUAL_VAR_POS_Z) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_GotItem) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_UsePower) EVT_WAIT(1) EVT_CALL(SetPlayerPos, RITUAL_VAR_POS_X, RITUAL_VAR_POS_Y, RITUAL_VAR_POS_Z) EVT_WAIT(1) diff --git a/src/world/area_dro/dro_02/npc_moustafa.c b/src/world/area_dro/dro_02/npc_moustafa.c index 96797e1d5b..93fac9c964 100644 --- a/src/world/area_dro/dro_02/npc_moustafa.c +++ b/src/world/area_dro/dro_02/npc_moustafa.c @@ -230,9 +230,9 @@ EvtScript N(EVS_NpcInteract_Moustafa) = { EVT_IF_GE(GB_StoryProgress, STORY_CH2_DEFEATED_TUTANKOOPA) EVT_IF_EQ(GF_DRO02_Moustafa_HeardAboutDryDryRuins, FALSE) EVT_CALL(SpeakToPlayer, NPC_Moustafa, ANIM_Moustafa_Shout, ANIM_Moustafa_Idle, 0, MSG_CH2_00CD) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(15) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_WAIT(30) EVT_CALL(SpeakToPlayer, NPC_Moustafa, ANIM_Moustafa_Shout, ANIM_Moustafa_Idle, 0, MSG_CH2_00CE) EVT_SET(GF_DRO02_Moustafa_HeardAboutDryDryRuins, TRUE) diff --git a/src/world/area_flo/flo_00/flo_00_3_npc.c b/src/world/area_flo/flo_00/flo_00_3_npc.c index 2adbff5fbc..7de58da209 100644 --- a/src/world/area_flo/flo_00/flo_00_3_npc.c +++ b/src/world/area_flo/flo_00/flo_00_3_npc.c @@ -66,7 +66,7 @@ EvtScript N(EVS_Wisterwood_Introduction) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_WAIT(15) EVT_CALL(SpeakToPlayer, NPC_Dummy_Wisterwood, -1, -1, 5, MSG_CH6_0001) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(InterpPlayerYaw, 350, 0) EVT_WAIT(15) EVT_CALL(ContinueSpeech, NPC_Dummy_Wisterwood, -1, -1, 5, MSG_CH6_0002) @@ -86,9 +86,9 @@ EvtScript N(EVS_Wisterwood_Introduction) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(ShowMessageAtWorldPos, MSG_CH6_0004, 0, 50, -200) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(9.0), EVT_FLOAT(-22.0)) EVT_CALL(SetCamDistance, CAM_DEFAULT, 333) @@ -476,7 +476,7 @@ EvtScript N(EVS_Scene_RescuedKlevar) = { EVT_CALL(EnableNpcAI, NPC_Klevar, FALSE) EVT_CALL(SetNpcAnimation, NPC_Klevar, ANIM_WorldKlevar_Leap) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_GotItem) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_UsePower) EVT_CALL(PlaySoundAtPlayer, SOUND_139, SOUND_SPACE_MODE_0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SET(LVar3, LVar1) @@ -495,7 +495,7 @@ EvtScript N(EVS_Scene_RescuedKlevar) = { EVT_ADD(LVar1, 20) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 30) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SetNpcAnimation, NPC_Klevar, ANIM_WorldKlevar_Idle) EVT_CALL(EnableNpcAI, NPC_Klevar, TRUE) EVT_CALL(N(UpgradeStarPowerCh6)) @@ -559,9 +559,9 @@ EvtScript N(EVS_Scene_RescuedKlevar) = { EVT_CALL(PlaySoundAtNpc, NPC_Klevar, SOUND_2045, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_WAIT(110) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_SET(GB_StoryProgress, STORY_CH6_STAR_SPRIT_DEPARTED) EVT_EXEC_WAIT(N(EVS_Wisterwood_Farewell)) EVT_CALL(EnablePartnerAI) diff --git a/src/world/area_flo/flo_00/flo_00_5_beanstalk.c b/src/world/area_flo/flo_00/flo_00_5_beanstalk.c index b4a3b0eeec..0831b0d366 100644 --- a/src/world/area_flo/flo_00/flo_00_5_beanstalk.c +++ b/src/world/area_flo/flo_00/flo_00_5_beanstalk.c @@ -254,7 +254,7 @@ EvtScript N(EVS_Exit_Beanstalk) = { EVT_CALL(PlaySound, SOUND_19C) EVT_CALL(SetMusicTrack, 0, SONG_MAGIC_BEANSTALK, 1, 8) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Walking) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Walk) EVT_CALL(N(GetPlayerAngles), LVar3, LVar4) EVT_SWITCH(LVar4) EVT_CASE_LT(90) @@ -317,7 +317,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { EVT_THREAD EVT_WAIT(5) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Walking) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Walk) EVT_SWITCH(AF_FLO_BeanstalkFacingRight) EVT_CASE_EQ(0) EVT_CALL(InterpPlayerYaw, 90, 0) @@ -384,7 +384,7 @@ EvtScript N(EVS_Scene_BeanstalkGrowing) = { EVT_EXEC(N(EVS_SetInteriorVineGrowth)) EVT_SWITCH(LVarF) EVT_CASE_EQ(200) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_CASE_EQ(250) EVT_SET(LVar0, -60) EVT_SET(LVar1, 0) @@ -477,12 +477,12 @@ EvtScript N(EVS_BeanPatch_ItemPrompt) = { EVT_CALL(AwaitPlayerLeave, -85, 85, 28) EVT_RETURN EVT_CASE_EQ(ITEM_FERTILE_SOIL) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_60006) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_PlaceItem) EVT_WAIT(5) EVT_CALL(RemoveKeyItemAt, LVar1) EVT_CALL(MakeItemEntity, ITEM_FERTILE_SOIL, BEANSTALK_BASE_X, 0, BEANSTALK_BASE_Z, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(MV_BeanstalkItemEntity, LVar0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still) EVT_WAIT(20) EVT_CASE_DEFAULT EVT_SWITCH(AF_FLO_PlatingInstructionsToggle) @@ -515,12 +515,12 @@ EvtScript N(EVS_BeanPatch_ItemPrompt) = { EVT_CASE_EQ(ITEM_MAGICAL_BEAN) EVT_CALL(RemoveItemEntity, MV_BeanstalkItemEntity) EVT_WAIT(5) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_60006) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_PlaceItem) EVT_WAIT(5) EVT_CALL(RemoveKeyItemAt, LVar1) EVT_CALL(MakeItemEntity, ITEM_MAGICAL_BEAN, BEANSTALK_BASE_X, 0, BEANSTALK_BASE_Z, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(MV_BeanstalkItemEntity, LVar0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still) EVT_WAIT(20) EVT_CASE_DEFAULT EVT_SWITCH(AF_FLO_PlatingInstructionsToggle) @@ -552,13 +552,13 @@ EvtScript N(EVS_BeanPatch_ItemPrompt) = { EVT_CASE_EQ(ITEM_MIRACLE_WATER) EVT_CALL(RemoveItemEntity, MV_BeanstalkItemEntity) EVT_WAIT(5) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_60006) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_PlaceItem) EVT_WAIT(5) EVT_CALL(RemoveKeyItemAt, LVar1) EVT_CALL(N(SyncStatusMenu)) EVT_CALL(MakeItemEntity, ITEM_MIRACLE_WATER, BEANSTALK_BASE_X, 0, BEANSTALK_BASE_Z, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(MV_BeanstalkItemEntity, LVar0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still) EVT_WAIT(30) EVT_CALL(RemoveItemEntity, MV_BeanstalkItemEntity) EVT_WAIT(30) diff --git a/src/world/area_flo/flo_03/flo_03_3_npc.c b/src/world/area_flo/flo_03/flo_03_3_npc.c index 9351334dae..10eb980cba 100644 --- a/src/world/area_flo/flo_03/flo_03_3_npc.c +++ b/src/world/area_flo/flo_03/flo_03_3_npc.c @@ -153,7 +153,7 @@ EvtScript N(EVS_NpcInteract_Petunia) = { EVT_EXEC_WAIT(N(EVS_FocusCamBetween)) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Petunia_AngryTalk, ANIM_Petunia_Angry, 0, MSG_CH6_0050) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Petunia_Angry) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) EVT_WAIT(20) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Petunia_AngryTalk, ANIM_Petunia_Angry, 0, MSG_CH6_0051) EVT_CALL(SetNpcAnimation, NPC_MontyMole_01, ANIM_MontyMole_Dark_Anim12) diff --git a/src/world/area_flo/flo_08/flo_08_4_npc.c b/src/world/area_flo/flo_08/flo_08_4_npc.c index a31cc6aef9..0de2fd90be 100644 --- a/src/world/area_flo/flo_08/flo_08_4_npc.c +++ b/src/world/area_flo/flo_08/flo_08_4_npc.c @@ -21,12 +21,12 @@ EvtScript N(EVS_NpcInteract_GateFlower) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Yellow_Talk, ANIM_GateFlower_Yellow_Idle, 0, MSG_CH6_0042) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Thinking) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Thinking) EVT_CALL(N(FlowerGuard_MakeItemList)) EVT_CHOOSE_CONSUMABLE_FROM(N(FlowerGuard_ItemChoiceList), 0) EVT_SWITCH(LVar0) EVT_CASE_LE(0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Yellow_Talk, ANIM_GateFlower_Yellow_Idle, 0, MSG_CH6_0043) EVT_CASE_DEFAULT EVT_SET(LVar8, LVar0) diff --git a/src/world/area_flo/flo_10/flo_10_4_fountain.c b/src/world/area_flo/flo_10/flo_10_4_fountain.c index 93bf534f1e..32a39630ef 100644 --- a/src/world/area_flo/flo_10/flo_10_4_fountain.c +++ b/src/world/area_flo/flo_10/flo_10_4_fountain.c @@ -81,7 +81,7 @@ EvtScript N(EVS_RaiseLily) = { EvtScript N(EVS_RaisePlayer) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_WAIT(40) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80024) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SitIdle) EVT_CALL(GetPlayerPos, LVar2, LVar0, LVar3) EVT_CALL(MakeLerp, -50, 90, 60, EASING_QUADRATIC_IN) EVT_LOOP(0) @@ -174,7 +174,7 @@ EvtScript N(EVS_FountainSlowing) = { EvtScript N(EVS_Scene_ReleaseFountain) = { EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still) EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar3, LVar4, LVar5) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar3, LVar4, LVar5) @@ -191,7 +191,7 @@ EvtScript N(EVS_Scene_ReleaseFountain) = { EVT_CALL(PlaySound, SOUND_80000024) EVT_WAIT(360) EVT_CALL(InterpPlayerYaw, 90, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80017) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Flail) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.2)) EVT_CALL(PlayerJump1, -100, -10, -172, 75) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) @@ -208,7 +208,7 @@ EvtScript N(EVS_Scene_PostReleaseFountain) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(SetPlayerPos, -100, -10, -172) EVT_CALL(InterpPlayerYaw, 150, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_DeadStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Fallen) EVT_CALL(SetNpcPos, NPC_PARTNER, -129, 9, -177) EVT_CALL(EnablePartnerAI) EVT_CALL(ClearPartnerMoveHistory, NPC_PARTNER) @@ -220,9 +220,9 @@ EvtScript N(EVS_Scene_PostReleaseFountain) = { EVT_CALL(InterpNpcYaw, NPC_Lily, 90, 0) EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(90.0), 0, 450, EVT_FLOAT(25.0), EVT_FLOAT(-6.0)) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_GetUp) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_GetUp) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(10) EVT_EXEC_WAIT(N(EVS_PushFlowerSong)) EVT_WAIT(10) diff --git a/src/world/area_flo/flo_10/flo_10_5_npc.c b/src/world/area_flo/flo_10/flo_10_5_npc.c index 53c6277c98..4d85977c4d 100644 --- a/src/world/area_flo/flo_10/flo_10_5_npc.c +++ b/src/world/area_flo/flo_10/flo_10_5_npc.c @@ -53,7 +53,7 @@ EvtScript N(EVS_OnInteract_WaterStoneSocket) = { EVT_WAIT(10) EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(1.0), 0, 450, EVT_FLOAT(25.0), EVT_FLOAT(-6.0)) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_60006) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_PlaceItem) EVT_CALL(RemoveKeyItemAt, LVar1) EVT_CALL(MakeItemEntity, ITEM_WATER_STONE, 0, -60, 6, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(LVarA, LVar0) diff --git a/src/world/area_flo/flo_12/flo_12_3_npc.c b/src/world/area_flo/flo_12/flo_12_3_npc.c index 48a607047c..5052ac501b 100644 --- a/src/world/area_flo/flo_12/flo_12_3_npc.c +++ b/src/world/area_flo/flo_12/flo_12_3_npc.c @@ -86,13 +86,13 @@ EvtScript N(EVS_NpcInteract_Rosie) = { EVT_CASE_EQ(0) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Rosie_TalkHold, ANIM_Rosie_TalkHold, 5, MSG_CH6_008F) EVT_CASE_EQ(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_60002) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_CarryRun) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Rosie_TalkHold, ANIM_Rosie_TalkHold, 5, MSG_CH6_008F) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_60005) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_TakeItem) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Rosie_TalkHold, ANIM_Rosie_IdleHold, 5, MSG_CH6_0091) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimPray) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Pray) EVT_WAIT(40) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Rosie_TalkHold, ANIM_Rosie_IdleHold, 5, MSG_CH6_0092) EVT_SET(GF_FLO12_RosieRequestedSomethingBeautiful, TRUE) EVT_END_SWITCH @@ -103,11 +103,11 @@ EvtScript N(EVS_NpcInteract_Rosie) = { EVT_IF_EQ(GF_FLO10_LilyRequestedWaterStone, TRUE) EVT_EXEC(N(EVS_PlayerApproachRosieAndItem)) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Rosie_TalkHold, ANIM_Rosie_TalkHold, 5, MSG_CH6_0090) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_60005) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_TakeItem) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Rosie_TalkHold, ANIM_Rosie_IdleHold, 5, MSG_CH6_0091) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimPray) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Pray) EVT_WAIT(40) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Rosie_TalkHold, ANIM_Rosie_IdleHold, 5, MSG_CH6_0092) EVT_SET(GF_FLO12_RosieRequestedSomethingBeautiful, TRUE) EVT_ELSE diff --git a/src/world/area_flo/flo_13/flo_13_4_npc.c b/src/world/area_flo/flo_13/flo_13_4_npc.c index 946e00ce61..0e5ca6869f 100644 --- a/src/world/area_flo/flo_13/flo_13_4_npc.c +++ b/src/world/area_flo/flo_13/flo_13_4_npc.c @@ -175,7 +175,7 @@ EvtScript N(EVS_Lakilulu_SpinyToss) = { EVT_CALL(SetNpcPos, NPC_Lakilulu_Spiny, LVar1, LVar2, LVar3) EVT_THREAD EVT_WAIT(5) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_END_THREAD EVT_CALL(ContinueSpeech, NPC_Lakilulu, -1, -1, SPEECH_FLAG_200, MSG_CH6_00A8) EVT_THREAD @@ -206,7 +206,7 @@ EvtScript N(EVS_Lakilulu_SpinyToss) = { EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(2.0)) EVT_END_THREAD EVT_CALL(PlaySoundAtPlayer, SOUND_HIT_PLAYER_NORMAL, SOUND_SPACE_MODE_0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_FallBack) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Hurt) EVT_SET(LVar0, 90) EVT_LOOP(20) EVT_ADD(LVar0, 144) @@ -216,7 +216,7 @@ EvtScript N(EVS_Lakilulu_SpinyToss) = { EVT_CALL(InterpPlayerYaw, LVar0, 1) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still) EVT_CALL(SetNpcAnimation, NPC_Lakilulu, ANIM_Lakilulu_Idle) EVT_RETURN EVT_END @@ -232,13 +232,13 @@ EvtScript N(EVS_NpcIdle_Lakilester) = { EVT_CALL(SetMusicTrack, 0, SONG_LAKILESTER_THEME, 0, 8) EVT_CALL(ShowMessageAtScreenPos, MSG_CH6_00A0, 160, 40) EVT_CALL(InterruptUsePartner) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_WAIT(20) EVT_CALL(InterpPlayerYaw, 270, 1) EVT_WAIT(20) EVT_CALL(InterpPlayerYaw, 90, 1) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still) EVT_CALL(func_802CF56C, 2) EVT_CALL(SetNpcAnimation, NPC_Lakilester, ANIM_WorldLakilester_Run) EVT_THREAD @@ -353,7 +353,7 @@ EvtScript N(EVS_Scene_LakilesterDefeated) = { EVT_THREAD EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldLakilester_Idle) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_WAIT(20) EVT_CALL(InterpPlayerYaw, 270, 1) EVT_END_THREAD @@ -390,7 +390,7 @@ EvtScript N(EVS_Scene_LakilesterDefeated) = { EVT_END_IF EVT_KILL_THREAD(LVar9) EVT_CALL(SetNpcAnimation, NPC_Lakilulu, ANIM_Lakilulu_ConcernedNod) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still) EVT_WAIT(20) EVT_CALL(GetNpcPos, NPC_Lakilulu, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 20) @@ -437,9 +437,9 @@ EvtScript N(EVS_Scene_LakilesterDefeated) = { EVT_ELSE EVT_CALL(ContinueSpeech, NPC_Lakilulu, ANIM_Lakilulu_Talk, ANIM_Lakilulu_Idle, 0, MSG_CH6_00A9) EVT_CALL(SetNpcAnimation, NPC_Lakilulu, ANIM_Lakilulu_Idle) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still) EVT_WAIT(20) EVT_CALL(GetNpcPos, NPC_Lakilulu, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 20) diff --git a/src/world/area_flo/flo_15/flo_15_3_npc.c b/src/world/area_flo/flo_15/flo_15_3_npc.c index d60aa8ca19..d29285edec 100644 --- a/src/world/area_flo/flo_15/flo_15_3_npc.c +++ b/src/world/area_flo/flo_15/flo_15_3_npc.c @@ -139,11 +139,11 @@ EvtScript N(EVS_NpcInteract_Sun_01) = { EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH6_SPOKE_WITH_THE_SUN) EVT_CALL(SpeakToPlayer, NPC_Sun_01, ANIM_Sun_TalkSad, ANIM_Sun_Idle, 517, MSG_CH6_009A) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Thinking) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Thinking) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SpeakToPlayer, NPC_Sun_01, ANIM_Sun_TalkSad, ANIM_Sun_Idle, 517, MSG_CH6_009B) EVT_SET(GB_StoryProgress, STORY_CH6_SPOKE_WITH_THE_SUN) EVT_CASE_LT(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) diff --git a/src/world/area_flo/flo_18/flo_18_4_npc.c b/src/world/area_flo/flo_18/flo_18_4_npc.c index 21bc3e3fec..98020a8835 100644 --- a/src/world/area_flo/flo_18/flo_18_4_npc.c +++ b/src/world/area_flo/flo_18/flo_18_4_npc.c @@ -74,9 +74,9 @@ EvtScript N(EVS_Scene_LakilesterLikesBeingGood) = { EVT_CALL(PlayerFaceNpc, NPC_PARTNER, FALSE) EVT_CALL(NpcFacePlayer, NPC_PARTNER, 0) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldLakilester_Talk, ANIM_WorldLakilester_Idle, 5, MSG_CH6_00C9) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still) EVT_WAIT(20) EVT_CALL(EnablePartnerAI) EVT_CALL(PutPartnerAway) diff --git a/src/world/area_flo/flo_19/flo_19_5_beanstalk.c b/src/world/area_flo/flo_19/flo_19_5_beanstalk.c index b6e3e07350..c88e6430dd 100644 --- a/src/world/area_flo/flo_19/flo_19_5_beanstalk.c +++ b/src/world/area_flo/flo_19/flo_19_5_beanstalk.c @@ -134,7 +134,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { EVT_THREAD EVT_WAIT(5) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Walking) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Walk) EVT_SWITCH(AF_FLO_BeanstalkFacingRight) EVT_CASE_EQ(0) EVT_CALL(InterpPlayerYaw, 90, 0) @@ -148,7 +148,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { EVT_CALL(UpdateColliderTransform, COLLIDER_o117) EVT_THREAD EVT_SET(AF_FLO_BeanstalkFadedOut, FALSE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Walking) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Walk) EVT_WAIT(200) EVT_EXEC_WAIT(N(EVS_FadeOutToBlack)) EVT_SET(AF_FLO_BeanstalkFadedOut, TRUE) @@ -230,7 +230,7 @@ EvtScript N(EVS_Exit_Beanstalk) = { EVT_CALL(PlaySound, SOUND_19D) EVT_CALL(SetMusicTrack, 0, SONG_MAGIC_BEANSTALK, 1, 8) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Walking) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Walk) EVT_CALL(N(GetPlayerAngles), LVar3, LVar4) EVT_SWITCH(LVar4) EVT_CASE_LT(90) diff --git a/src/world/area_flo/flo_21/flo_21_2_main.c b/src/world/area_flo/flo_21/flo_21_2_main.c index 19fd01c8f6..e280e02408 100644 --- a/src/world/area_flo/flo_21/flo_21_2_main.c +++ b/src/world/area_flo/flo_21/flo_21_2_main.c @@ -43,7 +43,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(45) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_END_THREAD EVT_THREAD EVT_WAIT(180) @@ -53,7 +53,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_CALL(N(StarSpiritEffectFunc4), 1) EVT_THREAD EVT_WAIT(80) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_ADD(LVar1, 100) EVT_CALL(SetCamDistance, CAM_DEFAULT, LVar1) diff --git a/src/world/area_flo/flo_21/flo_21_4_npc.c b/src/world/area_flo/flo_21/flo_21_4_npc.c index 265a23dbb5..939c603927 100644 --- a/src/world/area_flo/flo_21/flo_21_4_npc.c +++ b/src/world/area_flo/flo_21/flo_21_4_npc.c @@ -60,7 +60,7 @@ EvtScript N(EVS_HuffNPuff_JumpOut) = { EVT_CALL(NpcJump0, NPC_HuffNPuff_03, 650, 150, 0, 10) EVT_END_THREAD EVT_THREAD - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80017) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Flail) EVT_CALL(LoadPath, 30, EVT_PTR(N(Path_JumpOut)), ARRAY_COUNT(N(Path_JumpOut)), EASING_LINEAR) EVT_LABEL(0) EVT_CALL(GetNextPathPos) @@ -70,7 +70,7 @@ EvtScript N(EVS_HuffNPuff_JumpOut) = { EVT_GOTO(0) EVT_END_IF EVT_END_THREAD - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_RETURN EVT_END }; @@ -91,7 +91,7 @@ EvtScript N(EVS_Scene_HuffNPuffAmbush) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(InterpPlayerYaw, 90, 1) EVT_WAIT(5) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_CALL(SetNpcFlagBits, NPC_HuffNPuff_02, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar2, LVar3, LVar4) diff --git a/src/world/area_flo/flo_22/flo_22_3_npc.c b/src/world/area_flo/flo_22/flo_22_3_npc.c index e59628968a..60780561f9 100644 --- a/src/world/area_flo/flo_22/flo_22_3_npc.c +++ b/src/world/area_flo/flo_22/flo_22_3_npc.c @@ -10,7 +10,7 @@ EvtScript N(EVS_NpcIdle_Bzzap) = { EVT_SWITCH(MV_Bzzap_State) EVT_CASE_EQ(0) EVT_CASE_EQ(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002E) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_FallBack) EVT_SET(MV_Bzzap_State, 0) EVT_CALL(StartBattle) EVT_END_SWITCH @@ -57,7 +57,7 @@ EvtScript N(EVS_NpcIdle_Dayzee) = { EVT_SWITCH(MV_Dayzee_State) EVT_CASE_EQ(0) EVT_CASE_EQ(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002E) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_FallBack) EVT_SET(MV_Dayzee_State, 0) EVT_CALL(StartBattle) EVT_END_SWITCH diff --git a/src/world/area_flo/flo_22/flo_22_4_well.c b/src/world/area_flo/flo_22/flo_22_4_well.c index 8f422a596f..4672685c0c 100644 --- a/src/world/area_flo/flo_22/flo_22_4_well.c +++ b/src/world/area_flo/flo_22/flo_22_4_well.c @@ -23,7 +23,7 @@ EvtScript N(EVS_SniffleHint) = { }; EvtScript N(EVS_TossItemIntoWell) = { - EVT_CALL(SetPlayerAnimation, ANIM_Mario_6000E) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_Toss) EVT_THREAD EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) EVT_SET(LVar6, 35) @@ -46,7 +46,7 @@ EvtScript N(EVS_TossItemIntoWell) = { EVT_WAIT(10) EVT_CALL(PlaySoundAt, SOUND_302, SOUND_SPACE_MODE_0, 35, 0, 0) EVT_WAIT(5) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(10) EVT_RETURN EVT_END diff --git a/src/world/area_flo/flo_23/flo_23_3_npc.c b/src/world/area_flo/flo_23/flo_23_3_npc.c index e58066d317..d5bd7c5cd2 100644 --- a/src/world/area_flo/flo_23/flo_23_3_npc.c +++ b/src/world/area_flo/flo_23/flo_23_3_npc.c @@ -21,12 +21,12 @@ EvtScript N(EVS_NpcInteract_GateFlower) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Blue_Talk, ANIM_GateFlower_Blue_Idle, 0, MSG_CH6_0049) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Thinking) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Thinking) EVT_CALL(N(FlowerGuard_MakeItemList)) EVT_CHOOSE_CONSUMABLE_FROM(N(FlowerGuard_ItemChoiceList), 2) EVT_SWITCH(LVar0) EVT_CASE_LE(0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Blue_Talk, ANIM_GateFlower_Blue_Idle, 0, MSG_CH6_004A) EVT_CASE_DEFAULT EVT_SET(LVar8, LVar0) diff --git a/src/world/area_flo/flo_25/flo_25_3_npc.c b/src/world/area_flo/flo_25/flo_25_3_npc.c index 90bf53992b..468040f9cb 100644 --- a/src/world/area_flo/flo_25/flo_25_3_npc.c +++ b/src/world/area_flo/flo_25/flo_25_3_npc.c @@ -21,12 +21,12 @@ EvtScript N(EVS_NpcInteract_GateFlower) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Red_Talk, ANIM_GateFlower_Red_Idle, 0, MSG_CH6_003B) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Thinking) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Thinking) EVT_CALL(N(FlowerGuard_MakeItemList)) EVT_CHOOSE_CONSUMABLE_FROM(N(FlowerGuard_ItemChoiceList), 0) EVT_SWITCH(LVar0) EVT_CASE_LE(0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Red_Talk, ANIM_GateFlower_Red_Idle, 0, MSG_CH6_003C) EVT_CASE_DEFAULT EVT_SET(LVar8, LVar0) diff --git a/src/world/area_gv/gv_01/gv_01_1_main.c b/src/world/area_gv/gv_01/gv_01_1_main.c index 9f4544d023..e4c1bbf7f6 100644 --- a/src/world/area_gv/gv_01/gv_01_1_main.c +++ b/src/world/area_gv/gv_01/gv_01_1_main.c @@ -61,15 +61,15 @@ EvtScript N(EVS_Main) = { EVT_CALL(RandInt, 4, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1000D) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_SpinLand) EVT_CASE_EQ(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Crouch) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Crouch) EVT_CASE_EQ(2) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_ShockStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_VacantStare) EVT_CASE_EQ(3) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimPray) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Pray) EVT_CASE_EQ(4) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_DeadStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Fallen) EVT_END_SWITCH EVT_END_THREAD EVT_CALL(SetMusicTrack, 0, SONG_GAME_OVER, 0, 8) diff --git a/src/world/area_hos/hos_00/hos_00_6_scenes.c b/src/world/area_hos/hos_00/hos_00_6_scenes.c index 413e6734de..fdd15cd05d 100644 --- a/src/world/area_hos/hos_00/hos_00_6_scenes.c +++ b/src/world/area_hos/hos_00/hos_00_6_scenes.c @@ -202,7 +202,7 @@ EvtScript N(EVS_Scene_MeetingTwink) = { EVT_ADD(LVar0, -10) EVT_CALL(NpcJump0, NPC_Twink, LVar0, 20, LVar2, 15) EVT_CALL(PlaySoundAtPlayer, SOUND_HIT_PLAYER_NORMAL, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_ShockStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_VacantStare) EVT_CALL(SetNpcAnimation, NPC_Twink, ANIM_Twink_Cringe) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Twink, ANIM_Twink_Disappointed) @@ -210,7 +210,7 @@ EvtScript N(EVS_Scene_MeetingTwink) = { EVT_CALL(GetNpcPos, NPC_Twink, LVar0, LVar1, LVar2) EVT_ADD(LVar0, -100) EVT_CALL(NpcJump0, NPC_Twink, LVar0, 10, LVar2, 20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(2.0)) @@ -236,7 +236,7 @@ EvtScript N(EVS_Scene_MeetingTwink) = { EVT_END_THREAD EVT_CALL(ShowMessageAtScreenPos, MSG_HOS_000D, 160, 40) EVT_CALL(SetMusicTrack, 0, SONG_TWINK_THEME, 0, 8) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SetNpcAnimation, NPC_Twink, ANIM_Twink_Idle) EVT_CALL(NpcFacePlayer, NPC_Twink, 0) EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Shout, ANIM_Twink_Idle, 0, MSG_HOS_000E) @@ -355,7 +355,7 @@ EvtScript N(EVS_Scene_MeetingTwink) = { EVT_CALL(ContinueSpeech, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_HOS_0016) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_HOS_0017) EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_HOS_0018) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_CALL(SetNpcVar, NPC_Twink, 0, 1) EVT_LOOP(0) EVT_CALL(GetNpcVar, NPC_Twink, 0, LVar0) @@ -566,9 +566,9 @@ EvtScript N(EVS_Scene_TwinkDeparts) = { EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_HOS_0037) EVT_CALL(EnablePartnerAI) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_THREAD EVT_SET(GB_StoryProgress, STORY_CH0_TWINK_GAVE_LUCKY_STAR) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) diff --git a/src/world/area_hos/hos_03/hos_03_6_npc.c b/src/world/area_hos/hos_03/hos_03_6_npc.c index 447e3b2ef9..063bc77d57 100644 --- a/src/world/area_hos/hos_03/hos_03_6_npc.c +++ b/src/world/area_hos/hos_03/hos_03_6_npc.c @@ -89,11 +89,11 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { EVT_WAIT(5) EVT_CALL(InterpPlayerYaw, 204, 1) EVT_CALL(HidePlayerShadow, TRUE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(func_802D286C, 0x800) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 5, 7, 1, 1, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 5, 7, 1, 1, 0) EVT_WAIT(61) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001D) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SleepStanding) EVT_THREAD EVT_WAIT(70) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -108,7 +108,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { EvtScript N(EVS_ToadHouse_ReturnFromRest) = { EVT_EXEC(N(EVS_SetupMusic)) EVT_CALL(N(ToadHouse_CamSetFOV), 0, 25) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 0, 0, 0, 0, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 0, 0, 0, 0, 0) EVT_CALL(SetPlayerPos, 445, 25, 185) EVT_CALL(PlayerMoveTo, 440, 215, 20) EVT_RETURN diff --git a/src/world/area_hos/hos_05/hos_05_4_npc.c b/src/world/area_hos/hos_05/hos_05_4_npc.c index 4f85b64278..b1cd08fa7d 100644 --- a/src/world/area_hos/hos_05/hos_05_4_npc.c +++ b/src/world/area_hos/hos_05/hos_05_4_npc.c @@ -226,7 +226,7 @@ EvtScript N(EVS_Scene_RecieveStarBeam) = { EVT_CALL(PlaySoundAt, SOUND_B000001F, 0, 10, 154, 88) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, 10, 154, 88, 25) EVT_WAIT(6) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_GotItem) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_UsePower) EVT_LOOP(3) EVT_CALL(PlaySoundAt, SOUND_B000001F, 0, 0, 154, 88) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, 0, 154, 88, 30) @@ -242,7 +242,7 @@ EvtScript N(EVS_Scene_RecieveStarBeam) = { EVT_CALL(SetSelfVar, 0, 0) EVT_WAIT(30) EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0198, 160, 40) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(30) EVT_CALL(SetPanTarget, CAM_DEFAULT, 0, 220, -275) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(1.0)) diff --git a/src/world/area_hos/hos_06/hos_06_5_merluvlee.c b/src/world/area_hos/hos_06/hos_06_5_merluvlee.c index 47781507e0..2a53979f38 100644 --- a/src/world/area_hos/hos_06/hos_06_5_merluvlee.c +++ b/src/world/area_hos/hos_06/hos_06_5_merluvlee.c @@ -655,9 +655,9 @@ EvtScript N(EVS_NpcInit_Merluvlee) = { EvtScript N(EVS_KootRequestBall_Merluvlee) = { EVT_IF_EQ(GB_KootFavor_Current, KOOT_FAVOR_CH4_1) EVT_IF_EQ(GF_HOS06_MerluvleeRequestedCrystalBall, FALSE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_WAIT(20) EVT_CALL(SpeakToPlayer, NPC_Merluvlee, ANIM_Merluvlee_Talk, ANIM_Merluvlee_Idle, 0, MSG_HOS_0046) EVT_WAIT(10) diff --git a/src/world/area_hos/hos_10/hos_10_6_pre_title.c b/src/world/area_hos/hos_10/hos_10_6_pre_title.c index ae32b3df80..90ffc83cf8 100644 --- a/src/world/area_hos/hos_10/hos_10_6_pre_title.c +++ b/src/world/area_hos/hos_10/hos_10_6_pre_title.c @@ -8,7 +8,7 @@ EvtScript N(EVS_Scene_PreTitle) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_FallBack) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Hurt) EVT_CALL(SetPlayerPos, NPC_DISPOSE_LOCATION) EVT_CALL(EnableModel, MODEL_o2, FALSE) EVT_CALL(EnableModel, MODEL_nagare, FALSE) diff --git a/src/world/area_isk/isk_07/isk_07_7_ambush.c b/src/world/area_isk/isk_07/isk_07_7_ambush.c index d9b7f6cbd5..d50a86d0f0 100644 --- a/src/world/area_isk/isk_07/isk_07_7_ambush.c +++ b/src/world/area_isk/isk_07/isk_07_7_ambush.c @@ -28,11 +28,11 @@ EvtScript N(EVS_SetupSarcophagi) = { EVT_WAIT(12) EVT_CALL(InterpPlayerYaw, 109, 0) EVT_WAIT(3) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 5, 0, 1, 1, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8000A) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 5, 0, 1, 1, 0) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Shocked) EVT_WAIT(20) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 0, 0, 0, 0, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 0, 0, 0, 0, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, -151, -390, 576) diff --git a/src/world/area_isk/isk_11/isk_11_4_scene.c b/src/world/area_isk/isk_11/isk_11_4_scene.c index 924686833f..6f48c6de8f 100644 --- a/src/world/area_isk/isk_11/isk_11_4_scene.c +++ b/src/world/area_isk/isk_11/isk_11_4_scene.c @@ -142,14 +142,14 @@ EvtScript N(EVS_ManageSecretPassage) = { EVT_THREAD EVT_WAIT(20) EVT_LABEL(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_60002) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_CarryRun) EVT_WAIT(8) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_60003) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_CarryAboveRun) EVT_WAIT(8) EVT_IF_FALSE(MV_PlayerPanicDone) EVT_GOTO(20) EVT_END_IF - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_THREAD EVT_WAIT(20) diff --git a/src/world/area_isk/isk_13/isk_13_3_npc.c b/src/world/area_isk/isk_13/isk_13_3_npc.c index 876a2ef431..f9b57fcb51 100644 --- a/src/world/area_isk/isk_13/isk_13_3_npc.c +++ b/src/world/area_isk/isk_13/isk_13_3_npc.c @@ -249,7 +249,7 @@ EvtScript N(EVS_NpcIdle_StoneChomp) = { EVT_CALL(SetNpcJumpscale, NPC_SELF, EVT_FLOAT(1.0)) EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 20) EVT_LOOP(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80013) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_PanicHover) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD diff --git a/src/world/area_isk/isk_14/isk_14_3_npc.c b/src/world/area_isk/isk_14/isk_14_3_npc.c index fc334e25d7..cd86fafdaf 100644 --- a/src/world/area_isk/isk_14/isk_14_3_npc.c +++ b/src/world/area_isk/isk_14/isk_14_3_npc.c @@ -174,7 +174,7 @@ EvtScript N(EVS_NpcIdle_StoneChomp) = { EVT_CALL(NpcJump0, NPC_SELF, LVar0, LVar1, LVar2, 10) EVT_THREAD EVT_LOOP(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_WAIT(1) EVT_END_LOOP EVT_END_THREAD diff --git a/src/world/area_isk/isk_16/isk_16_1_main.c b/src/world/area_isk/isk_16/isk_16_1_main.c index 5e5f7c0a57..2c6c584b03 100644 --- a/src/world/area_isk/isk_16/isk_16_1_main.c +++ b/src/world/area_isk/isk_16/isk_16_1_main.c @@ -33,7 +33,7 @@ EvtScript N(EVS_SpawnStarCard) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(45) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_END_THREAD EVT_THREAD EVT_WAIT(180) @@ -43,7 +43,7 @@ EvtScript N(EVS_SpawnStarCard) = { EVT_CALL(N(StarSpiritEffectFunc4), 1) EVT_THREAD EVT_WAIT(80) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_ADD(LVar1, 100) EVT_CALL(SetCamDistance, CAM_DEFAULT, LVar1) diff --git a/src/world/area_isk/isk_16/isk_16_3_boss.c b/src/world/area_isk/isk_16/isk_16_3_boss.c index dd1657afd5..b8f36b8fa8 100644 --- a/src/world/area_isk/isk_16/isk_16_3_boss.c +++ b/src/world/area_isk/isk_16/isk_16_3_boss.c @@ -44,9 +44,9 @@ EvtScript N(EVS_Scene_TutankoopaAppears) = { EVT_CALL(SetNpcPos, NPC_Tutankoopa_01, 410, -1300, 410) EVT_THREAD EVT_WAIT(50) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_CALL(func_802CFD30, NPC_Tutankoopa_02, FOLD_TYPE_7, 0, 0, 0, 0) EVT_CALL(SetNpcPos, NPC_Tutankoopa_02, 410, -905, 410) @@ -73,7 +73,7 @@ EvtScript N(EVS_Scene_TutankoopaAppears) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_THREAD EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_END_THREAD EVT_CALL(GetNpcPos, NPC_Tutankoopa_02, LVar2, LVar3, LVar4) EVT_CALL(MakeLerp, 0, 110, 100, EASING_COS_IN_OUT) @@ -217,18 +217,18 @@ EvtScript N(EVS_Scene_TutankoopaDefeated) = { EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Tutankoopa_01, ANIM_Tutankoopa_Anim02) EVT_CALL(SetNpcSpeed, NPC_Tutankoopa_01, EVT_FLOAT(8.0)) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80022) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_LookAround) EVT_LOOP(2) EVT_CALL(NpcMoveTo, NPC_Tutankoopa_01, 304, 434, 0) EVT_CALL(NpcMoveTo, NPC_Tutankoopa_01, 444, 316, 0) EVT_CALL(NpcMoveTo, NPC_Tutankoopa_01, 473, 337, 0) EVT_CALL(NpcMoveTo, NPC_Tutankoopa_01, 318, 460, 0) EVT_END_LOOP - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_CALL(NpcMoveTo, NPC_Tutankoopa_01, 259, 522, 0) EVT_CALL(SetNpcPos, NPC_Tutankoopa_01, 0, -1500, 0) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SetSelfVar, 1, 0) EVT_END_THREAD EVT_CALL(ShowMessageAtScreenPos, MSG_CH2_00EA, 160, 40) diff --git a/src/world/area_iwa/iwa_04/iwa_04_4_npc.c b/src/world/area_iwa/iwa_04/iwa_04_4_npc.c index 57d52b178e..7c0c0fc756 100644 --- a/src/world/area_iwa/iwa_04/iwa_04_4_npc.c +++ b/src/world/area_iwa/iwa_04/iwa_04_4_npc.c @@ -139,7 +139,7 @@ EvtScript N(EVS_NpcAI_Buzzar) = { EVT_CALL(func_802CF56C, 2) EVT_END_THREAD EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_CALL(NpcFacePlayer, NPC_SELF, 0) EVT_CALL(GetNpcPos, NPC_SELF, LVar2, LVar3, LVar4) EVT_SET(LVar5, LVar3) @@ -225,7 +225,7 @@ EvtScript N(EVS_NpcAI_Buzzar) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Buzzar_Anim05) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(DisablePlayerInput, FALSE) EVT_ELSE EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) diff --git a/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c b/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c index a7c0b13d69..aadf29b1f3 100644 --- a/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c +++ b/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c @@ -20,13 +20,13 @@ EvtScript N(EVS_Scene_MeetParakarry) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ShowMessageAtScreenPos, MSG_CH2_000E, 320, 150) EVT_THREAD - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_CALL(PlaySoundAtPlayer, SOUND_263, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_TrainToad_01, EMOTE_QUESTION, 0, 20, FALSE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 0, 20, EMOTER_PLAYER, 0, 0, 0, 0) EVT_END_THREAD EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0), 30, 300, EVT_FLOAT(15.0), EVT_FLOAT(-9.5)) EVT_THREAD - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80022) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_LookAround) EVT_WAIT(20) EVT_CALL(InterpPlayerYaw, 270, 0) EVT_WAIT(55) @@ -70,7 +70,7 @@ EvtScript N(EVS_Scene_MeetParakarry) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(SetPlayerAnimation, ANIM_Mario_FallBack) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Hurt) EVT_CALL(SetNpcAnimation, NPC_Parakarry, ANIM_WorldParakarry_HurtStill) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(2.0)) @@ -112,7 +112,7 @@ EvtScript N(EVS_Scene_MeetParakarry) = { EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, TRUE) EVT_CALL(InterpPlayerYaw, 270, 0) EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_DeadStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Fallen) EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 8) EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) EVT_THREAD @@ -120,7 +120,7 @@ EvtScript N(EVS_Scene_MeetParakarry) = { EVT_END_THREAD EVT_WAIT(20) EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_Parakarry, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_GetUp) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_GetUp) EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_Parakarry, ANIM_WorldParakarry_Idle) EVT_CALL(GetNpcPos, NPC_Parakarry, LVar0, LVar1, LVar2) @@ -128,7 +128,7 @@ EvtScript N(EVS_Scene_MeetParakarry) = { EVT_CALL(NpcJump1, NPC_Parakarry, LVar0, LVar1, LVar2, 8) EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, FALSE) EVT_CALL(InterpPlayerYaw, 90, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(30) EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0), 35, 255, EVT_FLOAT(17.5), EVT_FLOAT(-11.5)) EVT_CALL(SetNpcAnimation, NPC_Parakarry, ANIM_WorldParakarry_Walk) @@ -143,9 +143,9 @@ EvtScript N(EVS_Scene_MeetParakarry) = { EVT_CALL(GetNpcPos, NPC_Parakarry, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_Parakarry, LVar0, LVar1, LVar2, 10) EVT_CALL(SpeakToPlayer, NPC_Parakarry, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 0, MSG_CH2_0010) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SpeakToPlayer, NPC_Parakarry, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 0, MSG_CH2_0011) EVT_SET(GB_StoryProgress, STORY_CH2_SPOKE_WITH_PARAKARRY) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(3.0)) @@ -225,9 +225,9 @@ EvtScript N(EVS_NpcInteract_Parakarry) = { EVT_CALL(SpeakToPlayer, NPC_Parakarry, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 0, MSG_CH2_0016) EVT_CASE_EQ(3) EVT_CALL(SpeakToPlayer, NPC_Parakarry, ANIM_WorldParakarry_Celebrate, ANIM_WorldParakarry_Idle, 0, MSG_CH2_0018) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Question) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Question) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SpeakToPlayer, NPC_Parakarry, ANIM_WorldParakarry_Talk, ANIM_WorldParakarry_Idle, 0, MSG_CH2_0019) EVT_CALL(ShowChoice, MSG_Choice_000F) EVT_IF_NE(LVar0, 0) diff --git a/src/world/area_jan/common/PullVine.inc.c b/src/world/area_jan/common/PullVine.inc.c index a188573dea..541089c863 100644 --- a/src/world/area_jan/common/PullVine.inc.c +++ b/src/world/area_jan/common/PullVine.inc.c @@ -113,7 +113,7 @@ EvtScript N(EVS_PullVine_Manage) = { EVT_END_IF EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8000D) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_HoldOnto) EVT_LOOP(50) EVT_CALL(N(PullVine_UpdatePosition), LVar0, EVT_FLOAT(-15.0), LVar2) EVT_ADDF(LVar1, LVar2) diff --git a/src/world/area_jan/jan_00/jan_00_2_npc.c b/src/world/area_jan/jan_00/jan_00_2_npc.c index 9e4821f869..ce507da786 100644 --- a/src/world/area_jan/jan_00/jan_00_2_npc.c +++ b/src/world/area_jan/jan_00/jan_00_2_npc.c @@ -312,9 +312,9 @@ EvtScript N(D_80242FA8_B234E8) = { EVT_CALL(PlayerMoveTo, LVar0, LVar2, 15) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) EVT_CALL(PlayerJump, 224, 0, 20, 20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Walking) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Walk) EVT_CALL(PlayerMoveTo, 260, 20, 15) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(func_80240B4C_B2108C, 3, LVar0, LVar1, LVar2) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_WALK) EVT_CALL(NpcMoveTo, NPC_PARTNER, LVar0, LVar2, 20) @@ -430,7 +430,7 @@ EvtScript N(EVS_NpcInteract_Kolorado_01) = { EVT_CALL(func_80240B4C_B2108C, 0, LVar0, LVar1, LVar2) EVT_CALL(PlayerMoveTo, LVar0, LVar2, 10) EVT_CALL(InterpPlayerYaw, 90, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_THREAD EVT_CALL(N(func_80240CF8_B21238), 0) EVT_END_THREAD diff --git a/src/world/area_jan/jan_01/jan_01_3_npc.c b/src/world/area_jan/jan_01/jan_01_3_npc.c index 6d5a88e45a..2ce0071dd3 100644 --- a/src/world/area_jan/jan_01/jan_01_3_npc.c +++ b/src/world/area_jan/jan_01/jan_01_3_npc.c @@ -47,7 +47,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_000D, 320, 60) EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_Kolorado, EMOTE_EXCLAMATION, 0, 25, FALSE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 25, EMOTER_PLAYER, 0, 0, 0, 0) EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_262, 0) EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, 0, 25, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(25) diff --git a/src/world/area_jan/jan_02/jan_02_3_npc.c b/src/world/area_jan/jan_02/jan_02_3_npc.c index 74ceb97346..5772fe12df 100644 --- a/src/world/area_jan/jan_02/jan_02_3_npc.c +++ b/src/world/area_jan/jan_02/jan_02_3_npc.c @@ -100,7 +100,7 @@ EvtScript N(EVS_Scene_GetJadeRaven) = { EVT_WAIT(10) EVT_END_IF EVT_CALL(ContinueSpeech, NPC_PARTNER, ANIM_WorldSushie_Talk, ANIM_WorldSushie_Idle, 5, MSG_CH5_002B) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_WAIT(30) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldSushie_Talk, ANIM_WorldSushie_Idle, 5, MSG_CH5_002C) EVT_WAIT(10) diff --git a/src/world/area_jan/jan_03/jan_03_4_npc.c b/src/world/area_jan/jan_03/jan_03_4_npc.c index f610de977b..a07ecc4a9c 100644 --- a/src/world/area_jan/jan_03/jan_03_4_npc.c +++ b/src/world/area_jan/jan_03/jan_03_4_npc.c @@ -174,12 +174,12 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { EVT_CALL(PlayerMoveTo, 370, -257, 0) EVT_CALL(InterpPlayerYaw, 229, 1) EVT_CALL(HidePlayerShadow, TRUE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(func_802D286C, 0x800) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 5, 7, 1, 1, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 5, 7, 1, 1, 0) EVT_THREAD EVT_WAIT(60) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001D) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SleepStanding) EVT_END_THREAD EVT_WAIT(20) EVT_THREAD @@ -196,7 +196,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { EvtScript N(EVS_ToadHouse_ReturnFromRest) = { EVT_CALL(HidePlayerShadow, FALSE) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 0, 0, 0, 0, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 0, 0, 0, 0, 0) EVT_CALL(SetPlayerPos, 345, 0, -186) EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) EVT_CALL(PlayerMoveTo, 291, -100, 0) @@ -660,7 +660,7 @@ EvtScript N(EVS_NpcInteract_Kolorado) = { EVT_EXEC_WAIT(N(EVS_LetterReward_Kolorado)) EVT_CASE_DEFAULT EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH5_0018) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) EVT_WAIT(20) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH5_0019) EVT_WAIT(10) diff --git a/src/world/area_jan/jan_03/jan_03_5_entity.c b/src/world/area_jan/jan_03/jan_03_5_entity.c index 2b79dfe49b..bf69c4e3e8 100644 --- a/src/world/area_jan/jan_03/jan_03_5_entity.c +++ b/src/world/area_jan/jan_03/jan_03_5_entity.c @@ -41,10 +41,10 @@ EvtScript N(EVS_UseSpring) = { EVT_CALL(PlayerJump, -556, 300, -195, 15) EVT_CALL(DisablePlayerPhysics, FALSE) EVT_CALL(FacePlayerTowardPoint, -630, -50, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimMidair) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Fall) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) EVT_CALL(PlayerJump2, -601, 376, -105, 30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_KILL_THREAD(LVarA) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN diff --git a/src/world/area_jan/jan_04/jan_04_4_npc.c b/src/world/area_jan/jan_04/jan_04_4_npc.c index 490b0a8048..3c9c26c785 100644 --- a/src/world/area_jan/jan_04/jan_04_4_npc.c +++ b/src/world/area_jan/jan_04/jan_04_4_npc.c @@ -92,7 +92,7 @@ EvtScript N(EVS_Sushie_ShoutAtChildren) = { EVT_CALL(AwaitPlayerApproach, 0, 0, 130) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_009F, 160, 40) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80022) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_LookAround) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) @@ -107,7 +107,7 @@ EvtScript N(EVS_Sushie_ShoutAtChildren) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldSushie_Hurt, ANIM_WorldSushie_Idle, 0, MSG_CH5_00A0) EVT_CALL(ResetCam, CAM_DEFAULT, 3) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN EVT_END @@ -148,17 +148,17 @@ EvtScript N(EVS_NpcIdle_Sushie) = { EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(5.0), 20, 301, EVT_FLOAT(17.0), EVT_FLOAT(-7.0)) EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldSushie_Talk, ANIM_WorldSushie_Idle, 0, MSG_CH5_00A4) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_WAIT(40) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldSushie_Talk, ANIM_WorldSushie_Idle, 0, MSG_CH5_00A5) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldSushie_Sad) EVT_WAIT(30) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldSushie_Idle) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldSushie_Talk, ANIM_WorldSushie_Idle, 0, MSG_CH5_00A6) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_WAIT(40) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldSushie_Talk, ANIM_WorldSushie_Idle, 0, MSG_CH5_00A7) EVT_CALL(CloseMessage) EVT_CALL(N(ChangeNpcToPartner), NPC_Sushie, PARTNER_SUSHIE) diff --git a/src/world/area_jan/jan_05/jan_05_3_log.c b/src/world/area_jan/jan_05/jan_05_3_log.c index a2ddf9c48a..2856d31c8f 100644 --- a/src/world/area_jan/jan_05/jan_05_3_log.c +++ b/src/world/area_jan/jan_05/jan_05_3_log.c @@ -46,7 +46,7 @@ EvtScript N(EVS_LogAnim_RiseUp) = { EvtScript N(EVS_LogAnim_FallDown) = { EVT_THREAD EVT_WAIT(17) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_CALL(N(UpdateLogShadow), MODEL_o147, MF_KillLogShadow) EVT_END_THREAD EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o94, COLLIDER_FLAGS_UPPER_MASK) @@ -71,7 +71,7 @@ EvtScript N(EVS_LogAnim_FallDown) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(PlaySoundAtCollider, COLLIDER_o94, SOUND_209D, 0) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, -185, 0, 320, 0) EVT_CALL(ShakeCam, CAM_DEFAULT, 2, 3, 1) diff --git a/src/world/area_jan/jan_05/jan_05_5_npc.c b/src/world/area_jan/jan_05/jan_05_5_npc.c index e51b12ab13..6efdeef4e0 100644 --- a/src/world/area_jan/jan_05/jan_05_5_npc.c +++ b/src/world/area_jan/jan_05/jan_05_5_npc.c @@ -189,10 +189,10 @@ EvtScript N(EVS_NpcIdle_YoshiKid) = { EVT_IF_EQ(LVar0, 5) EVT_CALL(SetMusicTrack, 0, SONG_YOSHI_KIDS_FOUND, 0, 8) EVT_SET(GB_StoryProgress, STORY_CH5_ALL_YOSHI_CHILDREN_RESCUED) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_ThumbsUp) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_ThumbsUp) EVT_WAIT(120) EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_ELSE EVT_WAIT(30) EVT_END_IF diff --git a/src/world/area_jan/jan_06/jan_06_2_statue.c b/src/world/area_jan/jan_06/jan_06_2_statue.c index 0710a1d793..d6867bba4c 100644 --- a/src/world/area_jan/jan_06/jan_06_2_statue.c +++ b/src/world/area_jan/jan_06/jan_06_2_statue.c @@ -121,9 +121,9 @@ EvtScript N(ItemPrompt_Statue) = { EVT_SET(MV_JadeRavenItemIdx, LVar0) EVT_CALL(CloseChoicePopup) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_60006 | SPRITE_ID_BACK_FACING) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_PlaceItem | SPRITE_ID_BACK_FACING) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still) EVT_WAIT(10) EVT_EXEC_WAIT(N(EVS_Scene_MoveStatue)) EVT_SET(GB_StoryProgress, STORY_CH5_MOVED_RAVEN_STATUE) diff --git a/src/world/area_jan/jan_06/jan_06_3_log.c b/src/world/area_jan/jan_06/jan_06_3_log.c index 77d0b1002d..7db412c26f 100644 --- a/src/world/area_jan/jan_06/jan_06_3_log.c +++ b/src/world/area_jan/jan_06/jan_06_3_log.c @@ -46,7 +46,7 @@ EvtScript N(EVS_LogAnim_RiseUp) = { EvtScript N(EVS_LogAnim_FallDown) = { EVT_THREAD EVT_WAIT(17) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_CALL(N(UpdateLogShadow), 130, MF_KillLogShadow) EVT_END_THREAD EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o167, COLLIDER_FLAGS_UPPER_MASK) @@ -71,7 +71,7 @@ EvtScript N(EVS_LogAnim_FallDown) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(PlaySoundAtCollider, COLLIDER_o167, SOUND_209D, 0) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, -100, 0, 60, 0) EVT_CALL(ShakeCam, CAM_DEFAULT, 2, 3, 1) diff --git a/src/world/area_jan/jan_07/jan_07_3_npc.c b/src/world/area_jan/jan_07/jan_07_3_npc.c index c7d635b0fa..27161205ca 100644 --- a/src/world/area_jan/jan_07/jan_07_3_npc.c +++ b/src/world/area_jan/jan_07/jan_07_3_npc.c @@ -30,7 +30,7 @@ EvtScript N(EVS_NpcIdle_YoshiKid) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_00B4, 320, 60) EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_YoshiKid, EMOTE_EXCLAMATION, 0, 30, FALSE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_262, 0) EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, 0, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(30) @@ -110,10 +110,10 @@ EvtScript N(EVS_NpcIdle_YoshiKid) = { EVT_IF_EQ(LVar0, 5) EVT_CALL(SetMusicTrack, 0, SONG_YOSHI_KIDS_FOUND, 0, 8) EVT_SET(GB_StoryProgress, STORY_CH5_ALL_YOSHI_CHILDREN_RESCUED) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_ThumbsUp) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_ThumbsUp) EVT_WAIT(120) EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_ELSE EVT_THREAD EVT_WAIT(12) diff --git a/src/world/area_jan/jan_08/jan_08_5_npc.c b/src/world/area_jan/jan_08/jan_08_5_npc.c index de77736360..dc47c0b3f6 100644 --- a/src/world/area_jan/jan_08/jan_08_5_npc.c +++ b/src/world/area_jan/jan_08/jan_08_5_npc.c @@ -78,10 +78,10 @@ EvtScript N(EVS_NpcIdle_YoshiKid) = { EVT_IF_EQ(LVar0, 5) EVT_CALL(SetMusicTrack, 0, SONG_YOSHI_KIDS_FOUND, 0, 8) EVT_SET(GB_StoryProgress, STORY_CH5_ALL_YOSHI_CHILDREN_RESCUED) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_ThumbsUp) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_ThumbsUp) EVT_WAIT(120) EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_ELSE EVT_WAIT(40) EVT_END_IF diff --git a/src/world/area_jan/jan_10/jan_10_3_npc.c b/src/world/area_jan/jan_10/jan_10_3_npc.c index 0ebf8f3bec..4d0cdc0a76 100644 --- a/src/world/area_jan/jan_10/jan_10_3_npc.c +++ b/src/world/area_jan/jan_10/jan_10_3_npc.c @@ -75,10 +75,10 @@ EvtScript N(EVS_NpcInteract_YoshiKid) = { EVT_IF_EQ(LVar0, 5) EVT_CALL(SetMusicTrack, 0, SONG_YOSHI_KIDS_FOUND, 0, 8) EVT_SET(GB_StoryProgress, STORY_CH5_ALL_YOSHI_CHILDREN_RESCUED) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_ThumbsUp) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_ThumbsUp) EVT_WAIT(120) EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_ELSE EVT_WAIT(30) EVT_END_IF diff --git a/src/world/area_jan/jan_10/jan_10_4_log.c b/src/world/area_jan/jan_10/jan_10_4_log.c index 6d19af275d..5b69578ac7 100644 --- a/src/world/area_jan/jan_10/jan_10_4_log.c +++ b/src/world/area_jan/jan_10/jan_10_4_log.c @@ -46,7 +46,7 @@ EvtScript N(EVS_LogAnim_RiseUp) = { EvtScript N(EVS_LogAnim_FallDown) = { EVT_THREAD EVT_WAIT(17) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_CALL(N(UpdateLogShadow), MODEL_o79, MF_KillLogShadow) EVT_END_THREAD EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_o11, COLLIDER_FLAGS_UPPER_MASK) @@ -71,7 +71,7 @@ EvtScript N(EVS_LogAnim_FallDown) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(PlaySoundAtCollider, COLLIDER_o11, SOUND_209D, 0) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 4, 0, 0, 0, 0) EVT_CALL(ShakeCam, CAM_DEFAULT, 2, 3, 1) diff --git a/src/world/area_jan/jan_11/jan_11_3_npc.c b/src/world/area_jan/jan_11/jan_11_3_npc.c index 60f7f55f03..612d441e20 100644 --- a/src/world/area_jan/jan_11/jan_11_3_npc.c +++ b/src/world/area_jan/jan_11/jan_11_3_npc.c @@ -62,7 +62,7 @@ EvtScript N(EVS_NpcIdle_YoshiKid) = { EVT_CALL(NpcFacePlayer, NPC_SELF, 0) EVT_THREAD EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_YoshiKid_Green_SadTalk, ANIM_YoshiKid_Green_SadIdle, 0, MSG_CH5_00AE) EVT_CALL(EndSpeech, NPC_SELF, ANIM_YoshiKid_Green_Talk, ANIM_YoshiKid_Green_Idle, 0) @@ -84,10 +84,10 @@ EvtScript N(EVS_NpcIdle_YoshiKid) = { EVT_IF_EQ(LVar0, 5) EVT_CALL(SetMusicTrack, 0, SONG_YOSHI_KIDS_FOUND, 0, 8) EVT_SET(GB_StoryProgress, STORY_CH5_ALL_YOSHI_CHILDREN_RESCUED) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_ThumbsUp) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_ThumbsUp) EVT_WAIT(120) EVT_EXEC(N(EVS_SetupMusic)) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_ELSE EVT_WAIT(35) EVT_END_IF diff --git a/src/world/area_jan/jan_13/jan_13_2_puzzle.c b/src/world/area_jan/jan_13/jan_13_2_puzzle.c index cfd2f4ee6a..6c113a691b 100644 --- a/src/world/area_jan/jan_13/jan_13_2_puzzle.c +++ b/src/world/area_jan/jan_13/jan_13_2_puzzle.c @@ -537,10 +537,10 @@ EvtScript N(EVS_ManageGeyserPlayerPhysics) = { EVT_DIVF(LVar3, 11) EVT_DIVF(LVar5, 11) EVT_CALL(SetPlayerPos, LVar3, LVar4, LVar5) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002E) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_FallBack) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(DisablePlayerInput, FALSE) EVT_END_IF EVT_WAIT(1) diff --git a/src/world/area_jan/jan_16/jan_16_3_npc.c b/src/world/area_jan/jan_16/jan_16_3_npc.c index 6e72f7dfec..2186aaccd0 100644 --- a/src/world/area_jan/jan_16/jan_16_3_npc.c +++ b/src/world/area_jan/jan_16/jan_16_3_npc.c @@ -116,9 +116,9 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven) = { EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_18A, 0) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 50, EVT_FLOAT(1.0)) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_THREAD EVT_WAIT(20) EVT_LOOP(10) diff --git a/src/world/area_jan/jan_22/jan_22_3_npc.c b/src/world/area_jan/jan_22/jan_22_3_npc.c index 790fa04d17..e6e7d88a8e 100644 --- a/src/world/area_jan/jan_22/jan_22_3_npc.c +++ b/src/world/area_jan/jan_22/jan_22_3_npc.c @@ -616,7 +616,7 @@ EvtScript N(EVS_Scene_RaphaelComingThrough) = { EVT_CALL(InterpNpcYaw, NPC_RaphaelRaven, 270, 0) EVT_END_THREAD EVT_WAIT(15) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Running) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Run) EVT_CALL(LoadPath, 45, EVT_PTR(N(RaphaelWalkPath)), ARRAY_COUNT(N(RaphaelWalkPath)), EASING_LINEAR) EVT_LABEL(0) EVT_CALL(GetNextPathPos) @@ -625,7 +625,7 @@ EvtScript N(EVS_Scene_RaphaelComingThrough) = { EVT_IF_EQ(LVar0, 1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_THREAD EVT_CALL(SetNpcPos, NPC_Raven_01, -200, 0, -190) EVT_CALL(SetNpcAnimation, NPC_Raven_01, ANIM_Raven_Walk) @@ -809,9 +809,9 @@ EvtScript N(EVS_NpcIdle_Kolorado_Before) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_00C5, 0, 60) EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_Kolorado_01, EMOTE_EXCLAMATION, 0, 20, FALSE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 20, EMOTER_PLAYER, 0, 0, 0, 0) EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20) EVT_CALL(DisablePlayerInput, FALSE) EVT_LABEL(2) @@ -1303,7 +1303,7 @@ EvtScript N(EVS_Scene_Misstar) = { EVT_KILL_THREAD(LVar9) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldMisstar_Leap) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_GotItem) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_UsePower) EVT_CALL(PlaySoundAtPlayer, SOUND_139, 0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SET(LVar3, LVar1) @@ -1322,7 +1322,7 @@ EvtScript N(EVS_Scene_Misstar) = { EVT_ADD(LVar1, 20) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 30) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldMisstar_Idle) EVT_EXEC_GET_TID(N(EVS_Misstar_Bobbing), LVar9) EVT_CALL(N(UpgradeStarPowerCh5)) @@ -1371,11 +1371,11 @@ EvtScript N(EVS_Scene_Misstar) = { EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_2045, 0) EVT_END_THREAD EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_WAIT(90) EVT_CALL(ResetCam, CAM_DEFAULT, 3) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_KILL_THREAD(LVar9) EVT_SET(GB_StoryProgress, STORY_CH5_STAR_SPRIT_DEPARTED) EVT_WAIT(10) diff --git a/src/world/area_jan/jan_22/jan_22_5_zipline.c b/src/world/area_jan/jan_22/jan_22_5_zipline.c index 6ccb9f36f9..eec1f0c134 100644 --- a/src/world/area_jan/jan_22/jan_22_5_zipline.c +++ b/src/world/area_jan/jan_22/jan_22_5_zipline.c @@ -120,7 +120,7 @@ EvtScript N(EVS_RideZipline) = { EVT_CALL(PlayerJump, ArrayVar(3), ArrayVar(4), ArrayVar(5), 7) EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8000D) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_HoldOnto) EVT_WAIT(10) EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) EVT_CALL(PlaySound, SOUND_80000019) diff --git a/src/world/area_jan/jan_23/jan_23_3_npc.c b/src/world/area_jan/jan_23/jan_23_3_npc.c index cd16d4c6b0..aad7ff1e14 100644 --- a/src/world/area_jan/jan_23/jan_23_3_npc.c +++ b/src/world/area_jan/jan_23/jan_23_3_npc.c @@ -239,9 +239,9 @@ EvtScript N(EVS_NpcInteract_RaphaelRaven_Before) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_RaphaelRaven_TalkNoFeet, ANIM_RaphaelRaven_IdleNoFeet, 0, MSG_CH5_00DA) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(5) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_WAIT(35) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_RaphaelRaven_TalkNoFeet, ANIM_RaphaelRaven_IdleNoFeet, 5, MSG_CH5_00DB) EVT_WAIT(20) diff --git a/src/world/area_kgr/kgr_02/kgr_02_3_npc.c b/src/world/area_kgr/kgr_02/kgr_02_3_npc.c index 0f91e47573..336f353610 100644 --- a/src/world/area_kgr/kgr_02/kgr_02_3_npc.c +++ b/src/world/area_kgr/kgr_02/kgr_02_3_npc.c @@ -232,7 +232,7 @@ EvtScript N(EVS_NpcDefeat_Fuzzipede) = { EVT_WAIT(20) EVT_CALL(HidePlayerShadow, TRUE) EVT_CALL(EnableNpcShadow, NPC_PARTNER, FALSE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80017) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Flail) EVT_CALL(GetPlayerPos, LVar1, LVar0, LVar3) EVT_LOOP(150) EVT_ADD(LVar0, 1) diff --git a/src/world/area_kkj/kkj_03/kkj_03_4_scenes.c b/src/world/area_kkj/kkj_03/kkj_03_4_scenes.c index bd2e602579..461e3297ff 100644 --- a/src/world/area_kkj/kkj_03/kkj_03_4_scenes.c +++ b/src/world/area_kkj/kkj_03/kkj_03_4_scenes.c @@ -34,9 +34,9 @@ EvtScript N(EVS_Scene_MeetingPeach) = { EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0026) EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_Intro_004C) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_Intro_004D) EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0002) @@ -120,9 +120,9 @@ EvtScript N(EVS_Scene_Ascending) = { EVT_END_THREAD EVT_THREAD EVT_LOOP(0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Running) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Run) EVT_WAIT(15) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_60003) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_CarryAboveRun) EVT_WAIT(15) EVT_END_LOOP EVT_END_THREAD diff --git a/src/world/area_kkj/kkj_10/kkj_10_3_npcs_early.c b/src/world/area_kkj/kkj_10/kkj_10_3_npcs_early.c index 476c699540..15e3d4a2e0 100644 --- a/src/world/area_kkj/kkj_10/kkj_10_3_npcs_early.c +++ b/src/world/area_kkj/kkj_10/kkj_10_3_npcs_early.c @@ -11,7 +11,7 @@ EvtScript N(EVS_CapturePeach) = { EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(NpcFacePlayer, NPC_SELF, 5) EVT_WAIT(20) EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) diff --git a/src/world/area_kkj/kkj_10/kkj_10_4_npcs_later.c b/src/world/area_kkj/kkj_10/kkj_10_4_npcs_later.c index 4f147ff451..3363dd9263 100644 --- a/src/world/area_kkj/kkj_10/kkj_10_4_npcs_later.c +++ b/src/world/area_kkj/kkj_10/kkj_10_4_npcs_later.c @@ -30,7 +30,7 @@ EvtScript N(EVS_CapturePeach) = { EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) EVT_CALL(N(SetPeachFlag8)) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(NpcFacePlayer, NPC_SELF, 5) EVT_WAIT(20) EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) diff --git a/src/world/area_kkj/kkj_11/kkj_11_5_npcs_early.c b/src/world/area_kkj/kkj_11/kkj_11_5_npcs_early.c index 968dba66fb..33e1cee87d 100644 --- a/src/world/area_kkj/kkj_11/kkj_11_5_npcs_early.c +++ b/src/world/area_kkj/kkj_11/kkj_11_5_npcs_early.c @@ -12,7 +12,7 @@ EvtScript N(EVS_NpcAI_Koopatrol_01) = { EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(NpcFacePlayer, NPC_SELF, 5) EVT_WAIT(20) EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) @@ -162,7 +162,7 @@ EvtScript N(EVS_NpcIdle_Koopatrol_04) = { EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(NpcFacePlayer, NPC_SELF, 5) EVT_WAIT(20) EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) diff --git a/src/world/area_kkj/kkj_11/kkj_11_6_npcs_later.c b/src/world/area_kkj/kkj_11/kkj_11_6_npcs_later.c index 075f4f23d9..c4e80c6b15 100644 --- a/src/world/area_kkj/kkj_11/kkj_11_6_npcs_later.c +++ b/src/world/area_kkj/kkj_11/kkj_11_6_npcs_later.c @@ -29,7 +29,7 @@ EvtScript N(EVS_CapturePeach) = { EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(NpcFacePlayer, NPC_SELF, 5) EVT_WAIT(20) EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) diff --git a/src/world/area_kkj/kkj_12/kkj_12_2_npc.c b/src/world/area_kkj/kkj_12/kkj_12_2_npc.c index 441aedeeb2..083a6e169d 100644 --- a/src/world/area_kkj/kkj_12/kkj_12_2_npc.c +++ b/src/world/area_kkj/kkj_12/kkj_12_2_npc.c @@ -117,7 +117,7 @@ EvtScript N(EVS_CapturePeach) = { EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(NpcFacePlayer, NPC_SELF, 5) EVT_WAIT(20) EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) diff --git a/src/world/area_kkj/kkj_13/kkj_13_3_npcs_finale.c b/src/world/area_kkj/kkj_13/kkj_13_3_npcs_finale.c index 672bbe8967..807249debe 100644 --- a/src/world/area_kkj/kkj_13/kkj_13_3_npcs_finale.c +++ b/src/world/area_kkj/kkj_13/kkj_13_3_npcs_finale.c @@ -38,7 +38,7 @@ EvtScript N(EVS_MoveToBattlePositions) = { EVT_THREAD EVT_CALL(SetNpcPos, NPC_Bowser_Prop, NPC_DISPOSE_LOCATION) EVT_CALL(PlayerMoveTo, 525, 0, 50) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_BeforeJump) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_BeforeJump) EVT_END_THREAD EVT_THREAD EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 600, 0, 0) @@ -218,9 +218,9 @@ EvtScript N(EVS_BowserFliesAway) = { EVT_EXEC(N(EVS_UpdatePropellerSounds)) EVT_THREAD EVT_WAIT(15) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(InterpPlayerYaw, 0, 1) EVT_END_THREAD EVT_CALL(LoadPath, 25, EVT_PTR(N(ToWindowPath)), ARRAY_COUNT(N(ToWindowPath)), EASING_LINEAR) diff --git a/src/world/area_kkj/kkj_13/kkj_13_5_intro_scenes.c b/src/world/area_kkj/kkj_13/kkj_13_5_intro_scenes.c index 4efc36cbd3..3597d18eef 100644 --- a/src/world/area_kkj/kkj_13/kkj_13_5_intro_scenes.c +++ b/src/world/area_kkj/kkj_13/kkj_13_5_intro_scenes.c @@ -220,9 +220,9 @@ EvtScript N(EVS_Scene_BowserAttacks) = { EVT_END_THREAD EVT_THREAD EVT_LOOP(2) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_60003) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_CarryAboveRun) EVT_WAIT(15) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Running) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Run) EVT_WAIT(15) EVT_END_LOOP EVT_END_THREAD @@ -366,7 +366,7 @@ EvtScript N(EVS_Scene_BowserAttacks) = { EVT_EXEC_WAIT(N(EVS_FocusCam_Everyone)) EVT_WAIT(5) EVT_CALL(PlayerMoveTo, 660, 0, 15) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_BeforeJump) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_BeforeJump) EVT_WAIT(15) EVT_CALL(SpeakToPlayer, NPC_Bowser_Body, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, MSG_Intro_0053) EVT_CALL(SpeakToPlayer, NPC_Peach, ANIM_Peach_C0013, ANIM_Peach_C0012, 5, MSG_Intro_0054) @@ -394,7 +394,7 @@ EvtScript N(EVS_Scene_BowserAttacks) = { EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) EVT_CALL(SetPlayerPos, 660, 0, 15) EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_FallDown) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_FallDown) EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_C0006) EVT_CALL(SetNpcAnimation, NPC_Bowser_Body, ANIM_WorldBowser_RearUpLaugh) EVT_EXEC_WAIT(N(EVS_FocusCam_OnPeach)) @@ -440,7 +440,7 @@ EvtScript N(EVS_Scene_BowserAttacks) = { EVT_PLAY_EFFECT(EFFECT_LIGHTNING, 4, LVar0, LVar1, LVar2, 0, 0) EVT_THREAD EVT_CALL(PlaySoundAtPlayer, SOUND_390, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_FallBack) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Hurt) EVT_CALL(LoadPath, 30, EVT_PTR(N(PlayerThrownPath)), ARRAY_COUNT(N(PlayerThrownPath)), EASING_LINEAR) EVT_SET(LVar4, 0) EVT_LOOP(0) diff --git a/src/world/area_kkj/kkj_14/kkj_14_8_chapter0.c b/src/world/area_kkj/kkj_14/kkj_14_8_chapter0.c index f313f41640..e9c09d6180 100644 --- a/src/world/area_kkj/kkj_14/kkj_14_8_chapter0.c +++ b/src/world/area_kkj/kkj_14/kkj_14_8_chapter0.c @@ -98,7 +98,7 @@ EvtScript N(EVS_Scene_Chapter0) = { EVT_CALL(N(ClearPeachDepressed)) EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_Bowser, EMOTE_EXCLAMATION, -45, 30, FALSE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, -45, 30, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(10) EVT_CALL(InterpPlayerYaw, 270, 3) EVT_WAIT(15) @@ -198,7 +198,7 @@ EvtScript N(EVS_Scene_Chapter0) = { EVT_CALL(PlaySoundAt, SOUND_1D8, 0, LVar0, LVar1, LVar2) EVT_WAIT(10) EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0) - EVT_CALL(ShowEmote, NPC_Bowser, EMOTE_QUESTION, -45, 20, FALSE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 20, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(20) EVT_CALL(InterpPlayerYaw, 135, 5) EVT_WAIT(10) @@ -349,7 +349,7 @@ EvtScript N(EVS_Scene_Chapter0) = { EVT_WAIT(30) EVT_CALL(SetPlayerAnimation, ANIM_Peach_C000D) EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_Bowser, EMOTE_EXCLAMATION, -45, 30, FALSE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, -45, 30, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(30) EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000) diff --git a/src/world/area_kkj/kkj_14/kkj_14_9_chapter1.c b/src/world/area_kkj/kkj_14/kkj_14_9_chapter1.c index b1c2f4654d..5bb049f63b 100644 --- a/src/world/area_kkj/kkj_14/kkj_14_9_chapter1.c +++ b/src/world/area_kkj/kkj_14/kkj_14_9_chapter1.c @@ -28,7 +28,7 @@ EvtScript N(EVS_Scene_Chapter1) = { EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_Peach_0036) EVT_CALL(SetPlayerAnimation, ANIM_Peach_C000D) EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_Bowser, EMOTE_EXCLAMATION, 0, 30, FALSE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(30) EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0000) diff --git a/src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c b/src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c index 7a27d35217..b7e434ced8 100644 --- a/src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c +++ b/src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c @@ -148,9 +148,9 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_CALL(ShowMessageAtScreenPos, MSG_Peach_CH1_KoopaBros_0007, 300, 20) EVT_WAIT(5) EVT_CALL(PlaySoundAtNpc, NPC_Bowser, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_Bowser, EMOTE_EXCLAMATION, -45, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Bowser, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_Kammy, EMOTE_EXCLAMATION, -45, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Kammy, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20) EVT_THREAD EVT_LOOP(2) @@ -333,13 +333,13 @@ EvtScript N(EVS_Scene_Chapter0_BowserAndKammy) = { EVT_WAIT(10) EVT_CALL(FadeOutMusic, 0, 500) EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_03, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_KoopaBros_03, EMOTE_EXCLAMATION, -45, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_KoopaBros_03, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_02, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_KoopaBros_02, EMOTE_EXCLAMATION, -45, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_KoopaBros_02, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_04, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_KoopaBros_04, EMOTE_EXCLAMATION, -45, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_KoopaBros_04, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(PlaySoundAtNpc, NPC_KoopaBros_01, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_KoopaBros_01, EMOTE_EXCLAMATION, -45, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_KoopaBros_01, EMOTE_EXCLAMATION, -45, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(30) EVT_CALL(SpeakToNpc, NPC_KoopaBros_02, ANIM_KoopaBros_Red_Anim14, ANIM_KoopaBros_Red_Anim04, 0, NPC_Bowser, MSG_Peach_CH1_KoopaBros_0014) EVT_CALL(SetPanTarget, CAM_DEFAULT, 30, 0, 0) diff --git a/src/world/area_kkj/kkj_15/kkj_15_7_chapter3.c b/src/world/area_kkj/kkj_15/kkj_15_7_chapter3.c index 4356b1c3f3..ff902946b6 100644 --- a/src/world/area_kkj/kkj_15/kkj_15_7_chapter3.c +++ b/src/world/area_kkj/kkj_15/kkj_15_7_chapter3.c @@ -174,7 +174,7 @@ EvtScript N(EVS_Scene_Chapter3) = { EVT_EXEC_WAIT(N(EVS_AnimateRotatingWall_AlmostCaught)) EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0005) EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_Bowser, EMOTE_EXCLAMATION, 0, 30, FALSE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(30) EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0011) EVT_END_THREAD @@ -214,9 +214,9 @@ EvtScript N(EVS_Scene_Chapter3) = { EVT_CALL(SetPlayerAnimation, ANIM_Peach_C0009) EVT_WAIT(1) EVT_CALL(PlaySoundAtNpc, NPC_Bowser, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_Bowser, EMOTE_EXCLAMATION, -45, 30, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Bowser, EMOTE_EXCLAMATION, -45, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_Kammy, EMOTE_EXCLAMATION, -45, 30, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Kammy, EMOTE_EXCLAMATION, -45, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(30) EVT_CALL(SetNpcVar, NPC_Bowser, 0, 1) EVT_THREAD diff --git a/src/world/area_kkj/kkj_16/kkj_16_2_npcs_early.c b/src/world/area_kkj/kkj_16/kkj_16_2_npcs_early.c index 6f73b449b0..2a872b0696 100644 --- a/src/world/area_kkj/kkj_16/kkj_16_2_npcs_early.c +++ b/src/world/area_kkj/kkj_16/kkj_16_2_npcs_early.c @@ -13,7 +13,7 @@ EvtScript N(EVS_CapturePeach) = { EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(NpcFacePlayer, NPC_SELF, 0) EVT_WAIT(20) EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) diff --git a/src/world/area_kkj/kkj_16/kkj_16_3_npcs_later.c b/src/world/area_kkj/kkj_16/kkj_16_3_npcs_later.c index 5418ba42fd..b365fee1b5 100644 --- a/src/world/area_kkj/kkj_16/kkj_16_3_npcs_later.c +++ b/src/world/area_kkj/kkj_16/kkj_16_3_npcs_later.c @@ -71,7 +71,7 @@ EvtScript N(EVS_CapturePeach) = { EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(NpcFacePlayer, NPC_SELF, 0) EVT_WAIT(20) EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) diff --git a/src/world/area_kkj/kkj_16/kkj_16_4_stealth.c b/src/world/area_kkj/kkj_16/kkj_16_4_stealth.c index 59e5ade750..48b0162e9a 100644 --- a/src/world/area_kkj/kkj_16/kkj_16_4_stealth.c +++ b/src/world/area_kkj/kkj_16/kkj_16_4_stealth.c @@ -162,7 +162,7 @@ EvtScript N(EVS_ManageSneakingScenes) = { EVT_END_THREAD EVT_CALL(SetPlayerAnimation, ANIM_Peach_C000D) EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_HammerBros, EMOTE_EXCLAMATION, 0, 30, FALSE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(30) EVT_CALL(SetPlayerAnimation, ANIM_Peach_A0001) EVT_THREAD diff --git a/src/world/area_kkj/kkj_20/kkj_20_4_npc.c b/src/world/area_kkj/kkj_20/kkj_20_4_npc.c index b456e67490..e8a51c61d6 100644 --- a/src/world/area_kkj/kkj_20/kkj_20_4_npc.c +++ b/src/world/area_kkj/kkj_20/kkj_20_4_npc.c @@ -149,12 +149,12 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { EVT_CALL(PlayerMoveTo, 95, -87, 0) EVT_CALL(InterpPlayerYaw, 229, 1) EVT_CALL(HidePlayerShadow, TRUE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(func_802D286C, 0x800) - EVT_CALL(func_802D2520, ANIM_Mario_10002, FOLD_TYPE_5, 7, 1, 1, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, FOLD_TYPE_5, 7, 1, 1, 0) EVT_THREAD EVT_WAIT(60) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001D) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SleepStanding) EVT_END_THREAD EVT_WAIT(20) EVT_THREAD @@ -172,7 +172,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { EvtScript N(EVS_ToadHouse_ReturnFromRest) = { EVT_CALL(HidePlayerShadow, FALSE) - EVT_CALL(func_802D2520, ANIM_Mario_10002, FOLD_TYPE_NONE, 0, 0, 0, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, FOLD_TYPE_NONE, 0, 0, 0, 0) EVT_CALL(SetPlayerPos, 85, 0, -85) EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) EVT_CALL(PlayerMoveTo, 60, -50, 0) diff --git a/src/world/area_kkj/kkj_23/kkj_23_4_npcs_peach.c b/src/world/area_kkj/kkj_23/kkj_23_4_npcs_peach.c index e853f36f99..e4611a2b04 100644 --- a/src/world/area_kkj/kkj_23/kkj_23_4_npcs_peach.c +++ b/src/world/area_kkj/kkj_23/kkj_23_4_npcs_peach.c @@ -47,7 +47,7 @@ EvtScript N(EVS_CapturePeach) = { EVT_SET_GROUP(EVT_GROUP_00) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_PARTIAL) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_SELF, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_CALL(NpcFacePlayer, NPC_SELF, 0) EVT_WAIT(20) EVT_CALL(PlayerFaceNpc, NPC_SELF, FALSE) diff --git a/src/world/area_kkj/kkj_23/kkj_23_5_scene.c b/src/world/area_kkj/kkj_23/kkj_23_5_scene.c index 6e049845b6..62892593db 100644 --- a/src/world/area_kkj/kkj_23/kkj_23_5_scene.c +++ b/src/world/area_kkj/kkj_23/kkj_23_5_scene.c @@ -280,7 +280,7 @@ EvtScript N(EVS_Scene_KammyUnmasksPeach) = { EVT_WAIT(10) EVT_CALL(NpcMoveTo, NPC_Kammy, 280, -50, 0) EVT_CALL(PlaySoundAtNpc, NPC_Kammy, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_Kammy, EMOTE_EXCLAMATION, -45, 15, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Kammy, EMOTE_EXCLAMATION, -45, 15, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20) EVT_CALL(InterpNpcYaw, NPC_Kammy, 270, 5) EVT_CALL(SpeakToPlayer, NPC_Kammy, ANIM_WorldKammy_Anim04, ANIM_WorldKammy_Anim01, 5, MSG_Peach_0153) diff --git a/src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c b/src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c index be07c92a79..ac93a5c7d8 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c +++ b/src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c @@ -62,7 +62,7 @@ EvtScript N(EVS_NpcIdle_Kammy_Broom) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(func_802D286C, 0x2000) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 8, 0, 0, 0, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 8, 0, 0, 0, 0) EVT_CALL(HidePlayerShadow, TRUE) EVT_CALL(DisablePartnerAI, 0) EVT_WAIT(1) diff --git a/src/world/area_kkj/kkj_25/kkj_25_5_arena.c b/src/world/area_kkj/kkj_25/kkj_25_5_arena.c index 6b67c903bf..2e0a5cc281 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_5_arena.c +++ b/src/world/area_kkj/kkj_25/kkj_25_5_arena.c @@ -298,11 +298,11 @@ EvtScript N(EVS_Scene_ActivateMachine) = { EVT_THREAD EVT_CALL(InterpPlayerYaw, 270, 0) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8000A) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Shocked) EVT_END_THREAD EVT_SET(MV_Unk_0A, 10) EVT_EXEC_WAIT(N(EVS_AnimateBridgeCollapsing)) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SetPlayerPos, 100, 0, 0) EVT_CALL(PartnerIsFlying, LVar0) EVT_IF_EQ(LVar0, FALSE) @@ -417,7 +417,7 @@ EvtScript N(EVS_Scene_ActivateMachine) = { EVT_CALL(SetNpcAnimation, NPC_Bowser_01, ANIM_WorldBowser_Idle) EVT_CALL(SpeakToPlayer, NPC_Bowser_01, ANIM_WorldBowser_Talk, ANIM_WorldBowser_Idle, 0, MSG_CH8_0082) EVT_WAIT(40) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_BeforeJump) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_BeforeJump) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 50) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) diff --git a/src/world/area_kkj/kkj_25/kkj_25_6_peach_free.c b/src/world/area_kkj/kkj_25/kkj_25_6_peach_free.c index 34a89f9195..c51cc7c187 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_6_peach_free.c +++ b/src/world/area_kkj/kkj_25/kkj_25_6_peach_free.c @@ -57,7 +57,7 @@ EvtScript N(EVS_SpawnBowserStarEnergyWaves) = { EvtScript N(EVS_Scene_PeachBreaksFree) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_BeforeJump) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_BeforeJump) EVT_CALL(SetPlayerPos, 100, 0, 0) EVT_CALL(PartnerIsFlying, LVar0) EVT_IF_EQ(LVar0, FALSE) diff --git a/src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c b/src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c index f288c8ca6c..b3b0e1b223 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c +++ b/src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c @@ -55,7 +55,7 @@ EvtScript N(AddStarSpiritHovering) = { EvtScript N(EVS_Scene_KammyDefeated) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_BeforeJump) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_BeforeJump) EVT_CALL(SetPlayerPos, 100, 0, 0) EVT_CALL(PartnerIsFlying, LVar0) EVT_IF_EQ(LVar0, FALSE) @@ -158,7 +158,7 @@ EvtScript N(EVS_Scene_KammyDefeated) = { EVT_CALL(SetNpcJumpscale, NPC_Twink_01, EVT_FLOAT(0.3)) EVT_CALL(NpcJump0, NPC_Twink_01, 195, 200, 0, 20) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Bowser_02, ANIM_WorldBowser_Idle) @@ -210,7 +210,7 @@ EvtScript N(EVS_Scene_KammyDefeated) = { EVT_WAIT(15) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_END_THREAD EVT_CALL(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 512, MSG_CH8_00A1) EVT_WAIT(10) @@ -275,9 +275,9 @@ EvtScript N(EVS_Scene_KammyDefeated) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 512, MSG_CH8_00A4) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) EVT_WAIT(15) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_WAIT(5) EVT_THREAD EVT_CALL(SetNpcFlagBits, NPC_Eldstar, NPC_FLAG_TOUCHES_GROUND, FALSE) @@ -359,7 +359,7 @@ EvtScript N(EVS_Scene_KammyDefeated) = { EVT_CALL(PlaySoundAt, SOUND_B000001F, 0, 110, 20, 3) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, 110, 20, 3, 25) EVT_WAIT(6) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_GotItem) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_UsePower) EVT_LOOP(3) EVT_CALL(PlaySoundAt, SOUND_B000001F, 0, 100, 20, 3) EVT_PLAY_EFFECT(EFFECT_SPARKLES, 0, 100, 20, 3, 30) @@ -375,7 +375,7 @@ EvtScript N(EVS_Scene_KammyDefeated) = { EVT_WAIT(30) EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_0199, 160, 40) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_BeforeJump) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_BeforeJump) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 45) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) diff --git a/src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c b/src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c index cdbde49a75..5ecc06f5c4 100644 --- a/src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c +++ b/src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c @@ -305,7 +305,7 @@ EvtScript N(EVS_Scene_BowserDefeated) = { EVT_CALL(NpcJump0, NPC_StarRod, 190, 18, 0, 20) EVT_THREAD EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_6000C) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_Lift) EVT_END_THREAD EVT_CALL(NpcJump0, NPC_StarRod, 150, 60, 0, 15) EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 14, 150, 60, 0, 1, 330) @@ -313,7 +313,7 @@ EvtScript N(EVS_Scene_BowserDefeated) = { EVT_CALL(ShowMessageAtScreenPos, MSG_CH8_00AA, 160, 40) EVT_CALL(PlaySound, SOUND_22D) EVT_CALL(RemoveNpc, NPC_StarRod) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_ThumbsUp) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_ThumbsUp) EVT_CALL(GetCurrentPartnerID, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(PARTNER_GOOMBARIO) @@ -347,7 +347,7 @@ EvtScript N(EVS_Scene_BowserDefeated) = { EVT_END_SWITCH EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(20) EVT_CALL(SpeakToPlayer, NPC_Peach_02, ANIM_Peach_C0000, ANIM_Peach_A0001, 0, MSG_CH8_00AB) EVT_THREAD @@ -372,9 +372,9 @@ EvtScript N(EVS_Scene_BowserDefeated) = { EVT_CALL(PlaySound, SOUND_8000006B) EVT_SET(MV_DestructState, DESTRUCT_STATE_1) EVT_CALL(PlaySoundAtPlayer, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_Bowser_01, EMOTE_EXCLAMATION, 0, 20, FALSE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 20, EMOTER_PLAYER, 0, 0, 0, 0) EVT_CALL(PlaySoundAtNpc, NPC_Peach_02, SOUND_262, 0) - EVT_CALL(ShowEmote, NPC_Peach_02, EMOTE_EXCLAMATION, 0, 20, TRUE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, NPC_Peach_02, EMOTE_EXCLAMATION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(20) EVT_CALL(InterpPlayerYaw, 270, 0) EVT_CALL(InterpNpcYaw, NPC_Peach_02, 90, 0) diff --git a/src/world/area_kmr/kmr_00/kmr_00_3_revival.c b/src/world/area_kmr/kmr_00/kmr_00_3_revival.c index 4ecccc620e..7b1a3edb98 100644 --- a/src/world/area_kmr/kmr_00/kmr_00_3_revival.c +++ b/src/world/area_kmr/kmr_00/kmr_00_3_revival.c @@ -238,7 +238,7 @@ EvtScript N(EVS_Scene_MarioRevived) = { EVT_WAIT(1) EVT_CALL(func_802D4D14, 180) EVT_CALL(SetPlayerPos, 0, 2, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_DeadStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Fallen) EVT_WAIT(60) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.7)) EVT_CALL(SetCamDistance, CAM_DEFAULT, -350) diff --git a/src/world/area_kmr/kmr_02/kmr_02_3_npc.c b/src/world/area_kmr/kmr_02/kmr_02_3_npc.c index 47b5db6d33..9878fdfdc5 100644 --- a/src/world/area_kmr/kmr_02/kmr_02_3_npc.c +++ b/src/world/area_kmr/kmr_02/kmr_02_3_npc.c @@ -182,9 +182,9 @@ EvtScript N(EVS_HandOverDolly) = { EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) EVT_CALL(N(AddPlayerHandsOffset), LVar3, LVar4, LVar5) EVT_CALL(MakeItemEntity, ITEM_DOLLY, LVar3, LVar4, LVar5, ITEM_SPAWN_MODE_DECORATION, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_60005) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_TakeItem) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(RemoveItemEntity, LVar0) EVT_RETURN EVT_END @@ -231,11 +231,11 @@ EvtScript N(EVS_Goombaria_RequestDolly) = { EVT_CALL(SetNpcJumpscale, NPC_Goombaria, EVT_FLOAT(1.0)) EVT_CALL(NpcJump0, NPC_Goombaria, LVar0, LVar1, LVar2, 10) EVT_WAIT(10) - EVT_CALL(func_802D2520, ANIM_Mario_10002, FOLD_TYPE_5, 1, 1, 1, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, FOLD_TYPE_5, 1, 1, 1, 0) EVT_WAIT(35) EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Idle) EVT_CALL(NpcFacePlayer, NPC_Goombaria, 3) - EVT_CALL(func_802D2520, ANIM_Mario_10002, FOLD_TYPE_NONE, 0, 0, 0, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, FOLD_TYPE_NONE, 0, 0, 0, 0) EVT_WAIT(20) EVT_ELSE EVT_CALL(ContinueSpeech, NPC_Goombaria, ANIM_Goombaria_Talk, ANIM_Goombaria_Idle, 0, MSG_CH0_0099) @@ -559,14 +559,14 @@ EvtScript N(EVS_ReturnToVillage) = { EVT_CALL(SetNpcJumpscale, NPC_Goombaria, EVT_FLOAT(1.0)) EVT_CALL(NpcJump0, NPC_Goombaria, -30, 0, -19, 10) EVT_WAIT(10) - EVT_CALL(func_802D2520, ANIM_Mario_10002, FOLD_TYPE_5, 1, 1, 1, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, FOLD_TYPE_5, 1, 1, 1, 0) EVT_WAIT(35) EVT_CALL(SetNpcSpeed, NPC_Goombaria, EVT_FLOAT(3.0)) EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Walk) EVT_CALL(NpcMoveTo, NPC_Goombaria, -23, -21, 0) EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Idle) EVT_CALL(NpcFacePlayer, NPC_Goombaria, 3) - EVT_CALL(func_802D2520, ANIM_Mario_10002, FOLD_TYPE_NONE, 0, 0, 0, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, FOLD_TYPE_NONE, 0, 0, 0, 0) EVT_CALL(PlayerMoveTo, -85, -10, 0) EVT_CALL(PlayerFaceNpc, NPC_Goombaria, TRUE) EVT_WAIT(20) @@ -600,7 +600,7 @@ EvtScript N(EVS_ReturnToVillage) = { EVT_CALL(RotateModel, MODEL_syoumen_enter, LVar0, 0, 1, 0) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_THREAD EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(2.0), 40, EVT_FLOAT(-350.0), EVT_FLOAT(15.0), EVT_FLOAT(-7.0)) EVT_END_THREAD @@ -658,9 +658,9 @@ EvtScript N(EVS_ReturnToVillage) = { EVT_CALL(NpcFacePlayer, NPC_Goombaria, 3) EVT_END_THREAD EVT_CALL(NpcFacePlayer, NPC_Goombario, 3) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_Goombario, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_CH0_0033) EVT_WAIT(10) @@ -987,9 +987,9 @@ EvtScript N(EVS_NpcInteract_Goompapa) = { EVT_CASE_LT(STORY_CH0_MET_GOOMPA) EVT_IF_EQ(GF_KMR02_Met_Goompapa, FALSE) EVT_CALL(SpeakToPlayer, NPC_Goompapa, ANIM_Goompapa_Talk, ANIM_Goompapa_Idle, 0, MSG_CH0_0052) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_Goompapa, ANIM_Goompapa_Talk, ANIM_Goompapa_Idle, 0, MSG_CH0_0053) EVT_SET(GF_KMR02_Met_Goompapa, TRUE) @@ -1000,9 +1000,9 @@ EvtScript N(EVS_NpcInteract_Goompapa) = { EVT_IF_EQ(GF_KMR02_Met_Goompapa, FALSE) EVT_CALL(SetNpcAnimation, NPC_Goompapa, ANIM_Goompapa_Idle) EVT_CALL(SpeakToPlayer, NPC_Goompapa, ANIM_Goompapa_Talk, ANIM_Goompapa_Idle, 0, MSG_CH0_0056) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_WAIT(30) EVT_CALL(SpeakToPlayer, NPC_Goompapa, ANIM_Goompapa_Talk, ANIM_Goompapa_Idle, 0, MSG_CH0_0057) EVT_CALL(BindNpcAI, NPC_Goompapa, EVT_PTR(N(EVS_NpcAI_GoombaFamily_NoAI))) @@ -1444,7 +1444,7 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { EVT_CALL(FullyRestoreHPandFP) EVT_CALL(N(SyncStatusMenu)) EVT_CALL(InterpPlayerYaw, 143, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80009) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_LayingDown) EVT_CALL(GetPlayerPos, -220, 33, -342) EVT_WAIT(90) EVT_CALL(PlaySoundAtNpc, NPC_Eldstar_02, SOUND_2041, SOUND_SPACE_MODE_0) @@ -1537,7 +1537,7 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { EVT_CALL(N(func_80242BC0_8B2C30), 255, 255, 255, 0, 0, 0, 50) EVT_END_THREAD EVT_WAIT(110) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80024) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SitIdle) EVT_WAIT(30) EVT_CALL(SetGroupVisibility, MODEL_Root, MODEL_GROUP_VISIBLE) EVT_CALL(N(func_80242F28_8B2F98)) @@ -1547,9 +1547,9 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) EVT_CALL(PlayerJump, -180, 19, -335, 10) EVT_CALL(InterpPlayerYaw, 143, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_WAIT(20) EVT_CALL(InterpPlayerYaw, 143, 3) EVT_WAIT(10) @@ -1563,7 +1563,7 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { EVT_WAIT(10) EVT_CALL(InterpPlayerYaw, 323, 3) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_CALL(SetNpcPos, NPC_Toad, -197, 39, -188) EVT_CALL(SetNpcAnimation, NPC_Toad, ANIM_Toad_Red_Walk) EVT_CALL(SetNpcFlagBits, NPC_Toad, NPC_FLAG_GRAVITY, TRUE) @@ -1589,7 +1589,7 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { EVT_CALL(PlaySoundAtCollider, COLLIDER_deilit7, SOUND_BASIC_DOOR_CLOSE, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_CALL(NpcMoveTo, NPC_Toad, -192, -230, 20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_CH0_000A) EVT_WAIT(5) @@ -1597,38 +1597,38 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { EVT_CALL(SetNpcAnimation, NPC_Toad, ANIM_Toad_Red_Idle) EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_CH0_000B) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_WAIT(20) EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_CH0_000C) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001E) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_JoltAwake) EVT_WAIT(30) EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_CH0_000D) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Thinking) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Thinking) EVT_WAIT(20) EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(4.0), 0, EVT_FLOAT(-300.0), EVT_FLOAT(20.0), EVT_FLOAT(-10.0)) EVT_WAIT(15) EVT_CALL(PlaySoundAtPlayer, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_Goompa, EMOTE_EXCLAMATION, 0, 30, FALSE, 0, 0, 0, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80016) + EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Surprise) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_WAIT(40) EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_CH0_000E) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) EVT_WAIT(20) EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_CH0_000F) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Question) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Question) EVT_WAIT(20) EVT_CALL(PlaySoundAtPlayer, SOUND_263, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_Goompa, EMOTE_QUESTION, 0, 60, FALSE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 0, 60, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(55) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_CH0_0010) EVT_WAIT(15) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Thinking) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Thinking) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SpeakToPlayer, NPC_Toad, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_CH0_0011) EVT_WAIT(5) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -1639,11 +1639,11 @@ EvtScript N(EVS_Scene_EldstarsPlea) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(4.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimMidairStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Jump) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(2.0)) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(PlayerJump, LVar0, LVar1, LVar2, 10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(BindNpcInteract, NPC_Toad, EVT_PTR(N(EVS_NpcInteract_Toad))) EVT_SET(GB_StoryProgress, STORY_CH0_MET_INNKEEPER) EVT_WAIT(1) diff --git a/src/world/area_kmr/kmr_02/kmr_02_4_rooms_1.c b/src/world/area_kmr/kmr_02/kmr_02_4_rooms_1.c index 8868227f12..81ddcef7c3 100644 --- a/src/world/area_kmr/kmr_02/kmr_02_4_rooms_1.c +++ b/src/world/area_kmr/kmr_02/kmr_02_4_rooms_1.c @@ -134,7 +134,7 @@ EvtScript N(EVS_RoomListener_Verdana) = { EVT_IF_LT(GB_StoryProgress, STORY_CH0_TWINK_GAVE_LUCKY_STAR) EVT_WAIT(12) EVT_IF_EQ(GB_StoryProgress, STORY_CH0_GATE_CRUSHED) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Thinking) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Thinking) EVT_LOOP(3) EVT_CALL(SetGroupVisibility, MODEL_monohoshi, MODEL_GROUP_VISIBLE) EVT_WAIT(10) @@ -142,9 +142,9 @@ EvtScript N(EVS_RoomListener_Verdana) = { EVT_WAIT(10) EVT_END_LOOP EVT_CALL(FadeOutMusic, 0, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80016) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Surprise) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(InterpPlayerYaw, 233, 1) EVT_WAIT(10) EVT_CALL(InterpPlayerYaw, 53, 1) @@ -154,11 +154,11 @@ EvtScript N(EVS_RoomListener_Verdana) = { EVT_CALL(InterpPlayerYaw, 53, 1) EVT_WAIT(3) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80017) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Flail) EVT_WAIT(30) EVT_SET(GB_StoryProgress, STORY_CH0_FELL_OFF_CLIFF) EVT_END_IF - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80018) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_PanicStill) EVT_WAIT(5) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) EVT_CALL(GetCamPosition, CAM_DEFAULT, LVar0, LVar1, LVar2) @@ -167,7 +167,7 @@ EvtScript N(EVS_RoomListener_Verdana) = { EVT_CALL(PlaySoundAtPlayer, SOUND_161, SOUND_SPACE_MODE_0) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80019) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Panic) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_THREAD EVT_LOOP(0) @@ -275,11 +275,11 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { EVT_WAIT(5) EVT_CALL(InterpPlayerYaw, 114, 1) EVT_CALL(HidePlayerShadow, TRUE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(func_802D286C, 0x00000800) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 5, 7, 1, 1, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 5, 7, 1, 1, 0) EVT_WAIT(61) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001D) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SleepStanding) EVT_THREAD EVT_WAIT(70) EVT_CALL(N(ToadHouse_CamSetFOV), 0, 25) @@ -295,7 +295,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { EvtScript N(EVS_ToadHouse_ReturnFromRest) = { EVT_EXEC(N(EVS_SetupMusic)) EVT_CALL(HidePlayerShadow, FALSE) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 0, 0, 0, 0, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 0, 0, 0, 0, 0) EVT_CALL(SetPlayerPos, -183, 19, -341) EVT_CALL(PlayerMoveTo, -132, -325, 20) EVT_RETURN diff --git a/src/world/area_kmr/kmr_02/kmr_02_7_kammy.c b/src/world/area_kmr/kmr_02/kmr_02_7_kammy.c index b3780cdb2b..28941e320b 100644 --- a/src/world/area_kmr/kmr_02/kmr_02_7_kammy.c +++ b/src/world/area_kmr/kmr_02/kmr_02_7_kammy.c @@ -101,9 +101,9 @@ EvtScript N(EVS_Scene_KammyStrikes) = { EVT_END_IF EVT_END_THREAD EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8000A) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Shocked) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SetCamType, CAM_DEFAULT, 4, FALSE) EVT_CALL(SetCamPitch, CAM_DEFAULT, 3, 0) EVT_CALL(SetCamPosA, CAM_DEFAULT, 166, 756) @@ -112,7 +112,7 @@ EvtScript N(EVS_Scene_KammyStrikes) = { EVT_CALL(SetCamDistance, CAM_DEFAULT, 1220) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_CALL(LoadPath, 120, EVT_PTR(N(FlightPath_ToGate1)), ARRAY_COUNT(N(FlightPath_ToGate1)), EASING_LINEAR) EVT_LABEL(20) EVT_CALL(GetNextPathPos) @@ -215,22 +215,22 @@ EvtScript N(EVS_Scene_KammyStrikes) = { EVT_WAIT(10) EVT_EXEC_WAIT(N(EVS_SummonGateBlock)) EVT_THREAD - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80012) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_PanicHoverStill) EVT_CALL(func_802D286C, 256) - EVT_CALL(func_802D2520, ANIM_Mario_80012, 5, 0, 1, 1, 0) + EVT_CALL(func_802D2520, ANIM_MarioW2_PanicHoverStill, 5, 0, 1, 1, 0) EVT_WAIT(13) - EVT_CALL(func_802D2520, ANIM_Mario_80012, 0, 0, 0, 0, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80013) + EVT_CALL(func_802D2520, ANIM_MarioW2_PanicHoverStill, 0, 0, 0, 0, 0) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_PanicHover) EVT_CALL(func_802D286C, 256) - EVT_CALL(func_802D2520, ANIM_Mario_80013, 5, 0, 1, 1, 0) + EVT_CALL(func_802D2520, ANIM_MarioW2_PanicHover, 5, 0, 1, 1, 0) EVT_WAIT(13) - EVT_CALL(func_802D2520, ANIM_Mario_80013, 0, 0, 0, 0, 0) + EVT_CALL(func_802D2520, ANIM_MarioW2_PanicHover, 0, 0, 0, 0, 0) EVT_END_THREAD EVT_THREAD EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.8)) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 25) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_END_THREAD EVT_THREAD EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Shock) @@ -302,14 +302,14 @@ EvtScript N(EVS_Scene_KammyStrikes) = { EVT_CALL(SetNpcAnimation, NPC_Goombaria, ANIM_Goombaria_Idle) EVT_CALL(SetNpcPos, NPC_Goombaria, 166, 0, 188) EVT_CALL(SetPlayerPos, 231, 0, 196) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(GetAngleToPlayer, NPC_Goombaria, LVar0) EVT_CALL(InterpNpcYaw, NPC_Goombaria, LVar0, 0) EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(90.0), 0, EVT_FLOAT(-300.0), EVT_FLOAT(12.0), EVT_FLOAT(-8.5)) EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_Goompapa, ANIM_Goompapa_AngryTalk, ANIM_Goompapa_Angry, 0, MSG_CH0_005F) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_WAIT(15) EVT_CALL(SetNpcAnimation, NPC_Goompapa, ANIM_Goompapa_Idle) EVT_WAIT(15) diff --git a/src/world/area_kmr/kmr_03/kmr_03_3_npc.c b/src/world/area_kmr/kmr_03/kmr_03_3_npc.c index ae14d9b93f..069b9776d1 100644 --- a/src/world/area_kmr/kmr_03/kmr_03_3_npc.c +++ b/src/world/area_kmr/kmr_03/kmr_03_3_npc.c @@ -89,7 +89,7 @@ EvtScript N(EVS_NpcAI_Goompa) = { EVT_WAIT(30) EVT_CALL(SpeakToPlayer, NPC_Goompa, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_00A7) EVT_WAIT(5) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_WAIT(30) EVT_CALL(SpeakToPlayer, NPC_Goompa, ANIM_Goompa_Talk, ANIM_Goompa_Idle, 0, MSG_CH0_00A8) EVT_CALL(N(ChangeNpcToPartner), 0, 5) diff --git a/src/world/area_kmr/kmr_03/kmr_03_6_fall_down.c b/src/world/area_kmr/kmr_03/kmr_03_6_fall_down.c index 57c66544b9..57efd5cf43 100644 --- a/src/world/area_kmr/kmr_03/kmr_03_6_fall_down.c +++ b/src/world/area_kmr/kmr_03/kmr_03_6_fall_down.c @@ -40,7 +40,7 @@ EvtScript N(EVS_Scene_FallingDown) = { EVT_CALL(PlaySoundAtPlayer, SOUND_175, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_CALL(HidePlayerShadow, TRUE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SetPlayerPos, -224, 120, -80) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_LABEL(0) @@ -59,18 +59,18 @@ EvtScript N(EVS_Scene_FallingDown) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_END_THREAD EVT_CALL(func_802D286C, 0x00002800) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 5, 5, 1, 1, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 5, 5, 1, 1, 0) EVT_WAIT(100) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 0, 0, 0, 0, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 0, 0, 0, 0, 0) EVT_CALL(HidePlayerShadow, FALSE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_BeforeJump) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_BeforeJump) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimMidairStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Jump) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) EVT_CALL(PlayerJump, LVar0, LVar1, LVar2, 10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_THREAD EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(3.0)) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) diff --git a/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c b/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c index 2b4dbc09f1..ae50afeeba 100644 --- a/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c +++ b/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c @@ -38,7 +38,7 @@ API_CALLABLE(N(func_80240444_8CAD44)) { } EvtScript N(EVS_GotHammer) = { - EVT_CALL(SetPlayerAnimation, ANIM_Mario_6000C) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_Lift) EVT_CALL(GetPlayerPos, LVar5, LVar6, LVar7) EVT_ADD(LVar6, 40) EVT_CALL(MakeItemEntity, ITEM_HAMMER, LVar5, LVar6, LVar7, ITEM_SPAWN_MODE_DECORATION, 0) @@ -65,7 +65,7 @@ EvtScript N(EVS_GotHammer) = { EVT_END_LOOP EVT_CALL(func_802D7B44, LVar8) EVT_CALL(RemoveItemEntity, LVarC) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_RETURN EVT_END }; diff --git a/src/world/area_kmr/kmr_07/kmr_07_3_npc.c b/src/world/area_kmr/kmr_07/kmr_07_3_npc.c index 7461ae2295..3e00ed3bfd 100644 --- a/src/world/area_kmr/kmr_07/kmr_07_3_npc.c +++ b/src/world/area_kmr/kmr_07/kmr_07_3_npc.c @@ -40,7 +40,7 @@ EvtScript N(EVS_NpcIdle_GoombaBros_Red) = { EVT_WAIT(1) EVT_END_THREAD EVT_CALL(ShowMessageAtScreenPos, MSG_CH0_00BB, 320, 60) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80022) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_LookAround) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, 360, 80, 35) @@ -68,7 +68,7 @@ EvtScript N(EVS_NpcIdle_GoombaBros_Red) = { EVT_CALL(SetNpcAnimation, NPC_GoombaBros_Blue, ANIM_GoombaBros_Blue_Idle) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_CALL(SpeakToPlayer, NPC_GoombaBros_Red, ANIM_GoombaBros_Red_Talk, ANIM_GoombaBros_Red_Idle, 0, MSG_CH0_00BC) EVT_WAIT(10) EVT_CALL(SetPanTarget, CAM_DEFAULT, 270, 80, 45) @@ -87,7 +87,7 @@ EvtScript N(EVS_NpcIdle_GoombaBros_Red) = { EVT_CALL(SetNpcAnimation, NPC_GoombaBros_Blue, ANIM_GoombaBros_Blue_Walk) EVT_CALL(PlaySoundAtNpc, NPC_GoombaBros_Blue, SOUND_10F, SOUND_SPACE_MODE_0) EVT_CALL(NpcJump0, NPC_GoombaBros_Blue, 267, 0, 28, 30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_END_THREAD EVT_THREAD EVT_CALL(SetNpcJumpscale, NPC_GoombaBros_Red, EVT_FLOAT(0.8)) @@ -96,7 +96,7 @@ EvtScript N(EVS_NpcIdle_GoombaBros_Red) = { EVT_CALL(NpcJump0, NPC_GoombaBros_Red, 276, 0, 55, 30) EVT_END_THREAD EVT_WAIT(15) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(5) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CALL(DisablePlayerInput, FALSE) diff --git a/src/world/area_kmr/kmr_11/kmr_11_3_scenes.c b/src/world/area_kmr/kmr_11/kmr_11_3_scenes.c index 56beec7447..52c8b5be34 100644 --- a/src/world/area_kmr/kmr_11/kmr_11_3_scenes.c +++ b/src/world/area_kmr/kmr_11/kmr_11_3_scenes.c @@ -176,14 +176,14 @@ EvtScript N(EVS_FortressCollapse_PlayFX) = { EvtScript N(EVS_FortressCollapse_PlayerReactions) = { EVT_CALL(DisablePartnerAI, 0) EVT_WAIT(37) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001F) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_FlailArms) EVT_WAIT(60) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.8)) EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 10) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Running) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Run) EVT_CALL(SetPlayerSpeed, EVT_FLOAT(6.0)) EVT_CALL(SetNpcSpeed, NPC_PARTNER, EVT_FLOAT(6.0)) EVT_THREAD @@ -191,7 +191,7 @@ EvtScript N(EVS_FortressCollapse_PlayerReactions) = { EVT_END_THREAD EVT_CALL(PlayerMoveTo, -547, 147, 0) EVT_CALL(InterpPlayerYaw, 90, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(EnablePartnerAI) EVT_WAIT(100) EVT_RETURN @@ -240,7 +240,7 @@ EvtScript N(EVS_Scene_SelfDestruct) = { EVT_END_LOOP EVT_CALL(SetNpcPos, NPC_GoombaKing, -303, 286, -120) EVT_CALL(FadeOutMusic, 0, 1000) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_ShockStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_VacantStare) EVT_WAIT(30) EVT_KILL_THREAD(LVarA) EVT_THREAD diff --git a/src/world/area_kmr/kmr_20/kmr_20_10_npc.c b/src/world/area_kmr/kmr_20/kmr_20_10_npc.c index e943c34a03..899d18f08a 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_10_npc.c +++ b/src/world/area_kmr/kmr_20/kmr_20_10_npc.c @@ -32,9 +32,9 @@ EvtScript N(EVS_KootFavorCheck_Luigi) = { EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Luigi_Idle) EVT_EXEC_WAIT(N(EVS_MarioSalute)) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 0, MSG_CH0_0103) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) EVT_WAIT(40) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Luigi_Talk, ANIM_Luigi_Idle, 0, MSG_CH0_0104) EVT_CALL(GetNpcYaw, NPC_SELF, LVar0) EVT_SET(LVar1, LVar0) diff --git a/src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c b/src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c index ceef22c854..97375cc378 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c +++ b/src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c @@ -78,7 +78,7 @@ EvtScript N(EVS_Player_EnterPipe_Intro) = { EVT_END_LOOP EVT_END_THREAD EVT_CALL(func_802D286C, 0x00000800) - EVT_CALL(func_802D2520, ANIM_Mario_10002, FOLD_TYPE_5, 2, 1, 1, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, FOLD_TYPE_5, 2, 1, 1, 0) EVT_WAIT(25) EVT_RETURN EVT_END diff --git a/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c b/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c index 56f032910f..c371049cbd 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c +++ b/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c @@ -150,7 +150,7 @@ EvtScript N(EVS_Player_EnterPipe_Epilogue) = { EVT_END_LOOP EVT_END_THREAD EVT_CALL(func_802D286C, 0x00000800) - EVT_CALL(func_802D2520, ANIM_Mario_10002, FOLD_TYPE_5, 2, 1, 1, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, FOLD_TYPE_5, 2, 1, 1, 0) EVT_WAIT(25) EVT_RETURN EVT_END @@ -189,7 +189,7 @@ EvtScript N(EVS_Luigi_EnterPipe_Epilogue) = { EvtScript N(EVS_Scene_BeginEpilogue) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(N(SetAmbienceVolumeHalf_Epilogue)) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80024) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SitIdle) EVT_CALL(SetPlayerPos, 95, 44, -40) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 150, 44, -40) EVT_CALL(SetPanTarget, CAM_DEFAULT, 150, 44, -40) @@ -198,7 +198,7 @@ EvtScript N(EVS_Scene_BeginEpilogue) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_WAIT(30) EVT_CALL(SpeakToPlayer, NPC_Luigi_1, ANIM_Luigi_TalkSit, ANIM_Luigi_IdleSit, 0, MSG_Outro_000D) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80025) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SitNodYes) EVT_WAIT(20) EVT_CALL(SpeakToPlayer, NPC_Luigi_1, ANIM_Luigi_TalkSit, ANIM_Luigi_IdleSit, 0, MSG_Outro_000E) EVT_WAIT(30) @@ -212,7 +212,7 @@ EvtScript N(EVS_Scene_EpilogueGetLetter) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(N(SetAmbienceVolumeHalf_Epilogue)) EVT_CALL(SetPlayerPos, 95, 44, -40) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80024) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SitIdle) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, 150, 44, -40) EVT_CALL(SetPanTarget, CAM_DEFAULT, 150, 44, -40) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(17.0), EVT_FLOAT(-6.0)) @@ -222,7 +222,7 @@ EvtScript N(EVS_Scene_EpilogueGetLetter) = { EVT_CALL(PlaySoundAt, SOUND_E0, SOUND_SPACE_MODE_0, 430, 0, -185) EVT_WAIT(25) EVT_CALL(PlaySoundAtPlayer, SOUND_263, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_Luigi_0, EMOTE_QUESTION, 0, 20, FALSE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 0, 20, EMOTER_PLAYER, 0, 0, 0, 0) EVT_CALL(PlaySoundAtNpc, NPC_Luigi_1, SOUND_263, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_Luigi_1, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(30) diff --git a/src/world/area_kmr/kmr_20/kmr_20_8_bed.c b/src/world/area_kmr/kmr_20/kmr_20_8_bed.c index 70cf1b056e..f55be49de5 100644 --- a/src/world/area_kmr/kmr_20/kmr_20_8_bed.c +++ b/src/world/area_kmr/kmr_20/kmr_20_8_bed.c @@ -63,12 +63,12 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { EVT_CALL(SetPlayerPos, LVar4, LVar0, LVar6) EVT_END_LOOP EVT_CALL(HidePlayerShadow, TRUE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(func_802D286C, 0x00000800) EVT_CALL(func_802D2520, 0x00010002, 5, 7, 1, 1, 0) EVT_THREAD EVT_WAIT(60) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001D) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SleepStanding) EVT_END_THREAD EVT_CALL(N(MuteAmbienceVolume_Bed)) EVT_WAIT(75) @@ -97,9 +97,9 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { EvtScript N(EVS_ToadHouse_ReturnFromRest) = { EVT_CALL(N(SetAmbienceVolumeHalf_Bed)) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(HidePlayerShadow, FALSE) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 0, 0, 0, 0, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 0, 0, 0, 0, 0) EVT_CALL(SetPlayerPos, -45, 30, -70) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(SetNpcPos, NPC_PARTNER, -75, 30, -70) diff --git a/src/world/area_kmr/kmr_22/kmr_22_1_main.c b/src/world/area_kmr/kmr_22/kmr_22_1_main.c index ba2bd60e6e..aa5249a67c 100644 --- a/src/world/area_kmr/kmr_22/kmr_22_1_main.c +++ b/src/world/area_kmr/kmr_22/kmr_22_1_main.c @@ -135,7 +135,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, TRUE) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_BeforeJump) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_BeforeJump) EVT_CALL(GetCurrentPartnerID, LVar0) EVT_IF_NE(LVar0, PARTNER_NONE) EVT_CALL(DisablePartnerAI, 0) diff --git a/src/world/area_kmr/kmr_23/kmr_23_1_main.c b/src/world/area_kmr/kmr_23/kmr_23_1_main.c index 87fef3ec6b..25723ec081 100644 --- a/src/world/area_kmr/kmr_23/kmr_23_1_main.c +++ b/src/world/area_kmr/kmr_23/kmr_23_1_main.c @@ -34,7 +34,7 @@ EvtScript N(EVS_Main) = { EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, TRUE) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10024) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_GetItem) EVT_CALL(GetCurrentPartnerID, LVar0) EVT_IF_NE(LVar0, PARTNER_NONE) EVT_CALL(DisablePartnerAI, FALSE) diff --git a/src/world/area_kpa/kpa_133/kpa_133_3_entity.c b/src/world/area_kpa/kpa_133/kpa_133_3_entity.c index d7977ada7f..0c22f32125 100644 --- a/src/world/area_kpa/kpa_133/kpa_133_3_entity.c +++ b/src/world/area_kpa/kpa_133/kpa_133_3_entity.c @@ -69,9 +69,9 @@ EvtScript N(EVS_SetupHiddenSpring) = { EVT_CALL(InterpPlayerYaw, LVar4, 0) EVT_WAIT(2) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(2.0)) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_CALL(PlayerJump1, LVar3, LVar1, LVar2, 10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(5) EVT_END_THREAD EVT_END_IF diff --git a/src/world/area_kpa/kpa_134/kpa_134_3_chains.c b/src/world/area_kpa/kpa_134/kpa_134_3_chains.c index cab33beaeb..7e7f3cec4b 100644 --- a/src/world/area_kpa/kpa_134/kpa_134_3_chains.c +++ b/src/world/area_kpa/kpa_134/kpa_134_3_chains.c @@ -87,7 +87,7 @@ EvtScript N(EVS_SetupLowerChain) = { EVT_CALL(PlaySoundAtPlayer, SOUND_229, SOUND_SPACE_MODE_0) EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8000D) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_HoldOnto) EVT_THREAD EVT_SET(LVar0, 150) EVT_SET(LVar1, 30) @@ -334,7 +334,7 @@ EvtScript N(EVS_SetupUpperChain) = { EVT_CALL(PlaySoundAtPlayer, SOUND_229, SOUND_SPACE_MODE_0) EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8000D) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_HoldOnto) EVT_THREAD EVT_SET(LVar0, 275) EVT_SET(LVar1, 0) diff --git a/src/world/area_kpa/kpa_14/kpa_14_2_main.c b/src/world/area_kpa/kpa_14/kpa_14_2_main.c index 81597d5970..404f89a325 100644 --- a/src/world/area_kpa/kpa_14/kpa_14_2_main.c +++ b/src/world/area_kpa/kpa_14/kpa_14_2_main.c @@ -174,7 +174,7 @@ EvtScript N(EVS_SetupLavaFall) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001A) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Thrown) EVT_CALL(MakeLerp, 30, 60, 5, EASING_QUADRATIC_IN) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -195,7 +195,7 @@ EvtScript N(EVS_SetupLavaFall) = { EVT_END_IF EVT_END_LOOP EVT_WAIT(5) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(DisablePlayerPhysics, FALSE) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CALL(DisablePlayerInput, FALSE) diff --git a/src/world/area_kpa/kpa_17/kpa_17_4_npc.c b/src/world/area_kpa/kpa_17/kpa_17_4_npc.c index 53c03e9f9f..85282b3881 100644 --- a/src/world/area_kpa/kpa_17/kpa_17_4_npc.c +++ b/src/world/area_kpa/kpa_17/kpa_17_4_npc.c @@ -21,7 +21,7 @@ EvtScript N(EVS_Scene_FallIntoCell) = { EVT_CALL(func_802CF56C, 1) EVT_END_IF EVT_CALL(PlaySoundAtPlayer, SOUND_161, SOUND_SPACE_MODE_0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80018) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_PanicStill) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_LOOP(0) EVT_SUB(LVar1, 16) @@ -33,13 +33,13 @@ EvtScript N(EVS_Scene_FallIntoCell) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80018) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_PanicStill) EVT_THREAD EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 20, EVT_FLOAT(0.6)) EVT_END_THREAD EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) EVT_CALL(PlayerJump1, 1030, 30, -496, 10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(1) EVT_CALL(DisablePlayerPhysics, FALSE) EVT_WAIT(1) @@ -47,10 +47,10 @@ EvtScript N(EVS_Scene_FallIntoCell) = { EVT_WAIT(5) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_WAIT(1) EVT_CALL(ShowMessageAtScreenPos, MSG_CH8_0007, 1000, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(10) EVT_CALL(DisablePlayerPhysics, FALSE) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) diff --git a/src/world/area_kpa/kpa_53/kpa_53_3_npc.c b/src/world/area_kpa/kpa_53/kpa_53_3_npc.c index 8f4473df33..3cc70761eb 100644 --- a/src/world/area_kpa/kpa_53/kpa_53_3_npc.c +++ b/src/world/area_kpa/kpa_53/kpa_53_3_npc.c @@ -142,9 +142,9 @@ EvtScript N(EVS_NpcInteract_Follower_FirstTime) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(0) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_CH8_0023) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_WAIT(35) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Peach_C0001, ANIM_Peach_C0026, 0, MSG_CH8_0024) EVT_SET(GF_KPA53_Met_PeachImposter, TRUE) diff --git a/src/world/area_kpa/kpa_81/kpa_81_3_npc.c b/src/world/area_kpa/kpa_81/kpa_81_3_npc.c index 6703bfd8bf..85f2ac844a 100644 --- a/src/world/area_kpa/kpa_81/kpa_81_3_npc.c +++ b/src/world/area_kpa/kpa_81/kpa_81_3_npc.c @@ -173,11 +173,11 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(10) EVT_END_IF - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80017) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Flail) EVT_WAIT(30) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80018) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_PanicStill) EVT_WAIT(10) EVT_CALL(PlaySoundAtPlayer, SOUND_161, SOUND_SPACE_MODE_0) EVT_THREAD diff --git a/src/world/area_kpa/kpa_83/kpa_83_3_npc.c b/src/world/area_kpa/kpa_83/kpa_83_3_npc.c index fd13aada3d..87f353bbcd 100644 --- a/src/world/area_kpa/kpa_83/kpa_83_3_npc.c +++ b/src/world/area_kpa/kpa_83/kpa_83_3_npc.c @@ -331,7 +331,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_CALL(SetNpcAnimation, NPC_JrTroopa, ANIM_JrTroopa_ChargeArmsUp) EVT_CALL(SetNpcSpeed, NPC_JrTroopa, EVT_FLOAT(8.0)) EVT_THREAD - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_LOOP(0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(GetNpcPos, NPC_JrTroopa, LVar3, LVar4, LVar5) @@ -353,7 +353,7 @@ EvtScript N(EVS_NpcIdle_Door) = { EVT_END_LOOP EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_STATIC_COLLISION | PS_FLAG_ROTATION_LOCKED | PS_FLAG_FACE_FORWARDS, FALSE) EVT_CALL(InterpPlayerYaw, 90, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_SET(LVar0, NPC_KoopaBrosRed) EVT_EXEC_GET_TID(N(EVS_KoopaBros_Hop), MV_KoopaBrosRed_HopScript) diff --git a/src/world/area_kpa/kpa_91/kpa_91_3_npc.c b/src/world/area_kpa/kpa_91/kpa_91_3_npc.c index 78f03beab3..9a538aef54 100644 --- a/src/world/area_kpa/kpa_91/kpa_91_3_npc.c +++ b/src/world/area_kpa/kpa_91/kpa_91_3_npc.c @@ -40,11 +40,11 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { EVT_WAIT(5) EVT_CALL(InterpPlayerYaw, 114, 1) EVT_CALL(HidePlayerShadow, TRUE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(func_802D286C, 0x00002800) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 5, 7, 1, 1, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 5, 7, 1, 1, 0) EVT_WAIT(61) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001D) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SleepStanding) EVT_THREAD EVT_WAIT(63) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -62,7 +62,7 @@ EvtScript N(EVS_ToadHouse_ReturnFromRest) = { EVT_CALL(UseSettingsFrom, CAM_DEFAULT, MV_LastPlayerPosX, MV_LastPlayerPosY, MV_LastPlayerPosZ) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(SetPanTarget, CAM_DEFAULT, MV_LastPlayerPosX, MV_LastPlayerPosY, MV_LastPlayerPosZ) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 0, 0, 0, 0, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 0, 0, 0, 0, 0) EVT_CALL(HidePlayerShadow, FALSE) EVT_CALL(SetPlayerPos, -139, 0, -90) EVT_CALL(PlayerMoveTo, -102, -130, 20) diff --git a/src/world/area_kpa/kpa_95/kpa_95_4_npc.c b/src/world/area_kpa/kpa_95/kpa_95_4_npc.c index 4b09995b43..afc1ceda82 100644 --- a/src/world/area_kpa/kpa_95/kpa_95_4_npc.c +++ b/src/world/area_kpa/kpa_95/kpa_95_4_npc.c @@ -41,11 +41,11 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { EVT_WAIT(5) EVT_CALL(InterpPlayerYaw, 114, 1) EVT_CALL(HidePlayerShadow, TRUE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(func_802D286C, 0x00002800) - EVT_CALL(func_802D2520, ANIM_Mario_10002, FOLD_TYPE_5, 7, 1, 1, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, FOLD_TYPE_5, 7, 1, 1, 0) EVT_WAIT(61) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001D) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SleepStanding) EVT_THREAD EVT_WAIT(63) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -63,7 +63,7 @@ EvtScript N(EVS_ToadHouse_ReturnFromRest) = { EVT_CALL(UseSettingsFrom, CAM_DEFAULT, MV_LastPlayerPosX, MV_LastPlayerPosY, MV_LastPlayerPosZ) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_CALL(SetPanTarget, CAM_DEFAULT, MV_LastPlayerPosX, MV_LastPlayerPosY, MV_LastPlayerPosZ) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 0, 0, 0, 0, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 0, 0, 0, 0, 0) EVT_CALL(HidePlayerShadow, FALSE) EVT_CALL(SetPlayerPos, -139, 0, -90) EVT_CALL(PlayerMoveTo, -102, -130, 20) diff --git a/src/world/area_kzn/common/SpinyTromp.inc.c b/src/world/area_kzn/common/SpinyTromp.inc.c index a132620abd..b755a295ea 100644 --- a/src/world/area_kzn/common/SpinyTromp.inc.c +++ b/src/world/area_kzn/common/SpinyTromp.inc.c @@ -59,18 +59,18 @@ EvtScript N(D_80240D10_C7EE90) = { EVT_WAIT(1) EVT_CALL(N(UnkFunc48), -20) EVT_END_IF - EVT_CALL(SetPlayerAnimation, ANIM_Mario_DeadStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Fallen) EVT_WAIT(1) EVT_CALL(N(SpinyTrompHit)) - EVT_CALL(func_802D2520, ANIM_Mario_DeadStill, 4, EVT_FLOAT(3.0), EVT_FLOAT(3.0), 0, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Fallen, 4, EVT_FLOAT(3.0), EVT_FLOAT(3.0), 0, 0) EVT_LABEL(1) EVT_WAIT(1) EVT_IF_EQ(AF_KZN_TrompRollingDone, FALSE) EVT_GOTO(1) EVT_END_IF EVT_WAIT(30) - EVT_CALL(func_802D2520, ANIM_Mario_DeadStill, 0, 0, 0, 0, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_GetUp) + EVT_CALL(func_802D2520, ANIM_Mario1_Fallen, 0, 0, 0, 0, 0) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_GetUp) EVT_CALL(N(UnkFunc48), 0) EVT_LABEL(2) EVT_CALL(DisablePlayerInput, FALSE) diff --git a/src/world/area_kzn/kzn_02/kzn_02_3_npc.c b/src/world/area_kzn/kzn_02/kzn_02_3_npc.c index 48b10409a9..9d07034357 100644 --- a/src/world/area_kzn/kzn_02/kzn_02_3_npc.c +++ b/src/world/area_kzn/kzn_02/kzn_02_3_npc.c @@ -130,7 +130,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EvtScript N(EVS_NpcInteract_Kolorado) = { EVT_THREAD EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_CH5_00F0) EVT_CALL(GetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) diff --git a/src/world/area_kzn/kzn_03/kzn_03_4_ziplines.c b/src/world/area_kzn/kzn_03/kzn_03_4_ziplines.c index bc278e3eba..066c8d4120 100644 --- a/src/world/area_kzn/kzn_03/kzn_03_4_ziplines.c +++ b/src/world/area_kzn/kzn_03/kzn_03_4_ziplines.c @@ -105,7 +105,7 @@ EvtScript N(EVS_RideZipline) = { EVT_CALL(PlayerJump, ArrayVar(3), ArrayVar(4), ArrayVar(5), 5) EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8000D) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_HoldOnto) EVT_WAIT(10) EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) EVT_CALL(PlaySound, SOUND_80000019) diff --git a/src/world/area_kzn/kzn_09/kzn_09_3_zipline.c b/src/world/area_kzn/kzn_09/kzn_09_3_zipline.c index 471b88a8a0..7b27151ac5 100644 --- a/src/world/area_kzn/kzn_09/kzn_09_3_zipline.c +++ b/src/world/area_kzn/kzn_09/kzn_09_3_zipline.c @@ -99,7 +99,7 @@ EvtScript N(EVS_RideZipline) = { EVT_CALL(PlayerJump, ArrayVar(3), ArrayVar(4), ArrayVar(5), 5) EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8000D) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_HoldOnto) EVT_WAIT(10) EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) EVT_CALL(PlaySound, SOUND_80000019) diff --git a/src/world/area_kzn/kzn_09/kzn_09_4_npc.c b/src/world/area_kzn/kzn_09/kzn_09_4_npc.c index 7fe0f5e400..6fb8022b20 100644 --- a/src/world/area_kzn/kzn_09/kzn_09_4_npc.c +++ b/src/world/area_kzn/kzn_09/kzn_09_4_npc.c @@ -158,19 +158,19 @@ EvtScript N(EVS_Scene_KoloradoFallsDown) = { EVT_WAIT(5) EVT_CALL(SetSelfVar, 0, 1) EVT_THREAD - EVT_CALL(SetPlayerAnimation, ANIM_Mario_ShockStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_VacantStare) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Running) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Run) EVT_CALL(SetPlayerSpeed, EVT_FLOAT(4.0)) EVT_CALL(PlayerMoveTo, -360, 0, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1000C) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_SpinFall) EVT_LABEL(5) EVT_CALL(GetSelfVar, 0, LVar0) EVT_IF_EQ(LVar0, 1) EVT_WAIT(1) EVT_GOTO(5) EVT_END_IF - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_CALL(ShowMessageAtScreenPos, MSG_CH5_00F5, 160, 40) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_162, SOUND_SPACE_MODE_0) diff --git a/src/world/area_kzn/kzn_10/kzn_10_2_tromp.c b/src/world/area_kzn/kzn_10/kzn_10_2_tromp.c index 8921b9a07f..4e90343338 100644 --- a/src/world/area_kzn/kzn_10/kzn_10_2_tromp.c +++ b/src/world/area_kzn/kzn_10/kzn_10_2_tromp.c @@ -138,9 +138,9 @@ EvtScript N(EVS_SetupSpinyTromp) = { EVT_CALL(InterpPlayerYaw, 270, 0) EVT_IF_NE(LVar0, PARTNER_LAKILESTER) EVT_WAIT(3) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_IF EVT_END_SWITCH EVT_END_THREAD diff --git a/src/world/area_kzn/kzn_19/kzn_19_2_main.c b/src/world/area_kzn/kzn_19/kzn_19_2_main.c index ff74623999..99704f96e1 100644 --- a/src/world/area_kzn/kzn_19/kzn_19_2_main.c +++ b/src/world/area_kzn/kzn_19/kzn_19_2_main.c @@ -44,7 +44,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(45) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_END_THREAD EVT_THREAD EVT_WAIT(180) @@ -54,7 +54,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_CALL(N(StarSpiritEffectFunc4), 1) EVT_THREAD EVT_WAIT(80) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_ADD(LVar1, 100) EVT_CALL(SetCamDistance, CAM_DEFAULT, LVar1) diff --git a/src/world/area_kzn/kzn_19/kzn_19_4_npc.c b/src/world/area_kzn/kzn_19/kzn_19_4_npc.c index 562bff3a6c..eefd4e1387 100644 --- a/src/world/area_kzn/kzn_19/kzn_19_4_npc.c +++ b/src/world/area_kzn/kzn_19/kzn_19_4_npc.c @@ -143,7 +143,7 @@ EvtScript N(EVS_Misstar_Escape) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) EVT_CALL(GetNpcPos, NPC_Misstar, LVar0, LVar1, LVar2) diff --git a/src/world/area_kzn/kzn_19/kzn_19_5_eruption.c b/src/world/area_kzn/kzn_19/kzn_19_5_eruption.c index 8952b3539d..cd52352ad4 100644 --- a/src/world/area_kzn/kzn_19/kzn_19_5_eruption.c +++ b/src/world/area_kzn/kzn_19/kzn_19_5_eruption.c @@ -66,7 +66,7 @@ EvtScript N(EVS_UpdateEruption) = { EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 25, EVT_FLOAT(2.0)) EVT_CALL(InterpPlayerYaw, 270, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_EXEC(N(EVS_CrackFloor)) EVT_CALL(MakeLerp, 200, 50, 75, EASING_LINEAR) EVT_LOOP(0) diff --git a/src/world/area_kzn/kzn_20/kzn_20_3_npc.c b/src/world/area_kzn/kzn_20/kzn_20_3_npc.c index 3578bc541e..e9817ab8df 100644 --- a/src/world/area_kzn/kzn_20/kzn_20_3_npc.c +++ b/src/world/area_kzn/kzn_20/kzn_20_3_npc.c @@ -149,7 +149,7 @@ EvtScript N(EVS_KoloradoBurned_PlayerReaction) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_LOOP(0) EVT_WAIT(1) EVT_CALL(GetNpcPos, NPC_Kolorado, LVar0, LVar1, LVar2) @@ -157,7 +157,7 @@ EvtScript N(EVS_KoloradoBurned_PlayerReaction) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_RETURN EVT_END }; @@ -244,9 +244,9 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(SetMusicTrack, 0, SONG_VOLCANO_ESCAPE, 0, 8) EVT_WAIT(20) EVT_THREAD - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_WAIT(60) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Yell) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Shout, ANIM_Kolorado_Yell, 0, MSG_CH5_010D) diff --git a/src/world/area_kzn/kzn_22/kzn_22_4_npc.c b/src/world/area_kzn/kzn_22/kzn_22_4_npc.c index 67c04e75a4..f5e8cb61d8 100644 --- a/src/world/area_kzn/kzn_22/kzn_22_4_npc.c +++ b/src/world/area_kzn/kzn_22/kzn_22_4_npc.c @@ -36,7 +36,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { // start scene (but wait for player to stop being hurt if they fell in the lava) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(GetPlayerAnimation, LVar0) - EVT_IF_EQ(LVar0, ANIM_Mario_8001A) + EVT_IF_EQ(LVar0, ANIM_MarioW2_Thrown) EVT_WAIT(35) EVT_END_IF EVT_WAIT(10) @@ -215,7 +215,7 @@ EvtScript N(EVS_Scene_Misstar) = { EVT_END_IF EVT_SET(AF_KZN23_GrabbedPlayer, TRUE) EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80000) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Carried) EVT_THREAD EVT_WAIT(25) EVT_SET(AF_KZN22_FlewAway, TRUE) diff --git a/src/world/area_kzn/kzn_23/kzn_23_3_npc.c b/src/world/area_kzn/kzn_23/kzn_23_3_npc.c index e07c85f717..a31a91f0ae 100644 --- a/src/world/area_kzn/kzn_23/kzn_23_3_npc.c +++ b/src/world/area_kzn/kzn_23/kzn_23_3_npc.c @@ -209,7 +209,7 @@ EvtScript N(EVS_Scene_Misstar) = { EVT_CALL(SetSelfVar, 0, 0) EVT_THREAD EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80000) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Carried) EVT_END_THREAD // fly out of the volcano shaft EVT_THREAD diff --git a/src/world/area_mac/mac_00/mac_00_10_shared_npc.c b/src/world/area_mac/mac_00/mac_00_10_shared_npc.c index 1de496a430..9068270828 100644 --- a/src/world/area_mac/mac_00/mac_00_10_shared_npc.c +++ b/src/world/area_mac/mac_00/mac_00_10_shared_npc.c @@ -53,7 +53,7 @@ EvtScript N(EVS_Scene_ToadTownGreeting) = { EVT_WAIT(50) EVT_THREAD EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_END_THREAD EVT_CALL(SpeakToPlayer, NPC_Toad_04, ANIM_Toad_Red_Talk, ANIM_Toad_Red_Idle, 0, MSG_MAC_Gate_007E) EVT_CALL(DisablePlayerInput, FALSE) diff --git a/src/world/area_mac/mac_00/mac_00_12_intro.c b/src/world/area_mac/mac_00/mac_00_12_intro.c index 1a0b8784f7..1ab2f6a25f 100644 --- a/src/world/area_mac/mac_00/mac_00_12_intro.c +++ b/src/world/area_mac/mac_00/mac_00_12_intro.c @@ -8,14 +8,14 @@ EvtScript N(EVS_PlayerExitPipe_Intro) = { EVT_WAIT(2) EVT_CALL(PlaySoundAtPlayer, SOUND_ENTER_PIPE, SOUND_SPACE_MODE_0) EVT_CALL(func_802D286C, 0x100) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 5, 2, 1, 1, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 5, 2, 1, 1, 0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_LOOP(40) EVT_ADD(LVar1, 1) EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(func_802D2520, ANIM_Mario_10002, 0, 0, 0, 0, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 0, 0, 0, 0, 0) EVT_CALL(HidePlayerShadow, FALSE) EVT_CALL(DisablePlayerPhysics, FALSE) EVT_RETURN diff --git a/src/world/area_mac/mac_00/mac_00_14_epilogue.c b/src/world/area_mac/mac_00/mac_00_14_epilogue.c index a8f444c4a6..54566e4ab6 100644 --- a/src/world/area_mac/mac_00/mac_00_14_epilogue.c +++ b/src/world/area_mac/mac_00/mac_00_14_epilogue.c @@ -8,14 +8,14 @@ EvtScript N(EVS_PlayerExitPipe_Epilogue) = { EVT_WAIT(2) EVT_CALL(PlaySoundAtPlayer, SOUND_ENTER_PIPE, SOUND_SPACE_MODE_0) EVT_CALL(func_802D286C, 0x100) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 5, 2, 1, 1, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 5, 2, 1, 1, 0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_LOOP(40) EVT_ADD(LVar1, 1) EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(func_802D2520, ANIM_Mario_10002, 0, 0, 0, 0, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 0, 0, 0, 0, 0) EVT_CALL(HidePlayerShadow, FALSE) EVT_CALL(DisablePlayerPhysics, FALSE) EVT_RETURN diff --git a/src/world/area_mac/mac_00/npc/dojo_members.inc.c b/src/world/area_mac/mac_00/npc/dojo_members.inc.c index 4ec91c3e47..fa481b9491 100644 --- a/src/world/area_mac/mac_00/npc/dojo_members.inc.c +++ b/src/world/area_mac/mac_00/npc/dojo_members.inc.c @@ -74,7 +74,7 @@ EvtScript N(EVS_NpcDefeat_Chan) = { EVT_CALL(GetBattleOutcome, LVar0) EVT_CALL(SetNpcVar, NPC_TheMaster, 1, LVar0) EVT_CALL(SetNpcVar, NPC_TheMaster, 0, 1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_RETURN EVT_END }; @@ -142,7 +142,7 @@ EvtScript N(EVS_NpcDefeat_Lee) = { EVT_CALL(GetBattleOutcome, LVar0) EVT_CALL(SetNpcVar, NPC_TheMaster, 1, LVar0) EVT_CALL(SetNpcVar, NPC_TheMaster, 0, 1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_RETURN EVT_END }; @@ -248,7 +248,7 @@ EvtScript N(EVS_NpcDefeat_Dojo) = { EVT_CALL(GetBattleOutcome, LVar0) EVT_CALL(SetSelfVar, VAR_BATTLE_OUTCOME, LVar0) EVT_CALL(SetSelfVar, VAR_FINISHED_BATTLE, TRUE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_RETURN EVT_END }; diff --git a/src/world/area_mac/mac_01/mac_01_9_npc.c b/src/world/area_mac/mac_01/mac_01_9_npc.c index d8156e993c..6c14b40a56 100644 --- a/src/world/area_mac/mac_01/mac_01_9_npc.c +++ b/src/world/area_mac/mac_01/mac_01_9_npc.c @@ -411,7 +411,7 @@ EvtScript N(EVS_MerlonBargeOut) = { EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, TRUE) EVT_CALL(InterpPlayerYaw, 270, 0) EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_FallBack) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Hurt) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) EVT_CALL(PlayerJump1, -222, 20, -158, 8) EVT_WAIT(5) @@ -490,15 +490,15 @@ EvtScript N(EVS_MerlonBargeOut) = { EVT_CALL(SpeakToPlayer, NPC_Merlon, ANIM_Merlon_Talk, ANIM_Merlon_Idle, 0, MSG_MAC_Plaza_0023) EVT_CALL(N(func_802447E0_805060)) EVT_WAIT(60) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001D) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SleepStanding) EVT_THREAD EVT_CALL(N(func_80244848_8050C8)) EVT_END_THREAD EVT_WAIT(10) EVT_CALL(ContinueSpeech, NPC_Merlon, ANIM_Merlon_Talk, ANIM_Merlon_Idle, 0, MSG_MAC_Plaza_0024) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001E) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_JoltAwake) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001C) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_NodYesTwice) EVT_WAIT(50) EVT_CALL(GetNpcPos, NPC_Merlon, LVar0, LVar1, LVar2) EVT_CALL(SetCamType, CAM_DEFAULT, 0, FALSE) @@ -825,7 +825,7 @@ EvtScript N(EVS_NpcInteract_Merlon) = { EVT_END_IF EVT_END_IF EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Merlon_Talk, ANIM_Merlon_Idle, 0, LVar0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(GetNpcPos, NPC_Merlon, LVar3, LVar4, LVar5) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) @@ -1775,12 +1775,12 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { EVT_CALL(PlayerMoveTo, 580, -210, 20) EVT_CALL(InterpPlayerYaw, 263, 1) EVT_CALL(HidePlayerShadow, TRUE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still) EVT_CALL(func_802D286C, 0x800) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 5, 7, 1, 1, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 5, 7, 1, 1, 0) EVT_THREAD EVT_WAIT(60) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001D) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SleepStanding) EVT_END_THREAD EVT_WAIT(20) EVT_THREAD @@ -1798,7 +1798,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { EvtScript N(EVS_ToadHouse_ReturnFromRest) = { EVT_EXEC(N(EVS_SetupMusic)) EVT_CALL(HidePlayerShadow, FALSE) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 0, 0, 0, 0, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 0, 0, 0, 0, 0) EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) EVT_CALL(SetPlayerPos, 568, 20, -186) EVT_CALL(PlayerMoveTo, 525, -168, 20) @@ -1981,22 +1981,22 @@ EvtScript N(EVS_NpcIdle_Twink) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0), -10, -300, 15, -9) EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Plaza_00DC) EVT_WAIT(5) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_WAIT(15) EVT_CALL(SetNpcJumpscale, NPC_Twink, EVT_FLOAT(1.0)) EVT_CALL(GetNpcPos, NPC_Twink, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_Twink, LVar0, LVar1, LVar2, 10) EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Plaza_00DD) EVT_WAIT(5) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002D) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Chuckle) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0), -40, -200, 15, -15) EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Plaza_00DE) EVT_WAIT(5) @@ -2018,7 +2018,7 @@ EvtScript N(EVS_NpcIdle_Twink) = { EVT_CALL(SetNpcPos, NPC_Twink, NPC_DISPOSE_LOCATION) EVT_EXEC(N(EVS_SetupMusic)) EVT_SET(GB_StoryProgress, STORY_CH1_RETURNED_TO_TOAD_TOWN) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN EVT_END diff --git a/src/world/area_mac/mac_02/npc/bootler.inc.c b/src/world/area_mac/mac_02/npc/bootler.inc.c index df0d085875..782cf7427a 100644 --- a/src/world/area_mac/mac_02/npc/bootler.inc.c +++ b/src/world/area_mac/mac_02/npc/bootler.inc.c @@ -78,7 +78,7 @@ EvtScript N(EVS_NpcIdle_Bootler) = { EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) EVT_WAIT(25) EVT_CALL(PlaySoundAtPlayer, SOUND_263, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_TayceT, EMOTE_QUESTION, 0, 30, FALSE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(30) EVT_CALL(SetNpcScale, NPC_Bootler, EVT_FLOAT(2.0), EVT_FLOAT(2.0), EVT_FLOAT(2.0)) EVT_CALL(SetNpcYaw, NPC_SELF, 90) @@ -90,7 +90,7 @@ EvtScript N(EVS_NpcIdle_Bootler) = { EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) EVT_WAIT(25) EVT_CALL(PlaySoundAtPlayer, SOUND_263, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_TayceT, EMOTE_QUESTION, 0, 30, FALSE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(30) EVT_CALL(SetNpcAnimation, NPC_Bootler, ANIM_Bootler_Walk) EVT_CALL(SetNpcScale, NPC_Bootler, EVT_FLOAT(1.0), EVT_FLOAT(1.0), EVT_FLOAT(1.0)) @@ -105,7 +105,7 @@ EvtScript N(EVS_NpcIdle_Bootler) = { EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) EVT_WAIT(25) EVT_CALL(PlaySoundAtPlayer, SOUND_263, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_TayceT, EMOTE_QUESTION, 0, 30, FALSE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(40) EVT_CALL(InterpPlayerYaw, 270, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) diff --git a/src/world/area_mac/mac_04/mac_04_6_npc.c b/src/world/area_mac/mac_04/mac_04_6_npc.c index 019664c493..2842028820 100644 --- a/src/world/area_mac/mac_04/mac_04_6_npc.c +++ b/src/world/area_mac/mac_04/mac_04_6_npc.c @@ -44,9 +44,9 @@ EvtScript N(EVS_TossTrainInToybox) = { EVT_END_LOOP EVT_CALL(RemoveItemEntity, LVar7) EVT_END_THREAD - EVT_CALL(SetPlayerAnimation, ANIM_Mario_60005) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_TakeItem) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(10) EVT_RETURN EVT_END diff --git a/src/world/area_mac/mac_04/npc_muskular.inc.c b/src/world/area_mac/mac_04/npc_muskular.inc.c index e168a38c18..c0d113c2f7 100644 --- a/src/world/area_mac/mac_04/npc_muskular.inc.c +++ b/src/world/area_mac/mac_04/npc_muskular.inc.c @@ -65,7 +65,7 @@ EvtScript N(EVS_Scene_RescuedMuskular) = { EVT_CALL(EnableNpcAI, NPC_Muskular, FALSE) EVT_CALL(SetNpcAnimation, NPC_Muskular, ANIM_WorldMuskular_Leap) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_GotItem) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_UsePower) EVT_CALL(PlaySoundAtPlayer, SOUND_139, SOUND_SPACE_MODE_0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SET(LVar3, LVar1) @@ -85,7 +85,7 @@ EvtScript N(EVS_Scene_RescuedMuskular) = { EVT_ADD(LVar1, 20) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 30) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SetNpcAnimation, NPC_Muskular, ANIM_WorldMuskular_Idle) EVT_CALL(EnableNpcAI, NPC_Muskular, TRUE) EVT_CALL(N(UpgradeStarPowerCh4)) @@ -100,14 +100,14 @@ EvtScript N(EVS_Scene_RescuedMuskular) = { EVT_WAIT(1) EVT_CALL(SetNpcPos, NPC_Twink, -600, 200, 350) EVT_CALL(NpcFlyTo, NPC_Twink, -437, 60, 270, 0, -10, EASING_LINEAR) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Housing_00C9) EVT_CALL(InterpNpcYaw, NPC_Twink, 270, 0) EVT_WAIT(20) EVT_CALL(NpcJump1, NPC_Twink, -460, 45, 220, 10) EVT_CALL(SpeakToNpc, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 512, NPC_Muskular, MSG_MAC_Housing_00CA) EVT_CALL(SetCamDistance, CAM_DEFAULT, -300) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(1) EVT_CALL(SpeakToNpc, NPC_Muskular, ANIM_WorldMuskular_Talk, ANIM_WorldMuskular_Idle, 512, NPC_Twink, MSG_MAC_Housing_00CB) EVT_CALL(SpeakToNpc, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, NPC_Muskular, MSG_MAC_Housing_00CC) @@ -167,9 +167,9 @@ EvtScript N(EVS_Scene_RescuedMuskular) = { EVT_CALL(PlaySoundAtNpc, NPC_Muskular, SOUND_2045, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_WAIT(115) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SetMusicTrack, 0, SONG_TWINK_THEME, 0, 8) EVT_CALL(SetPanTarget, CAM_DEFAULT, -450, 20, 250) EVT_CALL(SetCamDistance, CAM_DEFAULT, -350) @@ -183,11 +183,11 @@ EvtScript N(EVS_Scene_RescuedMuskular) = { EVT_CALL(NpcFacePlayer, NPC_Twink, 0) EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Housing_00D1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Question) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Question) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Housing_00D2) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) EVT_WAIT(30) EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Housing_00D3) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) diff --git a/src/world/area_mac/mac_04/npc_twink.inc.c b/src/world/area_mac/mac_04/npc_twink.inc.c index fae1224cd9..a3ae278974 100644 --- a/src/world/area_mac/mac_04/npc_twink.inc.c +++ b/src/world/area_mac/mac_04/npc_twink.inc.c @@ -39,26 +39,26 @@ EvtScript N(EVS_NpcIdle_TwinkStartCh4) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0), -10, -300, 15, -9) EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Bridge_0090) EVT_WAIT(5) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_WAIT(15) EVT_CALL(SetNpcJumpscale, NPC_Twink, EVT_FLOAT(1.0)) EVT_CALL(GetNpcPos, NPC_Twink, LVar0, LVar1, LVar2) EVT_CALL(NpcJump0, NPC_Twink, LVar0, LVar1, LVar2, 10) EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Bridge_0091) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002D) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Chuckle) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Bridge_0092) EVT_WAIT(5) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Thinking) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Thinking) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(3.0), -40, -200, 15, -15) EVT_CALL(SpeakToPlayer, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0, MSG_MAC_Bridge_0093) EVT_WAIT(5) diff --git a/src/world/area_mac/mac_05/mac_05_4_npc.c b/src/world/area_mac/mac_05/mac_05_4_npc.c index 664787db1e..dff6986288 100644 --- a/src/world/area_mac/mac_05/mac_05_4_npc.c +++ b/src/world/area_mac/mac_05/mac_05_4_npc.c @@ -392,7 +392,7 @@ EvtScript N(EVS_80248878) = { EVT_WAIT(10) EVT_THREAD EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.5)) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_CALL(SetPlayerPos, -120, 24, 375) EVT_CALL(PlaySoundAtPlayer, SOUND_44, SOUND_SPACE_MODE_0) EVT_CALL(PlayerJump1, -310, -10, 372, 80) @@ -560,9 +560,9 @@ EvtScript N(EVS_80248878) = { }; EvtScript N(D_802496C0_85B830) = { - EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimMidairStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Jump) EVT_WAIT(5) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimMidair) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Fall) EVT_RETURN EVT_END }; @@ -607,7 +607,7 @@ EvtScript N(EVS_802496FC) = { EVT_EXEC(N(D_802496C0_85B830)) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) EVT_CALL(PlayerJump, LVar0, LVar1, LVar2, 20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_RUN) EVT_CALL(N(func_80242A90_854C00), 4, LVar0, LVar1, LVar2) EVT_CALL(SetNpcJumpscale, NPC_PARTNER, EVT_FLOAT(1.0)) @@ -647,7 +647,7 @@ EvtScript N(EVS_802496FC) = { EvtScript N(D_80249C34_85BDA4) = { EVT_THREAD EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_CALL(PlayerJump1, -310, -10, 372, 30) EVT_CALL(SetPlayerActionState, ACTION_STATE_LAND) EVT_CALL(PlayerFaceNpc, NPC_Whale, FALSE) @@ -746,9 +746,9 @@ EvtScript N(D_80249E84_85BFF4) = { EVT_THREAD EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) EVT_CALL(GetPlayerPos, LVar2, LVar3, LVar4) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_CALL(PlayerJump1, LVar2, LVar3, LVar4, 10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_CALL(PlaySoundAt, SOUND_41, SOUND_SPACE_MODE_0, 0, 0, 480) EVT_CALL(SetNpcAnimation, NPC_Whale, ANIM_Kolorado_Panic) @@ -998,7 +998,7 @@ EvtScript N(EVS_NpcInteract_Toad_01) = { EVT_EXEC(N(D_802496C0_85B830)) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) EVT_CALL(PlayerJump, LVar0, LVar1, LVar2, 20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_THREAD EVT_CALL(N(func_80242C78_854DE8), 0) @@ -1146,9 +1146,9 @@ EvtScript N(EVS_NpcInteract_Kolorado) = { EVT_END_IF EVT_CASE_LT(STORY_CH5_DEFEATED_FUZZIPEDE) EVT_CALL(SpeakToPlayer, NPC_Kolorado, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_MAC_Port_0095) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_WAIT(30) EVT_CALL(SpeakToPlayer, NPC_Kolorado, ANIM_Kolorado_Talk, ANIM_Kolorado_Idle, 0, MSG_MAC_Port_0096) EVT_CASE_LT(STORY_CH5_REACHED_LAVA_LAVA_ISLAND) @@ -1246,7 +1246,7 @@ EvtScript N(EVS_NpcIdle_JrTroopa_01) = { EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) EVT_WAIT(20) EVT_CALL(PlaySoundAtPlayer, SOUND_262, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_Whale, EMOTE_EXCLAMATION, 0, 30, FALSE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, 0, EMOTE_EXCLAMATION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, 0, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_END_THREAD @@ -1842,7 +1842,7 @@ EvtScript N(EVS_NpcInteract_ArtistToad) = { EVT_CALL(InterpNpcYaw, NPC_ArtistToad, 270, 0) EVT_WAIT(60) EVT_EXEC(N(EVS_802442C4)) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimPray) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Pray) EVT_CALL(SetNpcAnimation, NPC_Toad_02, ANIM_Toad_Red_Disappointed) EVT_CALL(SetNpcAnimation, NPC_ArtistToad, ANIM_Musician_Poet_Pensive) EVT_WAIT(30) @@ -1862,7 +1862,7 @@ EvtScript N(EVS_NpcInteract_ArtistToad) = { EVT_WAIT(40) EVT_CALL(SetNpcAnimation, NPC_Toad_02, ANIM_Toad_Red_Idle) EVT_CALL(SetNpcAnimation, NPC_ArtistToad, ANIM_Musician_Poet_Idle) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(30) EVT_EXEC(N(EVS_802442E8)) EVT_THREAD diff --git a/src/world/area_mac/machi/machi_7_partner.c b/src/world/area_mac/machi/machi_7_partner.c index 7de3d99878..01b1310714 100644 --- a/src/world/area_mac/machi/machi_7_partner.c +++ b/src/world/area_mac/machi/machi_7_partner.c @@ -18,7 +18,7 @@ Vec3f N(FlightPath)[] = { }; EvtScript N(EVS_ChasePartner) = { - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Running) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Run) EVT_LABEL(0) EVT_CALL(GetAngleToNPC, NPC_PARTNER, LVar0) EVT_CALL(GetPlayerPos, LVar1, LVar2, LVar3) diff --git a/src/world/area_mgm/mgm_02/mgm_02_2_npc.c b/src/world/area_mgm/mgm_02/mgm_02_2_npc.c index 5aa7069822..da97674c32 100644 --- a/src/world/area_mgm/mgm_02/mgm_02_2_npc.c +++ b/src/world/area_mgm/mgm_02/mgm_02_2_npc.c @@ -481,7 +481,7 @@ API_CALLABLE(N(RunMinigame)) { npc->duration = 8; sfx_play_sound(enemy->varTable[8]); data->box[i].state = BOX_STATE_FUZZY_ATTACH; - gPlayerStatusPtr->anim = ANIM_Mario_CrouchStill; + gPlayerStatusPtr->anim = ANIM_Mario1_TiredStill; npc->currentAnim = ANIM_Fuzzy_Run; get_model_center_and_size(data->box[i].modelID, ¢erX, ¢erY, ¢erZ, &sizeX, &sizeY, &sizeZ); npc->pos.x = centerX; @@ -506,11 +506,11 @@ API_CALLABLE(N(RunMinigame)) { npc->pos.x = update_lerp(EASING_LINEAR, (f32)enemy->varTable[1] / 10.0, (f32)enemy->varTable[4] / 10.0, enemy->varTable[7], 8); npc->pos.y = update_lerp(EASING_LINEAR, (f32)enemy->varTable[2] / 10.0, (f32)enemy->varTable[5] / 10.0, enemy->varTable[7], 8); npc->pos.z = update_lerp(EASING_LINEAR, (f32)enemy->varTable[3] / 10.0, (f32)enemy->varTable[6] / 10.0, enemy->varTable[7], 8); - gPlayerStatusPtr->anim = ANIM_Mario_CrouchStill; + gPlayerStatusPtr->anim = ANIM_Mario1_TiredStill; npc->duration--; if (npc->duration <= 0) { npc->currentAnim = ANIM_Fuzzy_Stunned; - gPlayerStatusPtr->anim = ANIM_Mario_RunPanic; + gPlayerStatusPtr->anim = ANIM_Mario1_PanicRun; data->mashProgress = 0; npc->pos.x = gPlayerStatusPtr->position.x; npc->pos.y = gPlayerStatusPtr->position.y + 28.0; @@ -522,12 +522,12 @@ API_CALLABLE(N(RunMinigame)) { } break; case BOX_STATE_FUZZY_GRAB: - gPlayerStatusPtr->anim = ANIM_Mario_RunPanic; + gPlayerStatusPtr->anim = ANIM_Mario1_PanicRun; if (gGameStatusPtr->pressedButtons[0] & BUTTON_A) { data->mashProgress++; } if (data->mashProgress >= 12) { - gPlayerStatusPtr->anim = ANIM_Mario_10002; + gPlayerStatusPtr->anim = ANIM_Mario1_Idle; data->stunFlags &= ~STUN_FLAG_STUNNED; data->stunFlags |= STUN_FLAG_CHANGED; data->box[i].state = BOX_STATE_FUZZY_DETACH; @@ -616,7 +616,7 @@ API_CALLABLE(N(RunMinigame)) { gPlayerStatusPtr->targetYaw = 265.0f; } // rest of case could simply use fallthough, but wouldnt match - gPlayerStatusPtr->anim = ANIM_Mario_CrouchStill; + gPlayerStatusPtr->anim = ANIM_Mario1_TiredStill; npc->duration--; if (npc->duration <= 0) { fx_explosion(0, npc->pos.x, npc->pos.y, npc->pos.z + 1.0f); @@ -627,7 +627,7 @@ API_CALLABLE(N(RunMinigame)) { } break; case BOX_STATE_BOMB_ATTACK: - gPlayerStatusPtr->anim = ANIM_Mario_CrouchStill; + gPlayerStatusPtr->anim = ANIM_Mario1_TiredStill; npc->duration--; if (npc->duration <= 0) { fx_explosion(0, npc->pos.x, npc->pos.y, npc->pos.z + 1.0f); @@ -640,10 +640,10 @@ API_CALLABLE(N(RunMinigame)) { case BOX_STATE_BOMB_STUN: npc->duration--; if (npc->duration == 25) { - gPlayerStatusPtr->anim = ANIM_Mario_Charred; + gPlayerStatusPtr->anim = ANIM_Mario1_Burnt; } if (npc->duration <= 0) { - gPlayerStatusPtr->anim = ANIM_Mario_10002; + gPlayerStatusPtr->anim = ANIM_Mario1_Idle; data->stunFlags &= ~STUN_FLAG_STUNNED; data->stunFlags |= STUN_FLAG_CHANGED; data->box[i].state = BOX_STATE_BOMB_DONE; @@ -814,10 +814,10 @@ API_CALLABLE(N(RunMinigame)) { gPlayerStatusPtr->targetYaw = 180.0; if (data->timeLeft == 0) { sfx_play_sound(SOUND_MENU_ERROR); - gPlayerStatusPtr->anim = ANIM_Mario_10002; + gPlayerStatusPtr->anim = ANIM_Mario1_Idle; } else { sfx_play_sound(SOUND_D4); - gPlayerStatusPtr->anim = ANIM_Mario_10002; + gPlayerStatusPtr->anim = ANIM_Mario1_Idle; } return ApiStatus_DONE2; diff --git a/src/world/area_mim/mim_10/mim_10_4_npc.c b/src/world/area_mim/mim_10/mim_10_4_npc.c index 693816e596..9451a8fbaa 100644 --- a/src/world/area_mim/mim_10/mim_10_4_npc.c +++ b/src/world/area_mim/mim_10/mim_10_4_npc.c @@ -87,10 +87,10 @@ EvtScript N(EVS_Bootler_SpookPlayer) = { EVT_WAIT(1) EVT_END_LOOP EVT_END_CHILD_THREAD - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_WAIT(5) EVT_CALL(SpeakToPlayer, NPC_Bootler, ANIM_Bootler_Spook, ANIM_Bootler_Spook, 0, MSG_CH3_0002) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_RETURN EVT_END }; @@ -111,11 +111,11 @@ EvtScript N(EVS_Scene_BootlersInvitation) = { EVT_SET(MV_Unk_00, TRUE) EVT_CALL(SetMusicTrack, 0, SONG_BOOS_MANSION, 0, 8) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80022) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_LookAround) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_WAIT(10) EVT_CALL(InterpPlayerYaw, 270, 0) EVT_WAIT(20) diff --git a/src/world/area_mim/mim_12/mim_12_5_gate.c b/src/world/area_mim/mim_12/mim_12_5_gate.c index cf560246cf..ba4d15f7d6 100644 --- a/src/world/area_mim/mim_12/mim_12_5_gate.c +++ b/src/world/area_mim/mim_12/mim_12_5_gate.c @@ -371,11 +371,11 @@ EvtScript N(EVS_Scene_UnlockGate) = { EVT_CALL(EnablePartnerAI) EVT_WAIT(5) EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimMidairStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Jump) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.5)) EVT_CALL(PlayerJump, LVar0, LVar1, LVar2, 14) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10009) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Land) EVT_CALL(DisablePlayerPhysics, FALSE) EVT_WAIT(10) EVT_SET(GB_StoryProgress, STORY_CH3_UNLOCKED_GUSTY_GULCH) diff --git a/src/world/area_nok/nok_01/nok_01_4_npc.c b/src/world/area_nok/nok_01/nok_01_4_npc.c index 6139ce992e..484fe52a14 100644 --- a/src/world/area_nok/nok_01/nok_01_4_npc.c +++ b/src/world/area_nok/nok_01/nok_01_4_npc.c @@ -332,12 +332,12 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { EVT_WAIT(1) EVT_CALL(InterpPlayerYaw, 160, 1) EVT_CALL(HidePlayerShadow, TRUE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still) EVT_CALL(func_802D286C, 0x800) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 5, 7, 1, 1, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 5, 7, 1, 1, 0) EVT_THREAD EVT_WAIT(60) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001D) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SleepStanding) EVT_END_THREAD EVT_WAIT(20) EVT_THREAD @@ -354,7 +354,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { EvtScript N(EVS_ToadHouse_ReturnFromRest) = { EVT_CALL(HidePlayerShadow, FALSE) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 0, 0, 0, 0, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 0, 0, 0, 0, 0) EVT_CALL(SetPlayerPos, -380, 0, 5) EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) EVT_CALL(PlayerMoveTo, -325, 79, 0) diff --git a/src/world/area_nok/nok_01/nok_01_7_radio.c b/src/world/area_nok/nok_01/nok_01_7_radio.c index c01a8f3b76..af4e52ec67 100644 --- a/src/world/area_nok/nok_01/nok_01_7_radio.c +++ b/src/world/area_nok/nok_01/nok_01_7_radio.c @@ -93,11 +93,11 @@ EvtScript N(EVS_InitiateTradingEvent) = { EvtScript N(EVS_Interact_Radio) = { EVT_CALL(DisablePlayerInput, TRUE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(2) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8000E) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_RideLaki) EVT_WAIT(7) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_ADD(AB_NOK_0, 1) EVT_IF_GE(AB_NOK_0, 4) EVT_SET(AB_NOK_0, 0) diff --git a/src/world/area_nok/nok_01/npcs_crisis.inc.c b/src/world/area_nok/nok_01/npcs_crisis.inc.c index 46a194d010..64ed3574eb 100644 --- a/src/world/area_nok/nok_01/npcs_crisis.inc.c +++ b/src/world/area_nok/nok_01/npcs_crisis.inc.c @@ -175,9 +175,9 @@ EvtScript N(EVS_Scene_KooverGetsMugged) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, 1) EVT_END_THREAD EVT_THREAD - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8000A) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Shocked) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_CALL(PlaySoundAtNpc, NPC_FuzzyWithShell, SOUND_331, 0) EVT_CALL(SetNpcSprite, NPC_Koover, ANIM_KoopaWithoutShell_Idle) @@ -238,12 +238,12 @@ EvtScript N(EVS_NpcInteract_Koover_Crisis) = { EVT_END_IF EVT_CALL(SpeakToPlayer, NPC_Koover, ANIM_Koopa_Talk, ANIM_Koopa_Idle, 0, MSG_CH1_0000) EVT_CALL(InterpPlayerYaw, 227, 5) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Thinking) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Thinking) EVT_CALL(EndSpeech, NPC_Koover, ANIM_Koopa_Talk, ANIM_Koopa_Idle, 0) EVT_CALL(InterpPlayerYaw, 47, 5) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(EndSpeech, NPC_Koover, ANIM_Koopa_Talk, ANIM_Koopa_Idle, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) EVT_WAIT(15) EVT_CALL(EndSpeech, NPC_Koover, ANIM_Koopa_Talk, ANIM_Koopa_Idle, 0) EVT_EXEC_WAIT(N(EVS_Scene_KooverGetsMugged)) diff --git a/src/world/area_nok/nok_02/nok_02_6_npc.c b/src/world/area_nok/nok_02/nok_02_6_npc.c index da9b1fb5ef..067a4baedf 100644 --- a/src/world/area_nok/nok_02/nok_02_6_npc.c +++ b/src/world/area_nok/nok_02/nok_02_6_npc.c @@ -116,7 +116,7 @@ EvtScript N(EVS_NpcInteract_Kooper) = { EVT_CALL(SetNpcFlagBits, NPC_Kooper, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_Kooper, ANIM_KooperWithoutShell_Celebrate, ANIM_KooperWithoutShell_Idle, 0, MSG_CH1_00B5) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) EVT_WAIT(15) EVT_CALL(EndSpeech, NPC_Kooper, ANIM_KooperWithoutShell_Talk, ANIM_KooperWithoutShell_Idle, 0) EVT_CALL(SetNpcAnimation, NPC_Kooper, ANIM_KooperWithoutShell_Celebrate) diff --git a/src/world/area_nok/nok_04/nok_04_4_npc.c b/src/world/area_nok/nok_04/nok_04_4_npc.c index 48f6db441a..d1528d5498 100644 --- a/src/world/area_nok/nok_04/nok_04_4_npc.c +++ b/src/world/area_nok/nok_04/nok_04_4_npc.c @@ -356,7 +356,7 @@ EvtScript N(EVS_Scene_ShuffleFuzzyPositions) = { EVT_CALL(SetCamSpeed, CAM_DEFAULT, 3) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_WAIT(60) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_CALL(SetNpcJumpscale, NPC_BossFuzzy, 3) EVT_CALL(SetNpcJumpscale, NPC_KoopersShell, 3) EVT_CALL(SetNpcJumpscale, NPC_Fuzzy_01, 3) @@ -532,7 +532,7 @@ EvtScript N(EVS_Scene_ShuffleFuzzyPositions) = { EVT_CALL(N(AnimateTreeBranch), TREE_3, 0) EVT_CALL(PlaySound, SOUND_SHAKE_TREE) EVT_END_LOOP - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(30) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) @@ -888,7 +888,7 @@ EvtScript N(EVS_Scene_KooperArrives) = { EVT_EXEC_WAIT(N(EVS_ChooseShell)) EVT_CALL(PlayerMoveTo, -207, 268, 7) EVT_CALL(PlayerFaceNpc, NPC_Kooper, FALSE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_60005) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_TakeItem) EVT_CALL(SetNpcJumpscale, NPC_KoopersShell, 1) EVT_THREAD EVT_LOOP(30) @@ -911,7 +911,7 @@ EvtScript N(EVS_Scene_KooperArrives) = { EVT_CALL(PlayerFaceNpc, NPC_Kooper, FALSE) EVT_CALL(NpcFacePlayer, NPC_Kooper, 0) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SetNpcAnimation, NPC_Kooper, ANIM_KooperWithoutShell_Still) EVT_CALL(EnableNpcBlur, NPC_KoopersShell, TRUE) EVT_CALL(GetNpcPos, NPC_Kooper, LVar0, LVar1, LVar2) @@ -938,11 +938,11 @@ EvtScript N(EVS_Scene_KooperArrives) = { EVT_CALL(SpeakToPlayer, NPC_Kooper, ANIM_WorldKooper_Talk, ANIM_WorldKooper_Idle, 0, MSG_CH1_00C9) EVT_WAIT(10) EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0) - EVT_CALL(ShowEmote, NPC_BossFuzzy, EMOTE_QUESTION, -45, 50, FALSE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 50, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Thinking) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Thinking) EVT_WAIT(40) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldGoombario_Talk, ANIM_WorldGoombario_Idle, 0, MSG_CH1_00CA) EVT_CALL(SpeakToPlayer, NPC_Kooper, ANIM_WorldKooper_Talk, ANIM_WorldKooper_Idle, 0, MSG_CH1_00CB) @@ -951,9 +951,9 @@ EvtScript N(EVS_Scene_KooperArrives) = { EVT_CALL(EnablePartnerAI) EVT_CALL(PlayerFaceNpc, NPC_Kooper, FALSE) EVT_LABEL(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Thinking) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Thinking) EVT_CALL(ShowChoice, MSG_Choice_000F) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_IF_EQ(LVar0, 1) EVT_CALL(EndSpeech, NPC_Kooper, ANIM_WorldKooper_Talk, ANIM_WorldKooper_Idle, 0) EVT_CALL(SpeakToPlayer, NPC_Kooper, ANIM_WorldKooper_Talk, ANIM_WorldKooper_Idle, 0, MSG_CH1_00CD) @@ -1021,10 +1021,10 @@ EvtScript N(EVS_Scene_KooperArrives) = { EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_B0000017, 0) EVT_CALL(NpcJump0, NPC_BossFuzzy, LVarA, LVarB, LVarC, 20) EVT_WAIT(2) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80012) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_PanicHoverStill) EVT_CALL(PlaySoundAtNpc, NPC_BossFuzzy, SOUND_B0000017, 0) EVT_CALL(NpcJump0, NPC_BossFuzzy, LVarA, LVarB, LVarC, 15) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_LABEL(21) EVT_IF_EQ(AF_NOK04_BattleDone, FALSE) EVT_WAIT(1) @@ -1304,7 +1304,7 @@ EvtScript N(EVS_HitTree_Correct) = { EVT_ADD(LVar1, 40) EVT_CALL(SetNpcJumpscale, NPC_KoopersShell, EVT_FLOAT(0.6)) EVT_CALL(NpcJump0, NPC_KoopersShell, LVar0, LVar1, LVar2, 10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10024) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_GetItem) EVT_THREAD EVT_WAIT(4) EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) @@ -1318,7 +1318,7 @@ EvtScript N(EVS_HitTree_Correct) = { EVT_CALL(PlaySound, SOUND_D2) EVT_CALL(ShowMessageAtScreenPos, MSG_Menus_GotKooperShell, 160, 40) EVT_CALL(SetNpcPos, NPC_KoopersShell, NPC_DISPOSE_LOCATION) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(AddKeyItem, ITEM_KOOPER_SHELL) EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_BossFuzzy, ANIM_Fuzzy_Anim0C, ANIM_Fuzzy_Idle, 5, MSG_CH1_00C2) diff --git a/src/world/area_obk/obk_01/obk_01_3_chandelier.c b/src/world/area_obk/obk_01/obk_01_3_chandelier.c index c2d0841435..31b2a5c2e4 100644 --- a/src/world/area_obk/obk_01/obk_01_3_chandelier.c +++ b/src/world/area_obk/obk_01/obk_01_3_chandelier.c @@ -447,7 +447,7 @@ EvtScript N(EVS_LaunchFromCouch_GrabChandelier) = { EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) EVT_CALL(SetPlayerPos, 445, -135, 279) EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8000D) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_HoldOnto) EVT_WAIT(1) EVT_SET(AF_OBK01_CabinetMoved, TRUE) EVT_THREAD @@ -570,11 +570,11 @@ EvtScript N(EVS_LaunchFromCouch_Crash) = { EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, NPC_PARTNER, LVar0, LVar1, LVar2) EVT_CALL(PlaySoundAtPlayer, SOUND_162, SOUND_SPACE_MODE_0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80003) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Collapse) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_GetUp) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_GetUp) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_DustOff) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_DustOff) EVT_WAIT(7) EVT_CALL(PlaySoundAtPlayer, SOUND_DUST_OFF, SOUND_SPACE_MODE_0) EVT_WAIT(8) diff --git a/src/world/area_obk/obk_01/obk_01_4_portrait.c b/src/world/area_obk/obk_01/obk_01_4_portrait.c index 21d8c76e6d..4b32fb8020 100644 --- a/src/world/area_obk/obk_01/obk_01_4_portrait.c +++ b/src/world/area_obk/obk_01/obk_01_4_portrait.c @@ -51,7 +51,7 @@ EvtScript N(EVS_Interact_LowerPortrait) = { EVT_CASE_GE(1) EVT_CALL(RemoveKeyItemAt, LVar1) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_6000C) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_Lift) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 40) EVT_CALL(MakeItemEntity, ITEM_BOO_PORTRAIT, LVar0, LVar1, LVar2, ITEM_SPAWN_MODE_DECORATION, 0) @@ -72,7 +72,7 @@ EvtScript N(EVS_Interact_LowerPortrait) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(MakeLerp, 255, 0, 30, EASING_LINEAR) EVT_LOOP(0) EVT_CALL(UpdateLerp) @@ -98,9 +98,9 @@ EvtScript N(EVS_Interact_LowerPortrait) = { EVT_CASE_DEFAULT EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetPlayerAnimation, SPRITE_ID_BACK_FACING | ANIM_Mario_BeforeJump) + EVT_CALL(SetPlayerAnimation, SPRITE_ID_BACK_FACING | ANIM_Mario1_BeforeJump) EVT_WAIT(3) - EVT_CALL(SetPlayerAnimation, SPRITE_ID_BACK_FACING | ANIM_Mario_AnimMidairStill) + EVT_CALL(SetPlayerAnimation, SPRITE_ID_BACK_FACING | ANIM_Mario1_Jump) EVT_WAIT(1) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) EVT_CALL(PlayerJump, 812, -170, -2, 20) @@ -112,7 +112,7 @@ EvtScript N(EVS_Interact_LowerPortrait) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimMidairStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Jump) EVT_WAIT(1) EVT_CALL(PlaySoundAtPlayer, SOUND_DA, SOUND_SPACE_MODE_0) EVT_CALL(SetPlayerPos, 812, 61, -2) @@ -141,9 +141,9 @@ EvtScript N(EVS_Interact_UpperPortrait) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(DisablePartnerAI, 0) - EVT_CALL(SetPlayerAnimation, SPRITE_ID_BACK_FACING | ANIM_Mario_BeforeJump) + EVT_CALL(SetPlayerAnimation, SPRITE_ID_BACK_FACING | ANIM_Mario1_BeforeJump) EVT_WAIT(3) - EVT_CALL(SetPlayerAnimation, SPRITE_ID_BACK_FACING | ANIM_Mario_AnimMidairStill) + EVT_CALL(SetPlayerAnimation, SPRITE_ID_BACK_FACING | ANIM_Mario1_Jump) EVT_WAIT(1) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) EVT_CALL(PlayerJump, 812, 40, -2, 20) @@ -155,7 +155,7 @@ EvtScript N(EVS_Interact_UpperPortrait) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimMidairStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Jump) EVT_WAIT(1) EVT_CALL(PlaySoundAtPlayer, SOUND_DA, SOUND_SPACE_MODE_0) EVT_CALL(SetPlayerPos, 812, -146, -2) diff --git a/src/world/area_obk/obk_02/obk_02_6_entity.c b/src/world/area_obk/obk_02/obk_02_6_entity.c index ef8b44ce64..237d2490a3 100644 --- a/src/world/area_obk/obk_02/obk_02_6_entity.c +++ b/src/world/area_obk/obk_02/obk_02_6_entity.c @@ -29,11 +29,11 @@ EvtScript N(EVS_ChestTrap) = { EVT_END_LOOP EVT_END_THREAD EVT_WAIT(2) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001F) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_FlailArms) EVT_WAIT(48) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_SET(GF_OBK02_TriggeredChestTrap, TRUE) EVT_WAIT(5) EVT_RETURN diff --git a/src/world/area_obk/obk_03/obk_03_4_entity.c b/src/world/area_obk/obk_03/obk_03_4_entity.c index 4bd28d3772..21b222c734 100644 --- a/src/world/area_obk/obk_03/obk_03_4_entity.c +++ b/src/world/area_obk/obk_03/obk_03_4_entity.c @@ -72,14 +72,14 @@ EvtScript N(EVS_SecondSwitch_JumpToSafety) = { EVT_IF_GE(LVar2, -85) EVT_RETURN EVT_END_IF - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001F) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_FlailArms) EVT_WAIT(8) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_WAIT(2) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(2.0)) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_CALL(PlayerJump1, 330, -210, -49, 10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(5) EVT_RETURN EVT_END @@ -100,14 +100,14 @@ EvtScript N(EVS_ThirdSwitch_JumpToSafety) = { EVT_IF_GE(LVar2, -62) EVT_RETURN EVT_END_IF - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001F) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_FlailArms) EVT_WAIT(8) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_WAIT(2) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(2.0)) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_CALL(PlayerJump1, 352, -210, -5, 10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(5) EVT_RETURN EVT_END diff --git a/src/world/area_obk/obk_04/obk_04_6_game.c b/src/world/area_obk/obk_04/obk_04_6_game.c index f2e49f9dbe..d6698efd52 100644 --- a/src/world/area_obk/obk_04/obk_04_6_game.c +++ b/src/world/area_obk/obk_04/obk_04_6_game.c @@ -235,7 +235,7 @@ EvtScript N(EVS_ShowGotSuperBootsFX) = { EVT_THREAD EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(8.0), 0, EVT_FLOAT(300.0), EVT_FLOAT(17.5), EVT_FLOAT(-9.5)) EVT_END_THREAD - EVT_CALL(SetPlayerAnimation, ANIM_Mario_6000C) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_Lift) EVT_CALL(GetPlayerPos, LVar5, LVar6, LVar7) EVT_ADD(LVar6, 40) EVT_CALL(MakeItemEntity, ITEM_SUPER_BOOTS, LVar5, LVar6, LVar7, ITEM_SPAWN_MODE_DECORATION, 0) @@ -261,7 +261,7 @@ EvtScript N(EVS_ShowGotSuperBootsFX) = { EVT_END_LOOP EVT_CALL(func_802D7B44, LVar8) EVT_CALL(RemoveItemEntity, LVarC) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_THREAD EVT_CALL(ResetCam, CAM_DEFAULT, 3) EVT_END_THREAD @@ -277,9 +277,9 @@ EvtScript N(EVS_Scene_BoosUnleashed) = { EVT_EXEC(N(EVS_IntroduceAndHideBoots)) EVT_SET(MV_KeepAwayStarted, TRUE) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(InterpPlayerYaw, 270, 0) EVT_CALL(SetCamProperties, CAM_DEFAULT, EVT_FLOAT(2.0), 0, 0, 0, EVT_FLOAT(400.0), EVT_FLOAT(15.0), EVT_FLOAT(-7.0)) EVT_WAIT(60) @@ -438,7 +438,7 @@ EvtScript N(EVS_Scene_BoosUnleashed) = { EVT_CALL(GetNpcPos, MV_ItemCarrierNpc, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_CALL(SetNpcPos, NPC_DummyBoo, LVar0, LVar1, LVar2) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(1) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 30) diff --git a/src/world/area_obk/obk_07/obk_07_4_fireplace.c b/src/world/area_obk/obk_07/obk_07_4_fireplace.c index a9a67e87d3..e5153fe089 100644 --- a/src/world/area_obk/obk_07/obk_07_4_fireplace.c +++ b/src/world/area_obk/obk_07/obk_07_4_fireplace.c @@ -103,11 +103,11 @@ EvtScript N(EVS_Inspect_Fireplace) = { EVT_SET(LVar0, EVT_PTR(N(ExplosionPositions3))) EVT_EXEC(N(EVS_PlayExplosionFX)) EVT_WAIT(5) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Charred) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Burnt) EVT_WAIT(60) EVT_EXEC_WAIT(N(EVS_PlaySmokeFX)) EVT_WAIT(40) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(4.0)) EVT_SET(MV_InspectingFireplace, FALSE) EVT_CALL(DisablePlayerInput, FALSE) diff --git a/src/world/area_obk/obk_07/obk_07_6_phonograph.c b/src/world/area_obk/obk_07/obk_07_6_phonograph.c index e55a4dbe2e..19ea6defaa 100644 --- a/src/world/area_obk/obk_07/obk_07_6_phonograph.c +++ b/src/world/area_obk/obk_07/obk_07_6_phonograph.c @@ -886,9 +886,9 @@ EvtScript N(EVS_Inspect_Phonograph) = { EVT_CALL(RemoveKeyItemAt, LVar1) EVT_SET(GB_StoryProgress, STORY_CH3_PLAYED_THE_RECORD) EVT_CALL(EnableModel, MODEL_reco, TRUE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_60007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_PlaceRecord) EVT_WAIT(15) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(15) EVT_CALL(CloseChoicePopup) // try playing diff --git a/src/world/area_obk/obk_08/obk_08_3_cabinets.c b/src/world/area_obk/obk_08/obk_08_3_cabinets.c index 75d8f61144..6320346944 100644 --- a/src/world/area_obk/obk_08/obk_08_3_cabinets.c +++ b/src/world/area_obk/obk_08/obk_08_3_cabinets.c @@ -69,7 +69,7 @@ EvtScript N(EVS_CrushPlayer) = { EVT_END_THREAD EVT_CALL(DisablePlayerPhysics, TRUE) EVT_WAIT(8) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_WAIT(13) EVT_CALL(GetPlayerPos, MV_KnockdownPosX, MV_KnockdownPosY, MV_KnockdownPosZ) EVT_CALL(N(KnockDownPlayerB), 1, 37) @@ -92,7 +92,7 @@ EvtScript N(EVS_CrushPlayer) = { }; EvtScript N(EVS_RestorePlayer) = { - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(InterpPlayerYaw, 270, 0) EVT_WAIT(15) EVT_SUB(MV_KnockdownPosY, 3) @@ -108,9 +108,9 @@ EvtScript N(EVS_RestorePlayer) = { EVT_CALL(N(KnockDownPlayerC)) EVT_CALL(SetPlayerPos, MV_KnockdownPosX, MV_KnockdownPosY, MV_KnockdownPosZ) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_90001) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW3_ShakeHeadHard) EVT_WAIT(25) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(EnablePartnerAI) EVT_CALL(DisablePlayerPhysics, FALSE) EVT_RETURN diff --git a/src/world/area_obk/obk_09/obk_09_3_meet_bow.c b/src/world/area_obk/obk_09/obk_09_3_meet_bow.c index 26357ad88f..b93d0cb53e 100644 --- a/src/world/area_obk/obk_09/obk_09_3_meet_bow.c +++ b/src/world/area_obk/obk_09/obk_09_3_meet_bow.c @@ -15,7 +15,7 @@ EvtScript N(EVS_Scene_MeetBow) = { EVT_CALL(SetPlayerPos, -180, 0, 344) EVT_CALL(SetNpcPos, NPC_PARTNER, -180, 20, 344) EVT_CALL(PlayerMoveTo, 0, 190, 60) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001E) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_JoltAwake) EVT_END_THREAD EVT_WAIT(10) EVT_CALL(SetCamType, CAM_DEFAULT, 4, TRUE) @@ -30,7 +30,7 @@ EvtScript N(EVS_Scene_MeetBow) = { EVT_CALL(ShowMessageAtScreenPos, MSG_CH3_0042, 160, 40) EVT_KILL_THREAD(LVarA) EVT_CALL(InterpPlayerYaw, 40, 0) - EVT_CALL(SetPlayerAnimation, SPRITE_ID_BACK_FACING | ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, SPRITE_ID_BACK_FACING | ANIM_Mario1_Idle) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(2.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(4.0), EVT_FLOAT(-9.0)) EVT_CALL(SetCamDistance, CAM_DEFAULT, 400) diff --git a/src/world/area_obk/obk_09/obk_09_4_npc.c b/src/world/area_obk/obk_09/obk_09_4_npc.c index 78ff8e7a15..e7a950cc0a 100644 --- a/src/world/area_obk/obk_09/obk_09_4_npc.c +++ b/src/world/area_obk/obk_09/obk_09_4_npc.c @@ -74,7 +74,7 @@ EvtScript N(EVS_NpcInteract_Bootler) = { EVT_CASE_GE(STORY_CH5_STAR_SPRIT_DEPARTED) EVT_CALL(SpeakToPlayer, NPC_Bootler, ANIM_Bootler_Dejected, ANIM_Bootler_Quaver, 0, MSG_CH3_005A) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) EVT_WAIT(20) EVT_CALL(SpeakToPlayer, NPC_Bootler, ANIM_Bootler_Flail, ANIM_Bootler_Flail, 0, MSG_CH3_005B) EVT_END_SWITCH diff --git a/src/world/area_omo/common/ToyTrain.inc.c b/src/world/area_omo/common/ToyTrain.inc.c index 339e2f9364..fdaf8a04cb 100644 --- a/src/world/area_omo/common/ToyTrain.inc.c +++ b/src/world/area_omo/common/ToyTrain.inc.c @@ -333,13 +333,13 @@ EvtScript N(EVS_TrainUnk_D) = { EVT_USE_BUF(LVar0) EVT_BUF_READ3(LVar1, LVar2, LVar3) EVT_CALL(AddVectorPolar, LVar1, LVar2, EVT_FLOAT(15.0), LVar3) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Walking) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Walk) EVT_CALL(SetPlayerSpeed, EVT_FLOAT(4.0)) EVT_CALL(PlayerMoveTo, LVar1, LVar2, 0) EVT_CALL(SetPlayerSpeed, EVT_FLOAT(0.7)) EVT_CALL(PlayerMoveTo, LVar1, LVar2, 0) EVT_CALL(SetPlayerPos, LVar1, 50, LVar2) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(InterpPlayerYaw, LVar3, 0) EVT_END_THREAD EVT_WAIT(5) @@ -401,13 +401,13 @@ EvtScript N(EVS_TrainUnk_AltD) = { EVT_USE_BUF(LVar0) EVT_BUF_READ3(LVar1, LVar2, LVar3) EVT_CALL(AddVectorPolar, LVar1, LVar2, EVT_FLOAT(15.0), LVar3) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Walking) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Walk) EVT_CALL(SetPlayerSpeed, EVT_FLOAT(4.0)) EVT_CALL(PlayerMoveTo, LVar1, LVar2, 0) EVT_CALL(SetPlayerSpeed, EVT_FLOAT(0.7)) EVT_CALL(PlayerMoveTo, LVar1, LVar2, 0) EVT_CALL(SetPlayerPos, LVar1, 50, LVar2) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(InterpPlayerYaw, LVar3, 0) EVT_END_THREAD EVT_WAIT(5) @@ -478,10 +478,10 @@ EvtScript N(EVS_TrainUnk_E) = { EVT_THREAD EVT_ADDF(LVar2, EVT_FLOAT(60.0)) EVT_CALL(AddVectorPolar, LVar0, LVar1, EVT_FLOAT(20.0), LVar2) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Walking) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Walk) EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) EVT_CALL(PlayerMoveTo, LVar0, LVar1, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_WAIT(10) EVT_SUB(LVar1, 30) @@ -518,10 +518,10 @@ EvtScript N(EVS_TrainUnk_AltE) = { EVT_THREAD EVT_ADDF(LVar2, EVT_FLOAT(85.0)) EVT_CALL(AddVectorPolar, LVar0, LVar1, EVT_FLOAT(80.0), LVar2) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Walking) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Walk) EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) EVT_CALL(PlayerMoveTo, LVar0, LVar1, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_WAIT(10) EVT_ADDF(LVar2, EVT_FLOAT(50.0)) diff --git a/src/world/area_omo/omo_05/omo_05_4_npc.c b/src/world/area_omo/omo_05/omo_05_4_npc.c index 98281507a7..463253555c 100644 --- a/src/world/area_omo/omo_05/omo_05_4_npc.c +++ b/src/world/area_omo/omo_05/omo_05_4_npc.c @@ -352,11 +352,11 @@ EvtScript N(EVS_NpcInteract_GourmetGuy) = { EVT_WAIT(30) EVT_CALL(EnablePartnerAI) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Thinking) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Thinking) EVT_WAIT(1) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(90.0)) EVT_WAIT(60) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt1, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(ModifyColliderFlags, MODIFY_COLLIDER_FLAGS_SET_BITS, COLLIDER_tt2, COLLIDER_FLAGS_UPPER_MASK) EVT_SET(GB_StoryProgress, STORY_CH4_GAVE_CAKE_TO_GOURMET_GUY) diff --git a/src/world/area_omo/omo_12/omo_12_3_npc.c b/src/world/area_omo/omo_12/omo_12_3_npc.c index a8a51c3782..c972cfaff5 100644 --- a/src/world/area_omo/omo_12/omo_12_3_npc.c +++ b/src/world/area_omo/omo_12/omo_12_3_npc.c @@ -145,7 +145,7 @@ EvtScript N(EVS_EnterScene) = { EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_BigLanternGhost, ANIM_BigLanternGhost_Anim0F) EVT_WAIT(5) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8000A) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Shocked) EVT_WAIT(15) EVT_THREAD EVT_WAIT(20) @@ -293,14 +293,14 @@ EvtScript N(EVS_Scene_ReleaseWatt) = { EVT_CALL(SpeakToPlayer, NPC_Watt, ANIM_WorldWatt_Strain, ANIM_WorldWatt_Hurt, 0, MSG_CH4_0058) EVT_THREAD EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimPray) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Pray) EVT_WAIT(15) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_CALL(EndSpeech, NPC_Watt, ANIM_WorldWatt_Strain, ANIM_WorldWatt_Hurt, 0) EVT_ELSE EVT_CALL(SpeakToPlayer, NPC_Watt, ANIM_WorldWatt_Celebrate, ANIM_WorldWatt_Idle, 0, MSG_CH4_0057) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) EVT_END_IF EVT_CALL(func_802D2C14, 0) EVT_WAIT(20) @@ -309,9 +309,9 @@ EvtScript N(EVS_Scene_ReleaseWatt) = { EVT_CALL(ShowEmote, NPC_Watt, EMOTE_EXCLAMATION, 0, 30, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(40) EVT_CALL(SpeakToPlayer, NPC_Watt, ANIM_WorldWatt_Talk, ANIM_WorldWatt_Idle, 0, MSG_CH4_0059) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80011) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_TouchNose) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) EVT_WAIT(20) EVT_CALL(EndSpeech, NPC_Watt, ANIM_WorldWatt_Talk, ANIM_WorldWatt_Idle, 0) EVT_WAIT(20) @@ -360,9 +360,9 @@ EvtScript N(EVS_Scene_ReleaseWatt) = { EVT_CALL(NpcFacePlayer, NPC_Watt, 3) EVT_WAIT(20) EVT_CALL(SpeakToPlayer, NPC_Watt, ANIM_WorldWatt_Talk, ANIM_WorldWatt_Idle, 0, MSG_CH4_005A) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(5) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) EVT_WAIT(20) EVT_CALL(EndSpeech, NPC_Watt, ANIM_WorldWatt_Talk, ANIM_WorldWatt_Idle, 0) EVT_SET(AB_OMO12_LightSource, LIGHT_FROM_NO_CHANGE) diff --git a/src/world/area_omo/omo_13/omo_13_4_npc.c b/src/world/area_omo/omo_13/omo_13_4_npc.c index 6dc7231cef..857e757750 100644 --- a/src/world/area_omo/omo_13/omo_13_4_npc.c +++ b/src/world/area_omo/omo_13/omo_13_4_npc.c @@ -29,9 +29,9 @@ EvtScript N(EVS_NpcInteract_AntiGuy) = { EVT_IF_EQ(LVar0, -1) EVT_THREAD EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80011) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_TouchNose) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ShyGuy_Black_Anim11, ANIM_ShyGuy_Black_Anim01, 0, MSG_CH4_0046) EVT_CALL(EndSpeech, NPC_SELF, ANIM_ShyGuy_Black_Anim13, ANIM_ShyGuy_Black_Anim01, 0) @@ -56,9 +56,9 @@ EvtScript N(EVS_NpcInteract_AntiGuy) = { EVT_WAIT(30) EVT_CALL(EndSpeech, NPC_SELF, ANIM_ShyGuy_Black_Anim11, ANIM_ShyGuy_Black_Anim01, 0) EVT_WAIT(15) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001E) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_JoltAwake) EVT_WAIT(15) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) EVT_WAIT(15) EVT_CALL(EndSpeech, NPC_SELF, ANIM_ShyGuy_Black_Anim11, ANIM_ShyGuy_Black_Anim01, 0) EVT_SET(LVar0, EVT_PTR(N(BribeItemList))) diff --git a/src/world/area_omo/omo_14/omo_14_3_npc.c b/src/world/area_omo/omo_14/omo_14_3_npc.c index f898f1ab58..a2d9fc6849 100644 --- a/src/world/area_omo/omo_14/omo_14_3_npc.c +++ b/src/world/area_omo/omo_14/omo_14_3_npc.c @@ -119,11 +119,11 @@ EvtScript N(EVS_NpcIdle_ShyGuy_Loner) = { EVT_CALL(ShakeCam, CAM_DEFAULT, 1, 4, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_WAIT(3) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_RunPanic) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_PanicRun) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) EVT_CALL(PlaySound, SOUND_3EE) EVT_CALL(PlayerJump1, LVar0, LVar1, LVar2, 15) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_ELSE EVT_CALL(GetNpcPos, NPC_SELF, LVar3, LVar4, LVar5) EVT_CALL(NpcJump0, NPC_SELF, LVar3, LVar4, LVar5, 10) diff --git a/src/world/area_omo/omo_15/omo_15_2_main.c b/src/world/area_omo/omo_15/omo_15_2_main.c index a1971828ea..4ccfc04cf1 100644 --- a/src/world/area_omo/omo_15/omo_15_2_main.c +++ b/src/world/area_omo/omo_15/omo_15_2_main.c @@ -35,7 +35,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(45) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_END_THREAD EVT_THREAD EVT_WAIT(180) @@ -45,7 +45,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_CALL(N(StarSpiritEffectFunc4), 1) EVT_THREAD EVT_WAIT(80) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_ADD(LVar1, 100) EVT_CALL(SetCamDistance, CAM_DEFAULT, LVar1) diff --git a/src/world/area_osr/osr_02/osr_02_3_npc.c b/src/world/area_osr/osr_02/osr_02_3_npc.c index 0c8872d047..cdb6329c5c 100644 --- a/src/world/area_osr/osr_02/osr_02_3_npc.c +++ b/src/world/area_osr/osr_02/osr_02_3_npc.c @@ -141,7 +141,7 @@ EvtScript N(EVS_Scene_ReturnStarRod) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_60005) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_TakeItem) EVT_CALL(SetNpcPos, NPC_StarRod, 30, 25, 30) EVT_WAIT(20) EVT_CALL(SetNpcAnimation, NPC_Eldstar, ANIM_WorldEldstar_Leap) @@ -150,7 +150,7 @@ EvtScript N(EVS_Scene_ReturnStarRod) = { EVT_SET(LVar2, 35) EVT_CALL(SetNpcJumpscale, NPC_StarRod, EVT_FLOAT(0.5)) EVT_CALL(NpcJump1, NPC_StarRod, LVar0, LVar1, LVar2, 20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(PlaySound, SOUND_139) EVT_LOOP(6) EVT_PLAY_EFFECT(EFFECT_RADIAL_SHIMMER, 9, LVar0, LVar1, LVar2, 1, 20) @@ -264,7 +264,7 @@ EvtScript N(EVS_Scene_ReturnStarRod) = { EVT_CALL(SpeakToPlayer, NPC_Eldstar, ANIM_WorldEldstar_Wave, ANIM_WorldEldstar_Idle, 0, MSG_Outro_0009) EVT_WAIT(20) EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(90.0), 70, 400, EVT_FLOAT(17.0), EVT_FLOAT(-11.0)) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_THREAD EVT_SET(LVar4, NPC_Eldstar) EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_2045, SOUND_SPACE_MODE_0) @@ -304,7 +304,7 @@ EvtScript N(EVS_Scene_ReturnStarRod) = { EVT_SET(LVar4, NPC_Klevar) EVT_CALL(PlaySoundAtNpc, LVar4, SOUND_2045, SOUND_SPACE_MODE_0) EVT_EXEC_WAIT(N(EVS_StarSpirit_FlyAway)) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(20) EVT_CALL(SetMusicTrack, 0, SONG_TWINK_THEME, 1, 8) EVT_CALL(LoadPath, 30, EVT_PTR(N(FlightPath_TwinkStepForward)), ARRAY_COUNT(N(FlightPath_TwinkStepForward)), EASING_LINEAR) @@ -343,16 +343,16 @@ EvtScript N(EVS_Scene_ReturnStarRod) = { EVT_CALL(EndSpeech, NPC_Twink, ANIM_Twink_Talk, ANIM_Twink_Idle, 0) EVT_WAIT(20) EVT_EXEC(N(EVS_Twink_FlyAway)) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_WAIT(250) EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0002) EVT_CALL(NpcMoveTo, NPC_Peach, -10, 30, 40) EVT_CALL(SetNpcAnimation, NPC_Peach, ANIM_Peach_A0001) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(InterpPlayerYaw, 270, 0) EVT_WAIT(60) EVT_CALL(InterpPlayerYaw, 90, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_WAIT(20) EVT_CALL(GotoMap, EVT_PTR("hos_10"), hos_10_ENTRY_2) EVT_WAIT(100) diff --git a/src/world/area_osr/osr_03/osr_03_3_intro.c b/src/world/area_osr/osr_03/osr_03_3_intro.c index bd0e204acb..54916d2959 100644 --- a/src/world/area_osr/osr_03/osr_03_3_intro.c +++ b/src/world/area_osr/osr_03/osr_03_3_intro.c @@ -240,7 +240,7 @@ EvtScript N(MV_Scene_PlayerTossedOut) = { EVT_CALL(FadeOutMusic, 0, 500) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_GotItem) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_UsePower) EVT_CALL(EnableGroup, MODEL_hiru, FALSE) EVT_CALL(EnableGroup, MODEL_niwa, FALSE) EVT_CALL(EnableGroup, MODEL_jimidori, FALSE) @@ -288,7 +288,7 @@ EvtScript N(EVS_Scene_UnusedTossOut) = { EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, TRUE) EVT_CALL(InterpPlayerYaw, 90, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_FallBack) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Hurt) EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_FLIPPING, FALSE) EVT_CALL(EnableGroup, MODEL_hiru, FALSE) EVT_CALL(EnableGroup, MODEL_niwa, FALSE) diff --git a/src/world/area_pra/common/Reflection.inc.c b/src/world/area_pra/common/Reflection.inc.c index d380b7e2ee..cb1c295787 100644 --- a/src/world/area_pra/common/Reflection.inc.c +++ b/src/world/area_pra/common/Reflection.inc.c @@ -28,7 +28,7 @@ s32 N(reflection_unk_resolve_anim)(s32 playerAnim) { //TODO write with sensibile logic based on spriteIDs playerAnim &= ~SPRITE_ID_BACK_FACING; - temp = playerAnim + ~ANIM_Mario_6000B; + temp = playerAnim + ~ANIM_MarioW1_LandWatt; if (temp < 16 && temp & 1) { playerAnim--; } @@ -41,13 +41,13 @@ s32 N(reflection_unk_change_anim_facing)(s32 playerAnim) { u32 temp; switch (sprIndex) { - case SPR_Mario_1: - if (playerAnim > ANIM_Mario_1000C) { + case SPR_Mario1: + if (playerAnim > ANIM_Mario1_SpinFall) { return playerAnim; } break; - case SPR_Mario_6: - temp = playerAnim + ~ANIM_Mario_6000B; + case SPR_MarioW1: + temp = playerAnim + ~ANIM_MarioW1_LandWatt; if (temp < 16) { if (temp & 1) { return playerAnim; @@ -56,8 +56,8 @@ s32 N(reflection_unk_change_anim_facing)(s32 playerAnim) { } } break; - case SPR_Mario_8: - case SPR_Mario_9: + case SPR_MarioW2: + case SPR_MarioW3: return playerAnim; } diff --git a/src/world/area_pra/pra_01/pra_01_3_npc.c b/src/world/area_pra/pra_01/pra_01_3_npc.c index b541945eb5..90cad89eab 100644 --- a/src/world/area_pra/pra_01/pra_01_3_npc.c +++ b/src/world/area_pra/pra_01/pra_01_3_npc.c @@ -74,7 +74,7 @@ EvtScript N(EVS_Scene_RescuedKalmar) = { EVT_CALL(EnableNpcAI, NPC_Kalmar, FALSE) EVT_CALL(SetNpcAnimation, NPC_Kalmar, ANIM_WorldKalmar_Leap) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_GotItem) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_UsePower) EVT_CALL(PlaySoundAtPlayer, SOUND_139, SOUND_SPACE_MODE_0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SET(LVar3, LVar1) @@ -93,7 +93,7 @@ EvtScript N(EVS_Scene_RescuedKalmar) = { EVT_ADD(LVar1, 20) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 30) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SetNpcAnimation, NPC_Kalmar, ANIM_WorldKalmar_Idle) EVT_CALL(EnableNpcAI, NPC_Kalmar, TRUE) EVT_CALL(N(UpgradeStarPowerCh7)) @@ -157,11 +157,11 @@ EvtScript N(EVS_Scene_RescuedKalmar) = { EVT_CALL(PlaySoundAtNpc, NPC_Kalmar, SOUND_2045, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_WAIT(90) EVT_CALL(ResetCam, CAM_DEFAULT, 3) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_SET(GB_StoryProgress, STORY_CH7_STAR_SPRIT_DEPARTED) EVT_EXEC(N(EVS_SetupMusic)) EVT_CALL(EnablePartnerAI) diff --git a/src/world/area_pra/pra_09/pra_09_3_npc.c b/src/world/area_pra/pra_09/pra_09_3_npc.c index 24711df220..358a3a1fd6 100644 --- a/src/world/area_pra/pra_09/pra_09_3_npc.c +++ b/src/world/area_pra/pra_09/pra_09_3_npc.c @@ -297,7 +297,7 @@ EvtScript N(EVS_PreventPlayerLeaving) = { EVT_SET(LVar3, 0) EVT_EXEC_WAIT(N(EVS_Imposter_ChaseDownPlayer)) EVT_CALL(InterpPlayerYaw, 90, 3) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80009) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_LayingDown) EVT_CALL(GetNpcPos, NPC_Bombette_01, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 20) EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) @@ -576,7 +576,7 @@ EvtScript N(EVS_ManageImpostersScene) = { EVT_EXEC_WAIT(N(EVS_FocusCam_OnPosition)) EVT_CALL(SpeakToPlayer, NPC_Bombette_01, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Hurt, 0, MSG_CH7_0149) EVT_EXEC_WAIT(N(EVS_FocusCam_StartBattle)) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_EXEC_WAIT(N(EVS_RevealEveryImposter)) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) diff --git a/src/world/area_pra/pra_13/pra_13_3_npc.c b/src/world/area_pra/pra_13/pra_13_3_npc.c index 37627ac543..04d5aa229b 100644 --- a/src/world/area_pra/pra_13/pra_13_3_npc.c +++ b/src/world/area_pra/pra_13/pra_13_3_npc.c @@ -90,7 +90,7 @@ EvtScript N(EVS_Scene_ImpostersCaught) = { EVT_WAIT(15) EVT_CALL(GetNpcPos, NPC_FakeMario, LVar0, LVar1, LVar2) EVT_CALL(SetCamProperties, CAM_DEFAULT, EVT_FLOAT(5.0), LVar0, LVar1, LVar2, EVT_FLOAT(350.0), EVT_FLOAT(12.0), EVT_FLOAT(-7.0)) - EVT_CALL(SpeakToPlayer, NPC_FakeMario, ANIM_Mario_1002B, ANIM_Mario_1002B, 0, MSG_CH7_0139) + EVT_CALL(SpeakToPlayer, NPC_FakeMario, ANIM_Mario1_Flail, ANIM_Mario1_Flail, 0, MSG_CH7_0139) EVT_CALL(SpeakToPlayer, NPC_FakeBombette, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH7_013A) EVT_CALL(ResetCam, CAM_DEFAULT, EVT_FLOAT(6.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) @@ -165,7 +165,7 @@ EvtScript N(EVS_Scene_DefeatImposters) = { EvtScript N(EVS_NpcInit_FakeMario) = { EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_10000000, TRUE) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mario_10002) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mario1_Idle) EVT_CALL(GetEntryID, LVar0) EVT_IF_EQ(LVar0, pra_13_ENTRY_2) EVT_IF_LT(GB_StoryProgress, STORY_CH7_DEFEATED_MIRROR_DUPLIGHOSTS) diff --git a/src/world/area_pra/pra_19/pra_19_3_npc.c b/src/world/area_pra/pra_19/pra_19_3_npc.c index 1a7bb35863..49617a592f 100644 --- a/src/world/area_pra/pra_19/pra_19_3_npc.c +++ b/src/world/area_pra/pra_19/pra_19_3_npc.c @@ -408,7 +408,7 @@ EvtScript N(EVS_PreventPlayerLeaving) = { EVT_SET(LVar4, ANIM_WorldKooper_Run) EVT_EXEC_WAIT(N(EVS_Imposter_ChaseDownPlayer)) EVT_CALL(InterpPlayerYaw, 90, 3) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80009) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_LayingDown) EVT_CALL(GetNpcPos, NPC_FakeKooper, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 30) EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) @@ -513,9 +513,9 @@ EvtScript N(EVS_Example_UseKooper) = { EVT_CALL(SetNpcAnimation, NPC_ExampleKooper, ANIM_WorldKooper_SpinShell) EVT_END_THREAD EVT_THREAD - EVT_CALL(SetNpcAnimation, NPC_ExamplePlayer, ANIM_Mario_AnimMidairStill) + EVT_CALL(SetNpcAnimation, NPC_ExamplePlayer, ANIM_Mario1_Jump) EVT_WAIT(10) - EVT_CALL(SetNpcAnimation, NPC_ExamplePlayer, ANIM_Mario_10009) + EVT_CALL(SetNpcAnimation, NPC_ExamplePlayer, ANIM_Mario1_Land) EVT_END_THREAD EVT_CALL(SetNpcJumpscale, NPC_ExamplePlayer, EVT_FLOAT(2.0)) EVT_CALL(GetNpcPos, NPC_ExamplePlayer, LVar0, LVar1, LVar2) @@ -529,9 +529,9 @@ EvtScript N(EVS_Example_UseKooper) = { EVT_CALL(N(UpdateExampleKooperMotion), NPC_ExampleKooper, LVar0, 1) EVT_CALL(SetNpcAnimation, NPC_ExampleKooper, ANIM_WorldKooper_StillShell) EVT_THREAD - EVT_CALL(SetNpcAnimation, NPC_ExamplePlayer, ANIM_Mario_AnimMidairStill) + EVT_CALL(SetNpcAnimation, NPC_ExamplePlayer, ANIM_Mario1_Jump) EVT_WAIT(10) - EVT_CALL(SetNpcAnimation, NPC_ExamplePlayer, ANIM_Mario_10009) + EVT_CALL(SetNpcAnimation, NPC_ExamplePlayer, ANIM_Mario1_Land) EVT_END_THREAD EVT_CALL(SetNpcJumpscale, NPC_ExamplePlayer, EVT_FLOAT(2.0)) EVT_CALL(GetNpcPos, NPC_ExamplePlayer, LVar0, LVar1, LVar2) @@ -569,7 +569,7 @@ EvtScript N(EVS_ManageImpostersScene) = { EVT_GOTO(20) EVT_END_IF EVT_LABEL(0) - EVT_CALL(SetNpcAnimation, NPC_ExamplePlayer, ANIM_Mario_10002) + EVT_CALL(SetNpcAnimation, NPC_ExamplePlayer, ANIM_Mario1_Idle) EVT_CALL(SetNpcPos, NPC_ExamplePlayer, 53, 0, -75) EVT_CALL(SetNpcAnimation, NPC_ExampleKooper, ANIM_WorldKooper_Idle) EVT_CALL(SetNpcPos, NPC_ExampleKooper, 23, 0, -75) @@ -580,7 +580,7 @@ EvtScript N(EVS_ManageImpostersScene) = { EVT_GOTO(1) EVT_END_IF EVT_CALL(SetNpcSpeed, NPC_ExamplePlayer, EVT_FLOAT(3.0)) - EVT_CALL(SetNpcAnimation, NPC_ExamplePlayer, ANIM_Mario_Walking) + EVT_CALL(SetNpcAnimation, NPC_ExamplePlayer, ANIM_Mario1_Walk) EVT_THREAD EVT_CALL(SetNpcSpeed, NPC_ExampleKooper, EVT_FLOAT(3.0)) EVT_CALL(SetNpcAnimation, NPC_ExampleKooper, ANIM_WorldKooper_Walk) @@ -588,11 +588,11 @@ EvtScript N(EVS_ManageImpostersScene) = { EVT_CALL(SetNpcAnimation, NPC_ExampleKooper, ANIM_WorldKooper_Idle) EVT_END_THREAD EVT_CALL(NpcMoveTo, NPC_ExamplePlayer, 415, -75, 0) - EVT_CALL(SetNpcAnimation, NPC_ExamplePlayer, ANIM_Mario_10002) + EVT_CALL(SetNpcAnimation, NPC_ExamplePlayer, ANIM_Mario1_Idle) EVT_SET(GB_PRA19_TutorialState, 1) EVT_GOTO(11) EVT_LABEL(10) - EVT_CALL(SetNpcAnimation, NPC_ExamplePlayer, ANIM_Mario_10002) + EVT_CALL(SetNpcAnimation, NPC_ExamplePlayer, ANIM_Mario1_Idle) EVT_CALL(SetNpcPos, NPC_ExamplePlayer, 415, 0, -75) EVT_CALL(SetNpcAnimation, NPC_ExampleKooper, ANIM_WorldKooper_Idle) EVT_CALL(SetNpcPos, NPC_ExampleKooper, 385, 0, -75) @@ -606,7 +606,7 @@ EvtScript N(EVS_ManageImpostersScene) = { EVT_SET(GB_PRA19_TutorialState, 2) EVT_GOTO(21) EVT_LABEL(20) - EVT_CALL(SetNpcAnimation, NPC_ExamplePlayer, ANIM_Mario_10002) + EVT_CALL(SetNpcAnimation, NPC_ExamplePlayer, ANIM_Mario1_Idle) EVT_CALL(SetNpcPos, NPC_ExamplePlayer, 415, 0, -75) EVT_CALL(SetNpcAnimation, NPC_ExampleKooper, ANIM_WorldKooper_Idle) EVT_CALL(SetNpcPos, NPC_ExampleKooper, 385, 0, -75) @@ -626,11 +626,11 @@ EvtScript N(EVS_ManageImpostersScene) = { EVT_CALL(DisablePartnerAI, 0) EVT_CALL(SetPlayerFlagBits, PS_FLAG_NO_CHANGE_PARTNER | PS_FLAG_NO_PARTNER_USAGE, TRUE) EVT_WAIT(60) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Question) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Question) EVT_CALL(PlaySoundAtPlayer, SOUND_263, SOUND_SPACE_MODE_0) - EVT_CALL(ShowEmote, NPC_FakeKooper, EMOTE_QUESTION, 0, 30, FALSE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, 0, 30, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(35) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_CALL(PlaySoundAtCollider, COLLIDER_o1054, SOUND_1E4, SOUND_SPACE_MODE_0) EVT_PLAY_EFFECT(EFFECT_BOMBETTE_BREAKING, 0, 34, 22, 1, 10, 30) EVT_CALL(EnableModel, MODEL_o1024, FALSE) @@ -684,7 +684,7 @@ EvtScript N(EVS_ManageImpostersScene) = { EVT_END_THREAD EVT_WAIT(60) EVT_CALL(InterpPlayerYaw, 270, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(10) // kolorado imposter speaks EVT_CALL(GetNpcPos, NPC_FakeKolorado, LVar0, LVar1, LVar2) @@ -794,7 +794,7 @@ EvtScript N(EVS_ManageImpostersScene) = { EVT_EXEC_WAIT(N(EVS_FocusCam_OnPosition)) EVT_CALL(SpeakToPlayer, NPC_FakeKooper, ANIM_WorldKooper_Hurt, ANIM_WorldKooper_Hurt, 0, MSG_CH7_0162) EVT_EXEC_WAIT(N(EVS_FocusCam_StartBattle)) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_EXEC_WAIT(N(EVS_RevealEveryImposter)) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(SetNpcPos, NPC_SELF, LVar0, LVar1, LVar2) @@ -961,7 +961,7 @@ EvtScript N(EVS_NpcInit_FakeKolorado) = { EvtScript N(EVS_NpcInit_ExamplePlayer) = { EVT_CALL(SetNpcFlagBits, NPC_SELF, NPC_FLAG_IGNORE_PLAYER_COLLISION | NPC_FLAG_10000000, TRUE) - EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mario_10002) + EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Mario1_Idle) EVT_MALLOC_ARRAY(16, LVarA) EVT_CALL(N(CreateExamplePlayerRenderer)) EVT_RETURN diff --git a/src/world/area_pra/pra_22/pra_22_2_main.c b/src/world/area_pra/pra_22/pra_22_2_main.c index d678f71164..c3bf5321c2 100644 --- a/src/world/area_pra/pra_22/pra_22_2_main.c +++ b/src/world/area_pra/pra_22/pra_22_2_main.c @@ -146,9 +146,9 @@ EvtScript N(EVS_PushRightStatue_Impl) = { EVT_IF_EQ(LVarA, 1) EVT_CALL(DisablePlayerPhysics, TRUE) EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80002) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_TouchedLava) EVT_WAIT(15) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(1) EVT_CALL(DisablePlayerPhysics, FALSE) EVT_CALL(SetPlayerActionState, ACTION_STATE_FALLING) diff --git a/src/world/area_pra/pra_32/pra_32_2_main.c b/src/world/area_pra/pra_32/pra_32_2_main.c index bd7a887892..51639ab7ba 100644 --- a/src/world/area_pra/pra_32/pra_32_2_main.c +++ b/src/world/area_pra/pra_32/pra_32_2_main.c @@ -30,7 +30,7 @@ EvtScript N(EVS_SpawnStarCard) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(45) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_END_THREAD EVT_THREAD EVT_WAIT(180) @@ -40,7 +40,7 @@ EvtScript N(EVS_SpawnStarCard) = { EVT_CALL(N(StarSpiritEffectFunc4), 1) EVT_THREAD EVT_WAIT(80) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_ADD(LVar1, 100) EVT_CALL(SetCamDistance, CAM_DEFAULT, LVar1) @@ -92,7 +92,7 @@ EvtScript N(EVS_RespawnStarCard) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(45) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_END_THREAD EVT_THREAD EVT_WAIT(180) @@ -102,7 +102,7 @@ EvtScript N(EVS_RespawnStarCard) = { EVT_CALL(N(StarSpiritEffectFunc4), 1) EVT_THREAD EVT_WAIT(80) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_ADD(LVar1, 100) EVT_CALL(SetCamDistance, CAM_DEFAULT, LVar1) diff --git a/src/world/area_pra/pra_32/pra_32_3_npc.c b/src/world/area_pra/pra_32/pra_32_3_npc.c index 9e1a30a784..2f56fc6068 100644 --- a/src/world/area_pra/pra_32/pra_32_3_npc.c +++ b/src/world/area_pra/pra_32/pra_32_3_npc.c @@ -61,7 +61,7 @@ EvtScript N(EVS_Scene_CrystalKingAppears) = { EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(400.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_BeforeJump) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_BeforeJump) EVT_CALL(SetPlayerPos, 475, 100, 116) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(PartnerIsFlying, LVar4) @@ -114,7 +114,7 @@ EvtScript N(EVS_Scene_CrystalKingAppears) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SpeakToPlayer, NPC_CrystalKing_01, ANIM_CrystalKing_Anim09, ANIM_CrystalKing_Anim09, 0, MSG_CH7_016B) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Running) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Run) EVT_CALL(SetPlayerSpeed, EVT_FLOAT(2.5)) EVT_THREAD EVT_WAIT(10) diff --git a/src/world/area_sam/sam_01/sam_01_5_scenes.c b/src/world/area_sam/sam_01/sam_01_5_scenes.c index 05ecafd3c7..ed638469a2 100644 --- a/src/world/area_sam/sam_01/sam_01_5_scenes.c +++ b/src/world/area_sam/sam_01/sam_01_5_scenes.c @@ -77,7 +77,7 @@ EvtScript N(EVS_Scene_MysteryBegins) = { EVT_CALL(InterruptUsePartner) EVT_CALL(SetNpcFlagBits, NPC_MayorPenguin, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) EVT_CALL(SetNpcFlagBits, NPC_MayorPenguinWife, NPC_FLAG_IGNORE_PLAYER_COLLISION, TRUE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) @@ -110,7 +110,7 @@ EvtScript N(EVS_Scene_MysteryBegins) = { EVT_CALL(InterpNpcYaw, NPC_PARTNER, 180, 0) EVT_CALL(SetNpcAnimation, NPC_MayorPenguinWife, ANIM_MayorPenguinWife_Walk) EVT_CALL(NpcMoveTo, NPC_MayorPenguinWife, -255, -40, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_CALL(NpcMoveTo, NPC_MayorPenguinWife, -255, -165, 0) EVT_CALL(InterpPlayerYaw, 0, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 0, 0) @@ -163,7 +163,7 @@ EvtScript N(EVS_Scene_MysteryBegins) = { EVT_SET(MF_ContinueScene, FALSE) EVT_THREAD EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_WAIT(60) EVT_SET(MF_ContinueScene, TRUE) EVT_END_THREAD @@ -173,7 +173,7 @@ EvtScript N(EVS_Scene_MysteryBegins) = { EVT_WAIT(1) EVT_GOTO(100) EVT_END_IF - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SetCamDistance, CAM_DEFAULT, EVT_FLOAT(600.0)) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(15.0), EVT_FLOAT(-8.0)) EVT_CALL(SetCamSpeed, CAM_DEFAULT, EVT_FLOAT(0.6)) @@ -272,19 +272,19 @@ EvtScript N(EVS_Scene_MysteryBegins) = { EVT_CALL(PlayerFaceNpc, NPC_PenguinPatrol, FALSE) EVT_WAIT(13) EVT_CALL(SpeakToPlayer, NPC_PenguinPatrol, ANIM_PenguinPatrol_Talk, ANIM_PenguinPatrol_Idle, 0, MSG_CH7_000C) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_90000) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW3_ShakeHead) EVT_WAIT(35) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SpeakToPlayer, NPC_PenguinPatrol, ANIM_PenguinPatrol_Talk, ANIM_PenguinPatrol_Idle, 0, MSG_CH7_000D) EVT_WAIT(30) EVT_CALL(SpeakToPlayer, NPC_MayorPenguinWife, ANIM_MayorPenguinWife_PointTalk, ANIM_MayorPenguinWife_Point, 0, MSG_CH7_000E) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_90000) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW3_ShakeHead) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SpeakToPlayer, NPC_PenguinPatrol, ANIM_PenguinPatrol_Talk, ANIM_PenguinPatrol_Idle, 0, MSG_CH7_000F) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(GetCurrentPartnerID, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(PARTNER_GOOMBARIO) @@ -306,9 +306,9 @@ EvtScript N(EVS_Scene_MysteryBegins) = { EVT_END_SWITCH EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_PenguinPatrol, ANIM_PenguinPatrol_Talk, ANIM_PenguinPatrol_Idle, 0, MSG_CH7_0018) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) @@ -317,9 +317,9 @@ EvtScript N(EVS_Scene_MysteryBegins) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CALL(SpeakToPlayer, NPC_PenguinPatrol, ANIM_PenguinPatrol_TalkThink, ANIM_PenguinPatrol_StillThink, 0, MSG_CH7_0019) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SpeakToPlayer, NPC_PenguinPatrol, ANIM_PenguinPatrol_Talk, ANIM_PenguinPatrol_Idle, 0, MSG_CH7_001A) EVT_CALL(SetNpcPos, NPC_Penguin_05, -150, 0, 0) EVT_CALL(InterpNpcYaw, NPC_Penguin_05, 90, 0) @@ -359,9 +359,9 @@ EvtScript N(EVS_Scene_MysterySolved) = { EVT_CALL(GetAngleToPlayer, NPC_PenguinPatrol, LVar0) EVT_CALL(InterpNpcYaw, NPC_PenguinPatrol, LVar0, 0) EVT_CALL(SpeakToPlayer, NPC_PenguinPatrol, ANIM_PenguinPatrol_Talk, ANIM_PenguinPatrol_Idle, 0, MSG_CH7_001D) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_WAIT(40) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(GetNpcPos, NPC_PenguinPatrol, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar0, LVar1, LVar2) @@ -386,7 +386,7 @@ EvtScript N(EVS_Scene_MysterySolved) = { EVT_CALL(SpeakToPlayer, NPC_PenguinPatrol, ANIM_PenguinPatrol_Talk, ANIM_PenguinPatrol_Idle, 5, MSG_CH7_001F) EVT_CALL(GetAngleToPlayer, NPC_PenguinPatrol, LVar0) EVT_CALL(InterpNpcYaw, NPC_PenguinPatrol, LVar0, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) EVT_WAIT(20) EVT_THREAD EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -706,9 +706,9 @@ EvtScript N(EVS_Scene_MysterySolved) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(30) EVT_CALL(SpeakToPlayer, NPC_MayorPenguin, ANIM_MayorPenguin_Talk, ANIM_MayorPenguin_Idle, 0, MSG_CH7_0033) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(1) EVT_CALL(SpeakToPlayer, NPC_MayorPenguin, ANIM_MayorPenguin_Talk, ANIM_MayorPenguin_Idle, 0, MSG_CH7_0034) EVT_CALL(SetNpcFlagBits, NPC_MayorPenguin, NPC_FLAG_IGNORE_PLAYER_COLLISION, FALSE) diff --git a/src/world/area_sam/sam_02/sam_02_2_main.c b/src/world/area_sam/sam_02/sam_02_2_main.c index b227fe2fcd..1a3e9083c6 100644 --- a/src/world/area_sam/sam_02/sam_02_2_main.c +++ b/src/world/area_sam/sam_02/sam_02_2_main.c @@ -81,19 +81,19 @@ EvtScript N(EVS_EnterMap) = { EVT_WAIT(1) EVT_THREAD EVT_CALL(PlaySoundAtPlayer, SOUND_302, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001A) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Thrown) EVT_CALL(PlayerJump1, 450, 0, 50, 30) EVT_CALL(PlaySoundAtPlayer, SOUND_162, 0) EVT_CALL(PlayerJump1, 440, 0, 50, 5) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 3, EVT_FLOAT(1.0)) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_DustOff) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_DustOff) EVT_WAIT(7) EVT_CALL(PlaySoundAtPlayer, SOUND_DUST_OFF, 0) EVT_WAIT(8) EVT_CALL(PlaySoundAtPlayer, SOUND_DUST_OFF, 0) EVT_WAIT(15) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(1) EVT_EXEC_WAIT(N(EVS_BindExitTriggers)) EVT_CALL(DisablePlayerInput, FALSE) diff --git a/src/world/area_sam/sam_02/sam_02_4_npc.c b/src/world/area_sam/sam_02/sam_02_4_npc.c index 50b6a2f401..836048c15a 100644 --- a/src/world/area_sam/sam_02/sam_02_4_npc.c +++ b/src/world/area_sam/sam_02/sam_02_4_npc.c @@ -66,12 +66,12 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { EVT_CALL(PlayerMoveTo, 274, -270, 0) EVT_CALL(InterpPlayerYaw, 229, 1) EVT_CALL(HidePlayerShadow, TRUE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(func_802D286C, 0x800) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 5, FOLD_TYPE_7, 1, 1, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 5, FOLD_TYPE_7, 1, 1, 0) EVT_THREAD EVT_WAIT(60) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001D) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SleepStanding) EVT_END_THREAD EVT_WAIT(20) EVT_THREAD @@ -104,7 +104,7 @@ EvtScript N(EVS_ToadHouse_ReturnFromRest) = { EVT_END_IF EVT_END_IF EVT_CALL(HidePlayerShadow, FALSE) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 0, 0, 0, 0, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 0, 0, 0, 0, 0) EVT_CALL(SetPlayerPos, 277, 0, -256) EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) EVT_CALL(PlayerMoveTo, 336, -199, 0) diff --git a/src/world/area_sam/sam_04/sam_04_3_snowmen.c b/src/world/area_sam/sam_04/sam_04_3_snowmen.c index be5b00838c..7ee8cb3793 100644 --- a/src/world/area_sam/sam_04/sam_04_3_snowmen.c +++ b/src/world/area_sam/sam_04/sam_04_3_snowmen.c @@ -163,7 +163,7 @@ EvtScript N(EVS_Scene_SnowmenSpeak) = { EVT_THREAD EVT_WAIT(22) EVT_CALL(DisablePlayerPhysics, TRUE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(N(SetAngleClamped), LVar3, LVar0, LVar2, 0, 0) EVT_CALL(GetDist2D, LVar4, LVar0, LVar2, 0, 0) @@ -183,7 +183,7 @@ EvtScript N(EVS_Scene_SnowmenSpeak) = { EVT_END_LOOP EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(2.0)) EVT_CALL(PlayerJump1, 0, 0, 0, 16) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(InterpPlayerYaw, 0, 0) EVT_CALL(DisablePlayerPhysics, FALSE) EVT_END_THREAD diff --git a/src/world/area_sam/sam_06/sam_06_4_npc.c b/src/world/area_sam/sam_06/sam_06_4_npc.c index d1262a176c..79cf635ba7 100644 --- a/src/world/area_sam/sam_06/sam_06_4_npc.c +++ b/src/world/area_sam/sam_06/sam_06_4_npc.c @@ -755,12 +755,12 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { EVT_CALL(PlayerMoveTo, -347, -114, 0) EVT_CALL(InterpPlayerYaw, 229, 1) EVT_CALL(HidePlayerShadow, TRUE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(func_802D286C, 0x800) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 5, 7, 1, 1, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 5, 7, 1, 1, 0) EVT_THREAD EVT_WAIT(60) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001D) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SleepStanding) EVT_END_THREAD EVT_WAIT(20) EVT_THREAD @@ -778,7 +778,7 @@ EvtScript N(EVS_ToadHouse_GetInBed) = { EvtScript N(EVS_ToadHouse_ReturnFromRest) = { EVT_EXEC(N(EVS_SetupMusic)) EVT_CALL(HidePlayerShadow, FALSE) - EVT_CALL(func_802D2520, ANIM_Mario_10002, 0, 0, 0, 0, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, 0, 0, 0, 0, 0) EVT_CALL(PlayerMoveTo, -347, -114, 0) EVT_CALL(SetPlayerSpeed, EVT_FLOAT(3.0)) EVT_CALL(PlayerMoveTo, -309, -16, 0) diff --git a/src/world/area_sam/sam_08/sam_08_5_scenes.c b/src/world/area_sam/sam_08/sam_08_5_scenes.c index ece6b3f035..0d44582aec 100644 --- a/src/world/area_sam/sam_08/sam_08_5_scenes.c +++ b/src/world/area_sam/sam_08/sam_08_5_scenes.c @@ -100,7 +100,7 @@ EvtScript N(EVS_Scene_ImposterAppears) = { EVT_CALL(ShowEmote, NPC_Kooper_01A, EMOTE_QUESTION, 0, 20, EMOTER_NPC, 0, 0, 0, 0) EVT_WAIT(15) EVT_CALL(PlaySoundAtPlayer, SOUND_263, 0) - EVT_CALL(ShowEmote, NPC_Kooper_01A, EMOTE_QUESTION, -45, 20, FALSE, 0, 0, 0, 0) + EVT_CALL(ShowEmote, 0, EMOTE_QUESTION, -45, 20, EMOTER_PLAYER, 0, 0, 0, 0) EVT_WAIT(15) EVT_CALL(PlaySoundAtNpc, NPC_Kooper_02A, SOUND_263, 0) EVT_CALL(ShowEmote, NPC_Kooper_02A, EMOTE_QUESTION, 45, 20, EMOTER_NPC, 0, 0, 0, 0) diff --git a/src/world/area_sam/sam_11/sam_11_4_entity.c b/src/world/area_sam/sam_11/sam_11_4_entity.c index afb2a32f47..6c7c065dc7 100644 --- a/src/world/area_sam/sam_11/sam_11_4_entity.c +++ b/src/world/area_sam/sam_11/sam_11_4_entity.c @@ -188,7 +188,7 @@ EvtScript N(EVS_TouchFloor_RightRoof) = { EVT_WAIT(1) EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1000B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_SpinJump) EVT_CALL(SetZoneEnabled, ZONE_s, FALSE) EVT_WAIT(1) EVT_CALL(SetZoneEnabled, ZONE_gon, FALSE) @@ -269,7 +269,7 @@ EvtScript N(EVS_TouchFloor_LeftRoof) = { EVT_WAIT(1) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(SetPlayerPos, -210, LVar1, -380) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_WAIT(30) EVT_LOOP(10) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -286,7 +286,7 @@ EvtScript N(EVS_TouchFloor_LeftRoof) = { EVT_WAIT(10) EVT_CALL(SetNpcPos, NPC_PARTNER, -214, 150, -375) EVT_CALL(SetPlayerPos, -214, 150, -370) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Charred) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Burnt) EVT_WAIT(10) EVT_EXEC(N(EVS_SpawnChimneySmokeAtPlayer)) EVT_EXEC_WAIT(N(EVS_RevealLeftHouse)) @@ -303,7 +303,7 @@ EvtScript N(EVS_TouchFloor_LeftRoof) = { EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(40) EVT_IF_GE(GB_StoryProgress, STORY_CH7_SPOKE_WITH_HERRINGWAY) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_CALL(DisablePlayerPhysics, FALSE) EVT_CALL(DisablePlayerInput, FALSE) @@ -333,7 +333,7 @@ EvtScript N(EVS_TouchFloor_LeftRoof) = { EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(DisablePlayerPhysics, FALSE) EVT_CALL(EnablePartnerAI) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SetPlayerActionState, ACTION_STATE_IDLE) EVT_RETURN EVT_END diff --git a/src/world/area_sam/sam_11/sam_11_5_npc.c b/src/world/area_sam/sam_11/sam_11_5_npc.c index a6993b6f42..e353a479cc 100644 --- a/src/world/area_sam/sam_11/sam_11_5_npc.c +++ b/src/world/area_sam/sam_11/sam_11_5_npc.c @@ -145,7 +145,7 @@ EvtScript N(EVS_NpcInteract_Herringway) = { EVT_WAIT(30) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Herringway_Talk, ANIM_Herringway_Idle, 0, MSG_CH7_00CE) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(5) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(GetNpcPos, NPC_SELF, LVar3, LVar4, LVar5) @@ -169,17 +169,17 @@ EvtScript N(EVS_NpcInteract_Herringway) = { EVT_CALL(NpcFaceNpc, NPC_PARTNER, NPC_SELF, 0) EVT_CALL(NpcFacePlayer, NPC_SELF, 0) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_WAIT(20) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Herringway_Talk, ANIM_Herringway_Idle, 0, MSG_CH7_00CF) EVT_WAIT(5) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Thinking) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Thinking) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Herringway_Talk, ANIM_Herringway_Idle, 0, MSG_CH7_00D0) EVT_WAIT(20) EVT_THREAD - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_LOOP(30) EVT_CALL(PlayerFaceNpc, NPC_Herringway, FALSE) EVT_WAIT(1) diff --git a/src/world/area_sam/sam_11/sam_11_6_pond.c b/src/world/area_sam/sam_11/sam_11_6_pond.c index 67a4442961..f80c887ba3 100644 --- a/src/world/area_sam/sam_11/sam_11_6_pond.c +++ b/src/world/area_sam/sam_11/sam_11_6_pond.c @@ -186,7 +186,7 @@ EvtScript N(EVS_DamageFrozenPond_Before) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(PlaySoundAtPlayer, SOUND_398, 0) EVT_CALL(InterpPlayerYaw, 90, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001A) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Thrown) EVT_SET(MF_Unk_01, FALSE) EVT_LOOP(0) EVT_IF_EQ(MF_Unk_01, TRUE) @@ -208,7 +208,7 @@ EvtScript N(EVS_DamageFrozenPond_Before) = { EVT_SET(MF_Unk_01, TRUE) EVT_CALL(StopSound, SOUND_398) EVT_CALL(SetNpcAnimation, NPC_PenguinPatrol, ANIM_PenguinPatrol_Idle) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80016) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Surprise) EVT_CALL(SpeakToPlayer, NPC_PenguinPatrol, ANIM_PenguinPatrol_Talk, ANIM_PenguinPatrol_Idle, 0, MSG_CH7_00B8) EVT_CALL(SetNpcAnimation, NPC_PenguinPatrol, ANIM_PenguinPatrol_Walk) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -223,7 +223,7 @@ EvtScript N(EVS_DamageFrozenPond_Before) = { EVT_THREAD EVT_SET(MV_ThrownOut, 1) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001A) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Thrown) EVT_CALL(PlayerJump1, -680, 50, 0, 30) EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_PenguinPatrol, ANIM_PenguinPatrol_Idle) @@ -306,7 +306,7 @@ EvtScript N(EVS_DamageFrozenPond_After) = { EVT_IF_EQ(LVarA, 1) EVT_THREAD EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.5)) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80024) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SitIdle) EVT_CALL(PlayerJump1, 247, 0, 225, 30) EVT_CALL(PlayerJump1, 257, 0, 225, 8) EVT_END_THREAD @@ -371,13 +371,13 @@ EvtScript N(EVS_DamageFrozenPond_After) = { EVT_SET(GB_SAM11_FrozenPondDamage, 4) EVT_SET(GB_StoryProgress, STORY_CH7_SHATTERED_FROZEN_POND) EVT_IF_EQ(LVarA, 1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_DustOff) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_DustOff) EVT_WAIT(7) EVT_CALL(PlaySoundAtPlayer, SOUND_DUST_OFF, 0) EVT_WAIT(8) EVT_CALL(PlaySoundAtPlayer, SOUND_DUST_OFF, 0) EVT_WAIT(15) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(1) EVT_END_IF EVT_CALL(DisablePlayerInput, FALSE) diff --git a/src/world/area_sam/sam_12/sam_12_4_scenes.c b/src/world/area_sam/sam_12/sam_12_4_scenes.c index d7142e670d..b6c8565262 100644 --- a/src/world/area_sam/sam_12/sam_12_4_scenes.c +++ b/src/world/area_sam/sam_12/sam_12_4_scenes.c @@ -104,7 +104,7 @@ EvtScript N(EVS_SpawnMerlarSparkles) = { }; EvtScript N(EVS_MarioSleeping) = { - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001D) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SleepStanding) EVT_LOOP(0) EVT_CALL(PlaySoundAtPlayer, SOUND_32F, 0) EVT_WAIT(60) @@ -191,11 +191,11 @@ EvtScript N(EVS_Scene_MeetMerlar) = { EVT_CALL(RemoveEffect, LVar7) EVT_KILL_THREAD(LVarA) EVT_CALL(PlaySoundAtPlayer, SOUND_2F1, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_8001E) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_JoltAwake) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_WAIT(30) EVT_CALL(GetNpcPos, NPC_Merlar, LVar0, LVar1, LVar2) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar0, LVar1, LVar2) diff --git a/src/world/area_sbk/sbk_02/sbk_02_4_npc.c b/src/world/area_sbk/sbk_02/sbk_02_4_npc.c index 297647c306..9242b97066 100644 --- a/src/world/area_sbk/sbk_02/sbk_02_4_npc.c +++ b/src/world/area_sbk/sbk_02/sbk_02_4_npc.c @@ -77,7 +77,7 @@ EvtScript N(EVS_Scene_RescuedMamar) = { EVT_CALL(EnableNpcAI, NPC_Mamar, FALSE) EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_Leap) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_GotItem) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_UsePower) EVT_CALL(PlaySoundAtPlayer, SOUND_139, SOUND_SPACE_MODE_0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SET(LVar3, LVar1) @@ -96,7 +96,7 @@ EvtScript N(EVS_Scene_RescuedMamar) = { EVT_ADD(LVar1, 20) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 30) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SetNpcAnimation, NPC_Mamar, ANIM_WorldMamar_Idle) EVT_CALL(EnableNpcAI, NPC_Mamar, TRUE) EVT_CALL(N(UpgradeStarPowerCh2)) @@ -162,11 +162,11 @@ EvtScript N(EVS_Scene_RescuedMamar) = { EVT_CALL(PlaySoundAtNpc, NPC_Mamar, SOUND_2045, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_WAIT(90) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_SET(GB_StoryProgress, STORY_CH2_STAR_SPRIT_DEPARTED) EVT_EXEC(N(EVS_SetupMusic)) EVT_CALL(EnablePartnerAI) diff --git a/src/world/area_trd/trd_00/trd_00_1_main.c b/src/world/area_trd/trd_00/trd_00_1_main.c index ca0046eb06..139a9f65de 100644 --- a/src/world/area_trd/trd_00/trd_00_1_main.c +++ b/src/world/area_trd/trd_00/trd_00_1_main.c @@ -47,11 +47,11 @@ EvtScript N(D_80240B34_99A7A4) = { EVT_END_THREAD EVT_WAIT(82) EVT_CALL(SetPlayerPos, -1041, 0, 204) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Walking) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Walk) EVT_CALL(SetNpcPos, NPC_PARTNER, -1041, 0, 204) EVT_CALL(DisablePlayerPhysics, FALSE) EVT_CALL(PlayerMoveTo, -900, 200, 30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(DisablePlayerInput, FALSE) EVT_RETURN EVT_END diff --git a/src/world/area_trd/trd_00/trd_00_3_npc.c b/src/world/area_trd/trd_00/trd_00_3_npc.c index 217e41deb4..2c6b416e1a 100644 --- a/src/world/area_trd/trd_00/trd_00_3_npc.c +++ b/src/world/area_trd/trd_00/trd_00_3_npc.c @@ -168,7 +168,7 @@ EvtScript N(D_80241DA4_99BA14) = { EVT_CALL(SetNpcAnimation, NPC_Eldstar, ANIM_WorldEldstar_Leap) EVT_WAIT(20) EVT_CALL(PlaySoundAtPlayer, SOUND_139, SOUND_SPACE_MODE_0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_GotItem) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_UsePower) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SET(LVar3, LVar1) EVT_ADD(LVar0, 5) @@ -187,7 +187,7 @@ EvtScript N(D_80241DA4_99BA14) = { EVT_CALL(PlaySoundAtPlayer, SOUND_188, SOUND_SPACE_MODE_0) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 30) EVT_WAIT(40) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SetNpcAnimation, NPC_Eldstar, ANIM_WorldEldstar_Idle) EVT_CALL(EnableNpcAI, NPC_Eldstar, TRUE) EVT_CALL(N(UpgradeStarPowerCh1)) @@ -273,11 +273,11 @@ EvtScript N(D_80241DA4_99BA14) = { EVT_CALL(PlaySoundAtNpc, NPC_Eldstar, SOUND_2045, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_WAIT(90) EVT_CALL(ResetCam, CAM_DEFAULT, 3) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_SET(GB_StoryProgress, STORY_CH1_STAR_SPRIT_DEPARTED) EVT_EXEC(N(EVS_SetupMusic)) EVT_CALL(EnablePartnerAI) diff --git a/src/world/area_trd/trd_05/trd_05_3_trap.c b/src/world/area_trd/trd_05/trd_05_3_trap.c index b56c3902a9..5f2d2af383 100644 --- a/src/world/area_trd/trd_05/trd_05_3_trap.c +++ b/src/world/area_trd/trd_05/trd_05_3_trap.c @@ -50,7 +50,7 @@ void N(appendGfx_FallingSprite)(void) { G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); //TODO use SPR_RASTER_Mario8_XYZ here once they are defined - falling->playerSpriteID = SPR_Mario_8; + falling->playerSpriteID = SPR_MarioW2; animFrame = gGameStatusPtr->frameCounter % 4; if (animFrame == 0) { falling->rasterID = 37; @@ -302,7 +302,7 @@ EvtScript N(EVS_OnHitTrapTrigger) = { EVT_IF_EQ(LVar1, 1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(InterpPlayerYaw, 270, 1) EVT_WAIT(10) EVT_CALL(InterpPlayerYaw, 90, 1) @@ -314,7 +314,7 @@ EvtScript N(EVS_OnHitTrapTrigger) = { EVT_CALL(InterpPlayerYaw, 270, 1) EVT_WAIT(3) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80017) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Flail) EVT_WAIT(5) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_HURT) EVT_WAIT(15) diff --git a/src/world/area_trd/trd_06/trd_06_2_falling.c b/src/world/area_trd/trd_06/trd_06_2_falling.c index 445dda9246..7b07be7555 100644 --- a/src/world/area_trd/trd_06/trd_06_2_falling.c +++ b/src/world/area_trd/trd_06/trd_06_2_falling.c @@ -52,7 +52,7 @@ void N(appendGfx_FallingSprite)(void) { //TODO use SPR_RASTER_Mario8_XYZ here once they are defined if (!falling->animationEnabled) { - falling->playerSpriteID = SPR_Mario_8; + falling->playerSpriteID = SPR_MarioW2; animFrame = gGameStatusPtr->frameCounter % 4; if (animFrame == 0) { falling->rasterID = 37; @@ -153,7 +153,7 @@ API_CALLABLE(N(InitializeFallingPartner)) { API_CALLABLE(N(InitializeGetUp)) { FallingSprite* falling = &N(Falling); - falling->playerSpriteID = SPR_Mario_1; + falling->playerSpriteID = SPR_Mario1; falling->rasterID = 0; return ApiStatus_DONE2; } @@ -323,7 +323,7 @@ EvtScript N(EVS_Scene_FallIntoCell) = { EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(1.0)) EVT_CALL(PlayerJump, LVar0, 0, LVar2, 10) EVT_WAIT(15) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(DisablePlayerPhysics, FALSE) EVT_IF_LT(GB_StoryProgress, STORY_CH1_BOMBETTE_JOINED_PARTY) EVT_CALL(SetCamSpeed, CAM_DEFAULT, 3) @@ -341,9 +341,9 @@ EvtScript N(EVS_Scene_FallIntoCell) = { EVT_CALL(SpeakToPlayer, NPC_Bombette, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00D9) EVT_THREAD EVT_WAIT(5) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_CALL(EndSpeech, NPC_Bombette, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0) EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 0) diff --git a/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c b/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c index ff7f2f6a75..1d75aa2d71 100644 --- a/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c +++ b/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c @@ -74,16 +74,16 @@ EvtScript N(EVS_NpcInteract_Bombette) = { EVT_SET(GF_TRD06_Met_Bombette, TRUE) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00DA) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) EVT_CALL(EndSpeech, NPC_SELF, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(ShowChoice, MSG_Choice_000D) EVT_IF_NE(LVar0, 0) EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00DB) EVT_END_IF EVT_ELSE EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00DC) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(ShowChoice, MSG_Choice_000D) EVT_IF_NE(LVar0, 0) EVT_CALL(ContinueSpeech, NPC_SELF, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00DD) @@ -106,9 +106,9 @@ EvtScript N(EVS_NpcInteract_Bombette) = { EVT_WAIT(10) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldBombette_Talk, ANIM_WorldBombette_Idle, 0, MSG_CH1_00DF) EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) EVT_WAIT(15) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(25) EVT_CALL(PlaySoundAtNpc, NPC_PARTNER, SOUND_262, SOUND_SPACE_MODE_0) EVT_CALL(ShowEmote, NPC_PARTNER, EMOTE_EXCLAMATION, -45, 30, EMOTER_NPC, 0, 0, 0, 0) diff --git a/src/world/area_trd/trd_10/trd_10_1_main.c b/src/world/area_trd/trd_10/trd_10_1_main.c index 9ce76968bf..bafdd245a3 100644 --- a/src/world/area_trd/trd_10/trd_10_1_main.c +++ b/src/world/area_trd/trd_10/trd_10_1_main.c @@ -49,7 +49,7 @@ EvtScript N(EVS_BossDefeated) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(45) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_END_THREAD EVT_THREAD EVT_WAIT(180) @@ -59,7 +59,7 @@ EvtScript N(EVS_BossDefeated) = { EVT_CALL(N(StarSpiritEffectFunc4), 1) EVT_THREAD EVT_WAIT(80) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_ADD(LVar1, 100) EVT_CALL(SetCamDistance, CAM_DEFAULT, LVar1) diff --git a/src/world/common/atomic/MarioSalute.inc.c b/src/world/common/atomic/MarioSalute.inc.c index bef4eba06a..79f725d272 100644 --- a/src/world/common/atomic/MarioSalute.inc.c +++ b/src/world/common/atomic/MarioSalute.inc.c @@ -1,9 +1,9 @@ #include "common.h" EvtScript N(EVS_MarioSalute) = { - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_WAIT(20) EVT_RETURN EVT_END diff --git a/src/world/common/complete/KeyItemChoice.inc.c b/src/world/common/complete/KeyItemChoice.inc.c index e1185c1b23..2b740b4871 100644 --- a/src/world/common/complete/KeyItemChoice.inc.c +++ b/src/world/common/complete/KeyItemChoice.inc.c @@ -55,9 +55,9 @@ EvtScript N(EVS_KeyItemChoicePopup) = { EVT_CALL(N(AddPlayerHandsOffset), LVar3, LVar4, LVar5) EVT_BITWISE_OR_CONST(LVar0, ITEM_VIS_GROUP(ITEM_NONE, 5)) EVT_CALL(MakeItemEntity, LVar0, LVar3, LVar4, LVar5, ITEM_SPAWN_MODE_DECORATION, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_60005) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_TakeItem) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(RemoveItemEntity, LVar0) EVT_END_SWITCH EVT_CALL(N(ItemChoice_SaveSelected), LVarA) diff --git a/src/world/common/complete/NormalItemChoice.inc.c b/src/world/common/complete/NormalItemChoice.inc.c index 1be6f74ca1..a6348534ec 100644 --- a/src/world/common/complete/NormalItemChoice.inc.c +++ b/src/world/common/complete/NormalItemChoice.inc.c @@ -71,9 +71,9 @@ EvtScript N(EVS_ItemChoicePopup) = { EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) EVT_CALL(N(AddPlayerHandsOffset), LVar3, LVar4, LVar5) EVT_CALL(MakeItemEntity, LVar0, LVar3, LVar4, LVar5, ITEM_SPAWN_MODE_DECORATION, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_60005) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_TakeItem) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(RemoveItemEntity, LVar0) EVT_END_SWITCH EVT_CALL(N(ItemChoice_SaveSelected), LVarA) diff --git a/src/world/common/complete/Quizmo.inc.c b/src/world/common/complete/Quizmo.inc.c index 5ed47de945..14503bb85f 100644 --- a/src/world/common/complete/Quizmo.inc.c +++ b/src/world/common/complete/Quizmo.inc.c @@ -647,7 +647,7 @@ EvtScript N(EVS_Quizmo_MovePlayerToPodium) = { EVT_END_THREAD EVT_CALL(N(Quizmo_SpinPlayer)) EVT_CALL(FacePlayerTowardPoint, QUIZ_ARRAY_ORIGIN_X, QUIZ_ARRAY_ORIGIN_Z, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_RETURN EVT_END }; @@ -710,7 +710,7 @@ EvtScript N(EVS_Quizmo_SetCharacterPositons) = { EvtScript N(EVS_Quizmo_PlayerThinking) = { EVT_LOOP(0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Question) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Question) EVT_WAIT(20) EVT_END_LOOP EVT_RETURN @@ -718,20 +718,20 @@ EvtScript N(EVS_Quizmo_PlayerThinking) = { }; EvtScript N(EVS_Quizmo_PlayerHitBuzzer) = { - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Throw) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Throw) EVT_WAIT(15) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_RETURN EVT_END }; EvtScript N(EVS_Quizmo_PlayerReaction_RightAnswer) = { EVT_LOOP(0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_BeforeJump) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_BeforeJump) EVT_WAIT(2) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimMidairStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Jump) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 3) EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) @@ -757,7 +757,7 @@ EvtScript N(EVS_Quizmo_PlayerReaction_RightAnswer) = { EVT_ADD(LVar1, 0) EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimMidair) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Fall) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 0) EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) @@ -780,12 +780,12 @@ EvtScript N(EVS_Quizmo_PlayerReaction_RightAnswer) = { EVT_ADD(LVar1, -3) EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10009) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Land) EVT_WAIT(2) EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_BeforeJump) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_BeforeJump) EVT_WAIT(2) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimMidairStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Jump) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 3) EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) @@ -811,7 +811,7 @@ EvtScript N(EVS_Quizmo_PlayerReaction_RightAnswer) = { EVT_ADD(LVar1, 0) EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimMidair) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Fall) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 0) EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) @@ -834,12 +834,12 @@ EvtScript N(EVS_Quizmo_PlayerReaction_RightAnswer) = { EVT_ADD(LVar1, -3) EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10009) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Land) EVT_WAIT(2) EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_BeforeJump) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_BeforeJump) EVT_WAIT(2) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimMidairStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Jump) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 3) EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) @@ -865,7 +865,7 @@ EvtScript N(EVS_Quizmo_PlayerReaction_RightAnswer) = { EVT_ADD(LVar1, 0) EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimMidair) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Fall) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 0) EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) @@ -888,10 +888,10 @@ EvtScript N(EVS_Quizmo_PlayerReaction_RightAnswer) = { EVT_ADD(LVar1, -3) EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10009) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Land) EVT_WAIT(2) EVT_END_LOOP - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SetPlayerPos, LVar0, QUIZ_ARRAY_ORIGIN_Y, LVar2) EVT_WAIT(1) EVT_RETURN @@ -899,7 +899,7 @@ EvtScript N(EVS_Quizmo_PlayerReaction_RightAnswer) = { }; EvtScript N(EVS_Quizmo_PlayerReaction_WrongAnswer) = { - EVT_CALL(SetPlayerAnimation, ANIM_Mario_ShockStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_VacantStare) EVT_LOOP(0) EVT_WAIT(1) EVT_END_LOOP @@ -1009,7 +1009,7 @@ EvtScript N(EVS_Quizmo_QuizMain) = { EVT_SET(LVar0, MSG_QuizQuestion_01) EVT_ADD(LVar0, GB_CompletedQuizzes) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_ChuckQuizmo_OpenHat, ANIM_ChuckQuizmo_CloseHat, 0, LVar0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Question) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Question) EVT_SET(LVar0, MSG_QuizChoice_01) EVT_ADD(LVar0, GB_CompletedQuizzes) EVT_CALL(PlaySound, 142) diff --git a/src/world/common/enemy/HurtPlant.inc.c b/src/world/common/enemy/HurtPlant.inc.c index 49fc066ac4..e8252825b9 100644 --- a/src/world/common/enemy/HurtPlant.inc.c +++ b/src/world/common/enemy/HurtPlant.inc.c @@ -18,7 +18,7 @@ EvtScript N(EVS_NpcAI_HurtPlant) = { EVT_WAIT(15) EVT_CALL(PlaySoundAtNpc, NPC_SELF, SOUND_209A, 0) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_WAIT(5) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_HurtPlant_Anim02) EVT_CALL(DisablePlayerInput, FALSE) diff --git a/src/world/common/enemy/MBush.inc.c b/src/world/common/enemy/MBush.inc.c index 91e3c146a4..a75cc571b6 100644 --- a/src/world/common/enemy/MBush.inc.c +++ b/src/world/common/enemy/MBush.inc.c @@ -50,7 +50,7 @@ EvtScript N(EVS_NpcAI_MBush) = { EVT_WAIT(4) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_MBush_Anim07) EVT_WAIT(2) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_CALL(SetTimeFreezeMode, TIME_FREEZE_NORMAL) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(StartBattle) diff --git a/src/world/common/enemy/Sentinel.inc.c b/src/world/common/enemy/Sentinel.inc.c index 661bf0222a..d90c8190ab 100644 --- a/src/world/common/enemy/Sentinel.inc.c +++ b/src/world/common/enemy/Sentinel.inc.c @@ -52,7 +52,7 @@ EvtScript N(EVS_NpcAI_Sentinel) = { EVT_CALL(func_80045838, -1, SOUND_2F7, 0) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Sentinel_Anim08) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80017) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Flail) EVT_WAIT(10) EVT_CALL(func_80045838, -1, SOUND_32E | SOUND_ID_TRIGGER_CHANGE_SOUND, 0) EVT_THREAD diff --git a/src/world/common/entity/Pipe.inc.c b/src/world/common/entity/Pipe.inc.c index 0c5f090856..d32e4a6b34 100644 --- a/src/world/common/entity/Pipe.inc.c +++ b/src/world/common/entity/Pipe.inc.c @@ -116,7 +116,7 @@ EvtScript N(EVS_Pipe_EnterVertical) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(DisablePartnerAI, 0) EVT_CALL(HidePlayerShadow, TRUE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still) EVT_CALL(GetCurrentPartnerID, LVar0) EVT_IF_NE(LVar0, PARTNER_NONE) EVT_CALL(EnableNpcShadow, NPC_PARTNER, FALSE) @@ -129,7 +129,7 @@ EvtScript N(EVS_Pipe_EnterVertical) = { EVT_CALL(InterpPlayerYaw, LVar4, 0) EVT_CALL(PlaySound, SOUND_ENTER_PIPE) EVT_CALL(func_802D286C, 0x100) - EVT_CALL(func_802D2520, ANIM_Mario_StandStill, FOLD_TYPE_5, 2, 1, 1, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Still, FOLD_TYPE_5, 2, 1, 1, 0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_LOOP(40) EVT_ADD(LVar1, 1) @@ -150,9 +150,9 @@ EvtScript N(EVS_Pipe_EnterVertical) = { EVT_END_THREAD EVT_END_IF EVT_WAIT(2) - EVT_CALL(func_802D2520, ANIM_Mario_StandStill, FOLD_TYPE_NONE, 0, 0, 0, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Still, FOLD_TYPE_NONE, 0, 0, 0, 0) EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(DisablePlayerPhysics, FALSE) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(HidePlayerShadow, FALSE) @@ -203,7 +203,7 @@ EvtScript N(EVS_Pipe_EnterHorizontal) = { EVT_CALL(HidePlayerShadow, FALSE) EVT_END_THREAD EVT_CALL(func_802D286C, 0x100 | 0x800) - EVT_CALL(func_802D2520, ANIM_Mario_10002, FOLD_TYPE_5, 3, 1, 1, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, FOLD_TYPE_5, 3, 1, 1, 0) EVT_LOOP(40) EVT_CALL(N(Pipe_GetPointAheadOfPlayer), EVT_FLOAT(1.0)) EVT_CALL(SetPlayerPos, LVar0, LVar1, LVar2) @@ -220,7 +220,7 @@ EvtScript N(EVS_Pipe_EnterHorizontal) = { EVT_END_THREAD EVT_END_IF EVT_WAIT(5) - EVT_CALL(func_802D2520, ANIM_Mario_10002, FOLD_TYPE_NONE, 0, 0, 0, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, FOLD_TYPE_NONE, 0, 0, 0, 0) EVT_CALL(ModifyColliderFlags, 1, LVarB, COLLIDER_FLAGS_UPPER_MASK) EVT_CALL(DisablePlayerInput, FALSE) EVT_CALL(DisablePlayerPhysics, FALSE) @@ -279,7 +279,7 @@ EvtScript N(EVS_Pipe_ExitVertical_Impl) = { EVT_END_LOOP EVT_END_THREAD EVT_CALL(func_802D286C, 0x800) - EVT_CALL(func_802D2520, ANIM_Mario_10002, FOLD_TYPE_5, 2, 1, 1, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Idle, FOLD_TYPE_5, 2, 1, 1, 0) EVT_WAIT(25) EVT_EXEC_WAIT(LVarC) EVT_RETURN @@ -327,9 +327,9 @@ EvtScript N(EVS_Pipe_ExitHorizontal) = { EVT_CALL(PlaySound, SOUND_ENTER_PIPE) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(SetPlayerPos, LVar0, LVar6, LVar7) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still) EVT_CALL(func_802D286C, 0x800) - EVT_CALL(func_802D2520, ANIM_Mario_StandStill, FOLD_TYPE_5, 3, 1, 1, 0) + EVT_CALL(func_802D2520, ANIM_Mario1_Still, FOLD_TYPE_5, 3, 1, 1, 0) EVT_THREAD EVT_WAIT(8) EVT_CALL(HidePlayerShadow, TRUE) diff --git a/src/world/dead/area_flo/flo_00/flo_00_3_npc.c b/src/world/dead/area_flo/flo_00/flo_00_3_npc.c index 2adbff5fbc..7de58da209 100644 --- a/src/world/dead/area_flo/flo_00/flo_00_3_npc.c +++ b/src/world/dead/area_flo/flo_00/flo_00_3_npc.c @@ -66,7 +66,7 @@ EvtScript N(EVS_Wisterwood_Introduction) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_WAIT(15) EVT_CALL(SpeakToPlayer, NPC_Dummy_Wisterwood, -1, -1, 5, MSG_CH6_0001) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(InterpPlayerYaw, 350, 0) EVT_WAIT(15) EVT_CALL(ContinueSpeech, NPC_Dummy_Wisterwood, -1, -1, 5, MSG_CH6_0002) @@ -86,9 +86,9 @@ EvtScript N(EVS_Wisterwood_Introduction) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(ShowMessageAtWorldPos, MSG_CH6_0004, 0, 50, -200) EVT_CALL(SetCamPitch, CAM_DEFAULT, EVT_FLOAT(9.0), EVT_FLOAT(-22.0)) EVT_CALL(SetCamDistance, CAM_DEFAULT, 333) @@ -476,7 +476,7 @@ EvtScript N(EVS_Scene_RescuedKlevar) = { EVT_CALL(EnableNpcAI, NPC_Klevar, FALSE) EVT_CALL(SetNpcAnimation, NPC_Klevar, ANIM_WorldKlevar_Leap) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_GotItem) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_UsePower) EVT_CALL(PlaySoundAtPlayer, SOUND_139, SOUND_SPACE_MODE_0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_SET(LVar3, LVar1) @@ -495,7 +495,7 @@ EvtScript N(EVS_Scene_RescuedKlevar) = { EVT_ADD(LVar1, 20) EVT_PLAY_EFFECT(EFFECT_ENERGY_ORB_WAVE, 4, LVar0, LVar1, LVar2, 1, 30) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SetNpcAnimation, NPC_Klevar, ANIM_WorldKlevar_Idle) EVT_CALL(EnableNpcAI, NPC_Klevar, TRUE) EVT_CALL(N(UpgradeStarPowerCh6)) @@ -559,9 +559,9 @@ EvtScript N(EVS_Scene_RescuedKlevar) = { EVT_CALL(PlaySoundAtNpc, NPC_Klevar, SOUND_2045, SOUND_SPACE_MODE_0) EVT_END_THREAD EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_WAIT(110) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_SET(GB_StoryProgress, STORY_CH6_STAR_SPRIT_DEPARTED) EVT_EXEC_WAIT(N(EVS_Wisterwood_Farewell)) EVT_CALL(EnablePartnerAI) diff --git a/src/world/dead/area_flo/flo_00/flo_00_5_beanstalk.c b/src/world/dead/area_flo/flo_00/flo_00_5_beanstalk.c index b4a3b0eeec..0831b0d366 100644 --- a/src/world/dead/area_flo/flo_00/flo_00_5_beanstalk.c +++ b/src/world/dead/area_flo/flo_00/flo_00_5_beanstalk.c @@ -254,7 +254,7 @@ EvtScript N(EVS_Exit_Beanstalk) = { EVT_CALL(PlaySound, SOUND_19C) EVT_CALL(SetMusicTrack, 0, SONG_MAGIC_BEANSTALK, 1, 8) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Walking) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Walk) EVT_CALL(N(GetPlayerAngles), LVar3, LVar4) EVT_SWITCH(LVar4) EVT_CASE_LT(90) @@ -317,7 +317,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { EVT_THREAD EVT_WAIT(5) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Walking) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Walk) EVT_SWITCH(AF_FLO_BeanstalkFacingRight) EVT_CASE_EQ(0) EVT_CALL(InterpPlayerYaw, 90, 0) @@ -384,7 +384,7 @@ EvtScript N(EVS_Scene_BeanstalkGrowing) = { EVT_EXEC(N(EVS_SetInteriorVineGrowth)) EVT_SWITCH(LVarF) EVT_CASE_EQ(200) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_CASE_EQ(250) EVT_SET(LVar0, -60) EVT_SET(LVar1, 0) @@ -477,12 +477,12 @@ EvtScript N(EVS_BeanPatch_ItemPrompt) = { EVT_CALL(AwaitPlayerLeave, -85, 85, 28) EVT_RETURN EVT_CASE_EQ(ITEM_FERTILE_SOIL) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_60006) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_PlaceItem) EVT_WAIT(5) EVT_CALL(RemoveKeyItemAt, LVar1) EVT_CALL(MakeItemEntity, ITEM_FERTILE_SOIL, BEANSTALK_BASE_X, 0, BEANSTALK_BASE_Z, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(MV_BeanstalkItemEntity, LVar0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still) EVT_WAIT(20) EVT_CASE_DEFAULT EVT_SWITCH(AF_FLO_PlatingInstructionsToggle) @@ -515,12 +515,12 @@ EvtScript N(EVS_BeanPatch_ItemPrompt) = { EVT_CASE_EQ(ITEM_MAGICAL_BEAN) EVT_CALL(RemoveItemEntity, MV_BeanstalkItemEntity) EVT_WAIT(5) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_60006) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_PlaceItem) EVT_WAIT(5) EVT_CALL(RemoveKeyItemAt, LVar1) EVT_CALL(MakeItemEntity, ITEM_MAGICAL_BEAN, BEANSTALK_BASE_X, 0, BEANSTALK_BASE_Z, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(MV_BeanstalkItemEntity, LVar0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still) EVT_WAIT(20) EVT_CASE_DEFAULT EVT_SWITCH(AF_FLO_PlatingInstructionsToggle) @@ -552,13 +552,13 @@ EvtScript N(EVS_BeanPatch_ItemPrompt) = { EVT_CASE_EQ(ITEM_MIRACLE_WATER) EVT_CALL(RemoveItemEntity, MV_BeanstalkItemEntity) EVT_WAIT(5) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_60006) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_PlaceItem) EVT_WAIT(5) EVT_CALL(RemoveKeyItemAt, LVar1) EVT_CALL(N(SyncStatusMenu)) EVT_CALL(MakeItemEntity, ITEM_MIRACLE_WATER, BEANSTALK_BASE_X, 0, BEANSTALK_BASE_Z, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(MV_BeanstalkItemEntity, LVar0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still) EVT_WAIT(30) EVT_CALL(RemoveItemEntity, MV_BeanstalkItemEntity) EVT_WAIT(30) diff --git a/src/world/dead/area_flo/flo_03/flo_03_3_npc.c b/src/world/dead/area_flo/flo_03/flo_03_3_npc.c index 0a6d007d06..e8e615941b 100644 --- a/src/world/dead/area_flo/flo_03/flo_03_3_npc.c +++ b/src/world/dead/area_flo/flo_03/flo_03_3_npc.c @@ -155,7 +155,7 @@ EvtScript N(EVS_NpcInteract_Petunia) = { EVT_EXEC_WAIT(N(EVS_FocusCamBetween)) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Petunia_AngryTalk, ANIM_Petunia_Angry, 0, MSG_CH6_0050) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Petunia_Angry) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) EVT_WAIT(20) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Petunia_AngryTalk, ANIM_Petunia_Angry, 0, MSG_CH6_0051) EVT_CALL(SetNpcAnimation, NPC_MontyMole_01, ANIM_MontyMole_Dark_Anim12) diff --git a/src/world/dead/area_flo/flo_08/flo_08_4_npc.c b/src/world/dead/area_flo/flo_08/flo_08_4_npc.c index 81175c8ab2..4ec0ff0e38 100644 --- a/src/world/dead/area_flo/flo_08/flo_08_4_npc.c +++ b/src/world/dead/area_flo/flo_08/flo_08_4_npc.c @@ -21,12 +21,12 @@ EvtScript N(EVS_NpcInteract_GateFlower) = { EVT_CALL(PanToTarget, CAM_DEFAULT, 0, 1) EVT_CALL(WaitForCam, CAM_DEFAULT, EVT_FLOAT(1.0)) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Yellow_Talk, ANIM_GateFlower_Yellow_Idle, 0, MSG_CH6_0042) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Thinking) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Thinking) EVT_CALL(N(FlowerGuard_MakeItemList)) EVT_CHOOSE_CONSUMABLE_FROM(N(FlowerGuard_ItemChoiceList), 0) EVT_SWITCH(LVar0) EVT_CASE_LE(0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_GateFlower_Yellow_Talk, ANIM_GateFlower_Yellow_Idle, 0, MSG_CH6_0043) EVT_CASE_DEFAULT EVT_SET(LVar8, LVar0) diff --git a/src/world/dead/area_flo/flo_10/flo_10_4_fountain.c b/src/world/dead/area_flo/flo_10/flo_10_4_fountain.c index 93bf534f1e..32a39630ef 100644 --- a/src/world/dead/area_flo/flo_10/flo_10_4_fountain.c +++ b/src/world/dead/area_flo/flo_10/flo_10_4_fountain.c @@ -81,7 +81,7 @@ EvtScript N(EVS_RaiseLily) = { EvtScript N(EVS_RaisePlayer) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_WAIT(40) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80024) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SitIdle) EVT_CALL(GetPlayerPos, LVar2, LVar0, LVar3) EVT_CALL(MakeLerp, -50, 90, 60, EASING_QUADRATIC_IN) EVT_LOOP(0) @@ -174,7 +174,7 @@ EvtScript N(EVS_FountainSlowing) = { EvtScript N(EVS_Scene_ReleaseFountain) = { EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still) EVT_CALL(GetPlayerPos, LVar3, LVar4, LVar5) EVT_CALL(UseSettingsFrom, CAM_DEFAULT, LVar3, LVar4, LVar5) EVT_CALL(SetPanTarget, CAM_DEFAULT, LVar3, LVar4, LVar5) @@ -191,7 +191,7 @@ EvtScript N(EVS_Scene_ReleaseFountain) = { EVT_CALL(PlaySound, SOUND_80000024) EVT_WAIT(360) EVT_CALL(InterpPlayerYaw, 90, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80017) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Flail) EVT_CALL(SetPlayerJumpscale, EVT_FLOAT(0.2)) EVT_CALL(PlayerJump1, -100, -10, -172, 75) EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 5, EVT_FLOAT(1.0)) @@ -208,7 +208,7 @@ EvtScript N(EVS_Scene_PostReleaseFountain) = { EVT_CALL(DisablePlayerPhysics, TRUE) EVT_CALL(SetPlayerPos, -100, -10, -172) EVT_CALL(InterpPlayerYaw, 150, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_DeadStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Fallen) EVT_CALL(SetNpcPos, NPC_PARTNER, -129, 9, -177) EVT_CALL(EnablePartnerAI) EVT_CALL(ClearPartnerMoveHistory, NPC_PARTNER) @@ -220,9 +220,9 @@ EvtScript N(EVS_Scene_PostReleaseFountain) = { EVT_CALL(InterpNpcYaw, NPC_Lily, 90, 0) EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(90.0), 0, 450, EVT_FLOAT(25.0), EVT_FLOAT(-6.0)) EVT_WAIT(30) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_GetUp) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_GetUp) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(10) EVT_EXEC_WAIT(N(EVS_PushFlowerSong)) EVT_WAIT(10) diff --git a/src/world/dead/area_flo/flo_10/flo_10_5_npc.c b/src/world/dead/area_flo/flo_10/flo_10_5_npc.c index 53c6277c98..4d85977c4d 100644 --- a/src/world/dead/area_flo/flo_10/flo_10_5_npc.c +++ b/src/world/dead/area_flo/flo_10/flo_10_5_npc.c @@ -53,7 +53,7 @@ EvtScript N(EVS_OnInteract_WaterStoneSocket) = { EVT_WAIT(10) EVT_CALL(AdjustCam, CAM_DEFAULT, EVT_FLOAT(1.0), 0, 450, EVT_FLOAT(25.0), EVT_FLOAT(-6.0)) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_60006) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_PlaceItem) EVT_CALL(RemoveKeyItemAt, LVar1) EVT_CALL(MakeItemEntity, ITEM_WATER_STONE, 0, -60, 6, ITEM_SPAWN_MODE_DECORATION, 0) EVT_SET(LVarA, LVar0) diff --git a/src/world/dead/area_flo/flo_12/flo_12_3_npc.c b/src/world/dead/area_flo/flo_12/flo_12_3_npc.c index 48a607047c..5052ac501b 100644 --- a/src/world/dead/area_flo/flo_12/flo_12_3_npc.c +++ b/src/world/dead/area_flo/flo_12/flo_12_3_npc.c @@ -86,13 +86,13 @@ EvtScript N(EVS_NpcInteract_Rosie) = { EVT_CASE_EQ(0) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Rosie_TalkHold, ANIM_Rosie_TalkHold, 5, MSG_CH6_008F) EVT_CASE_EQ(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_60002) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_CarryRun) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Rosie_TalkHold, ANIM_Rosie_TalkHold, 5, MSG_CH6_008F) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_60005) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_TakeItem) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Rosie_TalkHold, ANIM_Rosie_IdleHold, 5, MSG_CH6_0091) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimPray) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Pray) EVT_WAIT(40) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Rosie_TalkHold, ANIM_Rosie_IdleHold, 5, MSG_CH6_0092) EVT_SET(GF_FLO12_RosieRequestedSomethingBeautiful, TRUE) EVT_END_SWITCH @@ -103,11 +103,11 @@ EvtScript N(EVS_NpcInteract_Rosie) = { EVT_IF_EQ(GF_FLO10_LilyRequestedWaterStone, TRUE) EVT_EXEC(N(EVS_PlayerApproachRosieAndItem)) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Rosie_TalkHold, ANIM_Rosie_TalkHold, 5, MSG_CH6_0090) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_60005) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW1_TakeItem) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Rosie_TalkHold, ANIM_Rosie_IdleHold, 5, MSG_CH6_0091) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_AnimPray) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Pray) EVT_WAIT(40) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Rosie_TalkHold, ANIM_Rosie_IdleHold, 5, MSG_CH6_0092) EVT_SET(GF_FLO12_RosieRequestedSomethingBeautiful, TRUE) EVT_ELSE diff --git a/src/world/dead/area_flo/flo_13/flo_13_4_npc.c b/src/world/dead/area_flo/flo_13/flo_13_4_npc.c index fcd1db97e0..b4fc383559 100644 --- a/src/world/dead/area_flo/flo_13/flo_13_4_npc.c +++ b/src/world/dead/area_flo/flo_13/flo_13_4_npc.c @@ -176,7 +176,7 @@ EvtScript N(EVS_Lakilulu_SpinyToss) = { EVT_CALL(SetNpcPos, NPC_Lakilulu_Spiny, LVar1, LVar2, LVar3) EVT_THREAD EVT_WAIT(5) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_END_THREAD EVT_CALL(ContinueSpeech, NPC_Lakilulu, -1, -1, SPEECH_FLAG_200, MSG_CH6_00A8) EVT_THREAD @@ -207,7 +207,7 @@ EvtScript N(EVS_Lakilulu_SpinyToss) = { EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 10, EVT_FLOAT(2.0)) EVT_END_THREAD EVT_CALL(PlaySoundAtPlayer, SOUND_HIT_PLAYER_NORMAL, SOUND_SPACE_MODE_0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_FallBack) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Hurt) EVT_SET(LVar0, 90) EVT_LOOP(20) EVT_ADD(LVar0, 144) @@ -217,7 +217,7 @@ EvtScript N(EVS_Lakilulu_SpinyToss) = { EVT_CALL(InterpPlayerYaw, LVar0, 1) EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still) EVT_CALL(SetNpcAnimation, NPC_Lakilulu, ANIM_Lakilulu_Idle) EVT_RETURN EVT_END @@ -233,13 +233,13 @@ EvtScript N(EVS_NpcIdle_Lakilester) = { EVT_CALL(SetMusicTrack, 0, SONG_LAKILESTER_THEME, 0, 8) EVT_CALL(ShowMessageAtScreenPos, MSG_CH6_00A0, 160, 40) EVT_CALL(InterruptUsePartner) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_WAIT(20) EVT_CALL(InterpPlayerYaw, 270, 1) EVT_WAIT(20) EVT_CALL(InterpPlayerYaw, 90, 1) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still) EVT_CALL(func_802CF56C, 2) EVT_CALL(SetNpcAnimation, NPC_Lakilester, ANIM_WorldLakilester_Run) EVT_THREAD @@ -354,7 +354,7 @@ EvtScript N(EVS_Scene_LakilesterDefeated) = { EVT_THREAD EVT_WAIT(10) EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_WorldLakilester_Idle) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_WAIT(20) EVT_CALL(InterpPlayerYaw, 270, 1) EVT_END_THREAD @@ -391,7 +391,7 @@ EvtScript N(EVS_Scene_LakilesterDefeated) = { EVT_END_IF EVT_KILL_THREAD(LVar9) EVT_CALL(SetNpcAnimation, NPC_Lakilulu, ANIM_Lakilulu_ConcernedNod) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still) EVT_WAIT(20) EVT_CALL(GetNpcPos, NPC_Lakilulu, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 20) @@ -438,9 +438,9 @@ EvtScript N(EVS_Scene_LakilesterDefeated) = { EVT_ELSE EVT_CALL(ContinueSpeech, NPC_Lakilulu, ANIM_Lakilulu_Talk, ANIM_Lakilulu_Idle, 0, MSG_CH6_00A9) EVT_CALL(SetNpcAnimation, NPC_Lakilulu, ANIM_Lakilulu_Idle) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still) EVT_WAIT(20) EVT_CALL(GetNpcPos, NPC_Lakilulu, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 20) diff --git a/src/world/dead/area_flo/flo_15/flo_15_3_npc.c b/src/world/dead/area_flo/flo_15/flo_15_3_npc.c index d60aa8ca19..d29285edec 100644 --- a/src/world/dead/area_flo/flo_15/flo_15_3_npc.c +++ b/src/world/dead/area_flo/flo_15/flo_15_3_npc.c @@ -139,11 +139,11 @@ EvtScript N(EVS_NpcInteract_Sun_01) = { EVT_SWITCH(GB_StoryProgress) EVT_CASE_LT(STORY_CH6_SPOKE_WITH_THE_SUN) EVT_CALL(SpeakToPlayer, NPC_Sun_01, ANIM_Sun_TalkSad, ANIM_Sun_Idle, 517, MSG_CH6_009A) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Thinking) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Thinking) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80007) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_SpeakUp) EVT_WAIT(20) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(SpeakToPlayer, NPC_Sun_01, ANIM_Sun_TalkSad, ANIM_Sun_Idle, 517, MSG_CH6_009B) EVT_SET(GB_StoryProgress, STORY_CH6_SPOKE_WITH_THE_SUN) EVT_CASE_LT(STORY_CH6_DESTROYED_PUFF_PUFF_MACHINE) diff --git a/src/world/dead/area_flo/flo_18/flo_18_4_npc.c b/src/world/dead/area_flo/flo_18/flo_18_4_npc.c index 382720fa55..91c8af06e7 100644 --- a/src/world/dead/area_flo/flo_18/flo_18_4_npc.c +++ b/src/world/dead/area_flo/flo_18/flo_18_4_npc.c @@ -74,9 +74,9 @@ EvtScript N(EVS_Scene_LakilesterLikesBeingGood) = { EVT_CALL(PlayerFaceNpc, NPC_PARTNER, FALSE) EVT_CALL(NpcFacePlayer, NPC_PARTNER, 0) EVT_CALL(SpeakToPlayer, NPC_PARTNER, ANIM_WorldLakilester_Talk, ANIM_WorldLakilester_Idle, 5, MSG_CH6_00C9) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_NodYes) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_NodYes) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StandStill) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Still) EVT_WAIT(20) EVT_CALL(EnablePartnerAI) EVT_CALL(PutPartnerAway) diff --git a/src/world/dead/area_flo/flo_19/flo_19_5_beanstalk.c b/src/world/dead/area_flo/flo_19/flo_19_5_beanstalk.c index 71f96d327e..b29bb0607f 100644 --- a/src/world/dead/area_flo/flo_19/flo_19_5_beanstalk.c +++ b/src/world/dead/area_flo/flo_19/flo_19_5_beanstalk.c @@ -136,7 +136,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { EVT_THREAD EVT_WAIT(5) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Walking) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Walk) EVT_SWITCH(AF_FLO_BeanstalkFacingRight) EVT_CASE_EQ(0) EVT_CALL(InterpPlayerYaw, 90, 0) @@ -150,7 +150,7 @@ EvtScript N(EVS_Enter_Beanstalk) = { EVT_CALL(UpdateColliderTransform, COLLIDER_o117) EVT_THREAD EVT_SET(AF_FLO_BeanstalkFadedOut, FALSE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Walking) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Walk) EVT_WAIT(200) EVT_EXEC_WAIT(N(EVS_FadeOutToBlack)) EVT_SET(AF_FLO_BeanstalkFadedOut, TRUE) @@ -232,7 +232,7 @@ EvtScript N(EVS_Exit_Beanstalk) = { EVT_CALL(PlaySound, SOUND_19D) EVT_CALL(SetMusicTrack, 0, SONG_MAGIC_BEANSTALK, 1, 8) EVT_CALL(SetNpcAnimation, NPC_PARTNER, PARTNER_ANIM_IDLE) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Walking) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Walk) EVT_CALL(N(GetPlayerAngles), LVar3, LVar4) EVT_SWITCH(LVar4) EVT_CASE_LT(90) diff --git a/src/world/dead/area_kzn/kzn_19/kzn_19_2_main.c b/src/world/dead/area_kzn/kzn_19/kzn_19_2_main.c index 9c5a05b73c..0187236a57 100644 --- a/src/world/dead/area_kzn/kzn_19/kzn_19_2_main.c +++ b/src/world/dead/area_kzn/kzn_19/kzn_19_2_main.c @@ -44,7 +44,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_END_THREAD EVT_THREAD EVT_WAIT(45) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_END_THREAD EVT_THREAD EVT_WAIT(180) @@ -54,7 +54,7 @@ EvtScript N(EVS_TrySpawningStarCard) = { EVT_CALL(N(StarSpiritEffectFunc4), 1) EVT_THREAD EVT_WAIT(80) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_ADD(LVar1, 100) EVT_CALL(SetCamDistance, CAM_DEFAULT, LVar1) diff --git a/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c b/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c index c6ce912b1a..74b3a995ee 100644 --- a/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c +++ b/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c @@ -485,7 +485,7 @@ EvtScript N(EVS_Misstar_Escape) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_CALL(InterpPlayerYaw, 90, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 90, 0) EVT_CALL(GetNpcPos, NPC_Misstar, LVar0, LVar1, LVar2) diff --git a/src/world/dead/area_kzn/kzn_19/kzn_19_5_eruption.c b/src/world/dead/area_kzn/kzn_19/kzn_19_5_eruption.c index 8952b3539d..cd52352ad4 100644 --- a/src/world/dead/area_kzn/kzn_19/kzn_19_5_eruption.c +++ b/src/world/dead/area_kzn/kzn_19/kzn_19_5_eruption.c @@ -66,7 +66,7 @@ EvtScript N(EVS_UpdateEruption) = { EVT_CALL(ShakeCam, CAM_DEFAULT, 0, 25, EVT_FLOAT(2.0)) EVT_CALL(InterpPlayerYaw, 270, 0) EVT_CALL(InterpNpcYaw, NPC_PARTNER, 270, 0) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_EXEC(N(EVS_CrackFloor)) EVT_CALL(MakeLerp, 200, 50, 75, EASING_LINEAR) EVT_LOOP(0) diff --git a/src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c b/src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c index 3578bc541e..e9817ab8df 100644 --- a/src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c +++ b/src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c @@ -149,7 +149,7 @@ EvtScript N(EVS_KoloradoBurned_PlayerReaction) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002A) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_LookUp) EVT_LOOP(0) EVT_WAIT(1) EVT_CALL(GetNpcPos, NPC_Kolorado, LVar0, LVar1, LVar2) @@ -157,7 +157,7 @@ EvtScript N(EVS_KoloradoBurned_PlayerReaction) = { EVT_BREAK_LOOP EVT_END_IF EVT_END_LOOP - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_RETURN EVT_END }; @@ -244,9 +244,9 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { EVT_CALL(SetMusicTrack, 0, SONG_VOLCANO_ESCAPE, 0, 8) EVT_WAIT(20) EVT_THREAD - EVT_CALL(SetPlayerAnimation, ANIM_Mario_1002B) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Flail) EVT_WAIT(60) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_END_THREAD EVT_CALL(SetNpcAnimation, NPC_SELF, ANIM_Kolorado_Yell) EVT_CALL(SpeakToPlayer, NPC_SELF, ANIM_Kolorado_Shout, ANIM_Kolorado_Yell, 0, MSG_CH5_010D) diff --git a/src/world/dead/area_kzn/kzn_22/kzn_22_4_npc.c b/src/world/dead/area_kzn/kzn_22/kzn_22_4_npc.c index 67c04e75a4..f5e8cb61d8 100644 --- a/src/world/dead/area_kzn/kzn_22/kzn_22_4_npc.c +++ b/src/world/dead/area_kzn/kzn_22/kzn_22_4_npc.c @@ -36,7 +36,7 @@ EvtScript N(EVS_NpcIdle_Kolorado) = { // start scene (but wait for player to stop being hurt if they fell in the lava) EVT_CALL(DisablePlayerInput, TRUE) EVT_CALL(GetPlayerAnimation, LVar0) - EVT_IF_EQ(LVar0, ANIM_Mario_8001A) + EVT_IF_EQ(LVar0, ANIM_MarioW2_Thrown) EVT_WAIT(35) EVT_END_IF EVT_WAIT(10) @@ -215,7 +215,7 @@ EvtScript N(EVS_Scene_Misstar) = { EVT_END_IF EVT_SET(AF_KZN23_GrabbedPlayer, TRUE) EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80000) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Carried) EVT_THREAD EVT_WAIT(25) EVT_SET(AF_KZN22_FlewAway, TRUE) diff --git a/src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c b/src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c index e07c85f717..a31a91f0ae 100644 --- a/src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c +++ b/src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c @@ -209,7 +209,7 @@ EvtScript N(EVS_Scene_Misstar) = { EVT_CALL(SetSelfVar, 0, 0) EVT_THREAD EVT_WAIT(1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_80000) + EVT_CALL(SetPlayerAnimation, ANIM_MarioW2_Carried) EVT_END_THREAD // fly out of the volcano shaft EVT_THREAD diff --git a/src/world/partner/bombette.c b/src/world/partner/bombette.c index 9078cc1701..1a0e352fe1 100644 --- a/src/world/partner/bombette.c +++ b/src/world/partner/bombette.c @@ -242,7 +242,7 @@ ApiStatus func_802BD758_3184A8(Evt *evt, s32 isInitialCall) { enable_npc_blur(npc); npc->duration = 4; npc->yaw = atan2(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z); - suggest_player_anim_clearUnkFlag(ANIM_Mario_10002); + suggest_player_anim_allow_backward(ANIM_Mario1_Idle); evt->functionTemp[0] = 21; case 21: if (playerStatus->actionState == ACTION_STATE_HIT_FIRE || playerStatus->actionState == ACTION_STATE_KNOCKBACK) { @@ -278,7 +278,7 @@ ApiStatus func_802BD758_3184A8(Evt *evt, s32 isInitialCall) { npc->pos.y = npc->moveToPos.y; npc->pos.z = npc->moveToPos.z; disable_npc_blur(npc); - suggest_player_anim_clearUnkFlag(ANIM_Mario_6000C); + suggest_player_anim_allow_backward(ANIM_MarioW1_Lift); npc->yaw = playerStatus->targetYaw; npc->currentAnim = ANIM_WorldBombette_Walk; evt->functionTemp[0] = 1; @@ -291,7 +291,7 @@ ApiStatus func_802BD758_3184A8(Evt *evt, s32 isInitialCall) { npc->pos.y = playerStatus->position.y + playerStatus->colliderHeight; npc->yaw = playerStatus->targetYaw; if (evt->functionTemp[1] == 1) { - suggest_player_anim_clearUnkFlag(ANIM_Mario_60006); + suggest_player_anim_allow_backward(ANIM_MarioW1_PlaceItem); } if (evt->functionTemp[1] != 0) { evt->functionTemp[1]--; @@ -327,7 +327,7 @@ ApiStatus func_802BD758_3184A8(Evt *evt, s32 isInitialCall) { hitDepth = 16.0f; if ((npc_raycast_down_around(COLLISION_CHANNEL_10000, &x, &y, &z, &hitDepth, npc->yaw, npc->collisionRadius) != 0) && (((u32) ((get_collider_flags(NpcHitQueryColliderID) & 0xFF) - 2)) < 2U)) { if (playerStatus->actionState == ACTION_STATE_IDLE) { - suggest_player_anim_clearUnkFlag(ANIM_Mario_10002); + suggest_player_anim_allow_backward(ANIM_Mario1_Idle); } npc->currentAnim = ANIM_WorldBombette_AboutToExplode; npc->flags &= ~NPC_FLAG_GRAVITY; @@ -347,7 +347,7 @@ ApiStatus func_802BD758_3184A8(Evt *evt, s32 isInitialCall) { } if (evt->functionTemp[1] == 40) { if (playerStatus->actionState == ACTION_STATE_IDLE) { - suggest_player_anim_clearUnkFlag(ANIM_Mario_10002); + suggest_player_anim_allow_backward(ANIM_Mario1_Idle); } enable_player_input(); D_802BE92C = 0; @@ -368,7 +368,7 @@ ApiStatus func_802BD758_3184A8(Evt *evt, s32 isInitialCall) { evt->functionTemp[1] = 20; evt->functionTemp[0] = 3; if (playerStatus->actionState == ACTION_STATE_IDLE) { - suggest_player_anim_clearUnkFlag(ANIM_Mario_10002); + suggest_player_anim_allow_backward(ANIM_Mario1_Idle); } } } @@ -478,7 +478,7 @@ ApiStatus func_802BD758_3184A8(Evt *evt, s32 isInitialCall) { switch (evt->functionTemp[0]) { case 7: if (playerStatus->actionState == ACTION_STATE_IDLE) { - suggest_player_anim_clearUnkFlag(ANIM_Mario_10002); + suggest_player_anim_allow_backward(ANIM_Mario1_Idle); } if (D_802BE92C != 0) { D_802BE92C = 0; diff --git a/src/world/partner/bow.c b/src/world/partner/bow.c index ce7564c2a7..9e0a3a5f4c 100644 --- a/src/world/partner/bow.c +++ b/src/world/partner/bow.c @@ -250,7 +250,7 @@ ApiStatus BowUseAbility(Evt* script, s32 isInitialCall) { bow->duration = 5; bow->yaw = atan2(bow->pos.x, bow->pos.z, playerStatus->position.x, playerStatus->position.z); set_action_state(ACTION_STATE_RIDE); - suggest_player_anim_clearUnkFlag(ANIM_Mario_10002); + suggest_player_anim_allow_backward(ANIM_Mario1_Idle); script->functionTemp[0]++; break; case 21: @@ -268,7 +268,7 @@ ApiStatus BowUseAbility(Evt* script, s32 isInitialCall) { if (bow->duration == 0) { bow->yaw = playerStatus->targetYaw; func_8003D624(bow, 7, playerStatus->alpha1, 0, 0, 0, 0); - suggest_player_anim_setUnkFlag(ANIM_Mario_Crouch); + suggest_player_anim_always_forward(ANIM_Mario1_Crouch); sfx_play_sound_at_npc(SOUND_BOW_VANISH, SOUND_SPACE_MODE_0, NPC_PARTNER); script->functionTemp[0] = 1; } diff --git a/src/world/partner/kooper.c b/src/world/partner/kooper.c index 1ad532d723..c84a4ef0a4 100644 --- a/src/world/partner/kooper.c +++ b/src/world/partner/kooper.c @@ -252,11 +252,11 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) { case 21: //TODO: make if statement less bad if ((((u8)playerStatus->actionState - 0x15) < 3U) || (playerStatus->timeInAir != 0)) { - suggest_player_anim_clearUnkFlag(ANIM_Mario_10002); + suggest_player_anim_allow_backward(ANIM_Mario1_Idle); script->functionTemp[0] = 0; break; } else { - suggest_player_anim_clearUnkFlag(ANIM_Mario_BeforeJump); + suggest_player_anim_allow_backward(ANIM_Mario1_BeforeJump); kooper->moveToPos.x = D_802BEC70 = playerStatus->position.x; kooper->moveToPos.y = D_802BEC74 = playerStatus->position.y; kooper->moveToPos.z = D_802BEC78 = playerStatus->position.z; @@ -277,9 +277,9 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) { disable_npc_blur(kooper); if (script->functionTemp[2] < playerStatus->inputEnabledCounter) { if (!(playerStatus->animFlags & PA_FLAG_CHANGING_MAP)) { - suggest_player_anim_clearUnkFlag(ANIM_Mario_10002); + suggest_player_anim_allow_backward(ANIM_Mario1_Idle); } else { - suggest_player_anim_clearUnkFlag(ANIM_Mario_Running); + suggest_player_anim_allow_backward(ANIM_Mario1_Run); } script->functionTemp[0] = 0; break; @@ -295,7 +295,7 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) { playerStatus->flags |= PS_FLAG_JUMPING; gCameras[CAM_DEFAULT].moveFlags |= CAMERA_MOVE_IGNORE_PLAYER_Y; - suggest_player_anim_clearUnkFlag(ANIM_Mario_AnimMidairStill); + suggest_player_anim_allow_backward(ANIM_Mario1_Jump); D_802BEC60 = 0; sfx_play_sound_at_npc(SOUND_JUMP_2081, SOUND_SPACE_MODE_0, NPC_PARTNER); script->functionTemp[0] = 2; @@ -313,7 +313,7 @@ ApiStatus func_802BD638_31B658(Evt* script, s32 isInitialCall) { if (kooper->jumpVelocity < 0.0f) { if (D_802BEC60 == 0) { D_802BEC60 = 1; - suggest_player_anim_clearUnkFlag(ANIM_Mario_AnimMidair); + suggest_player_anim_allow_backward(ANIM_Mario1_Fall); } } diff --git a/src/world/partner/lakilester.c b/src/world/partner/lakilester.c index 9c20c742eb..0838bb1d93 100644 --- a/src/world/partner/lakilester.c +++ b/src/world/partner/lakilester.c @@ -584,7 +584,7 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { npc->flags &= ~(NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8); npc->flags |= NPC_FLAG_IGNORE_PLAYER_COLLISION; set_action_state(ACTION_STATE_RIDE); - suggest_player_anim_setUnkFlag(ANIM_Mario_8000E); + suggest_player_anim_always_forward(ANIM_MarioW2_RideLaki); npc->currentAnim = ANIM_WorldLakilester_Walk; D_802BFF0C = 1; npc->flags &= ~(NPC_FLAG_IGNORE_WORLD_COLLISION | NPC_FLAG_8); @@ -600,7 +600,7 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { npc->moveSpeed = 3.0f; npc->jumpScale = 0.0f; npc->yaw = playerStatus->targetYaw; - suggest_player_anim_setUnkFlag(ANIM_Mario_8000E); + suggest_player_anim_always_forward(ANIM_MarioW2_RideLaki); set_action_state(ACTION_STATE_RIDE); disable_player_static_collisions(); D_802BFF08 = 1; @@ -702,12 +702,12 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { npc->currentAnim = ANIM_WorldLakilester_Walk; npc->jumpVelocity = 8.0f; npc->jumpScale = 1.4f; - suggest_player_anim_clearUnkFlag(ANIM_Mario_BeforeJump); + suggest_player_anim_allow_backward(ANIM_Mario1_BeforeJump); D_802BFF14 = 101; break; case 101: sfx_play_sound_at_npc(SOUND_JUMP_2081, SOUND_SPACE_MODE_0, NPC_PARTNER); - suggest_player_anim_clearUnkFlag(ANIM_Mario_AnimMidairStill); + suggest_player_anim_allow_backward(ANIM_Mario1_Jump); /* fallthrough */ case 102: D_802BFF14++; @@ -725,7 +725,7 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { npc->jumpVelocity -= npc->jumpScale; if (npc->jumpVelocity <= 0.0f) { - suggest_player_anim_clearUnkFlag(ANIM_Mario_AnimMidair); + suggest_player_anim_allow_backward(ANIM_Mario1_Fall); } npc->duration--; @@ -742,7 +742,7 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { npc->yaw = playerStatus->targetYaw; npc->duration = 3; set_action_state(ACTION_STATE_RIDE); - suggest_player_anim_setUnkFlag(ANIM_Mario_8000E); + suggest_player_anim_always_forward(ANIM_MarioW2_RideLaki); disable_player_shadow(); partnerActionStatus->actingPartner = PARTNER_LAKILESTER; partnerActionStatus->partnerActionState = PARTNER_ACTION_LAKILESTER_1; @@ -829,11 +829,11 @@ ApiStatus func_802BE724_322274(Evt* script, s32 isInitialCall) { } npc->moveSpeed = sp2C / npc->duration; - suggest_player_anim_clearUnkFlag(ANIM_Mario_BeforeJump); + suggest_player_anim_allow_backward(ANIM_Mario1_BeforeJump); D_802BFF14 += 1; break; case 4: - suggest_player_anim_clearUnkFlag(ANIM_Mario_AnimMidairStill); + suggest_player_anim_allow_backward(ANIM_Mario1_Jump); D_802BFF14++; /* fallthrough */ case 5: @@ -964,11 +964,11 @@ ApiStatus func_802BF4F0_323040(Evt* script, s32 isInitialCall) { lakilester->moveSpeed = sp2C / lakilester->duration; lakilester->yaw = atan2(playerStatus->position.x, playerStatus->position.z, lakilester->moveToPos.x, lakilester->moveToPos.z); - suggest_player_anim_clearUnkFlag(ANIM_Mario_BeforeJump); + suggest_player_anim_allow_backward(ANIM_Mario1_BeforeJump); D_802BFF00++; break; case 1: - suggest_player_anim_clearUnkFlag(ANIM_Mario_AnimMidairStill); + suggest_player_anim_allow_backward(ANIM_Mario1_Jump); D_802BFF00++; case 2: playerStatus->position.y += lakilester->jumpVelocity; @@ -1151,7 +1151,7 @@ s32 func_802BFBA0_3236F0(Evt* script, s32 isInitialCall) { } sfx_play_sound_at_npc(SOUND_295, SOUND_SPACE_MODE_0, NPC_PARTNER); - playerStatus->anim = ANIM_Mario_8000E; + playerStatus->anim = ANIM_MarioW2_RideLaki; playerStatus->animNotifyValue = 0; playerStatus->flags |= PS_FLAG_FACE_FORWARDS; func_802BFB44_323694(2.0f); diff --git a/src/world/partner/parakarry.c b/src/world/partner/parakarry.c index de25bb64bd..17a80d21f0 100644 --- a/src/world/partner/parakarry.c +++ b/src/world/partner/parakarry.c @@ -254,7 +254,7 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) { disable_npc_blur(parakarry); D_802BEBC0_31CBE0 = 21; } else { - suggest_player_anim_clearUnkFlag(ANIM_Mario_10002); + suggest_player_anim_allow_backward(ANIM_Mario1_Idle); parakarry->moveToPos.x = playerStatus->position.x; parakarry->moveToPos.y = playerStatus->position.y + 32.0f; parakarry->moveToPos.z = playerStatus->position.z; @@ -281,7 +281,7 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) { parakarry->moveSpeed = 0.2f; parakarry->currentAnim = ANIM_WorldParakarry_CarryHeavy; parakarry->planarFlyDist = 0; - suggest_player_anim_setUnkFlag(ANIM_Mario_8000D); + suggest_player_anim_always_forward(ANIM_MarioW2_HoldOnto); sfx_play_sound_at_npc(SOUND_2009, SOUND_SPACE_MODE_0, NPC_PARTNER); gCollisionStatus.lastTouchedFloor = -1; gCollisionStatus.currentFloor = -1; @@ -295,7 +295,7 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) { if (playerStatus->actionState != ACTION_STATE_HIT_FIRE && playerStatus->actionState != ACTION_STATE_HIT_LAVA && playerStatus->actionState != ACTION_STATE_KNOCKBACK) { if (partnerActionStatus->pressedButtons & (BUTTON_A | BUTTON_B | BUTTON_C_DOWN)) { D_802BEBC0_31CBE0 = (partnerActionStatus->pressedButtons & BUTTON_A) ? 0x14 : 0x15; - suggest_player_anim_clearUnkFlag(ANIM_Mario_10002); + suggest_player_anim_allow_backward(ANIM_Mario1_Idle); } else { tempFrameCounter = gGameStatusPtr->frameCounter; tempFrameCounterU32 = tempFrameCounter; @@ -324,7 +324,7 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) { y = playerStatus->position.y + playerStatus->colliderHeight * 0.5f; halfCollisionHeight = playerStatus->spriteFacingAngle - 90.0f + gCameras[gCurrentCameraID].currentYaw; if (player_raycast_up_corners(playerStatus, &x, &y, &z, &sp2C, halfCollisionHeight) >= 0) { - suggest_player_anim_clearUnkFlag(ANIM_Mario_10002); + suggest_player_anim_allow_backward(ANIM_Mario1_Idle); D_802BEBC0_31CBE0 = 0x15; break; } @@ -403,7 +403,7 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) { D_802BEBC0_31CBE0++; } } else { - suggest_player_anim_clearUnkFlag(ANIM_Mario_10002); + suggest_player_anim_allow_backward(ANIM_Mario1_Idle); D_802BEBC0_31CBE0 = 0x15; } } @@ -414,7 +414,7 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) { case 2: gCollisionStatus.currentFloor = func_802BD558_319AC8(); if (playerStatus->actionState != ACTION_STATE_HIT_FIRE && playerStatus->actionState != ACTION_STATE_HIT_LAVA && playerStatus->actionState != ACTION_STATE_KNOCKBACK) { - suggest_player_anim_setUnkFlag(ANIM_Mario_8000D); + suggest_player_anim_always_forward(ANIM_MarioW2_HoldOnto); if (!(playerStatus->flags & PS_FLAG_HIT_FIRE)) { if (partnerActionStatus->pressedButtons & (BUTTON_A | BUTTON_B | BUTTON_C_DOWN)) { if (partnerActionStatus->pressedButtons & buttonTemp) { // TODO find a way to remove this while still loading 0x15 instead of moving it from register @@ -460,7 +460,7 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) { y = playerStatus->position.y; z = playerStatus->position.z; if (npc_test_move_complex_with_slipping(COLLISION_CHANNEL_10000, &x, &y, &z, parakarry->moveSpeed, parakarry->yaw, playerStatus->colliderHeight, playerStatus->colliderDiameter)) { - suggest_player_anim_clearUnkFlag(ANIM_Mario_10002); + suggest_player_anim_allow_backward(ANIM_Mario1_Idle); D_802BEBC0_31CBE0 = 0x15; } else { x = parakarry->pos.x; @@ -510,13 +510,13 @@ ApiStatus func_802BD660_319BD0(Evt* evt, s32 isInitialCall) { break; } } - suggest_player_anim_clearUnkFlag(ANIM_Mario_10002); + suggest_player_anim_allow_backward(ANIM_Mario1_Idle); D_802BEBC0_31CBE0 = 21; } break; } } - suggest_player_anim_clearUnkFlag(ANIM_Mario_10002); + suggest_player_anim_allow_backward(ANIM_Mario1_Idle); D_802BEBC0_31CBE0 = 21; } } else { diff --git a/src/world/partner/sushie.c b/src/world/partner/sushie.c index b564f378d4..eb1c1bd937 100644 --- a/src/world/partner/sushie.c +++ b/src/world/partner/sushie.c @@ -255,7 +255,7 @@ void func_802BD414_31E184(Npc* npc) { (OriginalPlayerY - npc->moveToPos.y) - (npc->collisionHeight * 0.5f)); } if (bss_802BFEE8 == 1) { - suggest_player_anim_setUnkFlag(ANIM_Mario_80010); + suggest_player_anim_always_forward(ANIM_MarioW2_DiveSushie); npc->currentAnim = ANIM_WorldSushie_Ride; } if (bss_802BFEF4 == 0 && (playerStatus->position.y + (playerStatus->colliderHeight * 0.5f) < OriginalPlayerY)) { @@ -294,13 +294,13 @@ void func_802BD414_31E184(Npc* npc) { if ((OriginalPlayerY - npc->moveToPos.y) - (npc->collisionHeight * 0.5f) <= 0.0f) { if (bss_802BFEF4 != 0) { bss_802BFEF4 = 0; - func_802DDFF8(ANIM_Mario_10002, 0, 0, 0, 0, 0, 0); + func_802DDFF8(ANIM_Mario1_Idle, 0, 0, 0, 0, 0, 0); func_8003D624(npc, 0, 0, 0, 0, 0, 0); } bss_802BFEE4 = 0; npc->currentAnim = ANIM_WorldSushie_Ride; npc->moveToPos.y = OriginalPlayerY - (npc->collisionHeight * 0.5f); - suggest_player_anim_setUnkFlag(ANIM_Mario_8000F); + suggest_player_anim_always_forward(ANIM_MarioW2_RideSushie); } } } @@ -372,7 +372,7 @@ ApiStatus func_802BE3A4_31F114(Evt* script, s32 isInitialCall) { npc->flags |= NPC_FLAG_8; npc->flags &= ~NPC_FLAG_GRAVITY; npc->flags |= NPC_FLAG_IGNORE_PLAYER_COLLISION; - suggest_player_anim_setUnkFlag(ANIM_Mario_8000F); + suggest_player_anim_always_forward(ANIM_MarioW2_RideSushie); disable_player_shadow(); disable_npc_shadow(npc); func_8003D624(npc, 4, 2, 0, 0, 0, 0); @@ -422,7 +422,7 @@ ApiStatus func_802BE3A4_31F114(Evt* script, s32 isInitialCall) { npc->currentAnim = ANIM_WorldSushie_Run; npc->duration = 12; npc->moveToPos.y = y - (npc->collisionHeight * 0.5f); - suggest_player_anim_clearUnkFlag(ANIM_Mario_10002); + suggest_player_anim_allow_backward(ANIM_Mario1_Idle); script->functionTemp[0]++; break; } @@ -436,7 +436,7 @@ ApiStatus func_802BE3A4_31F114(Evt* script, s32 isInitialCall) { if (npc->duration != 0) { if (npc->duration == 2) { sfx_play_sound_at_npc(SOUND_JUMP_2081, SOUND_SPACE_MODE_0, NPC_PARTNER); - suggest_player_anim_clearUnkFlag(ANIM_Mario_BeforeJump); + suggest_player_anim_allow_backward(ANIM_Mario1_BeforeJump); } break; } @@ -454,7 +454,7 @@ ApiStatus func_802BE3A4_31F114(Evt* script, s32 isInitialCall) { npc->duration = (2.0f * npc->jumpVelocity) / 0.6f; npc->moveSpeed = dist / npc->duration; npc->jumpVelocity += y / npc->duration; - suggest_player_anim_clearUnkFlag(ANIM_Mario_AnimMidairStill); + suggest_player_anim_allow_backward(ANIM_Mario1_Jump); script->functionTemp[0]++; fx_rising_bubble(0, npc->pos.x, npc->moveToPos.y + (npc->collisionHeight * 0.5f), npc->pos.z, 0.0f); return 0; @@ -470,7 +470,7 @@ ApiStatus func_802BE3A4_31F114(Evt* script, s32 isInitialCall) { npc->jumpVelocity -= npc->jumpScale; add_vec2D_polar(&playerStatus->position.x, &playerStatus->position.z, npc->moveSpeed, npc->yaw); if (npc->jumpVelocity <= 0.0f) { - suggest_player_anim_clearUnkFlag(ANIM_Mario_AnimMidair); + suggest_player_anim_allow_backward(ANIM_Mario1_Fall); } gCameras[CAM_DEFAULT].targetPos.x = playerStatus->position.x; gCameras[CAM_DEFAULT].targetPos.y = playerStatus->position.y; @@ -480,7 +480,7 @@ ApiStatus func_802BE3A4_31F114(Evt* script, s32 isInitialCall) { set_action_state(ACTION_STATE_RIDE); disable_player_shadow(); playerStatus->flags &= ~PS_FLAG_MOVEMENT_LOCKED; - suggest_player_anim_setUnkFlag(ANIM_Mario_8000F); + suggest_player_anim_always_forward(ANIM_MarioW2_RideSushie); sfx_play_sound_at_npc(SOUND_2013, SOUND_SPACE_MODE_0, NPC_PARTNER); playerStatus->position.x = npc->pos.x; playerStatus->position.y = npc->pos.y; @@ -599,7 +599,7 @@ ApiStatus func_802BE3A4_31F114(Evt* script, s32 isInitialCall) { npc->moveSpeed = dist / npc->duration; npc->jumpVelocity += (npc->moveToPos.y - playerStatus->position.y) / npc->duration; sfx_play_sound_at_npc(SOUND_JUMP_2081, SOUND_SPACE_MODE_0, NPC_PARTNER); - suggest_player_anim_clearUnkFlag(ANIM_Mario_BeforeJump); + suggest_player_anim_allow_backward(ANIM_Mario1_BeforeJump); enable_player_shadow(); playerStatus->flags |= PS_FLAG_MOVEMENT_LOCKED; script->functionTemp[0] = 3; @@ -608,12 +608,12 @@ ApiStatus func_802BE3A4_31F114(Evt* script, s32 isInitialCall) { } break; case 3: - suggest_player_anim_clearUnkFlag(ANIM_Mario_AnimMidairStill); + suggest_player_anim_allow_backward(ANIM_Mario1_Jump); script->functionTemp[0]++; // fallthrough case 4: if (npc->jumpVelocity <= 0.0f) { - suggest_player_anim_clearUnkFlag(ANIM_Mario_AnimMidair); + suggest_player_anim_allow_backward(ANIM_Mario1_Fall); script->functionTemp[0]++; } // fallthrough @@ -621,7 +621,7 @@ ApiStatus func_802BE3A4_31F114(Evt* script, s32 isInitialCall) { if (npc->jumpVelocity <= 0.0f) { playerStatus->position.y = y = player_check_collision_below(npc->jumpVelocity, &collider); if (collider > 0) { - suggest_player_anim_clearUnkFlag(ANIM_Mario_10009); + suggest_player_anim_allow_backward(ANIM_Mario1_Land); } } else { playerStatus->position.y += npc->jumpVelocity; @@ -637,7 +637,7 @@ ApiStatus func_802BE3A4_31F114(Evt* script, s32 isInitialCall) { } if (collider >= 0) { playerStatus->flags &= ~PS_FLAG_MOVEMENT_LOCKED; - suggest_player_anim_clearUnkFlag(ANIM_Mario_10002); + suggest_player_anim_allow_backward(ANIM_Mario1_Idle); npc->flags |= NPC_FLAG_IGNORE_WORLD_COLLISION; dist = dist2D(npc->pos.x, npc->pos.z, npc->moveToPos.x, npc->moveToPos.z) + (playerStatus->colliderDiameter * 0.5f); @@ -668,7 +668,7 @@ ApiStatus func_802BE3A4_31F114(Evt* script, s32 isInitialCall) { gGameStatusPtr->keepUsingPartnerOnMapChange = FALSE; partnerActionStatus->partnerActionState = PARTNER_ACTION_NONE; partnerActionStatus->actingPartner = 0; - func_802DDFF8(ANIM_Mario_10002, 0, 0, 0, 0, 0, 0); + func_802DDFF8(ANIM_Mario1_Idle, 0, 0, 0, 0, 0, 0); func_8003D624(npc, 0, 0, 0, 0, 0, 0); return ApiStatus_DONE1; } @@ -885,7 +885,7 @@ s32 func_802BFAB8_320828(Evt* script, s32 isInitialCall) { if (script->varTable[12] == 0) { partner_kill_ability_script(); } else { - suggest_player_anim_setUnkFlag(ANIM_Mario_8000F); + suggest_player_anim_always_forward(ANIM_MarioW2_RideSushie); if ((partnerNPC->yaw >= 0.0f) && (partnerNPC->yaw <= 180.0f)) { partnerNPC->yawCamOffset = partnerNPC->yaw; partnerNPC->isFacingAway = 1; diff --git a/src/world/partner/watt.c b/src/world/partner/watt.c index 3aaa4ce0a2..01e8f1e15d 100644 --- a/src/world/partner/watt.c +++ b/src/world/partner/watt.c @@ -393,7 +393,7 @@ s32 WattPutAway(Evt* script, s32 isInitialCall) { if (isInitialCall) { world_watt_dispose_static_effect(); partner_init_put_away(watt); - force_player_anim(ANIM_Mario_10002); + force_player_anim(ANIM_Mario1_Idle); wattActionStatus->actingPartner = PARTNER_NONE; wattActionStatus->partnerActionState = PARTNER_ACTION_NONE; playerStatus->animFlags &= ~(PA_FLAG_WATT_IN_HANDS | PA_FLAG_USING_WATT); @@ -489,13 +489,13 @@ void func_802BE014_31DB84(void) { AnimID anim; if (playerStatus->runSpeed <= currentSpeed) { - anim = ANIM_Mario_60002; + anim = ANIM_MarioW1_CarryRun; } else if (playerStatus->walkSpeed <= currentSpeed) { - anim = ANIM_Mario_60000; + anim = ANIM_MarioW1_Carry; } else { - anim = ANIM_Mario_60007; + anim = ANIM_MarioW1_PlaceRecord; } - suggest_player_anim_clearUnkFlag(anim); + suggest_player_anim_allow_backward(anim); } void world_watt_sync_held_position(void) { diff --git a/src/world_use_item.c b/src/world_use_item.c index 124f728b68..d81fcdf381 100644 --- a/src/world_use_item.c +++ b/src/world_use_item.c @@ -106,7 +106,7 @@ ApiStatus WorldItem_ConsumeItem(Evt* script, s32 isInitialCall) { EvtScript EVS_WorldItem_ShowUsedItem = { EVT_SET_GROUP(EVT_GROUP_00) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_GotItem) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_UsePower) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 45) EVT_CALL(MakeItemEntity, LVarA, LVar0, LVar1, LVar2, 1, 0) @@ -127,7 +127,7 @@ EvtScript EVS_WorldItem_PlayEatingSounds = { EVT_WAIT(10) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Eat) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Eat) EVT_WAIT(45) EVT_RETURN EVT_END @@ -140,7 +140,7 @@ EvtScript EVS_WorldItem_PlayDrinkingSounds = { EVT_WAIT(10) EVT_END_LOOP EVT_END_THREAD - EVT_CALL(SetPlayerAnimation, ANIM_Mario_Drink) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Drink) EVT_WAIT(45) EVT_RETURN EVT_END @@ -163,7 +163,7 @@ EvtScript EVS_World_UseItem = { EVT_EXEC_WAIT(EVS_WorldItem_PlayDrinkingSounds) EVT_END_IF EVT_IF_EQ(LVarF, 1) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_StickOutTongue) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_StickOutTongue) EVT_END_IF EVT_IF_GT(LVarB, 0) EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) @@ -188,14 +188,14 @@ EvtScript EVS_World_UseItem = { EVT_END_IF EVT_IF_EQ(LVarF, 0) EVT_WAIT(10) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_ThumbsUp) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_ThumbsUp) EVT_WAIT(30) EVT_ELSE EVT_WAIT(30) EVT_END_IF EVT_CALL(GetPlayerPos, LVar0, LVar1, LVar2) EVT_CALL(ShowRecoveryShimmer, LVar0, LVar1, LVar2, LVarB) - EVT_CALL(SetPlayerAnimation, ANIM_Mario_10002) + EVT_CALL(SetPlayerAnimation, ANIM_Mario1_Idle) EVT_WAIT(20) EVT_CALL(WorldItem_ConsumeItem) EVT_CALL(DisablePlayerInput, FALSE) diff --git a/ver/jp/undefined_syms.txt b/ver/jp/undefined_syms.txt index fd83f50ae6..5d1f62c038 100644 --- a/ver/jp/undefined_syms.txt +++ b/ver/jp/undefined_syms.txt @@ -61,7 +61,7 @@ npc_test_move_complex_with_slipping = 0x800DDD74; update_player = 0x800DF720; clear_player_status = 0x800DFC30; player_reset_data = 0x800DFC54; -suggest_player_anim_clearUnkFlag = 0x800DFEDC; +suggest_player_anim_allow_backward = 0x800DFEDC; disable_player_input = 0x800E0158; enable_player_input = 0x800E0184; player_render_interact_prompts = 0x800E0240; diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 95687ce068..eb6ad01b30 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -2655,9 +2655,9 @@ clear_player_status = 0x800DFC50; // type:func rom:0x79100 player_reset_data = 0x800DFC74; // type:func rom:0x79124 func_800DFCF4 = 0x800DFCF4; // type:func rom:0x791A4 get_overriding_player_anim = 0x800DFD48; // type:func rom:0x791F8 -suggest_player_anim_clearUnkFlag = 0x800DFEFC; // type:func rom:0x793AC +suggest_player_anim_allow_backward = 0x800DFEFC; // type:func rom:0x793AC force_player_anim = 0x800DFF50; // type:func rom:0x79400 -suggest_player_anim_setUnkFlag = 0x800DFF78; // type:func rom:0x79428 +suggest_player_anim_always_forward = 0x800DFF78; // type:func rom:0x79428 update_player_blink = 0x800DFFCC; // type:func rom:0x7947C get_xz_dist_to_player = 0x800E0088; // type:func rom:0x79538 enable_player_shadow = 0x800E00B0; // type:func rom:0x79560 @@ -26785,7 +26785,7 @@ D_80286538 = 0x80286538; // type:data D_80286540 = 0x80286540; // type:data EVS_RunAwayStart = 0x802868BC; // EVS_RunAwayFail = 0x80287078; // -EVS_RunAwayReset = 0x80287128; // +EVS_PlayerDies = 0x80287128; // EVS_PlayEatFX = 0x802878D0; // EVS_PlayDrinkFX = 0x80287948; // EVS_UseLifeShroom = 0x802879C0; //