pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-09-16 14:32:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

mario anim names (#951)

Browse Source 
* prep

* player anims

* consistency

* extra space

* slight adjustment

* suggest_player_anim func names

---------

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
This commit is contained in:
HailSanta 2023-02-21 03:24:25 -05:00 committed by GitHub
parent 5a5d088d83
commit 4145cccd86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
354 changed files with 2139 additions and 2135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

746
include/enums.h
View File

@ -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,

4
include/functions.h
View File

@ -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);

2
include/script_api/battle.h
View File

@ -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;

2
src/16F740.c
View File

@ -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;

134
src/17D6A0.c
View File

@ -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
};

2
src/17FEB0.c
View File

@ -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;
}

6
src/18C790.c
View File

@ -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;

150
src/18F340.c
View File

@ -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

4
src/415D90.c
View File

@ -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;

91
src/77480.c
View File

@ -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;
}

6
src/7bb60_len_41b0.c
View File

@ -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();
}

8
src/C50A0.c
View File

@ -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();

4
src/battle/area/arn/actor/tubbas_heart.c
View File

@ -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)

2
src/battle/area/flo2/actor/huff_n_puff.c
View File

@ -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)

4
src/battle/area/hos/actor/magikoopa.c
View File

@ -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)

8
src/battle/area/isk_part_2/actor/tutankoopa.c
View File

@ -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)

10
src/battle/area/iwa/actor/buzzar.c
View File

@ -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)

2
src/battle/area/jan/actor/jungle_fuzzy.c
View File

@ -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)

4
src/battle/area/kmr_part_2/actor/goomba_king.c
View File

@ -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)

10
src/battle/area/kmr_part_3/actor/jr_troopa.c
View File

@ -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)

12
src/battle/area/kpa2/actor/bowser_intro.c
View File

@ -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)

2
src/battle/area/kpa2/actor/bowser_phase_2.c
View File

@ -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)

2
src/battle/area/kpa2/actor/bowser_phase_3.c
View File

@ -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)

8
src/battle/area/kzn2/actor/lava_piranha.c
View File

@ -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)

2
src/battle/area/mac/actor/master3.c
View File

@ -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)

2
src/battle/area/mim/actor/forest_fuzzy.c
View File

@ -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)

4
src/battle/area/nok/actor/kent_c_koopa.c
View File

@ -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)

6
src/battle/area/omo2_1/actor/shy_squad.c
View File

@ -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

2
src/battle/area/tik2/actor/blooper_baby.c
View File

@ -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)

2
src/battle/area/tik2/actor/electro_blooper.c
View File

@ -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)

2
src/battle/area/tik2/actor/super_blooper.c
View File

@ -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)

26
src/battle/area/trd_part_3/actor/eldstar.c
View File

@ -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)

2
src/battle/common/actor/fuzzy.inc.c
View File

@ -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)

8
src/battle/common/actor/swoopula.inc.c
View File

@ -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))

118
src/battle/common/move/HammerSupport.inc.c
View File

@ -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

72
src/battle/common/move/JumpSupport.inc.c
View File

@ -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)

16
src/battle/common/move/StarBeamSupport.inc.c
View File

@ -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)

14
src/battle/common/move/UseItem.inc.c
View File

@ -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

18
src/battle/move/hammer/attack.c
View File

@ -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)

24
src/battle/move/hammer/hammer_charge_0.c
View File

@ -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

24
src/battle/move/hammer/hammer_charge_1.c
View File

@ -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)

24
src/battle/move/hammer/hammer_charge_2.c
View File

@ -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

52
src/battle/move/hammer/hammer_throw.c
View File

@ -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)

2
src/battle/move/hammer/mega_quake.c
View File

@ -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))

2
src/battle/move/hammer/power_quake.c
View File

@ -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))

2
src/battle/move/hammer/quake_hammer.c
View File

@ -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))

76
src/battle/move/hammer/spin_smash.c
View File

@ -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

2
src/battle/move/item/coconut.c
View File

@ -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)))

4
src/battle/move/item/dried_shroom.c
View File

@ -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

2
src/battle/move/item/dusty_hammer.c
View File

@ -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)))

2
src/battle/move/item/egg_missile.c
View File

@ -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)))

4
src/battle/move/item/electro_pop.c
View File

@ -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)

8
src/battle/move/item/fire_flower.c
View File

@ -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)

10
src/battle/move/item/food.c
View File

@ -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

4
src/battle/move/item/fright_jar.c
View File

@ -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))

6
src/battle/move/item/hustle_drink.c
View File

@ -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)

2
src/battle/move/item/insecticide_herb.c
View File

@ -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)))

8
src/battle/move/item/life_shroom.c
View File

@ -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

10
src/battle/move/item/mushroom.c
View File

@ -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

2
src/battle/move/item/pebble.c
View File

@ -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)))

6
src/battle/move/item/please_come_back.c
View File

@ -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
};

8
src/battle/move/item/pow_block.c
View File

@ -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)

4
src/battle/move/item/repel_gel.c
View File

@ -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)

8
src/battle/move/item/sleepy_sheep.c
View File

@ -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)

2
src/battle/move/item/snowman_doll.c
View File

@ -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))

4
src/battle/move/item/stone_cap.c
View File

@ -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))

14
src/battle/move/item/strange_cake.c
View File

@ -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)

10
src/battle/move/item/super_soda.c
View File

@ -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)

4
src/battle/move/item/tasty_tonic.c
View File

@ -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)

2
src/battle/move/item/thunder_bolt.c
View File

@ -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)

2
src/battle/move/item/thunder_rage.c
View File

@ -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))

4
src/battle/move/item/ultra_shroom.c
View File

@ -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

4
src/battle/move/item/unknown_item.c
View File

@ -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

2
src/battle/move/item/volt_shroom.c
View File

@ -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)

22
src/battle/move/jump/attack.c
View File

@ -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)

6
src/battle/move/jump/auto_jump.c
View File

@ -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)

6
src/battle/move/jump/auto_multibounce.c
View File

@ -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

6
src/battle/move/jump/d_down_jump.c
View File

@ -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)

12
src/battle/move/jump/demo_power_bounce.c
View File

@ -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

6
src/battle/move/jump/dizzy_stomp.c
View File

@ -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)

28
src/battle/move/jump/earthquake_jump.c
View File

@ -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

12
src/battle/move/jump/jump_charge_0.c
View File

@ -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
};

12
src/battle/move/jump/jump_charge_1.c
View File

@ -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
};

12
src/battle/move/jump/jump_charge_2.c
View File

@ -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
};

12
src/battle/move/jump/multibounce.c
View File

@ -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

12
src/battle/move/jump/power_bounce.c
View File

@ -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

6
src/battle/move/jump/shrink_stomp.c
View File

@ -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)

6
src/battle/move/jump/sleep_stomp.c
View File

@ -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)

16
src/battle/move/star_power/chill_out.c
View File

@ -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)

20
src/battle/move/star_power/focus.c
View File

@ -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)

16
src/battle/move/star_power/lullaby.c
View File

@ -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)

16
src/battle/move/star_power/peach_focus.c
View File

@ -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)

16
src/battle/move/star_power/refresh.c
View File

@ -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)

30
src/battle/move/star_power/smooch.c
View File

@ -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
};

16
src/battle/move/star_power/star_storm.c
View File

@ -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)

16
src/battle/move/star_power/time_out.c
View File

@ -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)

16
src/battle/move/star_power/twink_dash.c
View File

@ -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)

16
src/battle/move/star_power/up_and_away.c
View File

@ -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)

2
src/battle/partner/bow.c
View File

@ -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)

20
src/battle/partner/lakilester.c
View File

@ -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)

Some files were not shown because too many files have changed in this diff Show More