diff --git a/src/battle/area/arn/actor/hyper_cleft.c b/src/battle/area/arn/actor/hyper_cleft.c index 6ffa0e0625..6622002592 100644 --- a/src/battle/area/arn/actor/hyper_cleft.c +++ b/src/battle/area/arn/actor/hyper_cleft.c @@ -6,7 +6,7 @@ #define NAMESPACE b_area_arn_hyper_cleft -extern s32 N(idleAnimations_80221CD4)[]; +extern s32 N(IdleAnimations_80221CD4)[]; extern EvtScript N(EVS_Init); extern EvtScript N(idle_80221DD0); extern EvtScript N(handleEvent_80222140); @@ -16,13 +16,13 @@ extern EvtScript N(nextTurn_80220D3C); extern EvtScript N(80222F1C); extern EvtScript N(80223310); -s32 N(defenseTable_80220B40)[] = { +s32 N(DefenseTable_80220B40)[] = { ELEMENT_NORMAL, 3, ELEMENT_FIRE, 99, ELEMENT_END, }; -s32 N(defenseTable_80220B54)[] = { +s32 N(DefenseTable_80220B54)[] = { ELEMENT_NORMAL, 1, ELEMENT_FIRE, 99, ELEMENT_END, @@ -60,8 +60,8 @@ ActorPartBlueprint N(ActorParts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 22 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80221CD4), - .defenseTable = N(defenseTable_80220B40), + .idleAnimations = N(IdleAnimations_80221CD4), + .defenseTable = N(DefenseTable_80220B40), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -91,7 +91,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations_80220C60)[] = { +s32 N(IdleAnimations_80220C60)[] = { STATUS_NORMAL, ANIM_Cleft_Hyper_Anim04, STATUS_STONE, ANIM_Cleft_Hyper_Anim00, STATUS_SLEEP, ANIM_Cleft_Hyper_Anim0C, @@ -162,7 +162,7 @@ EvtScript N(80220DC0) = { EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(1.0)) EVT_END_THREAD EVT_CALL(SetActorVar, ACTOR_SELF, 0, 2) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80220C60))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80220C60))) EVT_CALL(EnableActorGlow, ACTOR_SELF, TRUE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ATTACK_CHARGED, TRUE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -230,7 +230,7 @@ EvtScript N(80220DC0) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Cleft_Hyper_Anim02) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80221CD4))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80221CD4))) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -289,7 +289,7 @@ EvtScript N(80220DC0) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Cleft_Hyper_Anim02) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80221CD4))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80221CD4))) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -349,7 +349,7 @@ EvtScript N(takeTurn_80221A58) = { EVT_END }; -s32 N(idleAnimations_80221CD4)[] = { +s32 N(IdleAnimations_80221CD4)[] = { STATUS_NORMAL, ANIM_Cleft_Hyper_Anim02, STATUS_STONE, ANIM_Cleft_Hyper_Anim00, STATUS_SLEEP, ANIM_Cleft_Hyper_Anim0C, @@ -362,7 +362,7 @@ s32 N(idleAnimations_80221CD4)[] = { STATUS_END, }; -s32 N(idleAnimations_80221D20)[] = { +s32 N(IdleAnimations_80221D20)[] = { STATUS_NORMAL, ANIM_Cleft_Hyper_Anim05, STATUS_STONE, ANIM_Cleft_Hyper_Anim01, STATUS_SLEEP, ANIM_Cleft_Hyper_Anim0D, @@ -418,8 +418,8 @@ EvtScript N(80221DE0) = { EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Cleft_Hyper_Anim03) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80221D20))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_80220B54))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80221D20))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_80220B54))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 15) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -7) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, FALSE) @@ -529,7 +529,7 @@ EvtScript N(handleEvent_80222140) = { EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ATTACK_CHARGED, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80221CD4))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80221CD4))) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Cleft_Hyper_Anim08) EVT_EXEC_WAIT(DoShockHit) @@ -548,7 +548,7 @@ EvtScript N(handleEvent_80222140) = { EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ATTACK_CHARGED, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80221CD4))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80221CD4))) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Cleft_Hyper_Anim08) EVT_EXEC_WAIT(DoShockHit) @@ -564,7 +564,7 @@ EvtScript N(handleEvent_80222140) = { EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ATTACK_CHARGED, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80221CD4))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80221CD4))) EVT_END_IF EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 1) @@ -705,8 +705,8 @@ EvtScript N(80222F1C) = { EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, 0, LVar2) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Cleft_Hyper_Anim02) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80221CD4))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_80220B40))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80221CD4))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_80220B40))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 22) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -10) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, TRUE) diff --git a/src/battle/area/arn/actor/hyper_paragoomba.c b/src/battle/area/arn/actor/hyper_paragoomba.c index 9428613fb8..956639ae4b 100644 --- a/src/battle/area/arn/actor/hyper_paragoomba.c +++ b/src/battle/area/arn/actor/hyper_paragoomba.c @@ -7,10 +7,10 @@ #define NAMESPACE b_area_arn_hyper_paragoomba -extern s32 N(idleAnimations_8021C594)[]; -extern s32 N(idleAnimations_8021C62C)[]; -extern s32 N(idleAnimations_8021C638)[]; -extern s32 N(idleAnimations_8021F05C)[]; +extern s32 N(IdleAnimations_8021C594)[]; +extern s32 N(IdleAnimations_8021C62C)[]; +extern s32 N(IdleAnimations_8021C638)[]; +extern s32 N(IdleAnimations_8021F05C)[]; extern EvtScript N(init_8021B564); extern EvtScript N(idle_8021C690); extern EvtScript N(handleEvent_8021C9C4); @@ -26,17 +26,17 @@ extern EvtScript N(takeTurn_8021EE34); extern EvtScript N(takeTurn_8021FE6C); extern EvtScript N(nextTurn_8021E194); -s32 N(defenseTable_8021B2F0)[] = { +s32 N(DefenseTable_8021B2F0)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(defenseTable_8021B2FC)[] = { +s32 N(DefenseTable_8021B2FC)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_8021B308)[] = { +s32 N(StatusTable_8021B308)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 80, @@ -61,7 +61,7 @@ s32 N(statusTable_8021B308)[] = { STATUS_END, }; -s32 N(statusTable_8021B3B4)[] = { +s32 N(StatusTable_8021B3B4)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 80, @@ -86,15 +86,15 @@ s32 N(statusTable_8021B3B4)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_8021B460)[] = { +ActorPartBlueprint N(PartsTable_8021B460)[] = { { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 22 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021F05C), - .defenseTable = N(defenseTable_8021B2F0), + .idleAnimations = N(IdleAnimations_8021F05C), + .defenseTable = N(DefenseTable_8021B2F0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -105,8 +105,8 @@ ActorPartBlueprint N(partsTable_8021B460)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021C594), - .defenseTable = N(defenseTable_8021B2FC), + .idleAnimations = N(IdleAnimations_8021C594), + .defenseTable = N(DefenseTable_8021B2FC), .eventFlags = ACTOR_EVENT_FLAG_GROUNDABLE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -117,8 +117,8 @@ ActorPartBlueprint N(partsTable_8021B460)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -16, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021C62C), - .defenseTable = N(defenseTable_8021B2F0), + .idleAnimations = N(IdleAnimations_8021C62C), + .defenseTable = N(DefenseTable_8021B2F0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -129,8 +129,8 @@ ActorPartBlueprint N(partsTable_8021B460)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -16, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021C638), - .defenseTable = N(defenseTable_8021B2F0), + .idleAnimations = N(IdleAnimations_8021C638), + .defenseTable = N(DefenseTable_8021B2F0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -142,10 +142,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_HYPER_PARAGOOMBA, .level = 12, .maxHP = 7, - .partCount = ARRAY_COUNT(N(partsTable_8021B460)), - .partsData = N(partsTable_8021B460), + .partCount = ARRAY_COUNT( N(PartsTable_8021B460)), + .partsData = N(PartsTable_8021B460), .initScript = &N(init_8021B564), - .statusTable = N(statusTable_8021B3B4), + .statusTable = N(StatusTable_8021B3B4), .escapeChance = 50, .airLiftChance = 95, .hurricaneChance = 95, @@ -160,7 +160,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations_8021B518)[] = { +s32 N(IdleAnimations_8021B518)[] = { STATUS_NORMAL, ANIM_Paragoomba_Hyper_Miss, STATUS_STONE, ANIM_Paragoomba_Hyper_Still, STATUS_SLEEP, ANIM_Paragoomba_Hyper_Sleep, @@ -220,7 +220,7 @@ EvtScript N(8021B678) = { EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, FALSE, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021B518))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations_8021B518))) EVT_CALL(EnableActorGlow, ACTOR_SELF, TRUE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_ATTACK_CHARGED, TRUE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -310,7 +310,7 @@ EvtScript N(8021B678) = { EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_Paragoomba_Hyper_Idle) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 2, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021C594))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations_8021C594))) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -358,7 +358,7 @@ EvtScript N(8021B678) = { EVT_EXEC_WAIT(N(8021C94C)) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021C594))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations_8021C594))) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, -1) @@ -411,7 +411,7 @@ EvtScript N(takeTurn_8021C36C) = { EVT_END }; -s32 N(idleAnimations_8021C594)[] = { +s32 N(IdleAnimations_8021C594)[] = { STATUS_NORMAL, ANIM_Paragoomba_Hyper_Idle, STATUS_STONE, ANIM_Paragoomba_Hyper_Still, STATUS_SLEEP, ANIM_Paragoomba_Hyper_Sleep, @@ -424,7 +424,7 @@ s32 N(idleAnimations_8021C594)[] = { STATUS_END, }; -s32 N(idleAnimations_8021C5E0)[] = { +s32 N(IdleAnimations_8021C5E0)[] = { STATUS_NORMAL, ANIM_Paragoomba_Hyper_Run, STATUS_STONE, ANIM_Paragoomba_Hyper_Still, STATUS_SLEEP, ANIM_Paragoomba_Hyper_Sleep, @@ -437,12 +437,12 @@ s32 N(idleAnimations_8021C5E0)[] = { STATUS_END, }; -s32 N(idleAnimations_8021C62C)[] = { +s32 N(IdleAnimations_8021C62C)[] = { STATUS_NORMAL, ANIM_Paragoomba_Hyper_LWingStill, STATUS_END, }; -s32 N(idleAnimations_8021C638)[] = { +s32 N(IdleAnimations_8021C638)[] = { STATUS_NORMAL, ANIM_Paragoomba_Hyper_RWingStill, STATUS_END, }; @@ -471,7 +471,7 @@ EvtScript N(idle_8021C690) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(0.6)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021C5E0))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations_8021C5E0))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) EVT_LOOP(20) @@ -488,7 +488,7 @@ EvtScript N(idle_8021C690) = { EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(0.6)) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021C594))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations_8021C594))) EVT_LOOP(40) EVT_LABEL(2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) @@ -562,7 +562,7 @@ EvtScript N(handleEvent_8021C9C4) = { EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_ATTACK_CHARGED, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021C594))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations_8021C594))) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_Paragoomba_Hyper_Electrocute) EVT_EXEC_WAIT(DoShockHit) @@ -577,7 +577,7 @@ EvtScript N(handleEvent_8021C9C4) = { EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_ATTACK_CHARGED, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021C594))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations_8021C594))) EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_Paragoomba_Hyper_Electrocute) EVT_EXEC_WAIT(DoShockHit) @@ -593,7 +593,7 @@ EvtScript N(handleEvent_8021C9C4) = { EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_ATTACK_CHARGED, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021C594))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations_8021C594))) EVT_END_IF EVT_SET_CONST(LVar0, 2) EVT_SET_CONST(LVar1, ANIM_Paragoomba_Hyper_Idle) @@ -820,7 +820,7 @@ EvtScript N(8021D9F4) = { EVT_CALL(SetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Hyper_Idle) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_8021B308))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable_8021B308))) EVT_CALL(SetActorType, ACTOR_SELF, ACTOR_TYPE_HYPER_GOOMBA) EVT_EXEC_WAIT(N(8021E058)) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_TYPE_CHANGED, TRUE) @@ -830,7 +830,7 @@ EvtScript N(8021D9F4) = { EVT_END }; -s32 N(idleAnimations_8021DF7C)[] = { +s32 N(IdleAnimations_8021DF7C)[] = { STATUS_NORMAL, ANIM_Goomba_Hyper_Sleep, STATUS_STONE, ANIM_Goomba_Hyper_Still, STATUS_SLEEP, ANIM_Goomba_Hyper_Sleep, @@ -916,7 +916,7 @@ EvtScript N(8021E218) = { EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.5)) EVT_END_THREAD EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021DF7C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021DF7C))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Hyper_Idle) EVT_CALL(EnableActorGlow, ACTOR_SELF, TRUE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ATTACK_CHARGED, TRUE) @@ -983,7 +983,7 @@ EvtScript N(8021E218) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Hyper_Idle) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021F05C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021F05C))) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -1038,7 +1038,7 @@ EvtScript N(8021E218) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Hyper_Idle) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021F05C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021F05C))) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -1091,7 +1091,7 @@ EvtScript N(takeTurn_8021EE34) = { EVT_END }; -s32 N(idleAnimations_8021F05C)[] = { +s32 N(IdleAnimations_8021F05C)[] = { STATUS_NORMAL, ANIM_Goomba_Hyper_Idle, STATUS_STONE, ANIM_Goomba_Hyper_Still, STATUS_SLEEP, ANIM_Goomba_Hyper_Sleep, @@ -1104,7 +1104,7 @@ s32 N(idleAnimations_8021F05C)[] = { STATUS_END, }; -s32 N(idleAnimations_8021F0A8)[] = { +s32 N(IdleAnimations_8021F0A8)[] = { STATUS_NORMAL, ANIM_Goomba_Hyper_Run, STATUS_STONE, ANIM_Goomba_Hyper_Still, STATUS_SLEEP, ANIM_Goomba_Hyper_Sleep, @@ -1141,10 +1141,10 @@ EvtScript N(idle_8021F140) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021F0A8))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021F0A8))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021F05C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021F05C))) EVT_LOOP(20) EVT_LABEL(1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) @@ -1157,10 +1157,10 @@ EvtScript N(idle_8021F140) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021F0A8))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021F0A8))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021F05C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021F05C))) EVT_LOOP(80) EVT_LABEL(2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) @@ -1219,7 +1219,7 @@ EvtScript N(handleEvent_8021F41C) = { EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ATTACK_CHARGED, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021F05C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021F05C))) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Goomba_Hyper_Electrocute) EVT_EXEC_WAIT(DoShockHit) @@ -1243,7 +1243,7 @@ EvtScript N(handleEvent_8021F41C) = { EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ATTACK_CHARGED, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021F05C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021F05C))) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Goomba_Hyper_Electrocute) EVT_EXEC_WAIT(DoShockHit) @@ -1259,7 +1259,7 @@ EvtScript N(handleEvent_8021F41C) = { EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ATTACK_CHARGED, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021F05C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021F05C))) EVT_END_IF EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Goomba_Hyper_Idle) diff --git a/src/battle/area/arn/actor/hypergoomba.c b/src/battle/area/arn/actor/hypergoomba.c index f82da12bb8..14a83b635c 100644 --- a/src/battle/area/arn/actor/hypergoomba.c +++ b/src/battle/area/arn/actor/hypergoomba.c @@ -6,7 +6,7 @@ #define NAMESPACE b_area_arn_hypergoomba -extern s32 N(idleAnimations_80219818)[]; +extern s32 N(IdleAnimations_80219818)[]; extern EvtScript N(init_802188C0); extern EvtScript N(idle_802198FC); extern EvtScript N(handleEvent_80219BD8); @@ -14,12 +14,12 @@ extern EvtScript N(takeTurn_802195F0); extern EvtScript N(nextTurn_80218950); extern EvtScript N(takeTurn_8021A628); -s32 N(defenseTable_80218770)[] = { +s32 N(DefenseTable_80218770)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_8021877C)[] = { +s32 N(StatusTable_8021877C)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 80, @@ -44,15 +44,15 @@ s32 N(statusTable_8021877C)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_80218828)[] = { +ActorPartBlueprint N(PartsTable_80218828)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 22 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80219818), - .defenseTable = N(defenseTable_80218770), + .idleAnimations = N(IdleAnimations_80219818), + .defenseTable = N(DefenseTable_80218770), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -64,10 +64,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_HYPER_GOOMBA, .level = 12, .maxHP = 7, - .partCount = ARRAY_COUNT(N(partsTable_80218828)), - .partsData = N(partsTable_80218828), + .partCount = ARRAY_COUNT( N(PartsTable_80218828)), + .partsData = N(PartsTable_80218828), .initScript = &N(init_802188C0), - .statusTable = N(statusTable_8021877C), + .statusTable = N(StatusTable_8021877C), .escapeChance = 60, .airLiftChance = 90, .hurricaneChance = 90, @@ -82,7 +82,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations_80218874)[] = { +s32 N(IdleAnimations_80218874)[] = { STATUS_NORMAL, ANIM_Goomba_Hyper_Sleep, STATUS_STONE, ANIM_Goomba_Hyper_Still, STATUS_SLEEP, ANIM_Goomba_Hyper_Sleep, @@ -150,7 +150,7 @@ EvtScript N(802189D4) = { EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.5)) EVT_END_THREAD EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80218874))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80218874))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Hyper_Idle) EVT_CALL(EnableActorGlow, ACTOR_SELF, TRUE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ATTACK_CHARGED, TRUE) @@ -217,7 +217,7 @@ EvtScript N(802189D4) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Hyper_Idle) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80219818))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80219818))) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -272,7 +272,7 @@ EvtScript N(802189D4) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Hyper_Idle) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80219818))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80219818))) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -325,7 +325,7 @@ EvtScript N(takeTurn_802195F0) = { EVT_END }; -s32 N(idleAnimations_80219818)[] = { +s32 N(IdleAnimations_80219818)[] = { STATUS_NORMAL, ANIM_Goomba_Hyper_Idle, STATUS_STONE, ANIM_Goomba_Hyper_Still, STATUS_SLEEP, ANIM_Goomba_Hyper_Sleep, @@ -338,7 +338,7 @@ s32 N(idleAnimations_80219818)[] = { STATUS_END, }; -s32 N(idleAnimations_80219864)[] = { +s32 N(IdleAnimations_80219864)[] = { STATUS_NORMAL, ANIM_Goomba_Hyper_Run, STATUS_STONE, ANIM_Goomba_Hyper_Still, STATUS_SLEEP, ANIM_Goomba_Hyper_Sleep, @@ -375,10 +375,10 @@ EvtScript N(idle_802198FC) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80219864))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80219864))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80219818))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80219818))) EVT_LOOP(20) EVT_LABEL(1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) @@ -391,10 +391,10 @@ EvtScript N(idle_802198FC) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80219864))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80219864))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80219818))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80219818))) EVT_LOOP(80) EVT_LABEL(2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) @@ -453,7 +453,7 @@ EvtScript N(handleEvent_80219BD8) = { EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ATTACK_CHARGED, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80219818))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80219818))) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Goomba_Hyper_Electrocute) EVT_EXEC_WAIT(DoShockHit) @@ -477,7 +477,7 @@ EvtScript N(handleEvent_80219BD8) = { EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ATTACK_CHARGED, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80219818))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80219818))) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Goomba_Hyper_Electrocute) EVT_EXEC_WAIT(DoShockHit) @@ -493,7 +493,7 @@ EvtScript N(handleEvent_80219BD8) = { EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ATTACK_CHARGED, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80219818))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80219818))) EVT_END_IF EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Goomba_Hyper_Idle) diff --git a/src/battle/area/arn/actor/tubba_blubba.c b/src/battle/area/arn/actor/tubba_blubba.c index 452bde1cfb..7ffa3169be 100644 --- a/src/battle/area/arn/actor/tubba_blubba.c +++ b/src/battle/area/arn/actor/tubba_blubba.c @@ -15,7 +15,7 @@ extern EvtScript N(80226558); extern EvtScript N(80226B88); extern EvtScript N(80227878); -s32 N(idleAnimations_80225C40)[] = { +s32 N(IdleAnimations_80225C40)[] = { STATUS_NORMAL, ANIM_BattleTubba_Anim01, STATUS_STONE, ANIM_BattleTubba_Anim00, STATUS_SLEEP, ANIM_BattleTubba_Anim18, @@ -29,12 +29,12 @@ s32 N(idleAnimations_80225C40)[] = { STATUS_END, }; -s32 N(defenseTable_80225C94)[] = { +s32 N(DefenseTable_80225C94)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_80225CA0)[] = { +s32 N(StatusTable_80225CA0)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 80, @@ -59,15 +59,15 @@ s32 N(statusTable_80225CA0)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_80225D4C)[] = { +ActorPartBlueprint N(PartsTable_80225D4C)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { -15, 75 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80225C40), - .defenseTable = N(defenseTable_80225C94), + .idleAnimations = N(IdleAnimations_80225C40), + .defenseTable = N(DefenseTable_80225C94), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -79,10 +79,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_TUBBA_BLUBBA_INVINCIBLE, .level = 70, .maxHP = 10, - .partCount = ARRAY_COUNT(N(partsTable_80225D4C)), - .partsData = N(partsTable_80225D4C), + .partCount = ARRAY_COUNT( N(PartsTable_80225D4C)), + .partsData = N(PartsTable_80225D4C), .initScript = &N(init_80225D98), - .statusTable = N(statusTable_80225CA0), + .statusTable = N(StatusTable_80225CA0), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, diff --git a/src/battle/area/arn/actor/tubbas_heart.c b/src/battle/area/arn/actor/tubbas_heart.c index d7adb9d7ad..e9d66f5e1a 100644 --- a/src/battle/area/arn/actor/tubbas_heart.c +++ b/src/battle/area/arn/actor/tubbas_heart.c @@ -17,7 +17,7 @@ extern EvtScript N(80224B3C); extern EvtScript N(80225258); extern EvtScript N(802255D8); -s32 N(idleAnimations_80223BC0)[] = { +s32 N(IdleAnimations_80223BC0)[] = { STATUS_NORMAL, ANIM_TubbasHeart_Anim01, STATUS_STONE, ANIM_TubbasHeart_Anim00, STATUS_SLEEP, ANIM_TubbasHeart_Anim04, @@ -32,7 +32,7 @@ s32 N(idleAnimations_80223BC0)[] = { STATUS_END, }; -s32 N(idleAnimations_80223C1C)[] = { +s32 N(IdleAnimations_80223C1C)[] = { STATUS_NORMAL, ANIM_TubbasHeart_Anim0B, STATUS_STONE, ANIM_TubbasHeart_Anim00, STATUS_SLEEP, ANIM_TubbasHeart_Anim04, @@ -47,12 +47,12 @@ s32 N(idleAnimations_80223C1C)[] = { STATUS_END, }; -s32 N(defenseTable_80223C78)[] = { +s32 N(DefenseTable_80223C78)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_80223C84)[] = { +s32 N(StatusTable_80223C84)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -77,15 +77,15 @@ s32 N(statusTable_80223C84)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_80223D30)[] = { +ActorPartBlueprint N(PartsTable_80223D30)[] = { { .flags = ACTOR_PART_FLAG_NO_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80223BC0), - .defenseTable = N(defenseTable_80223C78), + .idleAnimations = N(IdleAnimations_80223BC0), + .defenseTable = N(DefenseTable_80223C78), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -96,8 +96,8 @@ ActorPartBlueprint N(partsTable_80223D30)[] = { .posOffset = { 0, 54, 0 }, .targetOffset = { 0, -30 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80223BC0), - .defenseTable = N(defenseTable_80223C78), + .idleAnimations = N(IdleAnimations_80223BC0), + .defenseTable = N(DefenseTable_80223C78), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -109,10 +109,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_TUBBA_HEART, .level = 0, .maxHP = 50, - .partCount = ARRAY_COUNT(N(partsTable_80223D30)), - .partsData = N(partsTable_80223D30), + .partCount = ARRAY_COUNT( N(PartsTable_80223D30)), + .partsData = N(PartsTable_80223D30), .initScript = &N(init_80223DA0), - .statusTable = N(statusTable_80223C84), + .statusTable = N(StatusTable_80223C84), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -523,7 +523,7 @@ EvtScript N(80225258) = { EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 3, LVar0, LVar1, LVar2, LVar3, 0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 4, LVarF) EVT_CALL(EnableActorGlow, ACTOR_SELF, TRUE) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80223C1C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80223C1C))) EVT_RETURN EVT_END }; @@ -564,7 +564,7 @@ EvtScript N(802255D8) = { EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar0) EVT_CALL(RemoveEffect, LVar0) EVT_CALL(SetActorVar, ACTOR_SELF, 4, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80223BC0))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80223BC0))) EVT_END_IF EVT_CALL(PlaySound, SOUND_20F9) EVT_CALL(SetGoalToTarget, ACTOR_SELF) diff --git a/src/battle/area/dig/actor/tubba_blubba.c b/src/battle/area/dig/actor/tubba_blubba.c index 4ac0f9fb6d..396d283f1f 100644 --- a/src/battle/area/dig/actor/tubba_blubba.c +++ b/src/battle/area/dig/actor/tubba_blubba.c @@ -14,7 +14,7 @@ extern EvtScript N(idle); extern EvtScript N(shakeCam); extern EvtScript N(attackBodyCrush); -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_BattleTubba_Anim02, STATUS_STONE, ANIM_BattleTubba_Anim00, STATUS_SLEEP, ANIM_BattleTubba_Anim00, @@ -29,12 +29,12 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 80, @@ -66,8 +66,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -15, 75 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -82,7 +82,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, diff --git a/src/battle/area/flo/actor/amazy_dayzee.c b/src/battle/area/flo/actor/amazy_dayzee.c index 92d65aae88..b0e9f62a90 100644 --- a/src/battle/area/flo/actor/amazy_dayzee.c +++ b/src/battle/area/flo/actor/amazy_dayzee.c @@ -10,14 +10,14 @@ extern EvtScript N(init); extern EvtScript N(takeTurn); extern EvtScript N(idle); extern EvtScript N(handleEvent); -extern s32 N(idleAnimations)[]; +extern s32 N(IdleAnimations)[]; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 1, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 10, @@ -49,8 +49,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -2, 30 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -65,7 +65,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 90, .airLiftChance = 85, .hurricaneChance = 80, @@ -80,7 +80,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 9, 25 }, }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_Dayzee_Amazy_Anim01, STATUS_STONE, ANIM_Dayzee_Amazy_Anim00, STATUS_SLEEP, ANIM_Dayzee_Amazy_Anim0C, diff --git a/src/battle/area/flo/actor/crazee_dayzee.c b/src/battle/area/flo/actor/crazee_dayzee.c index 7ea1c3aad3..11b33866fa 100644 --- a/src/battle/area/flo/actor/crazee_dayzee.c +++ b/src/battle/area/flo/actor/crazee_dayzee.c @@ -10,14 +10,14 @@ extern EvtScript N(EVS_Init); extern EvtScript N(takeTurn); extern EvtScript N(idle); extern EvtScript N(handleEvent); -extern s32 N(idleAnimations)[]; +extern s32 N(IdleAnimations)[]; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 95, @@ -49,8 +49,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -2, 30 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -65,7 +65,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(EVS_Init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 50, .airLiftChance = 85, .hurricaneChance = 80, @@ -80,7 +80,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 9, 25 }, }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_Dayzee_Anim01, STATUS_STONE, ANIM_Dayzee_Anim00, STATUS_SLEEP, ANIM_Dayzee_Anim0C, diff --git a/src/battle/area/flo/actor/lakitu.c b/src/battle/area/flo/actor/lakitu.c index dc55dd4055..d381f5bf5f 100644 --- a/src/battle/area/flo/actor/lakitu.c +++ b/src/battle/area/flo/actor/lakitu.c @@ -14,7 +14,7 @@ extern EvtScript N(takeTurn); extern EvtScript N(idle); extern EvtScript N(handleEvent); -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_Lakitu_Anim01, STATUS_STONE, ANIM_Lakitu_Anim00, STATUS_SLEEP, ANIM_Lakitu_Anim08, @@ -27,23 +27,23 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations2)[] = { +s32 N(IdleAnimations2)[] = { STATUS_NORMAL, ANIM_Lakitu_Anim0B, STATUS_END, }; -s32 N(idleAnimations3)[] = { +s32 N(IdleAnimations3)[] = { STATUS_NORMAL, ANIM_Spiny_Anim01, STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_MYSTERY, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 50, @@ -75,8 +75,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -5, 35 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -13 }, @@ -87,8 +87,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations2), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations2), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -99,8 +99,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations3), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations3), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -115,7 +115,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 40, .airLiftChance = 90, .hurricaneChance = 90, diff --git a/src/battle/area/flo/actor/ruff_puff.c b/src/battle/area/flo/actor/ruff_puff.c index 14804283c6..d47e9637b9 100644 --- a/src/battle/area/flo/actor/ruff_puff.c +++ b/src/battle/area/flo/actor/ruff_puff.c @@ -10,7 +10,7 @@ extern EvtScript N(takeTurn); extern EvtScript N(idle); extern EvtScript N(handleEvent); -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_TuffPuff_Idle, STATUS_STONE, ANIM_TuffPuff_Still, STATUS_SLEEP, ANIM_TuffPuff_Sleep, @@ -22,13 +22,13 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_MYSTERY, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 50, @@ -60,8 +60,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -2, 26 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -13 }, @@ -76,7 +76,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(EVS_Init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 50, .airLiftChance = 90, .hurricaneChance = 90, diff --git a/src/battle/area/flo2/actor/huff_n_puff.c b/src/battle/area/flo2/actor/huff_n_puff.c index 61eafe14ca..3de839074a 100644 --- a/src/battle/area/flo2/actor/huff_n_puff.c +++ b/src/battle/area/flo2/actor/huff_n_puff.c @@ -243,7 +243,7 @@ API_CALLABLE(N(UpdateLerp)) { s32 N(TuffPuffActorIds)[32] = { }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_HuffNPuff_Anim01, STATUS_STONE, ANIM_HuffNPuff_Anim01, STATUS_SLEEP, ANIM_HuffNPuff_Anim01, @@ -258,7 +258,7 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations2)[] = { +s32 N(IdleAnimations2)[] = { STATUS_NORMAL, ANIM_HuffNPuff_Anim02, STATUS_STONE, ANIM_HuffNPuff_Anim02, STATUS_SLEEP, ANIM_HuffNPuff_Anim02, @@ -273,7 +273,7 @@ s32 N(idleAnimations2)[] = { STATUS_END, }; -s32 N(idleAnimations3)[] = { +s32 N(IdleAnimations3)[] = { STATUS_NORMAL, ANIM_HuffNPuff_Anim03, STATUS_STONE, ANIM_HuffNPuff_Anim03, STATUS_SLEEP, ANIM_HuffNPuff_Anim03, @@ -288,27 +288,27 @@ s32 N(idleAnimations3)[] = { STATUS_END, }; -s32 N(idleAnimations_charged1)[] = { +s32 N(IdleAnimations_charged1)[] = { STATUS_NORMAL, ANIM_HuffNPuff_Anim11, STATUS_END, }; -s32 N(idleAnimations_charged2)[] = { +s32 N(IdleAnimations_charged2)[] = { STATUS_NORMAL, ANIM_HuffNPuff_Anim12, STATUS_END, }; -s32 N(idleAnimations_charged3)[] = { +s32 N(IdleAnimations_charged3)[] = { STATUS_NORMAL, ANIM_HuffNPuff_Anim13, STATUS_END, }; -s32 N(idleAnimations4)[] = { +s32 N(IdleAnimations4)[] = { STATUS_NORMAL, ANIM_RuffPuff_Anim02, STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_SHOCK, 99, ELEMENT_MYSTERY, 0, @@ -317,7 +317,7 @@ s32 N(defenseTable)[] = { ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -349,8 +349,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -10, 40 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { -15, -50 }, @@ -361,8 +361,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations2), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations2), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -373,8 +373,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations3), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations3), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -385,8 +385,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations4), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations4), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -401,7 +401,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(EVS_Init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -2219,9 +2219,9 @@ EvtScript N(electricCharge) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_HuffNPuff_Anim11) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_HuffNPuff_Anim12) EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_HuffNPuff_Anim13) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_charged1))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_charged2))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 3, EVT_PTR(N(idleAnimations_charged3))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_charged1))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations_charged2))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 3, EVT_PTR(N(IdleAnimations_charged3))) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ELECTRIFIED, TRUE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35C) EVT_CALL(N(StartRumbleWithParams), 70, 120) @@ -2272,9 +2272,9 @@ EvtScript N(attackGroundLightning) = { EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_EFFECT_SNAKING_STATIC), LVar0) EVT_CALL(RemoveEffect, LVar0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations2))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 3, EVT_PTR(N(idleAnimations3))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations2))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 3, EVT_PTR(N(IdleAnimations3))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_HuffNPuff_Anim0E) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_HuffNPuff_Anim0F) EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_HuffNPuff_Anim10) @@ -2363,9 +2363,9 @@ EvtScript N(electicCharge_copy) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_HuffNPuff_Anim11) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_HuffNPuff_Anim12) EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_HuffNPuff_Anim13) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_charged1))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_charged2))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 3, EVT_PTR(N(idleAnimations_charged3))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_charged1))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations_charged2))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 3, EVT_PTR(N(IdleAnimations_charged3))) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ELECTRIFIED, TRUE) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_35C) EVT_CALL(N(StartRumbleWithParams), 70, 120) @@ -2436,9 +2436,9 @@ EvtScript N(attackDirectLightning) = { EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_EFFECT_SNAKING_STATIC), LVar0) EVT_CALL(RemoveEffect, LVar0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations2))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 3, EVT_PTR(N(idleAnimations3))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations2))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 3, EVT_PTR(N(IdleAnimations3))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_HuffNPuff_Anim0E) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_HuffNPuff_Anim0F) EVT_CALL(SetAnimation, ACTOR_SELF, 3, ANIM_HuffNPuff_Anim10) diff --git a/src/battle/area/flo2/actor/monty_mole_boss.c b/src/battle/area/flo2/actor/monty_mole_boss.c index 58ef506661..46dc7342ef 100644 --- a/src/battle/area/flo2/actor/monty_mole_boss.c +++ b/src/battle/area/flo2/actor/monty_mole_boss.c @@ -6,21 +6,21 @@ #define NAMESPACE b_area_flo2_monty_mole_boss -extern s32 N(idleAnimations)[]; -extern s32 N(idleAnimations2)[]; +extern s32 N(IdleAnimations)[]; +extern s32 N(IdleAnimations2)[]; extern EvtScript N(init); extern EvtScript N(takeTurn); extern EvtScript N(idle); extern EvtScript N(handleEvent); -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_SMASH, 0, ELEMENT_THROW, -3, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 60, @@ -52,8 +52,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -2, 16 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -7 }, @@ -64,8 +64,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, -15 }, .targetOffset = { 0, 16 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -7 }, @@ -76,8 +76,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations2), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations2), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -92,7 +92,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 50, .airLiftChance = 55, .hurricaneChance = 40, @@ -107,7 +107,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_MontyMole_Dark_Anim01, STATUS_STONE, ANIM_MontyMole_Dark_Anim00, STATUS_SLEEP, ANIM_MontyMole_Dark_Anim14, @@ -120,17 +120,17 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations2)[] = { +s32 N(IdleAnimations2)[] = { STATUS_NORMAL, ANIM_MontyMole_Dark_Anim0F, STATUS_END, }; -s32 N(idleAnimations_hole)[] = { +s32 N(IdleAnimations_hole)[] = { STATUS_NORMAL, ANIM_MontyMole_Dark_Anim12, STATUS_END, }; -s32 N(idleAnimations_unused)[] = { +s32 N(IdleAnimations_unused)[] = { STATUS_NORMAL, ANIM_MontyMole_Dark_Anim06, STATUS_END, }; @@ -142,7 +142,7 @@ ActorPartBlueprint N(parts_hole)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_hole), + .idleAnimations = N(IdleAnimations_hole), .defenseTable = NULL, .eventFlags = 0, .elementImmunityFlags = 0, @@ -305,7 +305,7 @@ EvtScript N(handleEvent) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_MontyMole_Dark_Anim08) EVT_WAIT(15) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_TARGET_ONLY | ACTOR_FLAG_NO_DMG_APPLY, TRUE) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_hole))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_hole))) EVT_RETURN EVT_CASE_EQ(EVENT_BEGIN_AIR_LIFT) EVT_SET_CONST(LVar0, 1) diff --git a/src/battle/area/flo2/actor/spike.c b/src/battle/area/flo2/actor/spike.c index 81713dbcfd..4652a480f6 100644 --- a/src/battle/area/flo2/actor/spike.c +++ b/src/battle/area/flo2/actor/spike.c @@ -11,7 +11,7 @@ extern EvtScript N(takeTurn); extern EvtScript N(idle); extern EvtScript N(handleEvent); -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_BattleLakilester_Idle, STATUS_STONE, ANIM_BattleLakilester_Still, STATUS_SLEEP, ANIM_BattleLakilester_Block, @@ -24,17 +24,17 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations_spiny)[] = { +s32 N(IdleAnimations_spiny)[] = { STATUS_NORMAL, ANIM_BattleLakilester_Spiny, STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 40, @@ -66,8 +66,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -5, 35 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -13 }, @@ -78,8 +78,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_spiny), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations_spiny), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -94,7 +94,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, diff --git a/src/battle/area/flo2/actor/tuff_puff.c b/src/battle/area/flo2/actor/tuff_puff.c index 94b81268dd..a32019d168 100644 --- a/src/battle/area/flo2/actor/tuff_puff.c +++ b/src/battle/area/flo2/actor/tuff_puff.c @@ -20,7 +20,7 @@ extern EvtScript N(idle); extern EvtScript N(handleEvent); extern EvtScript N(nextTurn); -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_RuffPuff_Anim02, STATUS_STONE, ANIM_RuffPuff_Anim00, STATUS_SLEEP, ANIM_RuffPuff_Anim02, @@ -35,7 +35,7 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations2)[] = { +s32 N(IdleAnimations2)[] = { STATUS_NORMAL, ANIM_RuffPuff_Anim03, STATUS_STONE, ANIM_RuffPuff_Anim01, STATUS_SLEEP, ANIM_RuffPuff_Anim03, @@ -50,7 +50,7 @@ s32 N(idleAnimations2)[] = { STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_SHOCK, 99, ELEMENT_MYSTERY, 0, @@ -59,7 +59,7 @@ s32 N(defenseTable)[] = { ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -91,8 +91,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -104,7 +104,7 @@ ActorPartBlueprint N(parts)[] = { .targetOffset = { 0, -50 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -119,7 +119,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -146,7 +146,7 @@ EvtScript N(init) = { EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -1, 9) EVT_CALL(SetTargetOffset, ACTOR_SELF, 2, -1, -41) EVT_CALL(SetActorSize, ACTOR_SELF, 20, 25) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_RuffPuff_Anim02) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_IS_BIG), 0) EVT_ELSE @@ -155,7 +155,7 @@ EvtScript N(init) = { EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 1, 14) EVT_CALL(SetTargetOffset, ACTOR_SELF, 2, 1, -36) EVT_CALL(SetActorSize, ACTOR_SELF, 28, 35) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations2))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations2))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_RuffPuff_Anim03) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_IS_BIG), 1) EVT_END_IF diff --git a/src/battle/area/hos/actor/goombario_tutor.c b/src/battle/area/hos/actor/goombario_tutor.c index aabc11c710..d653ff713f 100644 --- a/src/battle/area/hos/actor/goombario_tutor.c +++ b/src/battle/area/hos/actor/goombario_tutor.c @@ -8,7 +8,7 @@ #define NAMESPACE b_area_hos_goombario_tutor -s32 N(idleAnimations_80219010)[] = { +s32 N(IdleAnimations_80219010)[] = { STATUS_NORMAL, ANIM_BattleGoombario_Idle, STATUS_STONE, ANIM_BattleGoombario_Still, STATUS_SLEEP, ANIM_BattleGoombario_Still, @@ -21,12 +21,12 @@ s32 N(idleAnimations_80219010)[] = { STATUS_END, }; -s32 N(defenseTable_8021905C)[] = { +s32 N(DefenseTable_8021905C)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_80219068)[] = { +s32 N(StatusTable_80219068)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -51,15 +51,15 @@ s32 N(statusTable_80219068)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_80219114)[] = { +ActorPartBlueprint N(PartsTable_80219114)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { -4, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80219010), - .defenseTable = N(defenseTable_8021905C), + .idleAnimations = N(IdleAnimations_80219010), + .defenseTable = N(DefenseTable_8021905C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -73,10 +73,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_GOOMBARIO_TUTOR1, .level = 99, .maxHP = 99, - .partCount = ARRAY_COUNT(N(partsTable_80219114)), - .partsData = N(partsTable_80219114), + .partCount = ARRAY_COUNT( N(PartsTable_80219114)), + .partsData = N(PartsTable_80219114), .initScript = &N(init_80219160), - .statusTable = N(statusTable_80219068), + .statusTable = N(StatusTable_80219068), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, diff --git a/src/battle/area/hos/actor/magikoopa.c b/src/battle/area/hos/actor/magikoopa.c index 8d0023e963..536d8cc50a 100644 --- a/src/battle/area/hos/actor/magikoopa.c +++ b/src/battle/area/hos/actor/magikoopa.c @@ -6,17 +6,17 @@ #define NAMESPACE b_area_hos_magikoopa -s32 N(defenseTable_8021D480)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(defenseTable_8021D48C)[] = { +s32 N(DefenseTable_flying)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_8021D498)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 100, @@ -41,7 +41,7 @@ s32 N(statusTable_8021D498)[] = { STATUS_END, }; -s32 N(statusTable_8021D544)[] = { +s32 N(StatusTable_flying)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 100, @@ -66,35 +66,35 @@ s32 N(statusTable_8021D544)[] = { STATUS_END, }; -extern s32 N(idleAnimations_8021D6D0)[]; +extern s32 N(IdleAnimations)[]; -ActorPartBlueprint N(partsTable_8021D5F0)[] = { +ActorPartBlueprint N(parts)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 2, 35 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021D6D0), - .defenseTable = N(defenseTable_8021D480), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -5, -12 }, }, }; -extern s32 N(idleAnimations_8021D71C)[]; -extern s32 N(idleAnimations_8021D768)[]; +extern s32 N(IdleAnimations_flying)[]; +extern s32 N(IdleAnimations_broomstick)[]; -ActorPartBlueprint N(partsTable_8021D614)[] = { +ActorPartBlueprint N(parts_flying)[] = { { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 2, 35 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021D6D0), - .defenseTable = N(defenseTable_8021D48C), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable_flying), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -5, -12 }, @@ -105,8 +105,8 @@ ActorPartBlueprint N(partsTable_8021D614)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -10, 35 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021D71C), - .defenseTable = N(defenseTable_8021D48C), + .idleAnimations = N(IdleAnimations_flying), + .defenseTable = N(DefenseTable_flying), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -117,8 +117,8 @@ ActorPartBlueprint N(partsTable_8021D614)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021D768), - .defenseTable = N(defenseTable_8021D48C), + .idleAnimations = N(IdleAnimations_broomstick), + .defenseTable = N(DefenseTable_flying), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -132,10 +132,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_MAGIKOOPA_BOSS, .level = 32, .maxHP = 8, - .partCount = ARRAY_COUNT(N(partsTable_8021D5F0)), - .partsData = N(partsTable_8021D5F0), + .partCount = ARRAY_COUNT(N(parts)), + .partsData = N(parts), .initScript = &N(init_8021E100), - .statusTable = N(statusTable_8021D498), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -157,10 +157,10 @@ ActorBlueprint N(flying) = { .type = ACTOR_TYPE_FLYING_MAGIKOOPA_BOSS, .level = 32, .maxHP = 8, - .partCount = ARRAY_COUNT(N(partsTable_8021D614)), - .partsData = N(partsTable_8021D614), + .partCount = ARRAY_COUNT(N(parts_flying)), + .partsData = N(parts_flying), .initScript = &N(init_8021E2C0), - .statusTable = N(statusTable_8021D544), + .statusTable = N(StatusTable_flying), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -175,7 +175,7 @@ ActorBlueprint N(flying) = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations_8021D6D0)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_Magikoopa_Anim01, STATUS_STONE, ANIM_Magikoopa_Anim00, STATUS_SLEEP, ANIM_Magikoopa_Anim08, @@ -188,7 +188,7 @@ s32 N(idleAnimations_8021D6D0)[] = { STATUS_END, }; -s32 N(idleAnimations_8021D71C)[] = { +s32 N(IdleAnimations_flying)[] = { STATUS_NORMAL, ANIM_FlyingMagikoopa_Anim01, STATUS_STONE, ANIM_FlyingMagikoopa_Anim00, STATUS_SLEEP, ANIM_FlyingMagikoopa_Anim08, @@ -201,7 +201,7 @@ s32 N(idleAnimations_8021D71C)[] = { STATUS_END, }; -s32 N(idleAnimations_8021D768)[] = { +s32 N(IdleAnimations_broomstick)[] = { STATUS_NORMAL, ANIM_FlyingMagikoopa_Anim0A, STATUS_END, }; @@ -305,7 +305,7 @@ EvtScript N(8021D890) = { EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8021E6D8))) EVT_CALL(SetActorType, ACTOR_SELF, 149) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_8021D498))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable))) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 32) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_TYPE_CHANGED, TRUE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) @@ -1204,17 +1204,17 @@ EvtScript N(init_80221478) = { EVT_END }; -s32 N(defenseTable_802214B4)[] = { +s32 N(DefenseTable_802214B4)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(defenseTable_802214C0)[] = { +s32 N(DefenseTable_802214C0)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_802214CC)[] = { +s32 N(StatusTable_802214CC)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -1239,7 +1239,7 @@ s32 N(statusTable_802214CC)[] = { STATUS_END, }; -s32 N(statusTable_80221578)[] = { +s32 N(StatusTable_80221578)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -1264,30 +1264,30 @@ s32 N(statusTable_80221578)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_80221624)[] = { +ActorPartBlueprint N(PartsTable_80221624)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 2, 35 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021D6D0), - .defenseTable = N(defenseTable_802214B4), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable_802214B4), .eventFlags = ACTOR_EVENT_FLAG_ILLUSORY, .elementImmunityFlags = 0, .projectileTargetOffset = { -5, -12 }, }, }; -ActorPartBlueprint N(partsTable_80221648)[] = { +ActorPartBlueprint N(PartsTable_80221648)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { -10, 35 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021D71C), - .defenseTable = N(defenseTable_802214C0), + .idleAnimations = N(IdleAnimations_flying), + .defenseTable = N(DefenseTable_802214C0), .eventFlags = ACTOR_EVENT_FLAG_ILLUSORY, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -1299,10 +1299,10 @@ ActorBlueprint N(clone) = { .type = ACTOR_TYPE_MAGICLONE, .level = 26, .maxHP = 11, - .partCount = ARRAY_COUNT(N(partsTable_80221624)), - .partsData = N(partsTable_80221624), + .partCount = ARRAY_COUNT( N(PartsTable_80221624)), + .partsData = N(PartsTable_80221624), .initScript = &N(init_8022143C), - .statusTable = N(statusTable_802214CC), + .statusTable = N(StatusTable_802214CC), .escapeChance = 40, .airLiftChance = 0, .hurricaneChance = 0, @@ -1322,10 +1322,10 @@ ActorBlueprint N(flying_clone) = { .type = ACTOR_TYPE_FLYING_MAGICLONE, .level = 26, .maxHP = 11, - .partCount = ARRAY_COUNT(N(partsTable_80221648)), - .partsData = N(partsTable_80221648), + .partCount = ARRAY_COUNT( N(PartsTable_80221648)), + .partsData = N(PartsTable_80221648), .initScript = &N(init_80221478), - .statusTable = N(statusTable_80221578), + .statusTable = N(StatusTable_80221578), .escapeChance = 40, .airLiftChance = 0, .hurricaneChance = 0, diff --git a/src/battle/area/isk_part_1/actor/pokey_mummy.c b/src/battle/area/isk_part_1/actor/pokey_mummy.c index 6e987347a9..48bf57c2d2 100644 --- a/src/battle/area/isk_part_1/actor/pokey_mummy.c +++ b/src/battle/area/isk_part_1/actor/pokey_mummy.c @@ -6,8 +6,8 @@ #define NAMESPACE b_area_isk_part_1_pokey_mummy -extern s32 N(idleAnimations_80218DC8)[]; -extern s32 N(idleAnimations_80218EB8)[]; +extern s32 N(IdleAnimations_80218DC8)[]; +extern s32 N(IdleAnimations_80218EB8)[]; extern EvtScript N(init_80218EC4); extern EvtScript N(takeTurn_80219D88); extern EvtScript N(idle_80219040); @@ -19,12 +19,12 @@ extern EvtScript N(8021B1B4); extern EvtScript N(8021BDE4); extern EvtScript N(8021C2BC); -s32 N(defenseTable_80218C10)[] = { +s32 N(DefenseTable_80218C10)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_80218C1C)[] = { +s32 N(StatusTable_80218C1C)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 80, @@ -49,15 +49,15 @@ s32 N(statusTable_80218C1C)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_80218CC8)[] = { +ActorPartBlueprint N(PartsTable_80218CC8)[] = { { .flags = ACTOR_PART_FLAG_NO_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 20 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80218DC8), - .defenseTable = N(defenseTable_80218C10), + .idleAnimations = N(IdleAnimations_80218DC8), + .defenseTable = N(DefenseTable_80218C10), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -69,7 +69,7 @@ ActorPartBlueprint N(partsTable_80218CC8)[] = { .targetOffset = { 0, 72 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable_80218C10), + .defenseTable = N(DefenseTable_80218C10), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -81,7 +81,7 @@ ActorPartBlueprint N(partsTable_80218CC8)[] = { .targetOffset = { 0, 54 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable_80218C10), + .defenseTable = N(DefenseTable_80218C10), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -93,7 +93,7 @@ ActorPartBlueprint N(partsTable_80218CC8)[] = { .targetOffset = { 0, 36 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable_80218C10), + .defenseTable = N(DefenseTable_80218C10), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -105,7 +105,7 @@ ActorPartBlueprint N(partsTable_80218CC8)[] = { .targetOffset = { 0, 16 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable_80218C10), + .defenseTable = N(DefenseTable_80218C10), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -116,8 +116,8 @@ ActorPartBlueprint N(partsTable_80218CC8)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80218EB8), - .defenseTable = N(defenseTable_80218C10), + .idleAnimations = N(IdleAnimations_80218EB8), + .defenseTable = N(DefenseTable_80218C10), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -129,10 +129,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_POKEY_MUMMY, .level = 10, .maxHP = 4, - .partCount = ARRAY_COUNT(N(partsTable_80218CC8)), - .partsData = N(partsTable_80218CC8), + .partCount = ARRAY_COUNT( N(PartsTable_80218CC8)), + .partsData = N(PartsTable_80218CC8), .initScript = &N(init_80218EC4), - .statusTable = N(statusTable_80218C1C), + .statusTable = N(StatusTable_80218C1C), .escapeChance = 60, .airLiftChance = 90, .hurricaneChance = 85, @@ -147,7 +147,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 65 }, }; -s32 N(idleAnimations_80218DC8)[] = { +s32 N(IdleAnimations_80218DC8)[] = { STATUS_NORMAL, ANIM_Pokey_Mummy_Anim04, STATUS_STONE, ANIM_Pokey_Mummy_Anim00, STATUS_SLEEP, ANIM_Pokey_Mummy_Anim25, @@ -158,7 +158,7 @@ s32 N(idleAnimations_80218DC8)[] = { STATUS_END, }; -s32 N(idleAnimations_80218E04)[] = { +s32 N(IdleAnimations_80218E04)[] = { STATUS_NORMAL, ANIM_Pokey_Mummy_Anim05, STATUS_STONE, ANIM_Pokey_Mummy_Anim01, STATUS_SLEEP, ANIM_Pokey_Mummy_Anim26, @@ -169,7 +169,7 @@ s32 N(idleAnimations_80218E04)[] = { STATUS_END, }; -s32 N(idleAnimations_80218E40)[] = { +s32 N(IdleAnimations_80218E40)[] = { STATUS_NORMAL, ANIM_Pokey_Mummy_Anim06, STATUS_STONE, ANIM_Pokey_Mummy_Anim02, STATUS_SLEEP, ANIM_Pokey_Mummy_Anim27, @@ -180,7 +180,7 @@ s32 N(idleAnimations_80218E40)[] = { STATUS_END, }; -s32 N(idleAnimations_80218E7C)[] = { +s32 N(IdleAnimations_80218E7C)[] = { STATUS_NORMAL, ANIM_Pokey_Mummy_Anim07, STATUS_STONE, ANIM_Pokey_Mummy_Anim03, STATUS_SLEEP, ANIM_Pokey_Mummy_Anim28, @@ -191,7 +191,7 @@ s32 N(idleAnimations_80218E7C)[] = { STATUS_END, }; -s32 N(idleAnimations_80218EB8)[] = { +s32 N(IdleAnimations_80218EB8)[] = { STATUS_NORMAL, ANIM_Pokey_Mummy_Anim16, STATUS_END, }; @@ -753,7 +753,7 @@ EvtScript N(8021B1B4) = { EVT_CALL(SetActorVar, ACTOR_SELF, 5, 0x00310113) EVT_CALL(SetActorVar, ACTOR_SELF, 6, 0x0031011A) EVT_CALL(SetActorVar, ACTOR_SELF, 7, 0x0031011B) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80218E04))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80218E04))) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_MULTI_TARGET, FALSE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_NO_TARGET, FALSE) @@ -770,7 +770,7 @@ EvtScript N(8021B1B4) = { EVT_CALL(SetActorVar, ACTOR_SELF, 5, 0x00310115) EVT_CALL(SetActorVar, ACTOR_SELF, 6, 0x0031011C) EVT_CALL(SetActorVar, ACTOR_SELF, 7, 0x0031011D) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80218E40))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80218E40))) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_MULTI_TARGET, FALSE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_NO_TARGET, FALSE) @@ -785,7 +785,7 @@ EvtScript N(8021B1B4) = { EVT_CALL(SetActorVar, ACTOR_SELF, 3, 0x0031010F) EVT_CALL(SetActorVar, ACTOR_SELF, 6, 0x0031011E) EVT_CALL(SetActorVar, ACTOR_SELF, 7, 0x0031011F) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80218E7C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80218E7C))) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_MULTI_TARGET, FALSE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_NO_TARGET, FALSE) diff --git a/src/battle/area/isk_part_1/actor/stone_chomp.c b/src/battle/area/isk_part_1/actor/stone_chomp.c index 95c28d809b..b6796cb15a 100644 --- a/src/battle/area/isk_part_1/actor/stone_chomp.c +++ b/src/battle/area/isk_part_1/actor/stone_chomp.c @@ -12,7 +12,7 @@ extern EvtScript N(handleEvent_80222364); extern EvtScript N(8022181C); extern EvtScript N(80222324); -s32 N(idleAnimations_80221450)[] = { +s32 N(IdleAnimations_80221450)[] = { STATUS_NORMAL, ANIM_StoneChomp_Anim01, STATUS_STONE, ANIM_StoneChomp_Anim00, STATUS_SLEEP, ANIM_StoneChomp_Anim0A, @@ -23,7 +23,7 @@ s32 N(idleAnimations_80221450)[] = { STATUS_END, }; -s32 N(idleAnimations_8022148C)[] = { +s32 N(IdleAnimations_8022148C)[] = { STATUS_NORMAL, ANIM_StoneChomp_Anim03, STATUS_POISON, ANIM_StoneChomp_Anim03, STATUS_STOP, ANIM_StoneChomp_Anim00, @@ -34,7 +34,7 @@ s32 N(idleAnimations_8022148C)[] = { STATUS_END, }; -s32 N(idleAnimations_802214C8)[] = { +s32 N(IdleAnimations_802214C8)[] = { STATUS_NORMAL, ANIM_StoneChomp_Anim04, STATUS_POISON, ANIM_StoneChomp_Anim04, STATUS_STOP, ANIM_StoneChomp_Anim00, @@ -45,7 +45,7 @@ s32 N(idleAnimations_802214C8)[] = { STATUS_END, }; -s32 N(idleAnimations_80221504)[] = { +s32 N(IdleAnimations_80221504)[] = { STATUS_NORMAL, ANIM_StoneChomp_Anim05, STATUS_POISON, ANIM_StoneChomp_Anim05, STATUS_STOP, ANIM_StoneChomp_Anim00, @@ -56,17 +56,17 @@ s32 N(idleAnimations_80221504)[] = { STATUS_END, }; -s32 N(idleAnimations_80221540)[] = { +s32 N(IdleAnimations_80221540)[] = { STATUS_NORMAL, ANIM_StoneChomp_Anim02, STATUS_END, }; -s32 N(defenseTable_8022154C)[] = { +s32 N(DefenseTable_8022154C)[] = { ELEMENT_NORMAL, 1, ELEMENT_END, }; -s32 N(statusTable_80221558)[] = { +s32 N(StatusTable_80221558)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -91,15 +91,15 @@ s32 N(statusTable_80221558)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_80221604)[] = { +ActorPartBlueprint N(PartsTable_80221604)[] = { { .flags = ACTOR_PART_FLAG_NO_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80221450), - .defenseTable = N(defenseTable_8022154C), + .idleAnimations = N(IdleAnimations_80221450), + .defenseTable = N(DefenseTable_8022154C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -110,8 +110,8 @@ ActorPartBlueprint N(partsTable_80221604)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -13, 40 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80221450), - .defenseTable = N(defenseTable_8022154C), + .idleAnimations = N(IdleAnimations_80221450), + .defenseTable = N(DefenseTable_8022154C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -14 }, @@ -122,8 +122,8 @@ ActorPartBlueprint N(partsTable_80221604)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 12 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80221540), - .defenseTable = N(defenseTable_8022154C), + .idleAnimations = N(IdleAnimations_80221540), + .defenseTable = N(DefenseTable_8022154C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -134,8 +134,8 @@ ActorPartBlueprint N(partsTable_80221604)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 12 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80221540), - .defenseTable = N(defenseTable_8022154C), + .idleAnimations = N(IdleAnimations_80221540), + .defenseTable = N(DefenseTable_8022154C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -146,8 +146,8 @@ ActorPartBlueprint N(partsTable_80221604)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 12 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80221540), - .defenseTable = N(defenseTable_8022154C), + .idleAnimations = N(IdleAnimations_80221540), + .defenseTable = N(DefenseTable_8022154C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -158,8 +158,8 @@ ActorPartBlueprint N(partsTable_80221604)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 12 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80221540), - .defenseTable = N(defenseTable_8022154C), + .idleAnimations = N(IdleAnimations_80221540), + .defenseTable = N(DefenseTable_8022154C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -170,8 +170,8 @@ ActorPartBlueprint N(partsTable_80221604)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 12 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80221540), - .defenseTable = N(defenseTable_8022154C), + .idleAnimations = N(IdleAnimations_80221540), + .defenseTable = N(DefenseTable_8022154C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -182,8 +182,8 @@ ActorPartBlueprint N(partsTable_80221604)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 12 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80221540), - .defenseTable = N(defenseTable_8022154C), + .idleAnimations = N(IdleAnimations_80221540), + .defenseTable = N(DefenseTable_8022154C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -194,8 +194,8 @@ ActorPartBlueprint N(partsTable_80221604)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 12 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80221540), - .defenseTable = N(defenseTable_8022154C), + .idleAnimations = N(IdleAnimations_80221540), + .defenseTable = N(DefenseTable_8022154C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -206,8 +206,8 @@ ActorPartBlueprint N(partsTable_80221604)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 12 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80221540), - .defenseTable = N(defenseTable_8022154C), + .idleAnimations = N(IdleAnimations_80221540), + .defenseTable = N(DefenseTable_8022154C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -219,10 +219,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_STONE_CHOMP, .level = 14, .maxHP = 4, - .partCount = ARRAY_COUNT(N(partsTable_80221604)), - .partsData = N(partsTable_80221604), + .partCount = ARRAY_COUNT( N(PartsTable_80221604)), + .partsData = N(PartsTable_80221604), .initScript = &N(init_80221ABC), - .statusTable = N(statusTable_80221558), + .statusTable = N(StatusTable_80221558), .escapeChance = 0, .airLiftChance = 25, .hurricaneChance = 25, @@ -448,7 +448,7 @@ EvtScript N(idle_80221D00) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80221504))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80221504))) EVT_CALL(SetActorIdleJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetIdleGoalToHome, ACTOR_SELF) EVT_CALL(GetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -480,7 +480,7 @@ EvtScript N(idle_80221D00) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_802214C8))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_802214C8))) EVT_CALL(SetActorIdleJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetIdleGoalToHome, ACTOR_SELF) EVT_CALL(GetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -494,7 +494,7 @@ EvtScript N(idle_80221D00) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80221504))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80221504))) EVT_CALL(SetActorIdleJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetIdleGoalToHome, ACTOR_SELF) EVT_CALL(GetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -523,7 +523,7 @@ EvtScript N(idle_80221D00) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022148C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022148C))) EVT_CALL(SetActorIdleJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetIdleGoalToHome, ACTOR_SELF) EVT_CALL(GetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/area/isk_part_2/actor/chain_chomp.c b/src/battle/area/isk_part_2/actor/chain_chomp.c index 4b705ea967..abfcc64451 100644 --- a/src/battle/area/isk_part_2/actor/chain_chomp.c +++ b/src/battle/area/isk_part_2/actor/chain_chomp.c @@ -15,7 +15,7 @@ extern EvtScript N(8021A200); extern EvtScript N(8021B41C); extern EvtScript N(8021B50C); -s32 N(idleAnimations_80218B40)[] = { +s32 N(IdleAnimations_80218B40)[] = { STATUS_NORMAL, ANIM_ChainChomp_Anim01, STATUS_STONE, ANIM_ChainChomp_Anim00, STATUS_SLEEP, ANIM_ChainChomp_Anim07, @@ -27,7 +27,7 @@ s32 N(idleAnimations_80218B40)[] = { STATUS_END, }; -s32 N(idleAnimations_80218B84)[] = { +s32 N(IdleAnimations_80218B84)[] = { STATUS_NORMAL, ANIM_ChainChomp_Anim03, STATUS_POISON, ANIM_ChainChomp_Anim03, STATUS_STOP, ANIM_ChainChomp_Anim00, @@ -39,7 +39,7 @@ s32 N(idleAnimations_80218B84)[] = { STATUS_END, }; -s32 N(idleAnimations_80218BC8)[] = { +s32 N(IdleAnimations_80218BC8)[] = { STATUS_NORMAL, ANIM_ChainChomp_Anim04, STATUS_POISON, ANIM_ChainChomp_Anim04, STATUS_STOP, ANIM_ChainChomp_Anim00, @@ -51,7 +51,7 @@ s32 N(idleAnimations_80218BC8)[] = { STATUS_END, }; -s32 N(idleAnimations_80218C0C)[] = { +s32 N(IdleAnimations_80218C0C)[] = { STATUS_NORMAL, ANIM_ChainChomp_Anim05, STATUS_POISON, ANIM_ChainChomp_Anim05, STATUS_STOP, ANIM_ChainChomp_Anim00, @@ -63,12 +63,12 @@ s32 N(idleAnimations_80218C0C)[] = { STATUS_END, }; -s32 N(idleAnimations_80218C50)[] = { +s32 N(IdleAnimations_80218C50)[] = { STATUS_NORMAL, ANIM_ChainChomp_Anim02, STATUS_END, }; -s32 N(defenseTable_80218C5C)[] = { +s32 N(DefenseTable_80218C5C)[] = { ELEMENT_NORMAL, 3, ELEMENT_SHOCK, 3, ELEMENT_FIRE, 99, @@ -77,7 +77,7 @@ s32 N(defenseTable_80218C5C)[] = { ELEMENT_END, }; -s32 N(statusTable_80218C88)[] = { +s32 N(StatusTable_80218C88)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -102,15 +102,15 @@ s32 N(statusTable_80218C88)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_80218D34)[] = { +ActorPartBlueprint N(PartsTable_80218D34)[] = { { .flags = ACTOR_PART_FLAG_NO_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80218B40), - .defenseTable = N(defenseTable_80218C5C), + .idleAnimations = N(IdleAnimations_80218B40), + .defenseTable = N(DefenseTable_80218C5C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -121,8 +121,8 @@ ActorPartBlueprint N(partsTable_80218D34)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -13, 40 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80218B40), - .defenseTable = N(defenseTable_80218C5C), + .idleAnimations = N(IdleAnimations_80218B40), + .defenseTable = N(DefenseTable_80218C5C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -16 }, @@ -133,8 +133,8 @@ ActorPartBlueprint N(partsTable_80218D34)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 12 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80218C50), - .defenseTable = N(defenseTable_80218C5C), + .idleAnimations = N(IdleAnimations_80218C50), + .defenseTable = N(DefenseTable_80218C5C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -145,8 +145,8 @@ ActorPartBlueprint N(partsTable_80218D34)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 12 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80218C50), - .defenseTable = N(defenseTable_80218C5C), + .idleAnimations = N(IdleAnimations_80218C50), + .defenseTable = N(DefenseTable_80218C5C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -157,8 +157,8 @@ ActorPartBlueprint N(partsTable_80218D34)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 12 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80218C50), - .defenseTable = N(defenseTable_80218C5C), + .idleAnimations = N(IdleAnimations_80218C50), + .defenseTable = N(DefenseTable_80218C5C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -169,8 +169,8 @@ ActorPartBlueprint N(partsTable_80218D34)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 12 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80218C50), - .defenseTable = N(defenseTable_80218C5C), + .idleAnimations = N(IdleAnimations_80218C50), + .defenseTable = N(DefenseTable_80218C5C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -181,8 +181,8 @@ ActorPartBlueprint N(partsTable_80218D34)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 12 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80218C50), - .defenseTable = N(defenseTable_80218C5C), + .idleAnimations = N(IdleAnimations_80218C50), + .defenseTable = N(DefenseTable_80218C5C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -193,8 +193,8 @@ ActorPartBlueprint N(partsTable_80218D34)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 12 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80218C50), - .defenseTable = N(defenseTable_80218C5C), + .idleAnimations = N(IdleAnimations_80218C50), + .defenseTable = N(DefenseTable_80218C5C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -205,8 +205,8 @@ ActorPartBlueprint N(partsTable_80218D34)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 12 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80218C50), - .defenseTable = N(defenseTable_80218C5C), + .idleAnimations = N(IdleAnimations_80218C50), + .defenseTable = N(DefenseTable_80218C5C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -217,8 +217,8 @@ ActorPartBlueprint N(partsTable_80218D34)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 12 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80218C50), - .defenseTable = N(defenseTable_80218C5C), + .idleAnimations = N(IdleAnimations_80218C50), + .defenseTable = N(DefenseTable_80218C5C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -230,10 +230,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_CHOMP, .level = 14, .maxHP = 4, - .partCount = ARRAY_COUNT(N(partsTable_80218D34)), - .partsData = N(partsTable_80218D34), + .partCount = ARRAY_COUNT( N(PartsTable_80218D34)), + .partsData = N(PartsTable_80218D34), .initScript = &N(init_80218EC4), - .statusTable = N(statusTable_80218C88), + .statusTable = N(StatusTable_80218C88), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -422,7 +422,7 @@ EvtScript N(idle_80219108) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80218C0C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80218C0C))) EVT_CALL(SetActorIdleJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0)) EVT_CALL(SetIdleGoalToHome, ACTOR_SELF) EVT_CALL(GetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -454,7 +454,7 @@ EvtScript N(idle_80219108) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80218BC8))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80218BC8))) EVT_CALL(SetActorIdleJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetIdleGoalToHome, ACTOR_SELF) EVT_CALL(GetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -468,7 +468,7 @@ EvtScript N(idle_80219108) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80218C0C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80218C0C))) EVT_CALL(SetActorIdleJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetIdleGoalToHome, ACTOR_SELF) EVT_CALL(GetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -497,7 +497,7 @@ EvtScript N(idle_80219108) = { EVT_END_IF EVT_WAIT(1) EVT_END_LOOP - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80218B84))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80218B84))) EVT_CALL(SetActorIdleJumpGravity, ACTOR_SELF, EVT_FLOAT(0.8)) EVT_CALL(SetIdleGoalToHome, ACTOR_SELF) EVT_CALL(GetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) diff --git a/src/battle/area/isk_part_2/actor/tutankoopa.c b/src/battle/area/isk_part_2/actor/tutankoopa.c index 9404840aa5..59aeea23b3 100644 --- a/src/battle/area/isk_part_2/actor/tutankoopa.c +++ b/src/battle/area/isk_part_2/actor/tutankoopa.c @@ -26,7 +26,7 @@ extern EvtScript N(8021F5E8); extern EvtScript N(8021F80C); extern EvtScript N(8021FA54); -s32 N(idleAnimations_8021B960)[] = { +s32 N(IdleAnimations_8021B960)[] = { STATUS_NORMAL, ANIM_Tutankoopa_Anim01, STATUS_STONE, ANIM_Tutankoopa_Anim00, STATUS_SLEEP, ANIM_Tutankoopa_Anim0C, @@ -39,7 +39,7 @@ s32 N(idleAnimations_8021B960)[] = { STATUS_END, }; -s32 N(idleAnimations_8021B9AC)[] = { +s32 N(IdleAnimations_8021B9AC)[] = { STATUS_NORMAL, ANIM_Tutankoopa_Anim0A, STATUS_STONE, ANIM_Tutankoopa_Anim07, STATUS_SLEEP, ANIM_Tutankoopa_Anim0D, @@ -52,27 +52,27 @@ s32 N(idleAnimations_8021B9AC)[] = { STATUS_END, }; -s32 N(idleAnimations_8021B9F8)[] = { +s32 N(IdleAnimations_8021B9F8)[] = { STATUS_NORMAL, ANIM_BuzzyBeetle_Anim06, STATUS_END, }; -s32 N(idleAnimations_8021BA04)[] = { +s32 N(IdleAnimations_8021BA04)[] = { STATUS_NORMAL, ANIM_Tutankoopa_Anim16, STATUS_END, }; -s32 N(idleAnimations_8021BA10)[] = { +s32 N(IdleAnimations_8021BA10)[] = { STATUS_NORMAL, ANIM_Tutankoopa_Anim16, STATUS_END, }; -s32 N(defenseTable_8021BA1C)[] = { +s32 N(DefenseTable_8021BA1C)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_8021BA28)[] = { +s32 N(StatusTable_8021BA28)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 20, @@ -97,15 +97,15 @@ s32 N(statusTable_8021BA28)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_8021BAD4)[] = { +ActorPartBlueprint N(PartsTable_8021BAD4)[] = { { .flags = ACTOR_PART_FLAG_NO_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 40 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021B960), - .defenseTable = N(defenseTable_8021BA1C), + .idleAnimations = N(IdleAnimations_8021B960), + .defenseTable = N(DefenseTable_8021BA1C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -116,8 +116,8 @@ ActorPartBlueprint N(partsTable_8021BAD4)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 39 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021B960), - .defenseTable = N(defenseTable_8021BA1C), + .idleAnimations = N(IdleAnimations_8021B960), + .defenseTable = N(DefenseTable_8021BA1C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -5, -15 }, @@ -128,7 +128,7 @@ ActorPartBlueprint N(partsTable_8021BAD4)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021B9F8), + .idleAnimations = N(IdleAnimations_8021B9F8), .defenseTable = NULL, .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, @@ -140,7 +140,7 @@ ActorPartBlueprint N(partsTable_8021BAD4)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021B9F8), + .idleAnimations = N(IdleAnimations_8021B9F8), .defenseTable = NULL, .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, @@ -152,7 +152,7 @@ ActorPartBlueprint N(partsTable_8021BAD4)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021B9F8), + .idleAnimations = N(IdleAnimations_8021B9F8), .defenseTable = NULL, .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, @@ -164,7 +164,7 @@ ActorPartBlueprint N(partsTable_8021BAD4)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021BA04), + .idleAnimations = N(IdleAnimations_8021BA04), .defenseTable = NULL, .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, @@ -176,7 +176,7 @@ ActorPartBlueprint N(partsTable_8021BAD4)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021BA04), + .idleAnimations = N(IdleAnimations_8021BA04), .defenseTable = NULL, .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, @@ -188,7 +188,7 @@ ActorPartBlueprint N(partsTable_8021BAD4)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021BA10), + .idleAnimations = N(IdleAnimations_8021BA10), .defenseTable = NULL, .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, @@ -201,10 +201,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_TUTANKOOPA, .level = 55, .maxHP = 30, - .partCount = ARRAY_COUNT(N(partsTable_8021BAD4)), - .partsData = N(partsTable_8021BAD4), + .partCount = ARRAY_COUNT( N(PartsTable_8021BAD4)), + .partsData = N(PartsTable_8021BAD4), .initScript = &N(init_8021BC1C), - .statusTable = N(statusTable_8021BA28), + .statusTable = N(StatusTable_8021BA28), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -479,7 +479,7 @@ EvtScript N(8021C974) = { EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) EVT_CALL(SetActorVar, ACTOR_SELF, 7, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 2) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021B9AC))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021B9AC))) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) @@ -1135,7 +1135,7 @@ EvtScript N(8021F80C) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_3B4) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Tutankoopa_Anim01) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021B960))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021B960))) EVT_WAIT(10) EVT_CALL(GetActorVar, ACTOR_SELF, 4, LVar0) EVT_IF_EQ(LVar0, 0) diff --git a/src/battle/area/iwa/actor/buzzar.c b/src/battle/area/iwa/actor/buzzar.c index 734be4a3d7..ade9cbfa1d 100644 --- a/src/battle/area/iwa/actor/buzzar.c +++ b/src/battle/area/iwa/actor/buzzar.c @@ -8,23 +8,23 @@ #define NAMESPACE b_area_iwa_buzzar -extern EvtScript N(init_8021B7E4); -extern EvtScript N(takeTurn_8021BCD8); -extern EvtScript N(idle_8021B930); -extern EvtScript N(handleEvent_8021B940); -extern EvtScript N(nextTurn_8021B918); -extern EvtScript N(8021BEBC); -extern EvtScript N(8021CCE8); -extern EvtScript N(8021DF2C); -extern EvtScript N(8021F030); -extern EvtScript N(8021F7EC); -extern EvtScript N(8021F808); -extern EvtScript N(8021F824); -extern EvtScript N(8021FA2C); +extern EvtScript N(EVS_Init); +extern EvtScript N(EVS_TakeTurn); +extern EvtScript N(EVS_Idle); +extern EvtScript N(EVS_HandleEvent); +extern EvtScript N(EVS_NextTurn); +extern EvtScript N(EVS_Attack_WindBlast); +extern EvtScript N(EVS_Attack_FeatherFling); +extern EvtScript N(EVS_Attack_GrappleDrop); +extern EvtScript N(EVS_Attack_ClawSwipe); +extern EvtScript N(EVS_FlyToHome); +extern EvtScript N(EVS_FlyToHome_GrappleFail); +extern EvtScript N(EVS_FlyToHome_Impl); +extern EvtScript N(EVS_FlyToHome_GrappleFail_Impl); extern EvtScript N(8021FC34); -s32 N(idleAnimations_8021B600)[] = { +s32 N(IdleAnimations_8021B600)[] = { STATUS_NORMAL, ANIM_Buzzar_Anim01, STATUS_STONE, ANIM_Buzzar_Anim00, STATUS_SLEEP, ANIM_Buzzar_Anim19, @@ -36,17 +36,17 @@ s32 N(idleAnimations_8021B600)[] = { STATUS_END, }; -s32 N(idleAnimations_8021B644)[] = { +s32 N(IdleAnimations_8021B644)[] = { STATUS_NORMAL, ANIM_Buzzar_Anim14, STATUS_END, }; -s32 N(defenseTable_8021B650)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_8021B65C)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 60, @@ -71,15 +71,15 @@ s32 N(statusTable_8021B65C)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_8021B708)[] = { +ActorPartBlueprint N(PartsTable)[] = { { .flags = ACTOR_PART_FLAG_NO_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { -20, 60 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021B600), - .defenseTable = N(defenseTable_8021B650), + .idleAnimations = N(IdleAnimations_8021B600), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -90,8 +90,8 @@ ActorPartBlueprint N(partsTable_8021B708)[] = { .posOffset = { 0, 31, 0 }, .targetOffset = { -14, 20 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021B600), - .defenseTable = N(defenseTable_8021B650), + .idleAnimations = N(IdleAnimations_8021B600), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -14 }, @@ -102,8 +102,8 @@ ActorPartBlueprint N(partsTable_8021B708)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021B644), - .defenseTable = N(defenseTable_8021B650), + .idleAnimations = N(IdleAnimations_8021B644), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -114,8 +114,8 @@ ActorPartBlueprint N(partsTable_8021B708)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021B644), - .defenseTable = N(defenseTable_8021B650), + .idleAnimations = N(IdleAnimations_8021B644), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -126,8 +126,8 @@ ActorPartBlueprint N(partsTable_8021B708)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021B644), - .defenseTable = N(defenseTable_8021B650), + .idleAnimations = N(IdleAnimations_8021B644), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -139,10 +139,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_BUZZAR, .level = 35, .maxHP = 40, - .partCount = ARRAY_COUNT(N(partsTable_8021B708)), - .partsData = N(partsTable_8021B708), - .initScript = &N(init_8021B7E4), - .statusTable = N(statusTable_8021B65C), + .partCount = ARRAY_COUNT( N(PartsTable)), + .partsData = N(PartsTable), + .initScript = &N(EVS_Init), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -157,15 +157,15 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 1, 58 }, }; -EvtScript N(init_8021B7E4) = { +EvtScript N(EVS_Init) = { EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 3, 0) - EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_8021BCD8))) - EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_8021B930))) - EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8021B940))) - EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(nextTurn_8021B918))) + EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(EVS_TakeTurn))) + EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(EVS_Idle))) + EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(EVS_HandleEvent))) + EVT_CALL(BindNextTurn, ACTOR_SELF, EVT_PTR(N(EVS_NextTurn))) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SET(LVar1, 40) EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -175,18 +175,18 @@ EvtScript N(init_8021B7E4) = { EVT_END }; -EvtScript N(nextTurn_8021B918) = { +EvtScript N(EVS_NextTurn) = { EVT_RETURN EVT_RETURN EVT_END }; -EvtScript N(idle_8021B930) = { +EvtScript N(EVS_Idle) = { EVT_RETURN EVT_END }; -EvtScript N(handleEvent_8021B940) = { +EvtScript N(EVS_HandleEvent) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0) EVT_SWITCH(LVar0) @@ -220,7 +220,7 @@ EvtScript N(handleEvent_8021B940) = { EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 20) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) - EVT_EXEC_WAIT(N(8021F7EC)) + EVT_EXEC_WAIT(N(EVS_FlyToHome)) EVT_CASE_EQ(EVENT_SHOCK_DEATH) EVT_SET_CONST(LVar0, 1) EVT_SET_CONST(LVar1, ANIM_Buzzar_Anim0B) @@ -256,7 +256,7 @@ EvtScript N(handleEvent_8021B940) = { EVT_END }; -EvtScript N(takeTurn_8021BCD8) = { +EvtScript N(EVS_TakeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) @@ -267,13 +267,13 @@ EvtScript N(takeTurn_8021BCD8) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) - EVT_EXEC_WAIT(N(8021BEBC)) + EVT_EXEC_WAIT(N(EVS_Attack_WindBlast)) EVT_CASE_EQ(2) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 3) - EVT_EXEC_WAIT(N(8021F030)) + EVT_EXEC_WAIT(N(EVS_Attack_ClawSwipe)) EVT_CASE_EQ(4) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 5) - EVT_EXEC_WAIT(N(8021CCE8)) + EVT_EXEC_WAIT(N(EVS_Attack_FeatherFling)) EVT_CASE_DEFAULT EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_IF_EQ(LVar0, 5) @@ -282,7 +282,7 @@ EvtScript N(takeTurn_8021BCD8) = { EVT_ADD(LVar0, 1) EVT_END_IF EVT_CALL(SetActorVar, ACTOR_SELF, 0, LVar0) - EVT_EXEC_WAIT(N(8021DF2C)) + EVT_EXEC_WAIT(N(EVS_Attack_GrappleDrop)) EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -292,7 +292,7 @@ EvtScript N(takeTurn_8021BCD8) = { #include "common/StartRumbleWithParams.inc.c" -EvtScript N(8021BEBC) = { +EvtScript N(EVS_Attack_WindBlast) = { EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) EVT_CALL(SetGoalToTarget, ACTOR_SELF) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_13) @@ -355,7 +355,7 @@ EvtScript N(8021BEBC) = { EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF EVT_WAIT(25) - EVT_EXEC_WAIT(N(8021F7EC)) + EVT_EXEC_WAIT(N(EVS_FlyToHome)) EVT_RETURN EVT_CASE_DEFAULT EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PARTNER) @@ -419,7 +419,7 @@ EvtScript N(8021BEBC) = { EVT_WAIT(25) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 20) - EVT_EXEC_WAIT(N(8021F7EC)) + EVT_EXEC_WAIT(N(EVS_FlyToHome)) EVT_RETURN EVT_END_SWITCH EVT_CASE_DEFAULT @@ -504,13 +504,13 @@ EvtScript N(8021BEBC) = { EVT_WAIT(25) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(MoveBattleCamOver, 20) - EVT_EXEC_WAIT(N(8021F7EC)) + EVT_EXEC_WAIT(N(EVS_FlyToHome)) EVT_CALL(func_8026BF48, 0) EVT_RETURN EVT_END }; -EvtScript N(8021CCE8) = { +EvtScript N(EVS_Attack_FeatherFling) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -630,7 +630,7 @@ EvtScript N(8021CCE8) = { EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF - EVT_EXEC_WAIT(N(8021F7EC)) + EVT_EXEC_WAIT(N(EVS_FlyToHome)) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -710,7 +710,7 @@ EvtScript N(8021CCE8) = { EVT_END_THREAD EVT_WAIT(30) EVT_CALL(YieldTurn) - EVT_EXEC_WAIT(N(8021F7EC)) + EVT_EXEC_WAIT(N(EVS_FlyToHome)) EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -718,7 +718,7 @@ EvtScript N(8021CCE8) = { EVT_END }; -EvtScript N(8021DCB8) = { +EvtScript N(EVS_LiftMarioario) = { EVT_CALL(GetAnimation, ACTOR_SELF, 1, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(ANIM_Buzzar_Anim01) @@ -761,7 +761,7 @@ EvtScript N(8021DCB8) = { EVT_END }; -EvtScript N(8021DF2C) = { +EvtScript N(EVS_Attack_GrappleDrop) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -818,7 +818,7 @@ EvtScript N(8021DF2C) = { EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF - EVT_EXEC_WAIT(N(8021F808)) + EVT_EXEC_WAIT(N(EVS_FlyToHome_GrappleFail)) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -867,7 +867,7 @@ EvtScript N(8021DF2C) = { EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 0, EASING_LINEAR) EVT_WAIT(20) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_EXEC_WAIT(N(8021F7EC)) + EVT_EXEC_WAIT(N(EVS_FlyToHome)) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -929,7 +929,7 @@ EvtScript N(8021DF2C) = { EVT_CALL(SetBattleFlagBits, BS_FLAGS1_4000, FALSE) EVT_CALL(ShowActionHud, TRUE) EVT_CALL(action_command_break_free_start, 0, 60, 30, 3) - EVT_EXEC_GET_TID(N(8021DCB8), LVarA) + EVT_EXEC_GET_TID(N(EVS_LiftMarioario), LVarA) EVT_WAIT(62) EVT_CALL(GetActionSuccessCopy, LVar0) EVT_IF_GT(LVar0, 0) @@ -948,7 +948,7 @@ EvtScript N(8021DF2C) = { EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE) EVT_WAIT(8) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_EXEC_WAIT(N(8021F808)) + EVT_EXEC_WAIT(N(EVS_FlyToHome_GrappleFail)) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -1001,7 +1001,7 @@ EvtScript N(8021DF2C) = { EVT_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(YieldTurn) - EVT_EXEC_WAIT(N(8021F7EC)) + EVT_EXEC_WAIT(N(EVS_FlyToHome)) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -1010,7 +1010,7 @@ EvtScript N(8021DF2C) = { EVT_END }; -EvtScript N(8021F030) = { +EvtScript N(EVS_Attack_ClawSwipe) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) EVT_CALL(EnableIdleScript, ACTOR_SELF, 0) EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER) @@ -1065,7 +1065,7 @@ EvtScript N(8021F030) = { EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY) EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0) EVT_END_IF - EVT_EXEC_WAIT(N(8021F7EC)) + EVT_EXEC_WAIT(N(EVS_FlyToHome)) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) EVT_RETURN @@ -1117,7 +1117,7 @@ EvtScript N(8021F030) = { EVT_WAIT(10) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) EVT_CALL(YieldTurn) - EVT_EXEC_WAIT(N(8021F7EC)) + EVT_EXEC_WAIT(N(EVS_FlyToHome)) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -1126,19 +1126,19 @@ EvtScript N(8021F030) = { EVT_END }; -EvtScript N(8021F7EC) = { - EVT_EXEC_WAIT(N(8021F824)) +EvtScript N(EVS_FlyToHome) = { + EVT_EXEC_WAIT(N(EVS_FlyToHome_Impl)) EVT_RETURN EVT_END }; -EvtScript N(8021F808) = { - EVT_EXEC_WAIT(N(8021FA2C)) +EvtScript N(EVS_FlyToHome_GrappleFail) = { + EVT_EXEC_WAIT(N(EVS_FlyToHome_GrappleFail_Impl)) EVT_RETURN EVT_END }; -EvtScript N(8021F824) = { +EvtScript N(EVS_FlyToHome_Impl) = { EVT_CALL(GetAnimation, ACTOR_SELF, 1, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(ANIM_Buzzar_Anim01) @@ -1172,7 +1172,7 @@ EvtScript N(8021F824) = { EVT_END }; -EvtScript N(8021FA2C) = { +EvtScript N(EVS_FlyToHome_GrappleFail_Impl) = { EVT_CALL(GetAnimation, ACTOR_SELF, 1, LVar0) EVT_SWITCH(LVar0) EVT_CASE_OR_EQ(ANIM_Buzzar_Anim01) diff --git a/src/battle/area/iwa/actor/cleft.c b/src/battle/area/iwa/actor/cleft.c index a6663ae278..71d1b235b0 100644 --- a/src/battle/area/iwa/actor/cleft.c +++ b/src/battle/area/iwa/actor/cleft.c @@ -6,26 +6,26 @@ #define NAMESPACE b_area_iwa_cleft -extern s32 N(idleAnimations_80218838)[]; +extern s32 N(IdleAnimations_80218838)[]; extern EvtScript N(init_802188D0); extern EvtScript N(idle_80218934); extern EvtScript N(takeTurn_8021A3EC); extern EvtScript N(handleEvent_80218C3C); -s32 N(defenseTable_80218710)[] = { +s32 N(DefenseTable_80218710)[] = { ELEMENT_NORMAL, 2, ELEMENT_FIRE, 99, ELEMENT_MAGIC, 0, ELEMENT_END, }; -s32 N(defenseTable_8021872C)[] = { +s32 N(DefenseTable_8021872C)[] = { ELEMENT_NORMAL, 0, ELEMENT_FIRE, 99, ELEMENT_END, }; -s32 N(statusTable_80218740)[] = { +s32 N(StatusTable_80218740)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 40, @@ -50,15 +50,15 @@ s32 N(statusTable_80218740)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_802187EC)[] = { +ActorPartBlueprint N(PartsTable_802187EC)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 22 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80218838), - .defenseTable = N(defenseTable_80218710), + .idleAnimations = N(IdleAnimations_80218838), + .defenseTable = N(DefenseTable_80218710), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -70,10 +70,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_CLEFT, .level = 10, .maxHP = 2, - .partCount = ARRAY_COUNT(N(partsTable_802187EC)), - .partsData = N(partsTable_802187EC), + .partCount = ARRAY_COUNT( N(PartsTable_802187EC)), + .partsData = N(PartsTable_802187EC), .initScript = &N(init_802188D0), - .statusTable = N(statusTable_80218740), + .statusTable = N(StatusTable_80218740), .escapeChance = 80, .airLiftChance = 40, .hurricaneChance = 40, @@ -88,7 +88,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations_80218838)[] = { +s32 N(IdleAnimations_80218838)[] = { STATUS_NORMAL, ANIM_Cleft_Anim02, STATUS_STONE, ANIM_Cleft_Anim00, STATUS_SLEEP, ANIM_Cleft_Anim0C, @@ -101,7 +101,7 @@ s32 N(idleAnimations_80218838)[] = { STATUS_END, }; -s32 N(idleAnimations_80218884)[] = { +s32 N(IdleAnimations_80218884)[] = { STATUS_NORMAL, ANIM_Cleft_Anim05, STATUS_STONE, ANIM_Cleft_Anim01, STATUS_SLEEP, ANIM_Cleft_Anim0D, @@ -159,8 +159,8 @@ EvtScript N(80218944) = { EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Cleft_Anim03) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80218884))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_8021872C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80218884))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_8021872C))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 15) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -7) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, FALSE) @@ -413,8 +413,8 @@ EvtScript N(802197AC) = { EVT_CALL(SetActorPos, ACTOR_SELF, LVar0, 0, LVar2) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Cleft_Anim02) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80218838))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_80218710))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80218838))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_80218710))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 22) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -10) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, TRUE) diff --git a/src/battle/area/jan/actor/hurt_plant.c b/src/battle/area/jan/actor/hurt_plant.c index cfd47156fb..46ac9bef68 100644 --- a/src/battle/area/jan/actor/hurt_plant.c +++ b/src/battle/area/jan/actor/hurt_plant.c @@ -10,7 +10,7 @@ extern EvtScript N(takeTurn_8021E33C); extern EvtScript N(idle_8021DAE4); extern EvtScript N(handleEvent_8021DCF4); -s32 N(idleAnimations_8021D940)[] = { +s32 N(IdleAnimations_8021D940)[] = { STATUS_NORMAL, ANIM_HurtPlant_Anim02, STATUS_STONE, ANIM_HurtPlant_Anim00, STATUS_SLEEP, ANIM_HurtPlant_Anim0C, @@ -23,13 +23,13 @@ s32 N(idleAnimations_8021D940)[] = { STATUS_END, }; -s32 N(defenseTable_8021D98C)[] = { +s32 N(DefenseTable_8021D98C)[] = { ELEMENT_NORMAL, 0, ELEMENT_FIRE, 0, ELEMENT_END, }; -s32 N(statusTable_8021D9A0)[] = { +s32 N(StatusTable_8021D9A0)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 95, @@ -54,15 +54,15 @@ s32 N(statusTable_8021D9A0)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_8021DA4C)[] = { +ActorPartBlueprint N(PartsTable_8021DA4C)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { -10, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021D940), - .defenseTable = N(defenseTable_8021D98C), + .idleAnimations = N(IdleAnimations_8021D940), + .defenseTable = N(DefenseTable_8021D98C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -8, -5 }, @@ -74,10 +74,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_HURT_PLANT, .level = 16, .maxHP = 8, - .partCount = ARRAY_COUNT(N(partsTable_8021DA4C)), - .partsData = N(partsTable_8021DA4C), + .partCount = ARRAY_COUNT( N(PartsTable_8021DA4C)), + .partsData = N(PartsTable_8021DA4C), .initScript = &N(init_8021DA98), - .statusTable = N(statusTable_8021D9A0), + .statusTable = N(StatusTable_8021D9A0), .escapeChance = 70, .airLiftChance = 20, .hurricaneChance = 20, diff --git a/src/battle/area/jan/actor/jungle_fuzzy.c b/src/battle/area/jan/actor/jungle_fuzzy.c index 79e76285e6..cb6821005e 100644 --- a/src/battle/area/jan/actor/jungle_fuzzy.c +++ b/src/battle/area/jan/actor/jungle_fuzzy.c @@ -7,20 +7,20 @@ #define NAMESPACE b_area_jan_jungle_fuzzy -extern s32 N(idleAnimations_8021EADC)[]; +extern s32 N(IdleAnimations_8021EADC)[]; extern EvtScript N(init_8021EB28); extern EvtScript N(takeTurn_80221628); extern EvtScript N(idle_8021EB8C); extern EvtScript N(handleEvent_8021EB9C); extern Formation N(specialFormation_8022180C); -s32 N(defenseTable_8021E9D0)[] = { +s32 N(DefenseTable_8021E9D0)[] = { ELEMENT_NORMAL, 0, ELEMENT_FIRE, 0, ELEMENT_END, }; -s32 N(statusTable_8021E9E4)[] = { +s32 N(StatusTable_8021E9E4)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 95, @@ -45,15 +45,15 @@ s32 N(statusTable_8021E9E4)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_8021EA90)[] = { +ActorPartBlueprint N(PartsTable_8021EA90)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 20 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021EADC), - .defenseTable = N(defenseTable_8021E9D0), + .idleAnimations = N(IdleAnimations_8021EADC), + .defenseTable = N(DefenseTable_8021E9D0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -65,10 +65,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_JUNGLE_FUZZY, .level = 16, .maxHP = 7, - .partCount = ARRAY_COUNT(N(partsTable_8021EA90)), - .partsData = N(partsTable_8021EA90), + .partCount = ARRAY_COUNT( N(PartsTable_8021EA90)), + .partsData = N(PartsTable_8021EA90), .initScript = &N(init_8021EB28), - .statusTable = N(statusTable_8021E9E4), + .statusTable = N(StatusTable_8021E9E4), .escapeChance = 30, .airLiftChance = 85, .hurricaneChance = 80, @@ -83,7 +83,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations_8021EADC)[] = { +s32 N(IdleAnimations_8021EADC)[] = { STATUS_NORMAL, ANIM_Fuzzy_Jungle_Idle, STATUS_STONE, ANIM_Fuzzy_Jungle_Still, STATUS_SLEEP, ANIM_Fuzzy_Jungle_Sleep, @@ -294,7 +294,7 @@ EvtScript N(divide) = { EVT_END }; -#include "common/UnkBattleFunc2.inc.c" +#include "common/SpawnEnemyDrainFX.inc.c" EvtScript N(leechAttack) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) @@ -562,11 +562,11 @@ EvtScript N(leechAttack) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) - EVT_CALL(N(UnkBattleFunc2), LVar0, LVar1, LVar2, LVar3) + EVT_CALL(N(SpawnDrainHealthStartFX), LVar0, LVar1, LVar2, LVar3) EVT_THREAD EVT_WAIT(15) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_25C) - EVT_CALL(N(UnkBattleFunc2_2), LVar0, LVar1, LVar2, LVar3) + EVT_CALL(N(SpawnDrainHealthContinueFX), LVar0, LVar1, LVar2, LVar3) EVT_END_THREAD EVT_ADD(LVar0, 20) EVT_ADD(LVar1, 20) diff --git a/src/battle/area/jan/actor/m_bush.c b/src/battle/area/jan/actor/m_bush.c index 4fec736959..1aee04a9f9 100644 --- a/src/battle/area/jan/actor/m_bush.c +++ b/src/battle/area/jan/actor/m_bush.c @@ -10,7 +10,7 @@ extern EvtScript N(takeTurn_80221F78); extern EvtScript N(idle_802219D4); extern EvtScript N(handleEvent_80221A74); -s32 N(idleAnimations_80221830)[] = { +s32 N(IdleAnimations_80221830)[] = { STATUS_NORMAL, ANIM_MBush_Anim02, STATUS_STONE, ANIM_MBush_Anim01, STATUS_SLEEP, ANIM_MBush_Anim08, @@ -23,13 +23,13 @@ s32 N(idleAnimations_80221830)[] = { STATUS_END, }; -s32 N(defenseTable_8022187C)[] = { +s32 N(DefenseTable_8022187C)[] = { ELEMENT_NORMAL, 0, ELEMENT_FIRE, 0, ELEMENT_END, }; -s32 N(statusTable_80221890)[] = { +s32 N(StatusTable_80221890)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 95, @@ -54,15 +54,15 @@ s32 N(statusTable_80221890)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_8022193C)[] = { +ActorPartBlueprint N(PartsTable_8022193C)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { -2, 22 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80221830), - .defenseTable = N(defenseTable_8022187C), + .idleAnimations = N(IdleAnimations_80221830), + .defenseTable = N(DefenseTable_8022187C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -74,10 +74,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_M_BUSH, .level = 16, .maxHP = 8, - .partCount = ARRAY_COUNT(N(partsTable_8022193C)), - .partsData = N(partsTable_8022193C), + .partCount = ARRAY_COUNT( N(PartsTable_8022193C)), + .partsData = N(PartsTable_8022193C), .initScript = &N(init_80221988), - .statusTable = N(statusTable_80221890), + .statusTable = N(StatusTable_80221890), .escapeChance = 70, .airLiftChance = 85, .hurricaneChance = 80, diff --git a/src/battle/area/jan/actor/spear_guy.c b/src/battle/area/jan/actor/spear_guy.c index 8ab8f282ff..b29e1fbe79 100644 --- a/src/battle/area/jan/actor/spear_guy.c +++ b/src/battle/area/jan/actor/spear_guy.c @@ -7,7 +7,7 @@ #define NAMESPACE b_area_jan_spear_guy -extern s32 N(idleAnimations_8021BF40)[]; +extern s32 N(IdleAnimations_8021BF40)[]; extern EvtScript N(init_80218980); extern EvtScript N(takeTurn_8021BCB4); extern EvtScript N(handleEvent_80218E3C); @@ -20,7 +20,7 @@ extern EvtScript N(8021BF8C); extern Formation N(specialFormation_8021A8C0); extern Formation N(specialFormation_8021A8DC); -s32 N(idleAnimations_802185C0)[] = { +s32 N(IdleAnimations_802185C0)[] = { STATUS_NORMAL, ANIM_SpearGuy_Anim04, STATUS_STONE, ANIM_SpearGuy_Anim02, STATUS_SLEEP, ANIM_SpearGuy_Anim0D, @@ -33,7 +33,7 @@ s32 N(idleAnimations_802185C0)[] = { STATUS_END, }; -s32 N(idleAnimations_8021860C)[] = { +s32 N(IdleAnimations_8021860C)[] = { STATUS_NORMAL, ANIM_SpearGuy_Anim03, STATUS_STONE, ANIM_SpearGuy_Anim0D, STATUS_SLEEP, ANIM_SpearGuy_Anim0D, @@ -46,29 +46,29 @@ s32 N(idleAnimations_8021860C)[] = { STATUS_END, }; -s32 N(idleAnimations_80218658)[] = { +s32 N(IdleAnimations_80218658)[] = { STATUS_NORMAL, ANIM_SpearGuy_Anim14, STATUS_END, }; -s32 N(idleAnimations_80218664)[] = { +s32 N(IdleAnimations_80218664)[] = { STATUS_NORMAL, ANIM_SpearGuy_Anim19, STATUS_END, }; -s32 N(defenseTable_80218670)[] = { +s32 N(DefenseTable_80218670)[] = { ELEMENT_NORMAL, 0, ELEMENT_FIRE, 0, ELEMENT_END, }; -s32 N(defenseTable_80218684)[] = { +s32 N(DefenseTable_80218684)[] = { ELEMENT_NORMAL, 0, ELEMENT_SHOCK, 0, ELEMENT_END, }; -s32 N(statusTable_80218698)[] = { +s32 N(StatusTable_80218698)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 70, @@ -93,7 +93,7 @@ s32 N(statusTable_80218698)[] = { STATUS_END, }; -s32 N(statusTable_80218744)[] = { +s32 N(StatusTable_80218744)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 70, @@ -118,15 +118,15 @@ s32 N(statusTable_80218744)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_802187F0)[] = { +ActorPartBlueprint N(PartsTable_802187F0)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 2, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 22 }, .opacity = 255, - .idleAnimations = N(idleAnimations_802185C0), - .defenseTable = N(defenseTable_80218670), + .idleAnimations = N(IdleAnimations_802185C0), + .defenseTable = N(DefenseTable_80218670), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_FRONT, .elementImmunityFlags = 0, .projectileTargetOffset = { -3, -8 }, @@ -137,8 +137,8 @@ ActorPartBlueprint N(partsTable_802187F0)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021BF40), - .defenseTable = N(defenseTable_80218684), + .idleAnimations = N(IdleAnimations_8021BF40), + .defenseTable = N(DefenseTable_80218684), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, @@ -149,8 +149,8 @@ ActorPartBlueprint N(partsTable_802187F0)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80218658), - .defenseTable = N(defenseTable_80218684), + .idleAnimations = N(IdleAnimations_80218658), + .defenseTable = N(DefenseTable_80218684), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -161,8 +161,8 @@ ActorPartBlueprint N(partsTable_802187F0)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80218664), - .defenseTable = N(defenseTable_80218684), + .idleAnimations = N(IdleAnimations_80218664), + .defenseTable = N(DefenseTable_80218684), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -174,10 +174,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_SPEAR_GUY, .level = 16, .maxHP = 7, - .partCount = ARRAY_COUNT(N(partsTable_802187F0)), - .partsData = N(partsTable_802187F0), + .partCount = ARRAY_COUNT( N(PartsTable_802187F0)), + .partsData = N(PartsTable_802187F0), .initScript = &N(init_80218980), - .statusTable = N(statusTable_80218698), + .statusTable = N(StatusTable_80218698), .escapeChance = 50, .airLiftChance = 85, .hurricaneChance = 80, @@ -197,11 +197,11 @@ EvtScript N(setSpearStance) = { EVT_CASE_EQ(2) EVT_CASE_EQ(0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_802185C0))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations_802185C0))) EVT_CALL(SetPartEventFlags, ACTOR_SELF, 2, 0x00010000) EVT_CASE_EQ(1) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021860C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations_8021860C))) EVT_CALL(SetPartEventFlags, ACTOR_SELF, 2, 16) EVT_END_SWITCH EVT_RETURN @@ -229,7 +229,7 @@ EvtScript N(init_80218980) = { EVT_CASE_OR_EQ(4) EVT_CASE_OR_EQ(6) EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_SPIKY_FRONT, FALSE) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021860C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations_8021860C))) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_SpearGuy_Anim03) EVT_END_CASE_GROUP EVT_END_SWITCH @@ -264,16 +264,16 @@ EvtScript N(idle_80218BE0) = { EVT_CASE_EQ(0) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) EVT_IF_FLAG(LVar0, STATUS_FLAG_SLEEP | STATUS_FLAG_FEAR | STATUS_FLAG_DIZZY) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021860C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations_8021860C))) EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_SPIKY_TOP, TRUE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_SPIKY_FRONT, FALSE) EVT_ELSE - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_802185C0))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations_802185C0))) EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_SPIKY_TOP, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_SPIKY_FRONT, TRUE) EVT_END_IF EVT_CASE_EQ(1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021860C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations_8021860C))) EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_SPIKY_TOP, TRUE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_SPIKY_FRONT, FALSE) EVT_END_SWITCH @@ -646,7 +646,7 @@ EvtScript N(summonBackup) = { EVT_CALL(GetActorVar, LVar1, 0, LVar4) EVT_IF_EQ(LVar4, 0) EVT_CALL(SetActorVar, LVar1, 0, 1) - EVT_CALL(SetIdleAnimations, LVar1, 2, EVT_PTR(N(idleAnimations_8021860C))) + EVT_CALL(SetIdleAnimations, LVar1, 2, EVT_PTR(N(IdleAnimations_8021860C))) EVT_CALL(SetPartEventFlags, LVar1, 2, 16) EVT_CALL(SetAnimation, LVar1, 2, ANIM_SpearGuy_Anim03) EVT_END_IF @@ -777,7 +777,7 @@ EvtScript N(becomeShyGuy) = { EVT_EXEC_WAIT(N(8021BF8C)) EVT_CALL(SetActorType, ACTOR_SELF, ACTOR_TYPE_SHY_GUY) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_TYPE_CHANGED, TRUE) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_80218744))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable_80218744))) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) EVT_RETURN @@ -1088,7 +1088,7 @@ EvtScript N(takeTurn_8021BCB4) = { EVT_END }; -s32 N(idleAnimations_8021BF40)[] = { +s32 N(IdleAnimations_8021BF40)[] = { STATUS_NORMAL, ANIM_ShyGuy_Red_Anim01, STATUS_STONE, ANIM_ShyGuy_Red_Anim00, STATUS_SLEEP, ANIM_ShyGuy_Red_Anim12, diff --git a/src/battle/area/kgr/actor/fuzzipede.c b/src/battle/area/kgr/actor/fuzzipede.c index 20f14c359b..9a85b6cc8a 100644 --- a/src/battle/area/kgr/actor/fuzzipede.c +++ b/src/battle/area/kgr/actor/fuzzipede.c @@ -14,7 +14,7 @@ extern EvtScript N(handleEvent_80219ED4); extern EvtScript N(nextTurn_80218C58); extern EvtScript N(8021A2E8); -s32 N(idleAnimations_802189B0)[] = { +s32 N(IdleAnimations_802189B0)[] = { STATUS_NORMAL, ANIM_Fuzzipede_Anim04, STATUS_STONE, ANIM_Fuzzipede_Anim00, STATUS_SLEEP, ANIM_Fuzzipede_Anim29, @@ -27,7 +27,7 @@ s32 N(idleAnimations_802189B0)[] = { STATUS_END, }; -s32 N(idleAnimations_802189FC)[] = { +s32 N(IdleAnimations_802189FC)[] = { STATUS_NORMAL, ANIM_Fuzzipede_Anim06, STATUS_STONE, ANIM_Fuzzipede_Anim02, STATUS_SLEEP, ANIM_Fuzzipede_Anim2A, @@ -40,12 +40,12 @@ s32 N(idleAnimations_802189FC)[] = { STATUS_END, }; -s32 N(defenseTable_80218A48)[] = { +s32 N(DefenseTable_80218A48)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_80218A54)[] = { +s32 N(StatusTable_80218A54)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 50, @@ -70,15 +70,15 @@ s32 N(statusTable_80218A54)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_80218B00)[] = { +ActorPartBlueprint N(PartsTable_80218B00)[] = { { .flags = ACTOR_PART_FLAG_NO_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 2, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_802189B0), - .defenseTable = N(defenseTable_80218A48), + .idleAnimations = N(IdleAnimations_802189B0), + .defenseTable = N(DefenseTable_80218A48), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -2, -10 }, @@ -90,7 +90,7 @@ ActorPartBlueprint N(partsTable_80218B00)[] = { .targetOffset = { 2, -16 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable_80218A48), + .defenseTable = N(DefenseTable_80218A48), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -2, -10 }, @@ -102,10 +102,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_FUZZIPEDE, .level = 43, .maxHP = 20, - .partCount = ARRAY_COUNT(N(partsTable_80218B00)), - .partsData = N(partsTable_80218B00), + .partCount = ARRAY_COUNT( N(PartsTable_80218B00)), + .partsData = N(PartsTable_80218B00), .initScript = &N(init_80218B70), - .statusTable = N(statusTable_80218A54), + .statusTable = N(StatusTable_80218A54), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -177,7 +177,7 @@ EvtScript N(80218D68) = { EVT_CALL(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzipede_Anim04) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_802189B0))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_802189B0))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_802197FC))) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING | ACTOR_FLAG_UPSIDE_DOWN, FALSE) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 2, 24) @@ -202,7 +202,7 @@ EvtScript N(80218FC8) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_EXEC_WAIT(D_8029C12C) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_802189B0))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_802189B0))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_802197FC))) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING | ACTOR_FLAG_UPSIDE_DOWN, FALSE) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 2, 24) @@ -259,7 +259,7 @@ EvtScript N(802191AC) = { EVT_WAIT(1) EVT_END_LOOP EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_802189FC))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_802189FC))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Fuzzipede_Anim06) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_80219ED4))) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, TRUE) @@ -407,7 +407,7 @@ EvtScript N(80219D68) = { EVT_END_IF EVT_CALL(func_8027D32C, ACTOR_SELF) EVT_EXEC_WAIT(N(8021A2E8)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_802189B0))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_802189B0))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_802197FC))) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING | ACTOR_FLAG_UPSIDE_DOWN, FALSE) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 2, 24) diff --git a/src/battle/area/kkj/actor/kammy_koopa.c b/src/battle/area/kkj/actor/kammy_koopa.c index f5fd6cd218..ca06701154 100644 --- a/src/battle/area/kkj/actor/kammy_koopa.c +++ b/src/battle/area/kkj/actor/kammy_koopa.c @@ -17,22 +17,22 @@ extern EvtScript N(handleEvent); extern EvtScript N(speakOnHit); extern EvtScript N(onDeath); -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_BattleKammy_Anim05, STATUS_END, }; -s32 N(idleAnimations_broomstick)[] = { +s32 N(IdleAnimations_broomstick)[] = { STATUS_NORMAL, ANIM_BattleKammy_Anim0C, STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -64,8 +64,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -10, 35 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -76,8 +76,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_broomstick), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations_broomstick), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -92,7 +92,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, diff --git a/src/battle/area/kmr_part_2/actor/blue_goomba.c b/src/battle/area/kmr_part_2/actor/blue_goomba.c index 3017f3dcbb..c097451e38 100644 --- a/src/battle/area/kmr_part_2/actor/blue_goomba.c +++ b/src/battle/area/kmr_part_2/actor/blue_goomba.c @@ -5,12 +5,12 @@ #define NAMESPACE b_area_kmr_part_2_blue_goomba -s32 N(defenseTable_802198B0)[] = { +s32 N(DefenseTable_802198B0)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_802198BC)[] = { +s32 N(StatusTable_802198BC)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 100, @@ -35,7 +35,7 @@ s32 N(statusTable_802198BC)[] = { STATUS_END, }; -extern s32 N(idleAnimations_802199B4)[]; +extern s32 N(IdleAnimations_802199B4)[]; extern EvtScript N(init_8021B268); extern EvtScript N(doDeath_8021B388); extern EvtScript N(takeTurn_8021A5A0); @@ -43,15 +43,15 @@ extern EvtScript N(idle_80219A98); extern EvtScript N(handleEvent_80219D74); extern EvtScript N(takeTurn_8021B2C8); -ActorPartBlueprint N(partsTable_80219968)[] = { +ActorPartBlueprint N(PartsTable_80219968)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_802199B4), - .defenseTable = N(defenseTable_802198B0), + .idleAnimations = N(IdleAnimations_802199B4), + .defenseTable = N(DefenseTable_802198B0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -3 }, @@ -63,10 +63,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_BLUE_GOOMBA_BOSS, .level = 20, .maxHP = 6, - .partCount = ARRAY_COUNT(N(partsTable_80219968)), - .partsData = N(partsTable_80219968), + .partCount = ARRAY_COUNT( N(PartsTable_80219968)), + .partsData = N(PartsTable_80219968), .initScript = &N(init_8021B268), - .statusTable = N(statusTable_802198BC), + .statusTable = N(StatusTable_802198BC), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -81,7 +81,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 8, 25 }, }; -s32 N(idleAnimations_802199B4)[] = { +s32 N(IdleAnimations_802199B4)[] = { STATUS_NORMAL, ANIM_GoombaBros_Blue_Idle, STATUS_STONE, ANIM_GoombaBros_Blue_Still, STATUS_SLEEP, ANIM_GoombaBros_Blue_Sleep, @@ -94,7 +94,7 @@ s32 N(idleAnimations_802199B4)[] = { STATUS_END, }; -s32 N(idleAnimations_80219A00)[] = { +s32 N(IdleAnimations_80219A00)[] = { STATUS_NORMAL, ANIM_GoombaBros_Blue_Run, STATUS_STONE, ANIM_GoombaBros_Blue_Still, STATUS_SLEEP, ANIM_GoombaBros_Blue_Sleep, @@ -131,10 +131,10 @@ EvtScript N(idle_80219A98) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80219A00))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80219A00))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_802199B4))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_802199B4))) EVT_LOOP(20) EVT_LABEL(1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) @@ -147,10 +147,10 @@ EvtScript N(idle_80219A98) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80219A00))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80219A00))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_802199B4))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_802199B4))) EVT_LOOP(80) EVT_LABEL(2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) diff --git a/src/battle/area/kmr_part_2/actor/blue_goomba2.c b/src/battle/area/kmr_part_2/actor/blue_goomba2.c index 8e27efe25d..5b11657c83 100644 --- a/src/battle/area/kmr_part_2/actor/blue_goomba2.c +++ b/src/battle/area/kmr_part_2/actor/blue_goomba2.c @@ -5,12 +5,12 @@ #define NAMESPACE b_area_kmr_part_2_blue_goomba_2 -s32 N(defenseTable_8021D400)[] = { +s32 N(DefenseTable_8021D400)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_8021D40C)[] = { +s32 N(StatusTable_8021D40C)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 100, @@ -35,21 +35,21 @@ s32 N(statusTable_8021D40C)[] = { STATUS_END, }; -extern s32 N(idleAnimations_8021D504)[]; +extern s32 N(IdleAnimations_8021D504)[]; extern EvtScript N(init_8021EDB8); extern EvtScript N(takeTurn_8021E0F0); extern EvtScript N(idle_8021D5E8); extern EvtScript N(handleEvent_8021D8C4); -ActorPartBlueprint N(partsTable_8021D4B8)[] = { +ActorPartBlueprint N(PartsTable_8021D4B8)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021D504), - .defenseTable = N(defenseTable_8021D400), + .idleAnimations = N(IdleAnimations_8021D504), + .defenseTable = N(DefenseTable_8021D400), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -3 }, @@ -61,10 +61,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_BLUE_GOOMBA_BOSS, .level = 20, .maxHP = 6, - .partCount = ARRAY_COUNT(N(partsTable_8021D4B8)), - .partsData = N(partsTable_8021D4B8), + .partCount = ARRAY_COUNT( N(PartsTable_8021D4B8)), + .partsData = N(PartsTable_8021D4B8), .initScript = &N(init_8021EDB8), - .statusTable = N(statusTable_8021D40C), + .statusTable = N(StatusTable_8021D40C), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -79,7 +79,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 8, 25 }, }; -s32 N(idleAnimations_8021D504)[] = { +s32 N(IdleAnimations_8021D504)[] = { STATUS_NORMAL, ANIM_GoombaBros_Blue_Idle, STATUS_STONE, ANIM_GoombaBros_Blue_Still, STATUS_SLEEP, ANIM_GoombaBros_Blue_Sleep, @@ -92,7 +92,7 @@ s32 N(idleAnimations_8021D504)[] = { STATUS_END, }; -s32 N(idleAnimations_8021D550)[] = { +s32 N(IdleAnimations_8021D550)[] = { STATUS_NORMAL, ANIM_GoombaBros_Blue_Run, STATUS_STONE, ANIM_GoombaBros_Blue_Still, STATUS_SLEEP, ANIM_GoombaBros_Blue_Sleep, @@ -129,10 +129,10 @@ EvtScript N(idle_8021D5E8) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021D550))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021D550))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021D504))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021D504))) EVT_LOOP(20) EVT_LABEL(1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) @@ -145,10 +145,10 @@ EvtScript N(idle_8021D5E8) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021D550))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021D550))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021D504))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021D504))) EVT_LOOP(80) EVT_LABEL(2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) diff --git a/src/battle/area/kmr_part_2/actor/goomba_king.c b/src/battle/area/kmr_part_2/actor/goomba_king.c index fcfc9f2efc..5b99de2acb 100644 --- a/src/battle/area/kmr_part_2/actor/goomba_king.c +++ b/src/battle/area/kmr_part_2/actor/goomba_king.c @@ -6,7 +6,7 @@ #define NAMESPACE b_area_kmr_part_2_goomba_king -s32 N(idleAnimations_80220800)[] = { +s32 N(IdleAnimations_80220800)[] = { STATUS_NORMAL, ANIM_GoombaKing_Idle, STATUS_STONE, ANIM_GoombaKing_Still, STATUS_SLEEP, ANIM_GoombaKing_Sleep, @@ -18,7 +18,7 @@ s32 N(idleAnimations_80220800)[] = { STATUS_END, }; -s32 N(idleAnimations_80220844)[] = { +s32 N(IdleAnimations_80220844)[] = { STATUS_NORMAL, ANIM_GoombaKing_Run, STATUS_STONE, ANIM_GoombaKing_Still, STATUS_SLEEP, ANIM_GoombaKing_Sleep, @@ -30,7 +30,7 @@ s32 N(idleAnimations_80220844)[] = { STATUS_END, }; -s32 N(idleAnimations_80220888)[] = { +s32 N(IdleAnimations_80220888)[] = { STATUS_NORMAL, ANIM_GoombaKing_Dizzy, STATUS_STONE, ANIM_GoombaKing_Still, STATUS_SLEEP, ANIM_GoombaKing_Sleep, @@ -42,7 +42,7 @@ s32 N(idleAnimations_80220888)[] = { STATUS_END, }; -s32 N(idleAnimations_802208CC)[] = { +s32 N(IdleAnimations_802208CC)[] = { STATUS_NORMAL, ANIM_GoombaKing_Angry, STATUS_STONE, ANIM_GoombaKing_Still, STATUS_SLEEP, ANIM_GoombaKing_Sleep, @@ -54,12 +54,12 @@ s32 N(idleAnimations_802208CC)[] = { STATUS_END, }; -s32 N(defenseTable_80220910)[] = { +s32 N(DefenseTable_80220910)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_8022091C)[] = { +s32 N(StatusTable_8022091C)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 100, @@ -84,15 +84,15 @@ s32 N(statusTable_8022091C)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_802209C8)[] = { +ActorPartBlueprint N(PartsTable_802209C8)[] = { { .flags = ACTOR_PART_FLAG_20 | ACTOR_PART_FLAG_NO_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { -25, 15 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80220800), - .defenseTable = N(defenseTable_80220910), + .idleAnimations = N(IdleAnimations_80220800), + .defenseTable = N(DefenseTable_80220910), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -104,7 +104,7 @@ ActorPartBlueprint N(partsTable_802209C8)[] = { .targetOffset = { 0, 80 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable_80220910), + .defenseTable = N(DefenseTable_80220910), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -126,10 +126,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_GOOMBA_KING, .level = 49, .maxHP = 10, - .partCount = ARRAY_COUNT(N(partsTable_802209C8)), - .partsData = N(partsTable_802209C8), + .partCount = ARRAY_COUNT( N(PartsTable_802209C8)), + .partsData = N(PartsTable_802209C8), .initScript = &N(init_80220A38), - .statusTable = N(statusTable_8022091C), + .statusTable = N(StatusTable_8022091C), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -186,10 +186,10 @@ EvtScript N(idle_80220B50) = { EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80220844))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80220844))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80220800))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80220800))) EVT_WAIT(20) EVT_LABEL(2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0) @@ -200,10 +200,10 @@ EvtScript N(idle_80220B50) = { EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80220844))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80220844))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80220800))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80220800))) EVT_WAIT(80) EVT_GOTO(0) EVT_RETURN diff --git a/src/battle/area/kmr_part_2/actor/goomnut_tree.c b/src/battle/area/kmr_part_2/actor/goomnut_tree.c index 6dc3de210f..d9cd8bcb5b 100644 --- a/src/battle/area/kmr_part_2/actor/goomnut_tree.c +++ b/src/battle/area/kmr_part_2/actor/goomnut_tree.c @@ -5,18 +5,18 @@ #define NAMESPACE b_area_kmr_part_2_goomnut_tree -s32 N(idleAnimations_802232D0)[] = { +s32 N(IdleAnimations_802232D0)[] = { STATUS_NORMAL, ANIM_SpikyGoomnut_Still, STATUS_END, }; -s32 N(defenseTable_802232DC)[] = { +s32 N(DefenseTable_802232DC)[] = { ELEMENT_NORMAL, 0, ELEMENT_SMASH, 0, ELEMENT_END, }; -s32 N(statusTable_802232F0)[] = { +s32 N(StatusTable_802232F0)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -48,7 +48,7 @@ extern EvtScript N(handleEvent_80223688); extern EvtScript N(shake_goomnut_tree); extern EvtScript N(80223DBC); -ActorPartBlueprint N(partsTable_8022339C)[] = { +ActorPartBlueprint N(PartsTable_8022339C)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, @@ -56,7 +56,7 @@ ActorPartBlueprint N(partsTable_8022339C)[] = { .targetOffset = { 0, 10 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable_802232DC), + .defenseTable = N(DefenseTable_802232DC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -67,8 +67,8 @@ ActorPartBlueprint N(partsTable_8022339C)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 10 }, .opacity = 255, - .idleAnimations = N(idleAnimations_802232D0), - .defenseTable = N(defenseTable_802232DC), + .idleAnimations = N(IdleAnimations_802232D0), + .defenseTable = N(DefenseTable_802232DC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -79,8 +79,8 @@ ActorPartBlueprint N(partsTable_8022339C)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 10 }, .opacity = 255, - .idleAnimations = N(idleAnimations_802232D0), - .defenseTable = N(defenseTable_802232DC), + .idleAnimations = N(IdleAnimations_802232D0), + .defenseTable = N(DefenseTable_802232DC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -91,8 +91,8 @@ ActorPartBlueprint N(partsTable_8022339C)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 10 }, .opacity = 255, - .idleAnimations = N(idleAnimations_802232D0), - .defenseTable = N(defenseTable_802232DC), + .idleAnimations = N(IdleAnimations_802232D0), + .defenseTable = N(DefenseTable_802232DC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -103,8 +103,8 @@ ActorPartBlueprint N(partsTable_8022339C)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 10 }, .opacity = 255, - .idleAnimations = N(idleAnimations_802232D0), - .defenseTable = N(defenseTable_802232DC), + .idleAnimations = N(IdleAnimations_802232D0), + .defenseTable = N(DefenseTable_802232DC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -116,10 +116,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_GOOMNUT_TREE, .level = 1, .maxHP = 255, - .partCount = ARRAY_COUNT(N(partsTable_8022339C)), - .partsData = N(partsTable_8022339C), + .partCount = ARRAY_COUNT( N(PartsTable_8022339C)), + .partsData = N(PartsTable_8022339C), .initScript = &N(init_80223488), - .statusTable = N(statusTable_802232F0), + .statusTable = N(StatusTable_802232F0), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, diff --git a/src/battle/area/kmr_part_2/actor/red_goomba.c b/src/battle/area/kmr_part_2/actor/red_goomba.c index 615a098d24..f39dbfca21 100644 --- a/src/battle/area/kmr_part_2/actor/red_goomba.c +++ b/src/battle/area/kmr_part_2/actor/red_goomba.c @@ -5,12 +5,12 @@ #define NAMESPACE b_area_kmr_part_2_red_goomba -s32 N(defenseTable_8021B6C0)[] = { +s32 N(DefenseTable_8021B6C0)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_8021B6CC)[] = { +s32 N(StatusTable_8021B6CC)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 100, @@ -35,7 +35,7 @@ s32 N(statusTable_8021B6CC)[] = { STATUS_END, }; -extern s32 N(idleAnimations_8021B7C4)[]; +extern s32 N(IdleAnimations_8021B7C4)[]; extern EvtScript N(idle_8021B8A8); extern EvtScript N(handleEvent_8021BB84); extern EvtScript N(takeTurn_8021C3B0); @@ -43,15 +43,15 @@ extern EvtScript N(init_8021D078); extern EvtScript N(doDeath_8021D0C4); -ActorPartBlueprint N(partsTable_8021B778)[] = { +ActorPartBlueprint N(PartsTable_8021B778)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021B7C4), - .defenseTable = N(defenseTable_8021B6C0), + .idleAnimations = N(IdleAnimations_8021B7C4), + .defenseTable = N(DefenseTable_8021B6C0), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -3 }, @@ -63,10 +63,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_RED_GOOMBA_BOSS, .level = 20, .maxHP = 7, - .partCount = ARRAY_COUNT(N(partsTable_8021B778)), - .partsData = N(partsTable_8021B778), + .partCount = ARRAY_COUNT( N(PartsTable_8021B778)), + .partsData = N(PartsTable_8021B778), .initScript = &N(init_8021D078), - .statusTable = N(statusTable_8021B6CC), + .statusTable = N(StatusTable_8021B6CC), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -81,7 +81,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 8, 25 }, }; -s32 N(idleAnimations_8021B7C4)[] = { +s32 N(IdleAnimations_8021B7C4)[] = { STATUS_NORMAL, ANIM_GoombaBros_Red_Idle, STATUS_STONE, ANIM_GoombaBros_Red_Still, STATUS_SLEEP, ANIM_GoombaBros_Red_Sleep, @@ -94,7 +94,7 @@ s32 N(idleAnimations_8021B7C4)[] = { STATUS_END, }; -s32 N(idleAnimations_8021B810)[] = { +s32 N(IdleAnimations_8021B810)[] = { STATUS_NORMAL, ANIM_GoombaBros_Red_Run, STATUS_STONE, ANIM_GoombaBros_Red_Still, STATUS_SLEEP, ANIM_GoombaBros_Red_Sleep, @@ -131,10 +131,10 @@ EvtScript N(idle_8021B8A8) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021B810))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021B810))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021B7C4))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021B7C4))) EVT_LOOP(20) EVT_LABEL(1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) @@ -147,10 +147,10 @@ EvtScript N(idle_8021B8A8) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021B810))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021B810))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021B7C4))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021B7C4))) EVT_LOOP(80) EVT_LABEL(2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) diff --git a/src/battle/area/kmr_part_2/actor/red_goomba2.c b/src/battle/area/kmr_part_2/actor/red_goomba2.c index 2bd03c2473..04f6e291d2 100644 --- a/src/battle/area/kmr_part_2/actor/red_goomba2.c +++ b/src/battle/area/kmr_part_2/actor/red_goomba2.c @@ -5,12 +5,12 @@ #define NAMESPACE b_area_kmr_part_2_red_goomba_2 -s32 N(defenseTable_8021EE00)[] = { +s32 N(DefenseTable_8021EE00)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_8021EE0C)[] = { +s32 N(StatusTable_8021EE0C)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 100, @@ -35,21 +35,21 @@ s32 N(statusTable_8021EE0C)[] = { STATUS_END, }; -extern s32 N(idleAnimations_8021EF04)[]; +extern s32 N(IdleAnimations_8021EF04)[]; extern EvtScript N(init_802207B8); extern EvtScript N(takeTurn_8021FAF0); extern EvtScript N(idle_8021EFE8); extern EvtScript N(handleEvent_8021F2C4); -ActorPartBlueprint N(partsTable_8021EEB8)[] = { +ActorPartBlueprint N(PartsTable_8021EEB8)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021EF04), - .defenseTable = N(defenseTable_8021EE00), + .idleAnimations = N(IdleAnimations_8021EF04), + .defenseTable = N(DefenseTable_8021EE00), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -3 }, @@ -61,10 +61,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_RED_GOOMBA_BOSS, .level = 20, .maxHP = 7, - .partCount = ARRAY_COUNT(N(partsTable_8021EEB8)), - .partsData = N(partsTable_8021EEB8), + .partCount = ARRAY_COUNT( N(PartsTable_8021EEB8)), + .partsData = N(PartsTable_8021EEB8), .initScript = &N(init_802207B8), - .statusTable = N(statusTable_8021EE0C), + .statusTable = N(StatusTable_8021EE0C), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -79,7 +79,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 8, 25 }, }; -s32 N(idleAnimations_8021EF04)[] = { +s32 N(IdleAnimations_8021EF04)[] = { STATUS_NORMAL, ANIM_GoombaBros_Red_Idle, STATUS_STONE, ANIM_GoombaBros_Red_Still, STATUS_SLEEP, ANIM_GoombaBros_Red_Sleep, @@ -92,7 +92,7 @@ s32 N(idleAnimations_8021EF04)[] = { STATUS_END, }; -s32 N(idleAnimations_8021EF50)[] = { +s32 N(IdleAnimations_8021EF50)[] = { STATUS_NORMAL, ANIM_GoombaBros_Red_Run, STATUS_STONE, ANIM_GoombaBros_Red_Still, STATUS_SLEEP, ANIM_GoombaBros_Red_Sleep, @@ -129,10 +129,10 @@ EvtScript N(idle_8021EFE8) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021EF50))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021EF50))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021EF04))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021EF04))) EVT_LOOP(20) EVT_LABEL(1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) @@ -145,10 +145,10 @@ EvtScript N(idle_8021EFE8) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021EF50))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021EF50))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021EF04))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021EF04))) EVT_LOOP(80) EVT_LABEL(2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) diff --git a/src/battle/area/kmr_part_3/actor/egg_jr_troopa.c b/src/battle/area/kmr_part_3/actor/egg_jr_troopa.c index 04218215c9..ecb006e9ba 100644 --- a/src/battle/area/kmr_part_3/actor/egg_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/egg_jr_troopa.c @@ -5,7 +5,7 @@ #define NAMESPACE b_area_kmr_part_3_egg_jr_troopa -s32 N(idleAnimations_80224380)[] = { +s32 N(IdleAnimations_80224380)[] = { STATUS_NORMAL, ANIM_JrTroopa_Idle, STATUS_SLEEP, ANIM_JrTroopa_Sleep, STATUS_STONE, ANIM_JrTroopa_Still, @@ -16,7 +16,7 @@ s32 N(idleAnimations_80224380)[] = { STATUS_END, }; -s32 N(idleAnimations_802243BC)[] = { +s32 N(IdleAnimations_802243BC)[] = { STATUS_NORMAL, ANIM_JrTroopa_Idle, STATUS_SLEEP, ANIM_JrTroopa_Still, STATUS_STONE, ANIM_JrTroopa_Still, @@ -27,18 +27,18 @@ s32 N(idleAnimations_802243BC)[] = { STATUS_END, }; -s32 N(idleAnimations_802243F8)[] = { +s32 N(IdleAnimations_802243F8)[] = { STATUS_NORMAL, ANIM_JrTroopa_EggIdle, STATUS_STOP, ANIM_JrTroopa_EggStill, STATUS_END, }; -s32 N(defenseTable_8022440C)[] = { +s32 N(DefenseTable_8022440C)[] = { ELEMENT_NORMAL, 1, ELEMENT_END, }; -s32 N(statusTable_80224418)[] = { +s32 N(StatusTable_80224418)[] = { STATUS_NORMAL, 100, STATUS_DEFAULT, 100, STATUS_SLEEP, 80, @@ -63,15 +63,15 @@ s32 N(statusTable_80224418)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_802244C4)[] = { +ActorPartBlueprint N(PartsTable_802244C4)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { -6, 18 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80224380), - .defenseTable = N(defenseTable_8022440C), + .idleAnimations = N(IdleAnimations_80224380), + .defenseTable = N(DefenseTable_8022440C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 5, -4 }, @@ -85,10 +85,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_JR_TROOPA2, .level = 44, .maxHP = 15, - .partCount = ARRAY_COUNT(N(partsTable_802244C4)), - .partsData = N(partsTable_802244C4), + .partCount = ARRAY_COUNT( N(PartsTable_802244C4)), + .partsData = N(PartsTable_802244C4), .initScript = &N(init_80224A94), - .statusTable = N(statusTable_80224418), + .statusTable = N(StatusTable_80224418), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -133,7 +133,7 @@ EvtScript N(802245E8) = { EVT_END }; -s32 N(idleAnimations_8022464C)[] = { +s32 N(IdleAnimations_8022464C)[] = { STATUS_NORMAL, ANIM_JrTroopa_Defeated, STATUS_END, }; @@ -182,7 +182,7 @@ EvtScript N(80224658) = { EVT_CALL(SetAnimation, ACTOR_SELF, LVarA, ANIM_JrTroopa_Collapse) EVT_WAIT(12) EVT_CALL(SetAnimation, ACTOR_SELF, LVarA, ANIM_JrTroopa_Defeated) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, LVarA, EVT_PTR(N(idleAnimations_8022464C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, LVarA, EVT_PTR(N(IdleAnimations_8022464C))) EVT_WAIT(60) EVT_CALL(SetActorFlagBits, ACTOR_SELF, 0x00400000, TRUE) EVT_RETURN @@ -198,7 +198,7 @@ EvtScript N(80224964) = { EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 0, LVar0, LVar1, LVar2, -4, 0, 0) EVT_PLAY_EFFECT(EFFECT_WALKING_DUST, 0, LVar0, LVar1, LVar2, 4, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_EnterEgg) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_802243F8))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_802243F8))) EVT_WAIT(10) EVT_RETURN EVT_END diff --git a/src/battle/area/kmr_part_3/actor/final_jr_troopa.c b/src/battle/area/kmr_part_3/actor/final_jr_troopa.c index 26620a5563..5faba2b47b 100644 --- a/src/battle/area/kmr_part_3/actor/final_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/final_jr_troopa.c @@ -9,7 +9,7 @@ #include "common/UnkBattleFunc1.inc.c" -s32 N(idleAnimations_8022C370)[] = { +s32 N(IdleAnimations_8022C370)[] = { STATUS_NORMAL, ANIM_JrTroopa_Idle, STATUS_SLEEP, ANIM_JrTroopa_Sleep, STATUS_STONE, ANIM_JrTroopa_Still, @@ -19,7 +19,7 @@ s32 N(idleAnimations_8022C370)[] = { STATUS_END, }; -s32 N(idleAnimations_8022C3A4)[] = { +s32 N(IdleAnimations_8022C3A4)[] = { STATUS_NORMAL, ANIM_SpikedParaJrTroopa_Idle, STATUS_SLEEP, ANIM_SpikedParaJrTroopa_Sleep, STATUS_STONE, ANIM_SpikedParaJrTroopa_Still, @@ -29,7 +29,7 @@ s32 N(idleAnimations_8022C3A4)[] = { STATUS_END, }; -s32 N(idleAnimations_8022C3D8)[] = { +s32 N(IdleAnimations_8022C3D8)[] = { STATUS_NORMAL, ANIM_MageJrTroopa_Idle, STATUS_SLEEP, ANIM_MageJrTroopa_Sleep, STATUS_STONE, ANIM_MageJrTroopa_Still, @@ -39,27 +39,27 @@ s32 N(idleAnimations_8022C3D8)[] = { STATUS_END, }; -s32 N(idleAnimations_8022C40C)[] = { +s32 N(IdleAnimations_8022C40C)[] = { STATUS_NORMAL, ANIM_JrTroopa_Defeated, STATUS_END, }; -s32 N(defenseTable_8022C418)[] = { +s32 N(DefenseTable_8022C418)[] = { ELEMENT_NORMAL, 2, ELEMENT_END, }; -s32 N(defenseTable_8022C424)[] = { +s32 N(DefenseTable_8022C424)[] = { ELEMENT_NORMAL, 2, ELEMENT_END, }; -s32 N(defenseTable_8022C430)[] = { +s32 N(DefenseTable_8022C430)[] = { ELEMENT_NORMAL, 2, ELEMENT_END, }; -s32 N(statusTable_8022C43C)[] = { +s32 N(StatusTable_8022C43C)[] = { STATUS_NORMAL, 100, STATUS_DEFAULT, 100, STATUS_SLEEP, 30, @@ -84,7 +84,7 @@ s32 N(statusTable_8022C43C)[] = { STATUS_END, }; -s32 N(statusTable_8022C4E8)[] = { +s32 N(StatusTable_8022C4E8)[] = { STATUS_NORMAL, 100, STATUS_DEFAULT, 100, STATUS_SLEEP, 30, @@ -109,7 +109,7 @@ s32 N(statusTable_8022C4E8)[] = { STATUS_END, }; -s32 N(statusTable_8022C594)[] = { +s32 N(StatusTable_8022C594)[] = { STATUS_NORMAL, 100, STATUS_DEFAULT, 100, STATUS_SLEEP, 30, @@ -134,15 +134,15 @@ s32 N(statusTable_8022C594)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_8022C640)[] = { +ActorPartBlueprint N(PartsTable_8022C640)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 26 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8022C370), - .defenseTable = N(defenseTable_8022C418), + .idleAnimations = N(IdleAnimations_8022C370), + .defenseTable = N(DefenseTable_8022C418), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -2, -6 }, @@ -153,8 +153,8 @@ ActorPartBlueprint N(partsTable_8022C640)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -5, 32 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8022C3A4), - .defenseTable = N(defenseTable_8022C424), + .idleAnimations = N(IdleAnimations_8022C3A4), + .defenseTable = N(DefenseTable_8022C424), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -11 }, @@ -165,8 +165,8 @@ ActorPartBlueprint N(partsTable_8022C640)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 28 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8022C3D8), - .defenseTable = N(defenseTable_8022C430), + .idleAnimations = N(IdleAnimations_8022C3D8), + .defenseTable = N(DefenseTable_8022C430), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -2, -7 }, @@ -180,10 +180,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_JR_TROOPA6, .level = 74, .maxHP = 60, - .partCount = ARRAY_COUNT(N(partsTable_8022C640)), - .partsData = N(partsTable_8022C640), + .partCount = ARRAY_COUNT( N(PartsTable_8022C640)), + .partsData = N(PartsTable_8022C640), .initScript = &N(init_8022CF80), - .statusTable = N(statusTable_8022C43C), + .statusTable = N(StatusTable_8022C43C), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -281,7 +281,7 @@ EvtScript N(8022CC04) = { EVT_END }; -s32 N(idleAnimations_8022CC68)[] = { +s32 N(IdleAnimations_8022CC68)[] = { STATUS_NORMAL, ANIM_JrTroopa_Defeated, STATUS_END, }; @@ -330,7 +330,7 @@ EvtScript N(8022CC74) = { EVT_CALL(SetAnimation, ACTOR_SELF, LVarA, ANIM_JrTroopa_Collapse) EVT_WAIT(12) EVT_CALL(SetAnimation, ACTOR_SELF, LVarA, ANIM_JrTroopa_Defeated) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, LVarA, EVT_PTR(N(idleAnimations_8022CC68))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, LVarA, EVT_PTR(N(IdleAnimations_8022CC68))) EVT_WAIT(60) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, TRUE) EVT_RETURN @@ -625,7 +625,7 @@ EvtScript N(8022DD48) = { EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(SetActorVar, ACTOR_SELF, 3, 2) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_8022C4E8))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable_8022C4E8))) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, TRUE) EVT_RETURN EVT_END @@ -656,7 +656,7 @@ EvtScript N(8022DF54) = { EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(SetActorVar, ACTOR_SELF, 3, 3) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_8022C594))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable_8022C594))) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) EVT_RETURN EVT_END @@ -1520,7 +1520,7 @@ EvtScript N(802318F8) = { EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E5) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_JrTroopa_Defeated) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022C40C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022C40C))) EVT_WAIT(60) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, TRUE) EVT_RETURN diff --git a/src/battle/area/kmr_part_3/actor/jr_troopa.c b/src/battle/area/kmr_part_3/actor/jr_troopa.c index 521cfbf653..2e7aa874f4 100644 --- a/src/battle/area/kmr_part_3/actor/jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/jr_troopa.c @@ -6,7 +6,7 @@ #define NAMESPACE b_area_kmr_part_3_jr_troopa -s32 N(idleAnimations_802229F0)[] = { +s32 N(IdleAnimations_802229F0)[] = { STATUS_NORMAL, ANIM_JrTroopa_Idle, STATUS_STONE, ANIM_JrTroopa_Still, STATUS_SLEEP, ANIM_JrTroopa_Still, @@ -17,12 +17,12 @@ s32 N(idleAnimations_802229F0)[] = { STATUS_END, }; -s32 N(defenseTable_80222A2C)[] = { +s32 N(DefenseTable_80222A2C)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_80222A38)[] = { +s32 N(StatusTable_80222A38)[] = { STATUS_NORMAL, 100, STATUS_DEFAULT, 100, STATUS_SLEEP, 100, @@ -47,15 +47,15 @@ s32 N(statusTable_80222A38)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_80222AE4)[] = { +ActorPartBlueprint N(PartsTable_80222AE4)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 30 }, .opacity = 255, - .idleAnimations = N(idleAnimations_802229F0), - .defenseTable = N(defenseTable_80222A2C), + .idleAnimations = N(IdleAnimations_802229F0), + .defenseTable = N(DefenseTable_80222A2C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -69,10 +69,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_JR_TROOPA1, .level = 41, .maxHP = 5, - .partCount = ARRAY_COUNT(N(partsTable_80222AE4)), - .partsData = N(partsTable_80222AE4), + .partCount = ARRAY_COUNT( N(PartsTable_80222AE4)), + .partsData = N(PartsTable_80222AE4), .initScript = &N(init_80223180), - .statusTable = N(statusTable_80222A38), + .statusTable = N(StatusTable_80222A38), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -117,7 +117,7 @@ EvtScript N(80222C08) = { EVT_END }; -s32 N(idleAnimations_80222C6C)[] = { +s32 N(IdleAnimations_80222C6C)[] = { STATUS_NORMAL, ANIM_JrTroopa_Defeated, STATUS_END, }; @@ -166,7 +166,7 @@ EvtScript N(80222C78) = { EVT_CALL(SetAnimation, ACTOR_SELF, LVarA, ANIM_JrTroopa_Collapse) EVT_WAIT(12) EVT_CALL(SetAnimation, ACTOR_SELF, LVarA, ANIM_JrTroopa_Defeated) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, LVarA, EVT_PTR(N(idleAnimations_80222C6C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, LVarA, EVT_PTR(N(IdleAnimations_80222C6C))) EVT_WAIT(30) EVT_CALL(UseIdleAnimation, ACTOR_PARTNER, FALSE) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) diff --git a/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c b/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c index 07ace942f9..e1aac8436e 100644 --- a/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/mage_jr_troopa.c @@ -7,7 +7,7 @@ #define NAMESPACE b_area_kmr_part_3_mage_jr_troopa -s32 N(idleAnimations_8022A550)[] = { +s32 N(IdleAnimations_8022A550)[] = { STATUS_NORMAL, ANIM_MageJrTroopa_Idle, STATUS_SLEEP, ANIM_MageJrTroopa_Sleep, STATUS_STONE, ANIM_MageJrTroopa_Still, @@ -19,7 +19,7 @@ s32 N(idleAnimations_8022A550)[] = { STATUS_END, }; -s32 N(idleAnimations_8022A594)[] = { +s32 N(IdleAnimations_8022A594)[] = { STATUS_NORMAL, ANIM_MageJrTroopa_Idle, STATUS_SLEEP, ANIM_MageJrTroopa_Still, STATUS_STONE, ANIM_MageJrTroopa_Still, @@ -31,7 +31,7 @@ s32 N(idleAnimations_8022A594)[] = { STATUS_END, }; -s32 N(idleAnimations_8022A5D8)[] = { +s32 N(IdleAnimations_8022A5D8)[] = { STATUS_NORMAL, ANIM_JrTroopa_Idle, STATUS_SLEEP, ANIM_JrTroopa_Sleep, STATUS_STONE, ANIM_JrTroopa_Still, @@ -43,17 +43,17 @@ s32 N(idleAnimations_8022A5D8)[] = { STATUS_END, }; -s32 N(idleAnimations_8022A61C)[] = { +s32 N(IdleAnimations_8022A61C)[] = { STATUS_NORMAL, ANIM_JrTroopa_Defeated, STATUS_END, }; -s32 N(defenseTable_8022A628)[] = { +s32 N(DefenseTable_8022A628)[] = { ELEMENT_NORMAL, 1, ELEMENT_END, }; -s32 N(statusTable_8022A634)[] = { +s32 N(StatusTable_8022A634)[] = { STATUS_NORMAL, 100, STATUS_DEFAULT, 100, STATUS_SLEEP, 35, @@ -78,15 +78,15 @@ s32 N(statusTable_8022A634)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_8022A6E0)[] = { +ActorPartBlueprint N(PartsTable_8022A6E0)[] = { { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 28 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8022A550), - .defenseTable = N(defenseTable_8022A628), + .idleAnimations = N(IdleAnimations_8022A550), + .defenseTable = N(DefenseTable_8022A628), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -2, -7 }, @@ -97,8 +97,8 @@ ActorPartBlueprint N(partsTable_8022A6E0)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 30 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8022A5D8), - .defenseTable = N(defenseTable_8022A628), + .idleAnimations = N(IdleAnimations_8022A5D8), + .defenseTable = N(DefenseTable_8022A628), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -112,10 +112,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_JR_TROOPA5, .level = 65, .maxHP = 50, - .partCount = ARRAY_COUNT(N(partsTable_8022A6E0)), - .partsData = N(partsTable_8022A6E0), + .partCount = ARRAY_COUNT( N(PartsTable_8022A6E0)), + .partsData = N(PartsTable_8022A6E0), .initScript = &N(init_8022ACE4), - .statusTable = N(statusTable_8022A634), + .statusTable = N(StatusTable_8022A634), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -572,7 +572,7 @@ EvtScript N(8022BF1C) = { EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E5) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JrTroopa_Defeated) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8022A61C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations_8022A61C))) EVT_WAIT(60) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_DMG_APPLY, TRUE) EVT_RETURN diff --git a/src/battle/area/kmr_part_3/actor/para_jr_troopa.c b/src/battle/area/kmr_part_3/actor/para_jr_troopa.c index 6f7c225ab1..8a03523478 100644 --- a/src/battle/area/kmr_part_3/actor/para_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/para_jr_troopa.c @@ -6,7 +6,7 @@ #define NAMESPACE b_area_kmr_part_3_para_jr_troopa -s32 N(idleAnimations_80225DC0)[] = { +s32 N(IdleAnimations_80225DC0)[] = { STATUS_NORMAL, ANIM_ParaJrTroopa_Idle, STATUS_SLEEP, ANIM_ParaJrTroopa_Sleep, STATUS_STONE, ANIM_ParaJrTroopa_Still, @@ -18,7 +18,7 @@ s32 N(idleAnimations_80225DC0)[] = { STATUS_END, }; -s32 N(idleAnimations_80225E04)[] = { +s32 N(IdleAnimations_80225E04)[] = { STATUS_NORMAL, ANIM_JrTroopa_Idle, STATUS_SLEEP, ANIM_JrTroopa_Sleep, STATUS_STONE, ANIM_JrTroopa_Still, @@ -30,17 +30,17 @@ s32 N(idleAnimations_80225E04)[] = { STATUS_END, }; -s32 N(idleAnimations_80225E48)[] = { +s32 N(IdleAnimations_80225E48)[] = { STATUS_NORMAL, ANIM_JrTroopa_Defeated, STATUS_END, }; -s32 N(defenseTable_80225E54)[] = { +s32 N(DefenseTable_80225E54)[] = { ELEMENT_NORMAL, 1, ELEMENT_END, }; -s32 N(statusTable_80225E60)[] = { +s32 N(StatusTable_80225E60)[] = { STATUS_NORMAL, 100, STATUS_DEFAULT, 100, STATUS_SLEEP, 50, @@ -65,15 +65,15 @@ s32 N(statusTable_80225E60)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_80225F0C)[] = { +ActorPartBlueprint N(PartsTable_80225F0C)[] = { { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 35 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80225DC0), - .defenseTable = N(defenseTable_80225E54), + .idleAnimations = N(IdleAnimations_80225DC0), + .defenseTable = N(DefenseTable_80225E54), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -6 }, @@ -84,8 +84,8 @@ ActorPartBlueprint N(partsTable_80225F0C)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 30 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80225E04), - .defenseTable = N(defenseTable_80225E54), + .idleAnimations = N(IdleAnimations_80225E04), + .defenseTable = N(DefenseTable_80225E54), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -99,10 +99,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_JR_TROOPA3, .level = 52, .maxHP = 40, - .partCount = ARRAY_COUNT(N(partsTable_80225F0C)), - .partsData = N(partsTable_80225F0C), + .partCount = ARRAY_COUNT( N(PartsTable_80225F0C)), + .partsData = N(PartsTable_80225F0C), .initScript = &N(init_80226510), - .statusTable = N(statusTable_80225E60), + .statusTable = N(StatusTable_80225E60), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -574,7 +574,7 @@ EvtScript N(802279B0) = { EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E5) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JrTroopa_Defeated) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_80225E48))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations_80225E48))) EVT_WAIT(60) EVT_CALL(SetActorFlagBits, ACTOR_SELF, 0x00400000, TRUE) EVT_RETURN diff --git a/src/battle/area/kmr_part_3/actor/paragoomba.c b/src/battle/area/kmr_part_3/actor/paragoomba.c index e9b6f045d9..096b1fb66b 100644 --- a/src/battle/area/kmr_part_3/actor/paragoomba.c +++ b/src/battle/area/kmr_part_3/actor/paragoomba.c @@ -6,17 +6,17 @@ #define NAMESPACE b_area_kmr_part_3_paragoomba1 -s32 N(defenseTable_8021C1B0)[] = { +s32 N(DefenseTable_8021C1B0)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(defenseTable_8021C1BC)[] = { +s32 N(DefenseTable_8021C1BC)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_8021C1C8)[] = { +s32 N(StatusTable_8021C1C8)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 100, @@ -41,7 +41,7 @@ s32 N(statusTable_8021C1C8)[] = { STATUS_END, }; -s32 N(statusTable_8021C274)[] = { +s32 N(StatusTable_8021C274)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 100, @@ -66,24 +66,24 @@ s32 N(statusTable_8021C274)[] = { STATUS_END, }; -extern s32 N(idleAnimations_8021DB9C)[]; -extern s32 N(idleAnimations_8021C3D8)[]; -extern s32 N(idleAnimations_8021C470)[]; -extern s32 N(idleAnimations_8021C47C)[]; +extern s32 N(IdleAnimations_8021DB9C)[]; +extern s32 N(IdleAnimations_8021C3D8)[]; +extern s32 N(IdleAnimations_8021C470)[]; +extern s32 N(IdleAnimations_8021C47C)[]; extern EvtScript N(init_8021F450); extern EvtScript N(takeTurn_8021CDFC); extern EvtScript N(idle_8021C4D4); extern EvtScript N(handleEvent_8021C808); -ActorPartBlueprint N(partsTable)[] = { +ActorPartBlueprint N(PartsTable)[] = { { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 20 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021DB9C), - .defenseTable = N(defenseTable_8021C1B0), + .idleAnimations = N(IdleAnimations_8021DB9C), + .defenseTable = N(DefenseTable_8021C1B0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -94,8 +94,8 @@ ActorPartBlueprint N(partsTable)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021C3D8), - .defenseTable = N(defenseTable_8021C1BC), + .idleAnimations = N(IdleAnimations_8021C3D8), + .defenseTable = N(DefenseTable_8021C1BC), .eventFlags = ACTOR_EVENT_FLAG_GROUNDABLE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -106,8 +106,8 @@ ActorPartBlueprint N(partsTable)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -16, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021C470), - .defenseTable = N(defenseTable_8021C1B0), + .idleAnimations = N(IdleAnimations_8021C470), + .defenseTable = N(DefenseTable_8021C1B0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -118,8 +118,8 @@ ActorPartBlueprint N(partsTable)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -16, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021C47C), - .defenseTable = N(defenseTable_8021C1B0), + .idleAnimations = N(IdleAnimations_8021C47C), + .defenseTable = N(DefenseTable_8021C1B0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -131,10 +131,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_PARAGOOMBA, .level = 6, .maxHP = 2, - .partCount = ARRAY_COUNT(N(partsTable)), - .partsData = N(partsTable), + .partCount = ARRAY_COUNT( N(PartsTable)), + .partsData = N(PartsTable), .initScript = &N(init_8021F450), - .statusTable = N(statusTable_8021C274), + .statusTable = N(StatusTable_8021C274), .escapeChance = 90, .airLiftChance = 100, .hurricaneChance = 100, @@ -149,7 +149,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations_8021C3D8)[] = { +s32 N(IdleAnimations_8021C3D8)[] = { STATUS_NORMAL, ANIM_Paragoomba_Idle, STATUS_STONE, ANIM_Paragoomba_Still, STATUS_SLEEP, ANIM_Paragoomba_Sleep, @@ -162,7 +162,7 @@ s32 N(idleAnimations_8021C3D8)[] = { STATUS_END, }; -s32 N(idleAnimations_8021C424)[] = { +s32 N(IdleAnimations_8021C424)[] = { STATUS_NORMAL, ANIM_Paragoomba_Run, STATUS_STONE, ANIM_Paragoomba_Still, STATUS_SLEEP, ANIM_Paragoomba_Sleep, @@ -175,12 +175,12 @@ s32 N(idleAnimations_8021C424)[] = { STATUS_END, }; -s32 N(idleAnimations_8021C470)[] = { +s32 N(IdleAnimations_8021C470)[] = { STATUS_NORMAL, ANIM_Paragoomba_LWingStill, STATUS_END, }; -s32 N(idleAnimations_8021C47C)[] = { +s32 N(IdleAnimations_8021C47C)[] = { STATUS_NORMAL, ANIM_Paragoomba_RWingStill, STATUS_END, }; @@ -209,7 +209,7 @@ EvtScript N(idle_8021C4D4) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(0.6)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021C424))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations_8021C424))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) EVT_LOOP(20) @@ -226,7 +226,7 @@ EvtScript N(idle_8021C4D4) = { EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(0.6)) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021C3D8))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations_8021C3D8))) EVT_LOOP(40) EVT_LABEL(2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) @@ -538,7 +538,7 @@ EvtScript N(8021D614) = { EVT_CALL(SetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Idle) EVT_CALL(SetActorFlagBits, ACTOR_SELF, 512, FALSE) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_8021C1C8))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable_8021C1C8))) EVT_CALL(SetActorType, ACTOR_SELF, 7) EVT_EXEC_WAIT(N(8021DC34)) EVT_CALL(SetActorFlagBits, ACTOR_SELF, 0x00001000, TRUE) @@ -548,7 +548,7 @@ EvtScript N(8021D614) = { EVT_END }; -s32 N(idleAnimations_8021DB9C)[] = { +s32 N(IdleAnimations_8021DB9C)[] = { STATUS_NORMAL, ANIM_Goomba_Idle, STATUS_STONE, ANIM_Goomba_Still, STATUS_SLEEP, ANIM_Goomba_Sleep, @@ -561,7 +561,7 @@ s32 N(idleAnimations_8021DB9C)[] = { STATUS_END, }; -s32 N(idleAnimations_8021DBE8)[] = { +s32 N(IdleAnimations_8021DBE8)[] = { STATUS_NORMAL, ANIM_Goomba_Run, STATUS_STONE, ANIM_Goomba_Still, STATUS_SLEEP, ANIM_Goomba_Sleep, @@ -602,10 +602,10 @@ EvtScript N(idle) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021DBE8))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021DBE8))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021DB9C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021DB9C))) EVT_LOOP(20) EVT_LABEL(1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) @@ -618,10 +618,10 @@ EvtScript N(idle) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021DBE8))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021DBE8))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021DB9C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021DB9C))) EVT_LOOP(80) EVT_LABEL(2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) diff --git a/src/battle/area/kmr_part_3/actor/spiked_goomba.c b/src/battle/area/kmr_part_3/actor/spiked_goomba.c index 31a6e1a0c8..03ef1d480b 100644 --- a/src/battle/area/kmr_part_3/actor/spiked_goomba.c +++ b/src/battle/area/kmr_part_3/actor/spiked_goomba.c @@ -5,12 +5,12 @@ #define NAMESPACE b_area_kmr_part_3_spiked_goomba -s32 N(defenseTable_8021A390)[] = { +s32 N(DefenseTable_8021A390)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_8021A39C)[] = { +s32 N(StatusTable_8021A39C)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 100, @@ -35,21 +35,21 @@ s32 N(statusTable_8021A39C)[] = { STATUS_END, }; -extern s32 N(idleAnimations_8021A494)[]; +extern s32 N(IdleAnimations_8021A494)[]; extern EvtScript N(init_8021BEBC); extern EvtScript N(takeTurn_8021B19C); extern EvtScript N(idle_8021A578); extern EvtScript N(handleEvent_8021A854); -ActorPartBlueprint N(partsTable_8021A448)[] = { +ActorPartBlueprint N(PartsTable_8021A448)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021A494), - .defenseTable = N(defenseTable_8021A390), + .idleAnimations = N(IdleAnimations_8021A494), + .defenseTable = N(DefenseTable_8021A390), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -12 }, @@ -61,10 +61,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_SPIKED_GOOMBA, .level = 6, .maxHP = 2, - .partCount = ARRAY_COUNT(N(partsTable_8021A448)), - .partsData = N(partsTable_8021A448), + .partCount = ARRAY_COUNT( N(PartsTable_8021A448)), + .partsData = N(PartsTable_8021A448), .initScript = &N(init_8021BEBC), - .statusTable = N(statusTable_8021A39C), + .statusTable = N(StatusTable_8021A39C), .escapeChance = 90, .airLiftChance = 95, .hurricaneChance = 90, @@ -79,7 +79,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations_8021A494)[] = { +s32 N(IdleAnimations_8021A494)[] = { STATUS_NORMAL, ANIM_SpikedGoomba_Idle, STATUS_STONE, ANIM_SpikedGoomba_Still, STATUS_SLEEP, ANIM_SpikedGoomba_Sleep, @@ -92,7 +92,7 @@ s32 N(idleAnimations_8021A494)[] = { STATUS_END, }; -s32 N(idleAnimations_8021A4E0)[] = { +s32 N(IdleAnimations_8021A4E0)[] = { STATUS_NORMAL, ANIM_SpikedGoomba_Run, STATUS_STONE, ANIM_SpikedGoomba_Still, STATUS_SLEEP, ANIM_SpikedGoomba_Sleep, @@ -129,10 +129,10 @@ EvtScript N(idle_8021A578) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021A4E0))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021A4E0))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021A494))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021A494))) EVT_LOOP(20) EVT_LABEL(1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) @@ -145,10 +145,10 @@ EvtScript N(idle_8021A578) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021A4E0))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021A4E0))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021A494))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021A494))) EVT_LOOP(80) EVT_LABEL(2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) diff --git a/src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c b/src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c index 8ebe20a3b5..3092c31a52 100644 --- a/src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c +++ b/src/battle/area/kmr_part_3/actor/spiked_para_jr_troopa.c @@ -7,7 +7,7 @@ #define NAMESPACE b_area_kmr_part_3_spiked_para_jr_troopa -s32 N(idleAnimations_80227F00)[] = { +s32 N(IdleAnimations_80227F00)[] = { STATUS_NORMAL, ANIM_SpikedParaJrTroopa_Idle, STATUS_SLEEP, ANIM_SpikedParaJrTroopa_Sleep, STATUS_STONE, ANIM_SpikedParaJrTroopa_Still, @@ -19,22 +19,22 @@ s32 N(idleAnimations_80227F00)[] = { STATUS_END, }; -s32 N(idleAnimations_80227F44)[] = { +s32 N(IdleAnimations_80227F44)[] = { STATUS_NORMAL, ANIM_JrTroopa_OutOfBreath, STATUS_END, }; -s32 N(idleAnimations_80227F50)[] = { +s32 N(IdleAnimations_80227F50)[] = { STATUS_NORMAL, ANIM_JrTroopa_Defeated, STATUS_END, }; -s32 N(defenseTable_80227F5C)[] = { +s32 N(DefenseTable_80227F5C)[] = { ELEMENT_NORMAL, 1, ELEMENT_END, }; -s32 N(statusTable_80227F68)[] = { +s32 N(StatusTable_80227F68)[] = { STATUS_NORMAL, 100, STATUS_DEFAULT, 100, STATUS_SLEEP, 40, @@ -59,15 +59,15 @@ s32 N(statusTable_80227F68)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_80228014)[] = { +ActorPartBlueprint N(PartsTable_80228014)[] = { { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { -5, 32 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80227F00), - .defenseTable = N(defenseTable_80227F5C), + .idleAnimations = N(IdleAnimations_80227F00), + .defenseTable = N(DefenseTable_80227F5C), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -11 }, @@ -78,8 +78,8 @@ ActorPartBlueprint N(partsTable_80228014)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 30 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80227F44), - .defenseTable = N(defenseTable_80227F5C), + .idleAnimations = N(IdleAnimations_80227F44), + .defenseTable = N(DefenseTable_80227F5C), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -93,10 +93,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_JR_TROOPA4, .level = 59, .maxHP = 40, - .partCount = ARRAY_COUNT(N(partsTable_80228014)), - .partsData = N(partsTable_80228014), + .partCount = ARRAY_COUNT( N(PartsTable_80228014)), + .partsData = N(PartsTable_80228014), .initScript = &N(init_80228618), - .statusTable = N(statusTable_80227F68), + .statusTable = N(StatusTable_80227F68), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -673,7 +673,7 @@ EvtScript N(8022A018) = { EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E5) EVT_CALL(SetAnimation, ACTOR_SELF, 2, ANIM_JrTroopa_Defeated) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_80227F50))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations_80227F50))) EVT_WAIT(60) EVT_CALL(SetActorFlagBits, ACTOR_SELF, 0x00400000, TRUE) EVT_RETURN diff --git a/src/battle/area/kpa/actor/bony_beetle.c b/src/battle/area/kpa/actor/bony_beetle.c index e0e6b9850d..763b7e5493 100644 --- a/src/battle/area/kpa/actor/bony_beetle.c +++ b/src/battle/area/kpa/actor/bony_beetle.c @@ -33,7 +33,7 @@ extern EvtScript N(attackSpikeBounce); extern EvtScript N(standUp); extern EvtScript N(standUp_spiky); -s32 N(idleAnimations_normal)[] = { +s32 N(IdleAnimations_normal)[] = { STATUS_NORMAL, ANIM_BonyBeetle_Anim04, STATUS_STONE, ANIM_BonyBeetle_Anim00, STATUS_SLEEP, ANIM_BonyBeetle_Anim2A, @@ -46,7 +46,7 @@ s32 N(idleAnimations_normal)[] = { STATUS_END, }; -s32 N(idleAnimations_spiky)[] = { +s32 N(IdleAnimations_spiky)[] = { STATUS_NORMAL, ANIM_BonyBeetle_Anim05, STATUS_STONE, ANIM_BonyBeetle_Anim01, STATUS_SLEEP, ANIM_BonyBeetle_Anim2B, @@ -59,7 +59,7 @@ s32 N(idleAnimations_spiky)[] = { STATUS_END, }; -s32 N(idleAnimations_flipped)[] = { +s32 N(IdleAnimations_flipped)[] = { STATUS_NORMAL, ANIM_BonyBeetle_Anim06, STATUS_STONE, ANIM_BonyBeetle_Anim02, STATUS_SLEEP, ANIM_BonyBeetle_Anim2C, @@ -72,7 +72,7 @@ s32 N(idleAnimations_flipped)[] = { STATUS_END, }; -s32 N(idleAnimations_spiky_flipped)[] = { +s32 N(IdleAnimations_spiky_flipped)[] = { STATUS_NORMAL, ANIM_BonyBeetle_Anim07, STATUS_STONE, ANIM_BonyBeetle_Anim03, STATUS_SLEEP, ANIM_BonyBeetle_Anim2D, @@ -85,17 +85,17 @@ s32 N(idleAnimations_spiky_flipped)[] = { STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 4, ELEMENT_END, }; -s32 N(defenseTable_flipped)[] = { +s32 N(DefenseTable_flipped)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 60, @@ -127,8 +127,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -3, 21 }, .opacity = 255, - .idleAnimations = N(idleAnimations_spiky), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations_spiky), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -143,7 +143,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 50, .airLiftChance = 70, .hurricaneChance = 60, @@ -164,12 +164,12 @@ EvtScript N(init) = { EVT_IF_EQ(LVar0, 1) EVT_IF_EQ(LVar1, 1) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_SPIKY)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_spiky))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_spiky))) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim05) EVT_ELSE EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_NORMAL)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_normal))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_normal))) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim04) EVT_END_IF @@ -177,12 +177,12 @@ EvtScript N(init) = { EVT_CALL(RandInt, 1000, LVar0) EVT_IF_LT(LVar0, 500) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_NORMAL)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_normal))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_normal))) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim04) EVT_ELSE EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_SPIKY)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_spiky))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_spiky))) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim05) EVT_END_IF @@ -256,14 +256,14 @@ EvtScript N(changeSpikesState) = { EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim2E) EVT_WAIT(25) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_spiky))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_spiky))) EVT_CASE_EQ(N(STATE_SPIKY)) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20CF) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_NORMAL)) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim2F) EVT_WAIT(25) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_normal))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_normal))) EVT_CASE_EQ(N(STATE_FLIPPED)) EVT_CASE_EQ(N(STATE_SPIKY_FLIPPED)) EVT_END_SWITCH @@ -332,8 +332,8 @@ EvtScript N(handleEvent_normal) = { EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -8) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -3, 21) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_FLIP_TRIGGERED), 1) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_flipped))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flipped))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_flipped))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_flipped))) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, FALSE) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim08) @@ -554,8 +554,8 @@ EvtScript N(handleEvent_spiky) = { EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -8) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -3, 21) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_FLIP_TRIGGERED), 1) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_flipped))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_spiky_flipped))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_flipped))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_spiky_flipped))) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, FALSE) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim09) @@ -862,8 +862,8 @@ EvtScript N(8021B7C8) = { EVT_CALL(func_8027D32C, ACTOR_SELF) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_FLIPPED)) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_FLIP_TRIGGERED), 1) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_flipped))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flipped))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_flipped))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_flipped))) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -8) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -3, 21) @@ -931,8 +931,8 @@ EvtScript N(handleEvent_flipped) = { EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -3, 21) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_FLIP_TRIGGERED), 1) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_flipped))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flipped))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_flipped))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_flipped))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim1A) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, TRUE) EVT_USE_BUF(N(bounceTable)) @@ -1011,8 +1011,8 @@ EvtScript N(standUp) = { EVT_WAIT(20) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_NORMAL)) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_normal))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_normal))) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE) EVT_END_IF EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -1063,8 +1063,8 @@ EvtScript N(handleEvent_spiky_flipped) = { EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -3, 21) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_FLIP_TRIGGERED), 1) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_flipped))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_spiky_flipped))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_flipped))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_spiky_flipped))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BonyBeetle_Anim1B) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, TRUE) EVT_USE_BUF(N(bounceTable)) @@ -1144,8 +1144,8 @@ EvtScript N(standUp_spiky) = { EVT_WAIT(20) EVT_CALL(SetActorYaw, ACTOR_SELF, 0) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_SPIKY)) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_spiky))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_spiky))) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, TRUE) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE) EVT_END_IF diff --git a/src/battle/area/kpa/actor/dry_bones.c b/src/battle/area/kpa/actor/dry_bones.c index 3accc74588..002346bf83 100644 --- a/src/battle/area/kpa/actor/dry_bones.c +++ b/src/battle/area/kpa/actor/dry_bones.c @@ -11,7 +11,7 @@ extern EvtScript N(takeTurn); extern EvtScript N(handleEvent); extern EvtScript N(nextTurn); -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_DryBones_Anim02, STATUS_STONE, ANIM_DryBones_Anim00, STATUS_SLEEP, ANIM_DryBones_Anim0E, @@ -24,31 +24,31 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations_dead)[] = { +s32 N(IdleAnimations_dead)[] = { STATUS_NORMAL, ANIM_DryBones_Anim01, STATUS_END, }; -s32 N(idleAnimations_bone)[] = { +s32 N(IdleAnimations_bone)[] = { STATUS_NORMAL, ANIM_DryBones_Anim0F, STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 2, ELEMENT_FIRE, -10, ELEMENT_BLAST, -10, ELEMENT_END, }; -s32 N(defenseTable_dead)[] = { +s32 N(DefenseTable_dead)[] = { ELEMENT_NORMAL, 99, ELEMENT_FIRE, -10, ELEMENT_BLAST, -10, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -73,7 +73,7 @@ s32 N(statusTable)[] = { STATUS_END, }; -s32 N(statusTable_dead)[] = { +s32 N(StatusTable_dead)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -105,8 +105,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -8, 30 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, @@ -117,8 +117,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_bone), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations_bone), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -133,7 +133,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 50, .airLiftChance = 75, .hurricaneChance = 70, @@ -235,9 +235,9 @@ EvtScript N(reassemble) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_DryBones_Anim08) EVT_WAIT(20) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_dead))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_dead))) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_dead))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_dead))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_dead))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable_dead))) EVT_CALL(ClearStatusEffects, ACTOR_SELF) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -1, 10) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) @@ -444,9 +444,9 @@ EvtScript N(takeTurn) = { EVT_WAIT(20) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable))) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 1, ACTOR_PART_FLAG_2000, FALSE) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -8, 30) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -10) diff --git a/src/battle/area/kpa2/actor/bowser.c b/src/battle/area/kpa2/actor/bowser.c index 9bb29bcf68..7bcbc640df 100644 --- a/src/battle/area/kpa2/actor/bowser.c +++ b/src/battle/area/kpa2/actor/bowser.c @@ -26,7 +26,7 @@ extern EvtScript N(attackHeavyJump); extern EvtScript N(returnHome); extern EvtScript N(recover); -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_BattleBowser_Idle, STATUS_STONE, ANIM_BattleBowser_Still, STATUS_SLEEP, ANIM_BattleBowser_Idle, @@ -40,12 +40,12 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 1, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 30, @@ -77,8 +77,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -18, 72 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = ELEMENT_FIRE, .projectileTargetOffset = { 0, -8 }, @@ -93,7 +93,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, diff --git a/src/battle/area/kpa2/actor/bowser_intro.c b/src/battle/area/kpa2/actor/bowser_intro.c index dd15df8666..9dd3fd415a 100644 --- a/src/battle/area/kpa2/actor/bowser_intro.c +++ b/src/battle/area/kpa2/actor/bowser_intro.c @@ -28,7 +28,7 @@ extern EvtScript N(attackFireBreath); extern EvtScript N(returnHome); extern EvtScript N(useStarRod); -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_BattleBowser_Idle, STATUS_STONE, ANIM_BattleBowser_Still, STATUS_SLEEP, ANIM_BattleBowser_Idle, @@ -42,17 +42,17 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(defenseTable_boosted)[] = { +s32 N(DefenseTable_boosted)[] = { ELEMENT_NORMAL, 1, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -77,7 +77,7 @@ s32 N(statusTable)[] = { STATUS_END, }; -s32 N(statusTable_boosted)[] = { +s32 N(StatusTable_boosted)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -109,8 +109,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -18, 72 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -125,7 +125,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -493,8 +493,8 @@ EvtScript N(powerUp) = { EVT_CALL(SetBattleCamOffsetZ, 0) EVT_CALL(MoveBattleCamOver, 25) EVT_CALL(ActorSpeak, MSG_Intro_005A, ACTOR_SELF, 1, ANIM_BattleBowser_RearUpMock, ANIM_BattleBowser_RearUpStill) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_boosted))) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_boosted))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_boosted))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable_boosted))) EVT_RETURN EVT_END }; @@ -573,8 +573,8 @@ EvtScript N(useStarRod) = { EVT_CALL(RemoveEffect, LVarD) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ENCHANTED, TRUE) EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 1, ACTOR_DECORATION_RADIAL_STAR_EMITTER) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_boosted))) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_boosted))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_boosted))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable_boosted))) EVT_CALL(N(RemoveChillOut)) EVT_WAIT(3) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) diff --git a/src/battle/area/kpa2/actor/bowser_phase_1.c b/src/battle/area/kpa2/actor/bowser_phase_1.c index d94f130923..7f2d05035a 100644 --- a/src/battle/area/kpa2/actor/bowser_phase_1.c +++ b/src/battle/area/kpa2/actor/bowser_phase_1.c @@ -42,7 +42,7 @@ extern EvtScript N(onSpinSmashOrNormalHit); extern EvtScript N(onBurnHit); extern EvtScript N(makeWalkingSounds); -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_BattleBowser_Idle, STATUS_STONE, ANIM_BattleBowser_Still, STATUS_SLEEP, ANIM_BattleBowser_Idle, @@ -56,17 +56,17 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 1, ELEMENT_END, }; -s32 N(defenseTable_boosted)[] = { +s32 N(DefenseTable_boosted)[] = { ELEMENT_NORMAL, 4, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 30, @@ -91,7 +91,7 @@ s32 N(statusTable)[] = { STATUS_END, }; -s32 N(statusTable_boosted)[] = { +s32 N(StatusTable_boosted)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -123,8 +123,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -18, 72 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -139,7 +139,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -375,8 +375,8 @@ EvtScript N(handleEvent) = { EVT_PLAY_EFFECT(EFFECT_SHIMMER_BURST, 1, LVar0, LVar1, LVar2, EVT_FLOAT(0.7), 30, 0) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ENCHANTED, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_TURNS_SINCE_LAST_STAR_BEAM), 0) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable))) EVT_SET(LVar1, ANIM_BattleBowser_Hurt) EVT_EXEC_WAIT(N(onHit)) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_FLAGS), LVar0) @@ -630,8 +630,8 @@ EvtScript N(useStarRod) = { EVT_CALL(RemoveEffect, LVarD) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ENCHANTED, TRUE) EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 1, ACTOR_DECORATION_RADIAL_STAR_EMITTER) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_boosted))) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_boosted))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_boosted))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable_boosted))) EVT_CALL(N(RemoveChillOut)) EVT_WAIT(3) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) diff --git a/src/battle/area/kpa2/actor/bowser_phase_2.c b/src/battle/area/kpa2/actor/bowser_phase_2.c index 3a386392c1..bcf331ea46 100644 --- a/src/battle/area/kpa2/actor/bowser_phase_2.c +++ b/src/battle/area/kpa2/actor/bowser_phase_2.c @@ -40,7 +40,7 @@ extern EvtScript N(onBurnHit); extern EvtScript N(makeWalkingSounds); extern EvtScript N(unkDecorationScript); -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_BattleBowser_Idle, STATUS_STONE, ANIM_BattleBowser_Still, STATUS_SLEEP, ANIM_BattleBowser_Idle, @@ -54,17 +54,17 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 2, ELEMENT_END, }; -s32 N(defenseTable_boosted)[] = { +s32 N(DefenseTable_boosted)[] = { ELEMENT_NORMAL, 99, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -89,7 +89,7 @@ s32 N(statusTable)[] = { STATUS_END, }; -s32 N(statusTable_boosted)[] = { +s32 N(StatusTable_boosted)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -121,8 +121,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -27, 108 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -137,7 +137,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -481,8 +481,8 @@ EvtScript N(useStarRod) = { EVT_CALL(RemoveEffect, LVarD) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_STAR_ROD_ENCHANTED, TRUE) EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 1, ACTOR_DECORATION_RADIAL_STAR_EMITTER) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_boosted))) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_boosted))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_boosted))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable_boosted))) EVT_CALL(N(RemoveChillOut)) EVT_WAIT(3) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) diff --git a/src/battle/area/kpa2/actor/bowser_phase_3.c b/src/battle/area/kpa2/actor/bowser_phase_3.c index 1f9a3e029b..2699c13487 100644 --- a/src/battle/area/kpa2/actor/bowser_phase_3.c +++ b/src/battle/area/kpa2/actor/bowser_phase_3.c @@ -43,7 +43,7 @@ extern EvtScript N(onBurnHit); extern EvtScript N(makeWalkingSounds); extern EvtScript N(unkDecorationScript); -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_BattleBowser_Idle, STATUS_STONE, ANIM_BattleBowser_Still, STATUS_SLEEP, ANIM_BattleBowser_Idle, @@ -57,17 +57,17 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 2, ELEMENT_END, }; -s32 N(defenseTable_boosted)[] = { +s32 N(DefenseTable_boosted)[] = { ELEMENT_NORMAL, 99, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -92,7 +92,7 @@ s32 N(statusTable)[] = { STATUS_END, }; -s32 N(statusTable_boosted)[] = { +s32 N(StatusTable_boosted)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -124,8 +124,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -27, 108 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -140,7 +140,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -230,8 +230,8 @@ EvtScript N(init) = { EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_A) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_STAR_ROD_ENCHANTED, TRUE) EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 1, ACTOR_DECORATION_RADIAL_STAR_EMITTER) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_boosted))) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_boosted))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_boosted))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable_boosted))) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent))) @@ -462,8 +462,8 @@ EvtScript N(handleEvent) = { EVT_PLAY_EFFECT(EFFECT_SHIMMER_BURST, 1, LVar0, LVar1, LVar2, EVT_FLOAT(1.05), 50, 0) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_STAR_ROD_ENCHANTED, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_TURNS_SINCE_LAST_STAR_BEAM), 0) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable))) EVT_SET(LVar1, ANIM_BattleBowser_Hurt) EVT_EXEC_WAIT(N(doOnHit)) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_FLAGS), LVar0) @@ -740,8 +740,8 @@ EvtScript N(useStarRod) = { EVT_CALL(RemoveEffect, LVarD) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_STAR_ROD_ENCHANTED, TRUE) EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 1, ACTOR_DECORATION_RADIAL_STAR_EMITTER) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_boosted))) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_boosted))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_boosted))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable_boosted))) EVT_CALL(N(RemoveChillOut)) EVT_WAIT(3) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar3) diff --git a/src/battle/area/kpa3/actor/anti_guy.c b/src/battle/area/kpa3/actor/anti_guy.c index 4db253e15c..8b3599c55d 100644 --- a/src/battle/area/kpa3/actor/anti_guy.c +++ b/src/battle/area/kpa3/actor/anti_guy.c @@ -5,18 +5,18 @@ #define NAMESPACE b_area_kpa3_anti_guy -extern s32 N(idleAnimations)[]; +extern s32 N(IdleAnimations)[]; extern EvtScript N(init); extern EvtScript N(takeTurn); extern EvtScript N(idle); extern EvtScript N(handleEvent); -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 50, @@ -48,8 +48,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, @@ -64,7 +64,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -79,7 +79,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_ShyGuy_Black_Anim01, STATUS_STONE, ANIM_ShyGuy_Black_Anim00, STATUS_SLEEP, ANIM_ShyGuy_Black_Anim12, diff --git a/src/battle/area/kpa4/actor/bombshell_bill.c b/src/battle/area/kpa4/actor/bombshell_bill.c index eeb4a38210..3456dd4c92 100644 --- a/src/battle/area/kpa4/actor/bombshell_bill.c +++ b/src/battle/area/kpa4/actor/bombshell_bill.c @@ -12,14 +12,14 @@ extern EvtScript N(takeTurn); extern EvtScript N(handleEvent); extern EvtScript N(playExplosionEffects); -extern s32 N(idleAnimations)[]; +extern s32 N(IdleAnimations)[]; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -51,8 +51,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 16 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_FIRE_EXPLODE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -6 }, @@ -67,7 +67,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 40, .airLiftChance = 100, .hurricaneChance = 95, @@ -82,7 +82,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_BulletBill_Gold_Anim01, STATUS_STONE, ANIM_BulletBill_Gold_Anim00, STATUS_STOP, ANIM_BulletBill_Gold_Anim00, diff --git a/src/battle/area/kpa4/actor/bombshell_bill_blaster.c b/src/battle/area/kpa4/actor/bombshell_bill_blaster.c index 2734d08efa..b3d62b9a14 100644 --- a/src/battle/area/kpa4/actor/bombshell_bill_blaster.c +++ b/src/battle/area/kpa4/actor/bombshell_bill_blaster.c @@ -15,14 +15,14 @@ extern EvtScript N(handleEvent); extern EvtScript N(bulletShot); extern EvtScript N(wait); -extern s32 N(idleAnimations)[]; +extern s32 N(IdleAnimations)[]; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 4, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -54,8 +54,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -6, 29 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -9 }, @@ -70,7 +70,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 15, .hurricaneChance = 10, @@ -85,7 +85,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 5, 25 }, }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_BillBlaster_Gold_Anim01, STATUS_STONE, ANIM_BillBlaster_Gold_Anim00, STATUS_STOP, ANIM_BillBlaster_Gold_Anim00, diff --git a/src/battle/area/kzn/actor/lava_bubble.c b/src/battle/area/kzn/actor/lava_bubble.c index 9752bf8c45..f88332fae0 100644 --- a/src/battle/area/kzn/actor/lava_bubble.c +++ b/src/battle/area/kzn/actor/lava_bubble.c @@ -5,14 +5,14 @@ #define NAMESPACE b_area_kzn_lava_bubble -extern s32 N(idleAnimations_80218FC4)[]; -extern s32 N(idleAnimations_80219010)[]; +extern s32 N(IdleAnimations_80218FC4)[]; +extern s32 N(IdleAnimations_80219010)[]; extern EvtScript N(init_8021901C); extern EvtScript N(takeTurn_8021AEA4); extern EvtScript N(idle_802191E4); extern EvtScript N(handleEvent_80219500); -s32 N(defenseTable_80218E10)[] = { +s32 N(DefenseTable_80218E10)[] = { ELEMENT_NORMAL, 0, ELEMENT_WATER, -2, ELEMENT_ICE, -2, @@ -21,7 +21,7 @@ s32 N(defenseTable_80218E10)[] = { ELEMENT_END, }; -s32 N(statusTable_80218E3C)[] = { +s32 N(StatusTable_80218E3C)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 50, @@ -46,15 +46,15 @@ s32 N(statusTable_80218E3C)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_80218EE8)[] = { +ActorPartBlueprint N(PartsTable_80218EE8)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { -2, 25 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80218FC4), - .defenseTable = N(defenseTable_80218E10), + .idleAnimations = N(IdleAnimations_80218FC4), + .defenseTable = N(DefenseTable_80218E10), .eventFlags = ACTOR_EVENT_FLAG_FIREY, .elementImmunityFlags = ELEMENT_FIRE, .projectileTargetOffset = { -3, -10 }, @@ -65,8 +65,8 @@ ActorPartBlueprint N(partsTable_80218EE8)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80219010), - .defenseTable = N(defenseTable_80218E10), + .idleAnimations = N(IdleAnimations_80219010), + .defenseTable = N(DefenseTable_80218E10), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, @@ -77,8 +77,8 @@ ActorPartBlueprint N(partsTable_80218EE8)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80219010), - .defenseTable = N(defenseTable_80218E10), + .idleAnimations = N(IdleAnimations_80219010), + .defenseTable = N(DefenseTable_80218E10), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, @@ -89,8 +89,8 @@ ActorPartBlueprint N(partsTable_80218EE8)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80219010), - .defenseTable = N(defenseTable_80218E10), + .idleAnimations = N(IdleAnimations_80219010), + .defenseTable = N(DefenseTable_80218E10), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, @@ -101,8 +101,8 @@ ActorPartBlueprint N(partsTable_80218EE8)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80219010), - .defenseTable = N(defenseTable_80218E10), + .idleAnimations = N(IdleAnimations_80219010), + .defenseTable = N(DefenseTable_80218E10), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, @@ -114,10 +114,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_LAVA_BUBBLE, .level = 17, .maxHP = 9, - .partCount = ARRAY_COUNT(N(partsTable_80218EE8)), - .partsData = N(partsTable_80218EE8), + .partCount = ARRAY_COUNT( N(PartsTable_80218EE8)), + .partsData = N(PartsTable_80218EE8), .initScript = &N(init_8021901C), - .statusTable = N(statusTable_80218E3C), + .statusTable = N(StatusTable_80218E3C), .escapeChance = 50, .airLiftChance = 90, .hurricaneChance = 85, @@ -132,7 +132,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations_80218FC4)[] = { +s32 N(IdleAnimations_80218FC4)[] = { STATUS_NORMAL, ANIM_LavaBubble_Anim01, STATUS_STONE, ANIM_LavaBubble_Anim00, STATUS_SLEEP, ANIM_LavaBubble_Anim01, @@ -145,7 +145,7 @@ s32 N(idleAnimations_80218FC4)[] = { STATUS_END, }; -s32 N(idleAnimations_80219010)[] = { +s32 N(IdleAnimations_80219010)[] = { STATUS_NORMAL, ANIM_LavaBubble_Anim01, STATUS_END, }; diff --git a/src/battle/area/kzn2/actor/lava_bud.c b/src/battle/area/kzn2/actor/lava_bud.c index b209453d2d..47783ef35a 100644 --- a/src/battle/area/kzn2/actor/lava_bud.c +++ b/src/battle/area/kzn2/actor/lava_bud.c @@ -48,25 +48,25 @@ enum { #define VINE_1_BASE (s32) Vine1Base #define VINE_2_BASE (s32) Vine2Base -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_LavaBud_Anim03, STATUS_STOP, ANIM_LavaBud_Anim02, STATUS_END, }; -s32 N(idleAnimations_fiery)[] = { +s32 N(IdleAnimations_fiery)[] = { STATUS_NORMAL, ANIM_LavaBud_Anim04, STATUS_STOP, ANIM_LavaBud_Anim02, STATUS_END, }; -s32 N(idleAnimations_wet)[] = { +s32 N(IdleAnimations_wet)[] = { STATUS_NORMAL, ANIM_LavaBud_Anim0F, STATUS_STOP, ANIM_LavaBud_Anim0F, STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_WATER, 0, ELEMENT_ICE, 0, @@ -75,7 +75,7 @@ s32 N(defenseTable)[] = { ELEMENT_END, }; -s32 N(defenseTable_fiery)[] = { +s32 N(DefenseTable_fiery)[] = { ELEMENT_NORMAL, 0, ELEMENT_WATER, -2, ELEMENT_ICE, -2, @@ -84,7 +84,7 @@ s32 N(defenseTable_fiery)[] = { ELEMENT_END, }; -s32 N(defenseTable_wet)[] = { +s32 N(DefenseTable_wet)[] = { ELEMENT_NORMAL, 0, ELEMENT_WATER, 0, ELEMENT_ICE, 0, @@ -93,7 +93,7 @@ s32 N(defenseTable_wet)[] = { ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 75, @@ -125,8 +125,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -138,7 +138,7 @@ ActorPartBlueprint N(parts)[] = { .targetOffset = { 0, 0 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -153,7 +153,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -351,9 +351,9 @@ EvtScript N(onBurnHit) = { EVT_EXEC_WAIT(N(playModelAnimation)) EVT_CALL(SetActorVar, ACTOR_SELF, 7, ANIM_LavaBud_Anim03) EVT_CALL(SetActorVar, ACTOR_SELF, 8, ANIM_LavaBud_Anim09) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_fiery))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_fiery))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 2, EVT_PTR(N(defenseTable_fiery))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_fiery))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_fiery))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 2, EVT_PTR(N(DefenseTable_fiery))) EVT_THREAD EVT_WAIT(14) EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) @@ -636,9 +636,9 @@ EvtScript N(onDeath) = { EVT_CALL(RemoveEffect, LVar0) EVT_CALL(SetActorVar, ACTOR_SELF, 6, 0) EVT_END_IF - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_wet))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_wet))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 2, EVT_PTR(N(defenseTable_wet))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_wet))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_wet))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 2, EVT_PTR(N(DefenseTable_wet))) EVT_CALL(SetActorVar, ACTOR_SELF, 7, ANIM_LavaBud_Anim0F) EVT_CALL(SetActorVar, ACTOR_SELF, 8, ANIM_LavaBud_Anim09) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LavaBud_Anim0F) @@ -672,7 +672,7 @@ EvtScript N(onDeath) = { EVT_END_IF EVT_CALL(LoadBattleDmaData, 21) EVT_EXEC_WAIT(N(playModelAnimation)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_wet))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_wet))) EVT_CALL(SetActorVar, ACTOR_SELF, 7, ANIM_LavaBud_Anim0F) EVT_CALL(SetActorVar, ACTOR_SELF, 8, ANIM_LavaBud_Anim09) EVT_WAIT(29) @@ -878,9 +878,9 @@ EvtScript N(onHit) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_COLD_BREATH, 0, LVar0, LVar1, LVar2, EVT_FLOAT(2.0), 45, 0) EVT_END_IF - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_wet))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_wet))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 2, EVT_PTR(N(defenseTable_wet))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_wet))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_wet))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 2, EVT_PTR(N(DefenseTable_wet))) EVT_CALL(SetActorVar, ACTOR_SELF, 7, ANIM_LavaBud_Anim0F) EVT_CALL(SetActorVar, ACTOR_SELF, 8, ANIM_LavaBud_Anim09) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_LavaBud_Anim0F) diff --git a/src/battle/area/kzn2/actor/lava_piranha.c b/src/battle/area/kzn2/actor/lava_piranha.c index 57f7b359cd..46e87d2402 100644 --- a/src/battle/area/kzn2/actor/lava_piranha.c +++ b/src/battle/area/kzn2/actor/lava_piranha.c @@ -118,9 +118,9 @@ extern StaticAnimatorNode* N(AnimModel_SideHeadVine)[]; extern StaticAnimatorNode* N(AnimModel_ExtraVine)[]; extern AnimScript N(anim1_8021A364); -extern s32 b_area_kzn2_lava_bud_idleAnimations_fiery[]; -extern s32 N(defenseTable_fiery)[]; -extern s32 b_area_kzn2_lava_bud_defenseTable_fiery[]; +extern s32 b_area_kzn2_lava_bud_IdleAnimations_fiery[]; +extern s32 N(DefenseTable_fiery)[]; +extern s32 b_area_kzn2_lava_bud_DefenseTable_fiery[]; API_CALLABLE(SetAnimatorFlags); API_CALLABLE(GetAnimatedPositionByTreeIndex); @@ -132,7 +132,7 @@ API_CALLABLE(DeleteAnimatedModel); extern Formation N(formation_lava_bud_1); extern Formation N(formation_lava_bud_2); -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_LavaPiranha_Anim03, STATUS_STONE, ANIM_LavaPiranha_Anim00, STATUS_SLEEP, ANIM_LavaPiranha_Anim0A, @@ -145,7 +145,7 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations_fiery)[] = { +s32 N(IdleAnimations_fiery)[] = { STATUS_NORMAL, ANIM_LavaPiranha_Anim04, STATUS_STONE, ANIM_LavaPiranha_Anim00, STATUS_SLEEP, ANIM_LavaPiranha_Anim04, @@ -158,13 +158,13 @@ s32 N(idleAnimations_fiery)[] = { STATUS_END, }; -s32 N(idleAnimations_wet)[] = { +s32 N(IdleAnimations_wet)[] = { STATUS_NORMAL, ANIM_LavaPiranha_Anim10, STATUS_STOP, ANIM_LavaPiranha_Anim00, STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_WATER, 0, ELEMENT_ICE, 0, @@ -173,7 +173,7 @@ s32 N(defenseTable)[] = { ELEMENT_END, }; -s32 N(defenseTable_fiery)[] = { +s32 N(DefenseTable_fiery)[] = { ELEMENT_NORMAL, 0, ELEMENT_WATER, -2, ELEMENT_ICE, -2, @@ -182,7 +182,7 @@ s32 N(defenseTable_fiery)[] = { ELEMENT_END, }; -s32 N(defenseTable_wet)[] = { +s32 N(DefenseTable_wet)[] = { ELEMENT_NORMAL, 0, ELEMENT_WATER, 0, ELEMENT_ICE, 0, @@ -191,7 +191,7 @@ s32 N(defenseTable_wet)[] = { ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 25, @@ -223,8 +223,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 40 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -236,7 +236,7 @@ ActorPartBlueprint N(parts)[] = { .targetOffset = { 0, 40 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -251,7 +251,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -1050,9 +1050,9 @@ EvtScript N(onBurnHit) = { EVT_CALL(PlayModelAnimation, VINE_0, VINE_0_BASE) EVT_CALL(SetActorVar, ACTOR_SELF, 7, ANIM_LavaPiranha_Anim03) EVT_CALL(SetActorVar, ACTOR_SELF, 8, ANIM_LavaPiranha_Anim09) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_fiery))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_fiery))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 2, EVT_PTR(N(defenseTable_fiery))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_fiery))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_fiery))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 2, EVT_PTR(N(DefenseTable_fiery))) EVT_THREAD EVT_WAIT(14) EVT_CALL(OverrideBattleDmaDest, VINE_0_BASE) @@ -1538,15 +1538,15 @@ EvtScript N(onDeath) = { EVT_CALL(SetActorVar, ACTOR_ENEMY1, 8, ANIM_LavaBud_Anim0B) EVT_CALL(SetActorVar, ACTOR_ENEMY2, 7, ANIM_LavaBud_Anim04) EVT_CALL(SetActorVar, ACTOR_ENEMY2, 8, ANIM_LavaBud_Anim0B) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(b_area_kzn2_lava_bud_idleAnimations_fiery)) - EVT_CALL(SetIdleAnimations, ACTOR_ENEMY1, 1, EVT_PTR(b_area_kzn2_lava_bud_idleAnimations_fiery)) - EVT_CALL(SetIdleAnimations, ACTOR_ENEMY2, 1, EVT_PTR(b_area_kzn2_lava_bud_idleAnimations_fiery)) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_fiery))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 2, EVT_PTR(N(defenseTable_fiery))) - EVT_CALL(SetDefenseTable, ACTOR_ENEMY1, 1, EVT_PTR(b_area_kzn2_lava_bud_defenseTable_fiery)) - EVT_CALL(SetDefenseTable, ACTOR_ENEMY1, 2, EVT_PTR(b_area_kzn2_lava_bud_defenseTable_fiery)) - EVT_CALL(SetDefenseTable, ACTOR_ENEMY2, 1, EVT_PTR(b_area_kzn2_lava_bud_defenseTable_fiery)) - EVT_CALL(SetDefenseTable, ACTOR_ENEMY2, 2, EVT_PTR(b_area_kzn2_lava_bud_defenseTable_fiery)) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(b_area_kzn2_lava_bud_IdleAnimations_fiery)) + EVT_CALL(SetIdleAnimations, ACTOR_ENEMY1, 1, EVT_PTR(b_area_kzn2_lava_bud_IdleAnimations_fiery)) + EVT_CALL(SetIdleAnimations, ACTOR_ENEMY2, 1, EVT_PTR(b_area_kzn2_lava_bud_IdleAnimations_fiery)) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_fiery))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 2, EVT_PTR(N(DefenseTable_fiery))) + EVT_CALL(SetDefenseTable, ACTOR_ENEMY1, 1, EVT_PTR(b_area_kzn2_lava_bud_DefenseTable_fiery)) + EVT_CALL(SetDefenseTable, ACTOR_ENEMY1, 2, EVT_PTR(b_area_kzn2_lava_bud_DefenseTable_fiery)) + EVT_CALL(SetDefenseTable, ACTOR_ENEMY2, 1, EVT_PTR(b_area_kzn2_lava_bud_DefenseTable_fiery)) + EVT_CALL(SetDefenseTable, ACTOR_ENEMY2, 2, EVT_PTR(b_area_kzn2_lava_bud_DefenseTable_fiery)) EVT_CALL(SetPartImmunityBits, ACTOR_SELF, 1, ELEMENT_FIRE, 1) EVT_CALL(SetPartImmunityBits, ACTOR_SELF, 2, ELEMENT_FIRE, 1) EVT_CALL(SetPartImmunityBits, ACTOR_ENEMY1, 1, ELEMENT_FIRE, 1) @@ -1888,9 +1888,9 @@ EvtScript N(ignite) = { EVT_SUB(LVar2, 3) EVT_PLAY_EFFECT(EFFECT_FLAME, 1, LVar3, LVar4, LVar2, EVT_FLOAT(0.3), LVarA, 0) EVT_CALL(SetActorVar, ACTOR_ENEMY1, 6, LVarA) - EVT_CALL(SetIdleAnimations, ACTOR_ENEMY1, 1, EVT_PTR(b_area_kzn2_lava_bud_idleAnimations_fiery)) - EVT_CALL(SetDefenseTable, ACTOR_ENEMY1, 1, EVT_PTR(b_area_kzn2_lava_bud_defenseTable_fiery)) - EVT_CALL(SetDefenseTable, ACTOR_ENEMY1, 2, EVT_PTR(b_area_kzn2_lava_bud_defenseTable_fiery)) + EVT_CALL(SetIdleAnimations, ACTOR_ENEMY1, 1, EVT_PTR(b_area_kzn2_lava_bud_IdleAnimations_fiery)) + EVT_CALL(SetDefenseTable, ACTOR_ENEMY1, 1, EVT_PTR(b_area_kzn2_lava_bud_DefenseTable_fiery)) + EVT_CALL(SetDefenseTable, ACTOR_ENEMY1, 2, EVT_PTR(b_area_kzn2_lava_bud_DefenseTable_fiery)) EVT_CALL(SetPartEventBits, ACTOR_ENEMY1, 1, ACTOR_EVENT_FLAG_FIREY, TRUE) EVT_CALL(SetPartEventBits, ACTOR_ENEMY1, 2, ACTOR_EVENT_FLAG_FIREY, TRUE) EVT_CALL(SetActorVar, ACTOR_ENEMY1, 7, ANIM_LavaBud_Anim04) @@ -1909,9 +1909,9 @@ EvtScript N(ignite) = { EVT_SUB(LVar2, 3) EVT_PLAY_EFFECT(EFFECT_FLAME, 1, LVar3, LVar4, LVar2, EVT_FLOAT(0.3), LVarA, 0) EVT_CALL(SetActorVar, ACTOR_ENEMY2, 6, LVarA) - EVT_CALL(SetIdleAnimations, ACTOR_ENEMY2, 1, EVT_PTR(b_area_kzn2_lava_bud_idleAnimations_fiery)) - EVT_CALL(SetDefenseTable, ACTOR_ENEMY2, 1, EVT_PTR(b_area_kzn2_lava_bud_defenseTable_fiery)) - EVT_CALL(SetDefenseTable, ACTOR_ENEMY2, 2, EVT_PTR(b_area_kzn2_lava_bud_defenseTable_fiery)) + EVT_CALL(SetIdleAnimations, ACTOR_ENEMY2, 1, EVT_PTR(b_area_kzn2_lava_bud_IdleAnimations_fiery)) + EVT_CALL(SetDefenseTable, ACTOR_ENEMY2, 1, EVT_PTR(b_area_kzn2_lava_bud_DefenseTable_fiery)) + EVT_CALL(SetDefenseTable, ACTOR_ENEMY2, 2, EVT_PTR(b_area_kzn2_lava_bud_DefenseTable_fiery)) EVT_CALL(SetPartEventBits, ACTOR_ENEMY2, 1, ACTOR_EVENT_FLAG_FIREY, TRUE) EVT_CALL(SetPartEventBits, ACTOR_ENEMY2, 2, ACTOR_EVENT_FLAG_FIREY, TRUE) EVT_CALL(SetActorVar, ACTOR_ENEMY2, 7, ANIM_LavaBud_Anim04) @@ -1930,9 +1930,9 @@ EvtScript N(ignite) = { EVT_SUB(LVar2, 3) EVT_PLAY_EFFECT(EFFECT_FLAME, 1, LVar3, LVar4, LVar2, EVT_FLOAT(0.7), LVarA, 0) EVT_CALL(SetActorVar, ACTOR_ENEMY0, 6, LVarA) - EVT_CALL(SetIdleAnimations, ACTOR_ENEMY0, 1, EVT_PTR(N(idleAnimations_fiery))) - EVT_CALL(SetDefenseTable, ACTOR_ENEMY0, 1, EVT_PTR(N(defenseTable_fiery))) - EVT_CALL(SetDefenseTable, ACTOR_ENEMY0, 2, EVT_PTR(N(defenseTable_fiery))) + EVT_CALL(SetIdleAnimations, ACTOR_ENEMY0, 1, EVT_PTR(N(IdleAnimations_fiery))) + EVT_CALL(SetDefenseTable, ACTOR_ENEMY0, 1, EVT_PTR(N(DefenseTable_fiery))) + 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, ANIM_LavaPiranha_Anim04) @@ -2028,9 +2028,9 @@ EvtScript N(doOnHit) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_PLAY_EFFECT(EFFECT_COLD_BREATH, 0, LVar0, LVar1, LVar2, EVT_FLOAT(3.0), 50, 0) EVT_END_IF - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_wet))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_wet))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 2, EVT_PTR(N(defenseTable_wet))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_wet))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_wet))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 2, EVT_PTR(N(DefenseTable_wet))) EVT_CALL(SetActorVar, ACTOR_SELF, 7, ANIM_LavaPiranha_Anim0A) EVT_CALL(SetActorVar, ACTOR_SELF, 8, ANIM_LavaPiranha_Anim09) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FIREY, FALSE) diff --git a/src/battle/area/kzn2/actor/petit_piranha.c b/src/battle/area/kzn2/actor/petit_piranha.c index 90571ae3da..927256ccd5 100644 --- a/src/battle/area/kzn2/actor/petit_piranha.c +++ b/src/battle/area/kzn2/actor/petit_piranha.c @@ -12,7 +12,7 @@ extern EvtScript N(idle); extern EvtScript N(handleEvent); extern EvtScript N(onDeath); -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_PetitPiranha_Anim01, STATUS_STONE, ANIM_PetitPiranha_Anim01, STATUS_SLEEP, ANIM_PetitPiranha_Anim01, @@ -26,7 +26,7 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_WATER, -2, ELEMENT_ICE, -2, @@ -35,7 +35,7 @@ s32 N(defenseTable)[] = { ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 100, @@ -67,8 +67,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_FIREY, .elementImmunityFlags = 0, .projectileTargetOffset = { -2, -22 }, @@ -83,7 +83,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, diff --git a/src/battle/area/kzn2/actor/petit_piranha_bomb.c b/src/battle/area/kzn2/actor/petit_piranha_bomb.c index 6836e3b00d..5fba757f6c 100644 --- a/src/battle/area/kzn2/actor/petit_piranha_bomb.c +++ b/src/battle/area/kzn2/actor/petit_piranha_bomb.c @@ -10,7 +10,7 @@ extern EvtScript N(idle); extern EvtScript N(takeTurn); extern EvtScript N(handleEvent); -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_PetitPiranha_Anim01, STATUS_STONE, ANIM_PetitPiranha_Anim00, STATUS_SLEEP, ANIM_PetitPiranha_Anim00, @@ -24,7 +24,7 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_WATER, -2, ELEMENT_ICE, -2, @@ -33,7 +33,7 @@ s32 N(defenseTable)[] = { ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -65,8 +65,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_FIREY, .elementImmunityFlags = ELEMENT_FIRE, .projectileTargetOffset = { -2, -22 }, @@ -81,7 +81,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, diff --git a/src/battle/area/mac/actor/chan.c b/src/battle/area/mac/actor/chan.c index dd7d02e6e6..cb5acf6e8d 100644 --- a/src/battle/area/mac/actor/chan.c +++ b/src/battle/area/mac/actor/chan.c @@ -5,19 +5,19 @@ #define NAMESPACE b_area_mac_chan -s32 N(defenseTable_80219D50)[] = { +s32 N(DefenseTable_80219D50)[] = { ELEMENT_NORMAL, 2, ELEMENT_FIRE, 99, ELEMENT_BLAST, 99, ELEMENT_END, }; -s32 N(defenseTable_80219D6C)[] = { +s32 N(DefenseTable_80219D6C)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_80219D78)[] = { +s32 N(StatusTable_80219D78)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 30, @@ -42,18 +42,18 @@ s32 N(statusTable_80219D78)[] = { STATUS_END, }; -extern s32 N(idleAnimations_80219EBC)[]; +extern s32 N(IdleAnimations_80219EBC)[]; extern EvtScript N(init_8021CCDC); -ActorPartBlueprint N(partsTable_80219E24)[] = { +ActorPartBlueprint N(PartsTable_80219E24)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 16 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80219EBC), - .defenseTable = N(defenseTable_80219D50), + .idleAnimations = N(IdleAnimations_80219EBC), + .defenseTable = N(DefenseTable_80219D50), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, .projectileTargetOffset = { 1, 7 }, @@ -65,10 +65,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_CHAN, .level = 0, .maxHP = 15, - .partCount = ARRAY_COUNT(N(partsTable_80219E24)), - .partsData = N(partsTable_80219E24), + .partCount = ARRAY_COUNT( N(PartsTable_80219E24)), + .partsData = N(PartsTable_80219E24), .initScript = &N(init_8021CCDC), - .statusTable = N(statusTable_80219D78), + .statusTable = N(StatusTable_80219D78), .escapeChance = 100, .airLiftChance = 0, .hurricaneChance = 0, @@ -83,7 +83,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations_80219E70)[] = { +s32 N(IdleAnimations_80219E70)[] = { STATUS_NORMAL, ANIM_Chan_Idle, STATUS_STONE, ANIM_Chan_Still, STATUS_SLEEP, ANIM_Chan_Sleep, @@ -96,7 +96,7 @@ s32 N(idleAnimations_80219E70)[] = { STATUS_END, }; -s32 N(idleAnimations_80219EBC)[] = { +s32 N(IdleAnimations_80219EBC)[] = { STATUS_NORMAL, ANIM_Chan_Idle, STATUS_STONE, ANIM_Chan_Still, STATUS_SLEEP, ANIM_Chan_Sleep, @@ -109,7 +109,7 @@ s32 N(idleAnimations_80219EBC)[] = { STATUS_END, }; -s32 N(idleAnimations_80219F08)[] = { +s32 N(IdleAnimations_80219F08)[] = { STATUS_NORMAL, ANIM_Chan_Toppled, STATUS_STONE, ANIM_Chan_ToppledStill, STATUS_SLEEP, ANIM_Chan_ToppledSleep, @@ -144,7 +144,7 @@ EvtScript N(80219F4C) = { EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -9) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_Chan))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8021AAB8))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80219E70))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80219E70))) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, TRUE) EVT_END_IF @@ -169,8 +169,8 @@ EvtScript N(8021A12C) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_Chan))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8021AAB8))) EVT_CALL(SetActorVar, ACTOR_SELF, 9, 1) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_80219D6C))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80219F08))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_80219D6C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80219F08))) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, TRUE) @@ -375,8 +375,8 @@ EvtScript N(handleEvent_8021AAB8) = { EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 16) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -9) EVT_CALL(SetActorVar, ACTOR_SELF, 9, 1) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_80219D6C))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80219F08))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_80219D6C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80219F08))) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Chan_Hurt) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) @@ -555,7 +555,7 @@ EvtScript N(takeTurn_8021B81C) = { EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn_Chan))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8021AAB8))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80219E70))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80219E70))) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, TRUE) EVT_CALL(GetIndexFromPos, ACTOR_SELF, LVar0) @@ -711,8 +711,8 @@ EvtScript N(takeTurn_Chan) = { EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 16) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -9) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_80219D50))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80219E70))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_80219D50))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80219E70))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle_8021A11C))) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE) EVT_END_IF diff --git a/src/battle/area/mac/actor/lee.c b/src/battle/area/mac/actor/lee.c index c235f007c9..24431b5986 100644 --- a/src/battle/area/mac/actor/lee.c +++ b/src/battle/area/mac/actor/lee.c @@ -13,7 +13,7 @@ #define NAMESPACE b_area_mac_lee -s32 N(idleAnimations_8021D360)[] = { +s32 N(IdleAnimations_8021D360)[] = { STATUS_NORMAL, ANIM_Lee_Idle, STATUS_STONE, ANIM_Lee_Still, STATUS_SLEEP, ANIM_Lee_Sleep, @@ -26,7 +26,7 @@ s32 N(idleAnimations_8021D360)[] = { STATUS_END, }; -s32 N(idleAnimations_8021D3AC)[] = { +s32 N(IdleAnimations_8021D3AC)[] = { STATUS_NORMAL, ANIM_Lee_Hurt, STATUS_END, }; @@ -35,12 +35,12 @@ s32 N(unk_missing_8021D3B8)[] = { 0x00000001, 0x00A40004, 0x00000000, }; -s32 N(defenseTable_8021D3C4)[] = { +s32 N(DefenseTable_8021D3C4)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_8021D3D0)[] = { +s32 N(StatusTable_8021D3D0)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 60, @@ -65,15 +65,15 @@ s32 N(statusTable_8021D3D0)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_8021D47C)[] = { +ActorPartBlueprint N(PartsTable_8021D47C)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { -5, 25 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021D360), - .defenseTable = N(defenseTable_8021D3C4), + .idleAnimations = N(IdleAnimations_8021D360), + .defenseTable = N(DefenseTable_8021D3C4), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -2, -10 }, @@ -87,10 +87,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_LEE, .level = 0, .maxHP = 20, - .partCount = ARRAY_COUNT(N(partsTable_8021D47C)), - .partsData = N(partsTable_8021D47C), + .partCount = ARRAY_COUNT( N(PartsTable_8021D47C)), + .partsData = N(PartsTable_8021D47C), .initScript = &N(init_8021D4C8), - .statusTable = N(statusTable_8021D3D0), + .statusTable = N(StatusTable_8021D3D0), .escapeChance = 100, .airLiftChance = 0, .hurricaneChance = 0, @@ -372,7 +372,7 @@ EvtScript N(8021E118) = { EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) EVT_CALL(SetActorVar, LVarA, 8, 2) EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar0, 1, TRUE) - EVT_CALL(SetIdleAnimations, LVarA, 1, EVT_PTR(N(idleAnimations_8021D3AC))) + EVT_CALL(SetIdleAnimations, LVarA, 1, EVT_PTR(N(IdleAnimations_8021D3AC))) EVT_CALL(SetAnimation, LVarA, 1, ANIM_Lee_Hurt) EVT_WAIT(30) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -391,7 +391,7 @@ EvtScript N(8021E118) = { EVT_END_IF EVT_CALL(ForceHomePos, LVarA, LVarB, LVarC, LVarD) EVT_CALL(HPBarToHome, LVarA) - EVT_CALL(SetIdleAnimations, LVarA, 1, EVT_PTR(N(idleAnimations_8021D360))) + EVT_CALL(SetIdleAnimations, LVarA, 1, EVT_PTR(N(IdleAnimations_8021D360))) EVT_CALL(SetAnimation, LVarA, 1, ANIM_Lee_Idle) EVT_CALL(SetActorPos, ACTOR_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(ForceHomePos, ACTOR_SELF, NPC_DISPOSE_LOCATION) @@ -449,7 +449,7 @@ EvtScript N(8021E5DC) = { Vec3i N(vector3D_8021E940) = { NPC_DISPOSE_LOCATION }; -s32 N(idleAnimations_8021E94C)[] = { +s32 N(IdleAnimations_8021E94C)[] = { STATUS_NORMAL, ANIM_BattleGoombario_Idle, STATUS_STONE, ANIM_BattleGoombario_Still, STATUS_SLEEP, ANIM_BattleGoombario_Still, @@ -462,12 +462,12 @@ s32 N(idleAnimations_8021E94C)[] = { STATUS_END, }; -s32 N(defenseTable_8021E998)[] = { +s32 N(DefenseTable_8021E998)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_8021E9A4)[] = { +s32 N(StatusTable_8021E9A4)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 60, @@ -492,15 +492,15 @@ s32 N(statusTable_8021E9A4)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_8021EA50)[] = { +ActorPartBlueprint N(PartsTable_8021EA50)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 20 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021E94C), - .defenseTable = N(defenseTable_8021E998), + .idleAnimations = N(IdleAnimations_8021E94C), + .defenseTable = N(DefenseTable_8021E998), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -9 }, @@ -514,10 +514,10 @@ ActorBlueprint N(goombario) = { .type = ACTOR_TYPE_LEE_GOOMBARIO, .level = 0, .maxHP = 20, - .partCount = ARRAY_COUNT(N(partsTable_8021EA50)), - .partsData = N(partsTable_8021EA50), + .partCount = ARRAY_COUNT( N(PartsTable_8021EA50)), + .partsData = N(PartsTable_8021EA50), .initScript = &N(init_Goombario), - .statusTable = N(statusTable_8021E9A4), + .statusTable = N(StatusTable_8021E9A4), .escapeChance = 100, .airLiftChance = 0, .hurricaneChance = 0, @@ -1066,7 +1066,7 @@ Formation N(formation_goombario) = { { .actor = &N(goombario), .home = { .vec = &N(vector3D_8021E940) }}, }; -s32 N(idleAnimations_80220540)[] = { +s32 N(IdleAnimations_80220540)[] = { STATUS_NORMAL, ANIM_BattleKooper_Idle, STATUS_STONE, ANIM_BattleKooper_Still, STATUS_SLEEP, ANIM_BattleKooper_Still, @@ -1079,7 +1079,7 @@ s32 N(idleAnimations_80220540)[] = { STATUS_END, }; -s32 N(idleAnimations_8022058C)[] = { +s32 N(IdleAnimations_8022058C)[] = { STATUS_NORMAL, ANIM_BattleKooper_Toppled, STATUS_STONE, ANIM_BattleKooper_StillToppled, STATUS_SLEEP, ANIM_BattleKooper_StillToppled, @@ -1092,17 +1092,17 @@ s32 N(idleAnimations_8022058C)[] = { STATUS_END, }; -s32 N(defenseTable_802205D8)[] = { +s32 N(DefenseTable_802205D8)[] = { ELEMENT_NORMAL, 1, ELEMENT_END, }; -s32 N(defenseTable_802205E4)[] = { +s32 N(DefenseTable_802205E4)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_802205F0)[] = { +s32 N(StatusTable_802205F0)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 60, @@ -1127,15 +1127,15 @@ s32 N(statusTable_802205F0)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_8022069C)[] = { +ActorPartBlueprint N(PartsTable_8022069C)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { -2, 32 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80220540), - .defenseTable = N(defenseTable_802205D8), + .idleAnimations = N(IdleAnimations_80220540), + .defenseTable = N(DefenseTable_802205D8), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -16 }, @@ -1149,10 +1149,10 @@ ActorBlueprint N(kooper) = { .type = ACTOR_TYPE_LEE_KOOPER, .level = 0, .maxHP = 20, - .partCount = ARRAY_COUNT(N(partsTable_8022069C)), - .partsData = N(partsTable_8022069C), + .partCount = ARRAY_COUNT( N(PartsTable_8022069C)), + .partsData = N(PartsTable_8022069C), .initScript = &N(init_Kooper), - .statusTable = N(statusTable_802205F0), + .statusTable = N(StatusTable_802205F0), .escapeChance = 100, .airLiftChance = 0, .hurricaneChance = 0, @@ -1255,8 +1255,8 @@ EvtScript N(handleEvent_80220908) = { EVT_CASE_EQ(13) EVT_CALL(SetActorVar, ACTOR_SELF, 4, 1) EVT_CALL(SetActorVar, ACTOR_SELF, 5, 1) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_802205E4))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022058C))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_802205E4))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022058C))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 5, 15) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -6) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleKooper_Hurt) @@ -1408,8 +1408,8 @@ EvtScript N(takeTurn_80221200) = { EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BattleKooper_Idle) EVT_CALL(SetActorVar, ACTOR_SELF, 4, 0) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_802205D8))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80220540))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_802205D8))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80220540))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -2, 38) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -3, -9) EVT_END_IF @@ -1595,7 +1595,7 @@ Formation N(formation_kooper) = { { .actor = &N(kooper), .home = { .vec = &N(vector3D_8021E940) }} }; -s32 N(idleAnimations_80222290)[] = { +s32 N(IdleAnimations_80222290)[] = { STATUS_NORMAL, ANIM_BattleBombette_Idle, STATUS_STONE, ANIM_BattleBombette_Still, STATUS_SLEEP, ANIM_BattleBombette_Still, @@ -1608,12 +1608,12 @@ s32 N(idleAnimations_80222290)[] = { STATUS_END, }; -s32 N(defenseTable_802222DC)[] = { +s32 N(DefenseTable_802222DC)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_802222E8)[] = { +s32 N(StatusTable_802222E8)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 60, @@ -1638,15 +1638,15 @@ s32 N(statusTable_802222E8)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_80222394)[] = { +ActorPartBlueprint N(PartsTable_80222394)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 22 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80222290), - .defenseTable = N(defenseTable_802222DC), + .idleAnimations = N(IdleAnimations_80222290), + .defenseTable = N(DefenseTable_802222DC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -2, -7 }, @@ -1660,10 +1660,10 @@ ActorBlueprint N(bombette) = { .type = ACTOR_TYPE_LEE_BOMBETTE, .level = 0, .maxHP = 20, - .partCount = ARRAY_COUNT(N(partsTable_80222394)), - .partsData = N(partsTable_80222394), + .partCount = ARRAY_COUNT( N(PartsTable_80222394)), + .partsData = N(PartsTable_80222394), .initScript = &N(init_LeeBombette), - .statusTable = N(statusTable_802222E8), + .statusTable = N(StatusTable_802222E8), .escapeChance = 100, .airLiftChance = 0, .hurricaneChance = 0, @@ -1949,7 +1949,7 @@ Formation N(formation_bombette) = { { .actor = &N(bombette), .home = { .vec = &N(vector3D_8021E940) }} }; -s32 N(idleAnimations_80223388)[] = { +s32 N(IdleAnimations_80223388)[] = { STATUS_NORMAL, ANIM_BattleParakarry_Idle, STATUS_STONE, ANIM_BattleParakarry_Still, STATUS_SLEEP, ANIM_BattleParakarry_Still, @@ -1962,12 +1962,12 @@ s32 N(idleAnimations_80223388)[] = { STATUS_END, }; -s32 N(defenseTable_802233D4)[] = { +s32 N(DefenseTable_802233D4)[] = { ELEMENT_NORMAL, 1, ELEMENT_END, }; -s32 N(statusTable_802233E0)[] = { +s32 N(StatusTable_802233E0)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 60, @@ -1992,15 +1992,15 @@ s32 N(statusTable_802233E0)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_8022348C)[] = { +ActorPartBlueprint N(PartsTable_8022348C)[] = { { .flags = ACTOR_PART_FLAG_NO_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { -3, 32 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80223388), - .defenseTable = N(defenseTable_802233D4), + .idleAnimations = N(IdleAnimations_80223388), + .defenseTable = N(DefenseTable_802233D4), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -16 }, @@ -2012,7 +2012,7 @@ ActorPartBlueprint N(partsTable_8022348C)[] = { .targetOffset = { -3, -18 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable_802233D4), + .defenseTable = N(DefenseTable_802233D4), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -16 }, @@ -2026,10 +2026,10 @@ ActorBlueprint N(parakarry) = { .type = ACTOR_TYPE_LEE_PARAKARRY, .level = 0, .maxHP = 20, - .partCount = ARRAY_COUNT(N(partsTable_8022348C)), - .partsData = N(partsTable_8022348C), + .partCount = ARRAY_COUNT( N(PartsTable_8022348C)), + .partsData = N(PartsTable_8022348C), .initScript = &N(init_Parakarry), - .statusTable = N(statusTable_802233E0), + .statusTable = N(StatusTable_802233E0), .escapeChance = 100, .airLiftChance = 0, .hurricaneChance = 0, @@ -2311,7 +2311,7 @@ Formation N(formation_parakarry) = { { .actor = &N(parakarry), .home = { .vec = &N(vector3D_8021E940) }} }; -s32 N(idleAnimations_80224410)[] = { +s32 N(IdleAnimations_80224410)[] = { STATUS_NORMAL, ANIM_BattleBow_Idle, STATUS_STONE, ANIM_BattleBow_Still, STATUS_SLEEP, ANIM_BattleBow_Still, @@ -2324,12 +2324,12 @@ s32 N(idleAnimations_80224410)[] = { STATUS_END, }; -s32 N(defenseTable_8022445C)[] = { +s32 N(DefenseTable_8022445C)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_80224468)[] = { +s32 N(StatusTable_80224468)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 60, @@ -2354,15 +2354,15 @@ s32 N(statusTable_80224468)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_80224514)[] = { +ActorPartBlueprint N(PartsTable_80224514)[] = { { .flags = ACTOR_PART_FLAG_NO_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80224410), - .defenseTable = N(defenseTable_8022445C), + .idleAnimations = N(IdleAnimations_80224410), + .defenseTable = N(DefenseTable_8022445C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -2374,7 +2374,7 @@ ActorPartBlueprint N(partsTable_80224514)[] = { .targetOffset = { 0, -26 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable_8022445C), + .defenseTable = N(DefenseTable_8022445C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -2388,10 +2388,10 @@ ActorBlueprint N(bow) = { .type = ACTOR_TYPE_LEE_BOW, .level = 0, .maxHP = 20, - .partCount = ARRAY_COUNT(N(partsTable_80224514)), - .partsData = N(partsTable_80224514), + .partCount = ARRAY_COUNT( N(PartsTable_80224514)), + .partsData = N(PartsTable_80224514), .initScript = &N(init_Bow), - .statusTable = N(statusTable_80224468), + .statusTable = N(StatusTable_80224468), .escapeChance = 100, .airLiftChance = 0, .hurricaneChance = 0, @@ -2762,7 +2762,7 @@ Formation N(formation_bow) = { { .actor = &N(bow), .home = { .vec = &N(vector3D_8021E940) }} }; -s32 N(idleAnimations_80225974)[] = { +s32 N(IdleAnimations_80225974)[] = { STATUS_NORMAL, ANIM_BattleWatt_Idle, STATUS_STONE, ANIM_BattleWatt_Still, STATUS_SLEEP, ANIM_BattleWatt_Still, @@ -2775,13 +2775,13 @@ s32 N(idleAnimations_80225974)[] = { STATUS_END, }; -s32 N(defenseTable_802259C0)[] = { +s32 N(DefenseTable_802259C0)[] = { ELEMENT_NORMAL, 0, ELEMENT_SHOCK, 99, ELEMENT_END, }; -s32 N(statusTable_802259D4)[] = { +s32 N(StatusTable_802259D4)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 60, @@ -2806,15 +2806,15 @@ s32 N(statusTable_802259D4)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_80225A80)[] = { +ActorPartBlueprint N(PartsTable_80225A80)[] = { { .flags = ACTOR_PART_FLAG_NO_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { -1, 20 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80225974), - .defenseTable = N(defenseTable_802259C0), + .idleAnimations = N(IdleAnimations_80225974), + .defenseTable = N(DefenseTable_802259C0), .eventFlags = ACTOR_EVENT_FLAG_ELECTRIFIED, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -2826,7 +2826,7 @@ ActorPartBlueprint N(partsTable_80225A80)[] = { .targetOffset = { -1, -30 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable_802259C0), + .defenseTable = N(DefenseTable_802259C0), .eventFlags = ACTOR_EVENT_FLAG_ELECTRIFIED, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -2840,10 +2840,10 @@ ActorBlueprint N(watt) = { .type = ACTOR_TYPE_LEE_WATT, .level = 0, .maxHP = 20, - .partCount = ARRAY_COUNT(N(partsTable_80225A80)), - .partsData = N(partsTable_80225A80), + .partCount = ARRAY_COUNT( N(PartsTable_80225A80)), + .partsData = N(PartsTable_80225A80), .initScript = &N(init_Watt), - .statusTable = N(statusTable_802259D4), + .statusTable = N(StatusTable_802259D4), .escapeChance = 100, .airLiftChance = 0, .hurricaneChance = 0, @@ -3241,7 +3241,7 @@ Formation N(formation_watt) = { { .actor = &N(watt), .home = { .vec = &N(vector3D_8021E940) }} }; -s32 N(idleAnimations_8022697C)[] = { +s32 N(IdleAnimations_8022697C)[] = { STATUS_NORMAL, ANIM_BattleSushie_Idle, STATUS_STONE, ANIM_BattleSushie_Still, STATUS_SLEEP, ANIM_BattleSushie_Still, @@ -3254,12 +3254,12 @@ s32 N(idleAnimations_8022697C)[] = { STATUS_END, }; -s32 N(defenseTable_802269C8)[] = { +s32 N(DefenseTable_802269C8)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_802269D4)[] = { +s32 N(StatusTable_802269D4)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 60, @@ -3284,15 +3284,15 @@ s32 N(statusTable_802269D4)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_80226A80)[] = { +ActorPartBlueprint N(PartsTable_80226A80)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8022697C), - .defenseTable = N(defenseTable_802269C8), + .idleAnimations = N(IdleAnimations_8022697C), + .defenseTable = N(DefenseTable_802269C8), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -12 }, @@ -3306,10 +3306,10 @@ ActorBlueprint N(sushie) = { .type = ACTOR_TYPE_LEE_SUSHIE, .level = 0, .maxHP = 20, - .partCount = ARRAY_COUNT(N(partsTable_80226A80)), - .partsData = N(partsTable_80226A80), + .partCount = ARRAY_COUNT( N(PartsTable_80226A80)), + .partsData = N(PartsTable_80226A80), .initScript = &N(init_Sushie), - .statusTable = N(statusTable_802269D4), + .statusTable = N(StatusTable_802269D4), .escapeChance = 100, .airLiftChance = 0, .hurricaneChance = 0, @@ -3715,7 +3715,7 @@ Formation N(formation_sushie) = { { .actor = &N(sushie), .home = { .vec = &N(vector3D_8021E940) }} }; -s32 N(idleAnimations_8022840C)[] = { +s32 N(IdleAnimations_8022840C)[] = { STATUS_NORMAL, ANIM_BattleLakilester_Idle, STATUS_STONE, ANIM_BattleLakilester_Still, STATUS_SLEEP, ANIM_BattleLakilester_Still, @@ -3728,17 +3728,17 @@ s32 N(idleAnimations_8022840C)[] = { STATUS_END, }; -s32 N(idleAnimations_80228458)[] = { +s32 N(IdleAnimations_80228458)[] = { STATUS_NORMAL, ANIM_BattleLakilester_Spiny, STATUS_END, }; -s32 N(defenseTable_80228464)[] = { +s32 N(DefenseTable_80228464)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_80228470)[] = { +s32 N(StatusTable_80228470)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 60, @@ -3763,15 +3763,15 @@ s32 N(statusTable_80228470)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_8022851C)[] = { +ActorPartBlueprint N(PartsTable_8022851C)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { -3, 33 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8022840C), - .defenseTable = N(defenseTable_80228464), + .idleAnimations = N(IdleAnimations_8022840C), + .defenseTable = N(DefenseTable_80228464), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -2, -10 }, @@ -3782,8 +3782,8 @@ ActorPartBlueprint N(partsTable_8022851C)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80228458), - .defenseTable = N(defenseTable_80228464), + .idleAnimations = N(IdleAnimations_80228458), + .defenseTable = N(DefenseTable_80228464), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -3797,10 +3797,10 @@ ActorBlueprint N(lakilester) = { .type = ACTOR_TYPE_LEE_LAKILESTER, .level = 0, .maxHP = 20, - .partCount = ARRAY_COUNT(N(partsTable_8022851C)), - .partsData = N(partsTable_8022851C), + .partCount = ARRAY_COUNT( N(PartsTable_8022851C)), + .partsData = N(PartsTable_8022851C), .initScript = &N(init_Lakilester), - .statusTable = N(statusTable_80228470), + .statusTable = N(StatusTable_80228470), .escapeChance = 100, .airLiftChance = 0, .hurricaneChance = 0, diff --git a/src/battle/area/mac/actor/master1.c b/src/battle/area/mac/actor/master1.c index ffc6e19748..efa5180dbc 100644 --- a/src/battle/area/mac/actor/master1.c +++ b/src/battle/area/mac/actor/master1.c @@ -5,7 +5,7 @@ #define NAMESPACE b_area_mac_master1 -s32 N(idleAnimations_8022A260)[] = { +s32 N(IdleAnimations_8022A260)[] = { STATUS_NORMAL, ANIM_TheMaster_Walk, STATUS_STONE, ANIM_TheMaster_Still, STATUS_SLEEP, ANIM_TheMaster_Sleep, @@ -18,12 +18,12 @@ s32 N(idleAnimations_8022A260)[] = { STATUS_END, }; -s32 N(defenseTable_8022A2AC)[] = { +s32 N(DefenseTable_8022A2AC)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_8022A2B8)[] = { +s32 N(StatusTable_8022A2B8)[] = { STATUS_NORMAL, 50, STATUS_DEFAULT, 50, STATUS_SLEEP, 40, @@ -48,15 +48,15 @@ s32 N(statusTable_8022A2B8)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_8022A364)[] = { +ActorPartBlueprint N(PartsTable_8022A364)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { -5, 28 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8022A260), - .defenseTable = N(defenseTable_8022A2AC), + .idleAnimations = N(IdleAnimations_8022A260), + .defenseTable = N(DefenseTable_8022A2AC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 2, -7 }, @@ -70,10 +70,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_THE_MASTER_1, .level = 0, .maxHP = 50, - .partCount = ARRAY_COUNT(N(partsTable_8022A364)), - .partsData = N(partsTable_8022A364), + .partCount = ARRAY_COUNT( N(PartsTable_8022A364)), + .partsData = N(PartsTable_8022A364), .initScript = &N(init_8022A3B0), - .statusTable = N(statusTable_8022A2B8), + .statusTable = N(StatusTable_8022A2B8), .escapeChance = 100, .airLiftChance = 0, .hurricaneChance = 0, diff --git a/src/battle/area/mac/actor/master2.c b/src/battle/area/mac/actor/master2.c index f8a93ba6fc..bcbb7e2104 100644 --- a/src/battle/area/mac/actor/master2.c +++ b/src/battle/area/mac/actor/master2.c @@ -5,7 +5,7 @@ #define NAMESPACE b_area_mac_master2 -s32 N(idleAnimations_8022B640)[] = { +s32 N(IdleAnimations_8022B640)[] = { STATUS_NORMAL, ANIM_TheMaster_Walk, STATUS_STONE, ANIM_TheMaster_Still, STATUS_SLEEP, ANIM_TheMaster_Sleep, @@ -18,7 +18,7 @@ s32 N(idleAnimations_8022B640)[] = { STATUS_END, }; -s32 N(idleAnimations_8022B68C)[] = { +s32 N(IdleAnimations_8022B68C)[] = { STATUS_NORMAL, ANIM_TheMaster_AscendedWalk, STATUS_STONE, ANIM_TheMaster_AscendedStill, STATUS_SLEEP, ANIM_TheMaster_AscendedSleep, @@ -31,12 +31,12 @@ s32 N(idleAnimations_8022B68C)[] = { STATUS_END, }; -s32 N(defenseTable_8022B6D8)[] = { +s32 N(DefenseTable_8022B6D8)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_8022B6E4)[] = { +s32 N(StatusTable_8022B6E4)[] = { STATUS_NORMAL, 50, STATUS_DEFAULT, 50, STATUS_SLEEP, 30, @@ -61,15 +61,15 @@ s32 N(statusTable_8022B6E4)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_8022B790)[] = { +ActorPartBlueprint N(PartsTable_8022B790)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { -5, 28 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8022B640), - .defenseTable = N(defenseTable_8022B6D8), + .idleAnimations = N(IdleAnimations_8022B640), + .defenseTable = N(DefenseTable_8022B6D8), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 2, -7 }, @@ -83,10 +83,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_THE_MASTER_2, .level = 0, .maxHP = 75, - .partCount = ARRAY_COUNT(N(partsTable_8022B790)), - .partsData = N(partsTable_8022B790), + .partCount = ARRAY_COUNT( N(PartsTable_8022B790)), + .partsData = N(PartsTable_8022B790), .initScript = &N(init_8022B7DC), - .statusTable = N(statusTable_8022B6E4), + .statusTable = N(StatusTable_8022B6E4), .escapeChance = 100, .airLiftChance = 0, .hurricaneChance = 0, @@ -534,7 +534,7 @@ EvtScript N(nextTurn_8022CFFC) = { EVT_WAIT(1) EVT_END_LOOP EVT_WAIT(15) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022B68C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022B68C))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedRun) EVT_WAIT(15) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) diff --git a/src/battle/area/mac/actor/master3.c b/src/battle/area/mac/actor/master3.c index 54023e02c0..823f54e798 100644 --- a/src/battle/area/mac/actor/master3.c +++ b/src/battle/area/mac/actor/master3.c @@ -5,7 +5,7 @@ #define NAMESPACE b_area_mac_master3 -s32 N(idleAnimations_8022D9A0)[] = { +s32 N(IdleAnimations_8022D9A0)[] = { STATUS_NORMAL, ANIM_TheMaster_Walk, STATUS_STONE, ANIM_TheMaster_Still, STATUS_SLEEP, ANIM_TheMaster_Sleep, @@ -18,7 +18,7 @@ s32 N(idleAnimations_8022D9A0)[] = { STATUS_END, }; -s32 N(idleAnimations_8022D9EC)[] = { +s32 N(IdleAnimations_8022D9EC)[] = { STATUS_NORMAL, ANIM_TheMaster_AscendedWalk, STATUS_STONE, ANIM_TheMaster_AscendedStill, STATUS_SLEEP, ANIM_TheMaster_AscendedSleep, @@ -31,12 +31,12 @@ s32 N(idleAnimations_8022D9EC)[] = { STATUS_END, }; -s32 N(defenseTable_8022DA38)[] = { +s32 N(DefenseTable_8022DA38)[] = { ELEMENT_NORMAL, 1, ELEMENT_END, }; -s32 N(statusTable_8022DA44)[] = { +s32 N(StatusTable_8022DA44)[] = { STATUS_NORMAL, 50, STATUS_DEFAULT, 50, STATUS_SLEEP, 20, @@ -61,15 +61,15 @@ s32 N(statusTable_8022DA44)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_8022DAF0)[] = { +ActorPartBlueprint N(PartsTable_8022DAF0)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { -5, 28 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8022D9A0), - .defenseTable = N(defenseTable_8022DA38), + .idleAnimations = N(IdleAnimations_8022D9A0), + .defenseTable = N(DefenseTable_8022DA38), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 2, -7 }, @@ -80,8 +80,8 @@ ActorPartBlueprint N(partsTable_8022DAF0)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8022D9A0), - .defenseTable = N(defenseTable_8022DA38), + .idleAnimations = N(IdleAnimations_8022D9A0), + .defenseTable = N(DefenseTable_8022DA38), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -95,10 +95,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_THE_MASTER_3, .level = 0, .maxHP = 99, - .partCount = ARRAY_COUNT(N(partsTable_8022DAF0)), - .partsData = N(partsTable_8022DAF0), + .partCount = ARRAY_COUNT( N(PartsTable_8022DAF0)), + .partsData = N(PartsTable_8022DAF0), .initScript = &N(init_8022DB60), - .statusTable = N(statusTable_8022DA44), + .statusTable = N(StatusTable_8022DA44), .escapeChance = 100, .airLiftChance = 0, .hurricaneChance = 0, @@ -911,7 +911,7 @@ EvtScript N(nextTurn_80230D44) = { EVT_WAIT(1) EVT_END_LOOP EVT_WAIT(15) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022D9EC))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022D9EC))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedRun) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_TheMaster_AscendedUppercut) EVT_WAIT(2) diff --git a/src/battle/area/mim/actor/forest_fuzzy.c b/src/battle/area/mim/actor/forest_fuzzy.c index 81d508be2a..ae7fcac327 100644 --- a/src/battle/area/mim/actor/forest_fuzzy.c +++ b/src/battle/area/mim/actor/forest_fuzzy.c @@ -6,19 +6,19 @@ #define NAMESPACE b_area_mim_forest_fuzzy -extern s32 N(idleAnimations_802184C4)[]; +extern s32 N(IdleAnimations_802184C4)[]; extern EvtScript N(init_80218510); extern EvtScript N(takeTurn_8021A61C); extern EvtScript N(idle_80218574); extern EvtScript N(handleEvent_80218584); extern Formation N(specialFormation_8021A800); -s32 N(defenseTable_802183C0)[] = { +s32 N(DefenseTable_802183C0)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_802183CC)[] = { +s32 N(StatusTable_802183CC)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 95, @@ -43,15 +43,15 @@ s32 N(statusTable_802183CC)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_80218478)[] = { +ActorPartBlueprint N(PartsTable_80218478)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 20 }, .opacity = 255, - .idleAnimations = N(idleAnimations_802184C4), - .defenseTable = N(defenseTable_802183C0), + .idleAnimations = N(IdleAnimations_802184C4), + .defenseTable = N(DefenseTable_802183C0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -63,10 +63,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_FOREST_FUZZY, .level = 11, .maxHP = 6, - .partCount = ARRAY_COUNT(N(partsTable_80218478)), - .partsData = N(partsTable_80218478), + .partCount = ARRAY_COUNT( N(PartsTable_80218478)), + .partsData = N(PartsTable_80218478), .initScript = &N(init_80218510), - .statusTable = N(statusTable_802183CC), + .statusTable = N(StatusTable_802183CC), .escapeChance = 40, .airLiftChance = 90, .hurricaneChance = 90, @@ -81,7 +81,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations_802184C4)[] = { +s32 N(IdleAnimations_802184C4)[] = { STATUS_NORMAL, ANIM_Fuzzy_Forest_Idle, STATUS_STONE, ANIM_Fuzzy_Forest_Still, STATUS_SLEEP, ANIM_Fuzzy_Forest_Sleep, @@ -292,7 +292,7 @@ EvtScript N(80218C48) = { EVT_END }; -#include "common/UnkBattleFunc2.inc.c" +#include "common/SpawnEnemyDrainFX.inc.c" EvtScript N(80219054) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) @@ -426,11 +426,11 @@ EvtScript N(80219054) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) - EVT_CALL(N(UnkBattleFunc2), LVar0, LVar1, LVar2, LVar3) + EVT_CALL(N(SpawnDrainHealthStartFX), LVar0, LVar1, LVar2, LVar3) EVT_THREAD EVT_WAIT(15) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_25C) - EVT_CALL(N(UnkBattleFunc2_2), LVar0, LVar1, LVar2, LVar3) + EVT_CALL(N(SpawnDrainHealthContinueFX), LVar0, LVar1, LVar2, LVar3) EVT_END_THREAD EVT_ADD(LVar0, 20) EVT_ADD(LVar1, 20) diff --git a/src/battle/area/mim/actor/piranha_plant.c b/src/battle/area/mim/actor/piranha_plant.c index 6db6d2afa9..263dc99105 100644 --- a/src/battle/area/mim/actor/piranha_plant.c +++ b/src/battle/area/mim/actor/piranha_plant.c @@ -11,7 +11,7 @@ extern EvtScript N(takeTurn_8021DCD4); extern EvtScript N(idle_8021D4E4); extern EvtScript N(handleEvent_8021D60C); -s32 N(idleAnimations_8021D330)[] = { +s32 N(IdleAnimations_8021D330)[] = { STATUS_NORMAL, ANIM_SmallPiranha_Anim01, STATUS_STONE, ANIM_SmallPiranha_Anim00, STATUS_SLEEP, ANIM_SmallPiranha_Anim00, @@ -34,12 +34,12 @@ s32 N(unk_missing_8021D388)[] = { STATUS_END, }; -s32 N(defenseTable_8021D394)[] = { +s32 N(DefenseTable_8021D394)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_8021D3A0)[] = { +s32 N(StatusTable_8021D3A0)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 95, @@ -64,15 +64,15 @@ s32 N(statusTable_8021D3A0)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_8021D44C)[] = { +ActorPartBlueprint N(PartsTable_8021D44C)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 35 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021D330), - .defenseTable = N(defenseTable_8021D394), + .idleAnimations = N(IdleAnimations_8021D330), + .defenseTable = N(DefenseTable_8021D394), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -84,10 +84,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_PIRANHA_PLANT, .level = 11, .maxHP = 5, - .partCount = ARRAY_COUNT(N(partsTable_8021D44C)), - .partsData = N(partsTable_8021D44C), + .partCount = ARRAY_COUNT( N(PartsTable_8021D44C)), + .partsData = N(PartsTable_8021D44C), .initScript = &N(init_8021D498), - .statusTable = N(statusTable_8021D3A0), + .statusTable = N(StatusTable_8021D3A0), .escapeChance = 70, .airLiftChance = 20, .hurricaneChance = 20, diff --git a/src/battle/area/nok/actor/kent_c_koopa.c b/src/battle/area/nok/actor/kent_c_koopa.c index 90ea953af8..27551d6ffe 100644 --- a/src/battle/area/nok/actor/kent_c_koopa.c +++ b/src/battle/area/nok/actor/kent_c_koopa.c @@ -12,7 +12,7 @@ s32 N(intTable_80227910)[] = { 0x00000007, 0x00000006, 0x00000004, 0x00000000, 0x00000002, 0x00000000, }; -s32 N(idleAnimations_80227968)[] = { +s32 N(IdleAnimations_80227968)[] = { STATUS_NORMAL, ANIM_KentCKoopa_Anim01, STATUS_STONE, ANIM_KentCKoopa_Anim00, STATUS_SLEEP, ANIM_KentCKoopa_Anim13, @@ -25,35 +25,35 @@ s32 N(idleAnimations_80227968)[] = { STATUS_END, }; -s32 N(idleAnimations_802279B4)[] = { +s32 N(IdleAnimations_802279B4)[] = { STATUS_NORMAL, ANIM_KentCKoopa_Anim1A, STATUS_STOP, ANIM_KentCKoopa_Anim19, STATUS_PARALYZE, ANIM_KentCKoopa_Anim19, STATUS_END, }; -s32 N(idleAnimations_802279D0)[] = { +s32 N(IdleAnimations_802279D0)[] = { STATUS_NORMAL, ANIM_Coin_Rotate, STATUS_END, }; -s32 N(defenseTable_802279DC)[] = { +s32 N(DefenseTable_802279DC)[] = { ELEMENT_NORMAL, 6, ELEMENT_BLAST, 6, ELEMENT_END, }; -s32 N(defenseTable_802279F0)[] = { +s32 N(DefenseTable_802279F0)[] = { ELEMENT_NORMAL, 3, ELEMENT_END, }; -s32 N(defenseTable_802279FC)[] = { +s32 N(DefenseTable_802279FC)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_80227A08)[] = { +s32 N(StatusTable_80227A08)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 80, @@ -78,15 +78,15 @@ s32 N(statusTable_80227A08)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_80227AB4)[] = { +ActorPartBlueprint N(PartsTable_80227AB4)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 60 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80227968), - .defenseTable = N(defenseTable_802279DC), + .idleAnimations = N(IdleAnimations_80227968), + .defenseTable = N(DefenseTable_802279DC), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -98,7 +98,7 @@ ActorPartBlueprint N(partsTable_80227AB4)[] = { .targetOffset = { 0, -20 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable_802279F0), + .defenseTable = N(DefenseTable_802279F0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -110,7 +110,7 @@ ActorPartBlueprint N(partsTable_80227AB4)[] = { .targetOffset = { -70, 26 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable_802279FC), + .defenseTable = N(DefenseTable_802279FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -121,8 +121,8 @@ ActorPartBlueprint N(partsTable_80227AB4)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_802279D0), - .defenseTable = N(defenseTable_802279FC), + .idleAnimations = N(IdleAnimations_802279D0), + .defenseTable = N(DefenseTable_802279FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -133,8 +133,8 @@ ActorPartBlueprint N(partsTable_80227AB4)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_802279D0), - .defenseTable = N(defenseTable_802279FC), + .idleAnimations = N(IdleAnimations_802279D0), + .defenseTable = N(DefenseTable_802279FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -145,8 +145,8 @@ ActorPartBlueprint N(partsTable_80227AB4)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_802279D0), - .defenseTable = N(defenseTable_802279FC), + .idleAnimations = N(IdleAnimations_802279D0), + .defenseTable = N(DefenseTable_802279FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -157,8 +157,8 @@ ActorPartBlueprint N(partsTable_80227AB4)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_802279D0), - .defenseTable = N(defenseTable_802279FC), + .idleAnimations = N(IdleAnimations_802279D0), + .defenseTable = N(DefenseTable_802279FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -169,8 +169,8 @@ ActorPartBlueprint N(partsTable_80227AB4)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_802279D0), - .defenseTable = N(defenseTable_802279FC), + .idleAnimations = N(IdleAnimations_802279D0), + .defenseTable = N(DefenseTable_802279FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -181,8 +181,8 @@ ActorPartBlueprint N(partsTable_80227AB4)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_802279D0), - .defenseTable = N(defenseTable_802279FC), + .idleAnimations = N(IdleAnimations_802279D0), + .defenseTable = N(DefenseTable_802279FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -196,10 +196,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_KENT_C_KOOPA, .level = 55, .maxHP = 70, - .partCount = ARRAY_COUNT(N(partsTable_80227AB4)), - .partsData = N(partsTable_80227AB4), + .partCount = ARRAY_COUNT( N(PartsTable_80227AB4)), + .partsData = N(PartsTable_80227AB4), .initScript = &N(init_80227C20), - .statusTable = N(statusTable_80227A08), + .statusTable = N(StatusTable_80227A08), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -557,13 +557,13 @@ EvtScript N(takeTurn_80228A7C) = { EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KentCKoopa_Anim0C) EVT_WAIT(10) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_802279DC))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_802279DC))) EVT_CALL(SetEnemyTargetOffset, ACTOR_SELF, 1, 0, 60) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, 0x00020000, TRUE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, 0x00800000, FALSE) EVT_CALL(SetPartFlags, ACTOR_SELF, 2, 0x00020004) EVT_CALL(SetPartFlags, ACTOR_SELF, 1, 0x00800004) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80227968))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80227968))) EVT_CALL(N(UnkBattleFunc1), -26, 38, 2, 63) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0x0047001C) @@ -998,8 +998,8 @@ EvtScript N(8022AD84) = { EvtScript N(flipOver_KentC) = { EVT_CALL(SetEnemyTargetOffset, ACTOR_SELF, 1, 0, 40) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_802279F0))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_802279B4))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_802279F0))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_802279B4))) EVT_CALL(N(UnkBattleFunc1), -24, 47, 23, 37) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KentCKoopa_Anim1C) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) diff --git a/src/battle/area/omo/actor/anti_guy.c b/src/battle/area/omo/actor/anti_guy.c index d0a94edf27..74e9c8e7b3 100644 --- a/src/battle/area/omo/actor/anti_guy.c +++ b/src/battle/area/omo/actor/anti_guy.c @@ -5,18 +5,18 @@ #define NAMESPACE b_area_omo_anti_guy -extern s32 N(idleAnimations_80221A14)[]; +extern s32 N(IdleAnimations_80221A14)[]; extern EvtScript N(init_80221A60); extern EvtScript N(takeTurn_802233AC); extern EvtScript N(idle_80221AAC); extern EvtScript N(handleEvent_80221C20); -s32 N(defenseTable_80221910)[] = { +s32 N(DefenseTable_80221910)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_8022191C)[] = { +s32 N(StatusTable_8022191C)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 50, @@ -45,15 +45,15 @@ enum PartIDs { PT_MAIN = 1, }; -ActorPartBlueprint N(partsTable_802219C8)[] = { +ActorPartBlueprint N(PartsTable_802219C8)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = PT_MAIN, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80221A14), - .defenseTable = N(defenseTable_80221910), + .idleAnimations = N(IdleAnimations_80221A14), + .defenseTable = N(DefenseTable_80221910), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, @@ -65,10 +65,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_ANTI_GUY, .level = 42, .maxHP = 50, - .partCount = ARRAY_COUNT(N(partsTable_802219C8)), - .partsData = N(partsTable_802219C8), + .partCount = ARRAY_COUNT( N(PartsTable_802219C8)), + .partsData = N(PartsTable_802219C8), .initScript = &N(init_80221A60), - .statusTable = N(statusTable_8022191C), + .statusTable = N(StatusTable_8022191C), .escapeChance = 50, .airLiftChance = 0, .hurricaneChance = 0, @@ -83,7 +83,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations_80221A14)[] = { +s32 N(IdleAnimations_80221A14)[] = { STATUS_NORMAL, ANIM_ShyGuy_Black_Anim01, STATUS_STONE, ANIM_ShyGuy_Black_Anim00, STATUS_SLEEP, ANIM_ShyGuy_Black_Anim12, diff --git a/src/battle/area/omo/actor/blue_shy_guy.c b/src/battle/area/omo/actor/blue_shy_guy.c index 5d9e17c66f..84cb1ab104 100644 --- a/src/battle/area/omo/actor/blue_shy_guy.c +++ b/src/battle/area/omo/actor/blue_shy_guy.c @@ -5,19 +5,19 @@ #define NAMESPACE b_area_omo_blue_shy_guy -extern s32 N(idleAnimations_8021AE1C)[]; +extern s32 N(IdleAnimations_8021AE1C)[]; extern EvtScript N(init_8021AE68); extern EvtScript N(takeTurn_8021C7B4); extern EvtScript N(idle_8021AEB4); extern EvtScript N(handleEvent_8021B028); -s32 N(defenseTable_8021AD10)[] = { +s32 N(DefenseTable_8021AD10)[] = { ELEMENT_NORMAL, 0, ELEMENT_SHOCK, 0, ELEMENT_END, }; -s32 N(statusTable_8021AD24)[] = { +s32 N(StatusTable_8021AD24)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 70, @@ -46,15 +46,15 @@ enum PartIDs { PT_MAIN = 1, }; -ActorPartBlueprint N(partsTable_8021ADD0)[] = { +ActorPartBlueprint N(PartsTable_8021ADD0)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = PT_MAIN, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021AE1C), - .defenseTable = N(defenseTable_8021AD10), + .idleAnimations = N(IdleAnimations_8021AE1C), + .defenseTable = N(DefenseTable_8021AD10), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, @@ -66,10 +66,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_SHY_GUY, .level = 14, .maxHP = 7, - .partCount = ARRAY_COUNT(N(partsTable_8021ADD0)), - .partsData = N(partsTable_8021ADD0), + .partCount = ARRAY_COUNT( N(PartsTable_8021ADD0)), + .partsData = N(PartsTable_8021ADD0), .initScript = &N(init_8021AE68), - .statusTable = N(statusTable_8021AD24), + .statusTable = N(StatusTable_8021AD24), .escapeChance = 60, .airLiftChance = 85, .hurricaneChance = 80, @@ -84,7 +84,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations_8021AE1C)[] = { +s32 N(IdleAnimations_8021AE1C)[] = { STATUS_NORMAL, ANIM_ShyGuy_Blue_Anim01, STATUS_STONE, ANIM_ShyGuy_Blue_Anim00, STATUS_SLEEP, ANIM_ShyGuy_Blue_Anim12, diff --git a/src/battle/area/omo/actor/green_shy_guy.c b/src/battle/area/omo/actor/green_shy_guy.c index 00def550e1..05d9fbc465 100644 --- a/src/battle/area/omo/actor/green_shy_guy.c +++ b/src/battle/area/omo/actor/green_shy_guy.c @@ -5,19 +5,19 @@ #define NAMESPACE b_area_omo_green_shy_guy -extern s32 N(idleAnimations_8021FF1C)[]; +extern s32 N(IdleAnimations_8021FF1C)[]; extern EvtScript N(init_8021FF68); extern EvtScript N(takeTurn_802218B4); extern EvtScript N(idle_8021FFB4); extern EvtScript N(handleEvent_80220128); -s32 N(defenseTable_8021FE10)[] = { +s32 N(DefenseTable_8021FE10)[] = { ELEMENT_NORMAL, 0, ELEMENT_SHOCK, 0, ELEMENT_END, }; -s32 N(statusTable_8021FE24)[] = { +s32 N(StatusTable_8021FE24)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 70, @@ -46,15 +46,15 @@ enum PartIDs { PT_MAIN = 1, }; -ActorPartBlueprint N(partsTable_8021FED0)[] = { +ActorPartBlueprint N(PartsTable_8021FED0)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = PT_MAIN, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021FF1C), - .defenseTable = N(defenseTable_8021FE10), + .idleAnimations = N(IdleAnimations_8021FF1C), + .defenseTable = N(DefenseTable_8021FE10), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, @@ -66,10 +66,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_SHY_GUY, .level = 14, .maxHP = 7, - .partCount = ARRAY_COUNT(N(partsTable_8021FED0)), - .partsData = N(partsTable_8021FED0), + .partCount = ARRAY_COUNT( N(PartsTable_8021FED0)), + .partsData = N(PartsTable_8021FED0), .initScript = &N(init_8021FF68), - .statusTable = N(statusTable_8021FE24), + .statusTable = N(StatusTable_8021FE24), .escapeChance = 60, .airLiftChance = 85, .hurricaneChance = 80, @@ -84,7 +84,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations_8021FF1C)[] = { +s32 N(IdleAnimations_8021FF1C)[] = { STATUS_NORMAL, ANIM_ShyGuy_Green_Anim01, STATUS_STONE, ANIM_ShyGuy_Green_Anim00, STATUS_SLEEP, ANIM_ShyGuy_Green_Anim12, diff --git a/src/battle/area/omo/actor/groove_guy.c b/src/battle/area/omo/actor/groove_guy.c index e99013f8f3..291145b876 100644 --- a/src/battle/area/omo/actor/groove_guy.c +++ b/src/battle/area/omo/actor/groove_guy.c @@ -21,7 +21,7 @@ extern Formation N(specialFormation_802273A8); extern Formation N(specialFormation_802273C4); extern Formation N(specialFormation_802273E0); -s32 N(idleAnimations_802249E0)[] = { +s32 N(IdleAnimations_802249E0)[] = { STATUS_NORMAL, ANIM_GrooveGuy_Anim01, STATUS_STONE, ANIM_GrooveGuy_Anim00, STATUS_SLEEP, ANIM_GrooveGuy_Anim06, @@ -34,13 +34,13 @@ s32 N(idleAnimations_802249E0)[] = { STATUS_END, }; -s32 N(defenseTable_80224A2C)[] = { +s32 N(DefenseTable_80224A2C)[] = { ELEMENT_NORMAL, 0, ELEMENT_SHOCK, 0, ELEMENT_END, }; -s32 N(statusTable_80224A40)[] = { +s32 N(StatusTable_80224A40)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 70, @@ -71,15 +71,15 @@ enum PartIDs { PT_MAIN = 1, }; -ActorPartBlueprint N(partsTable_80224AEC)[] = { +ActorPartBlueprint N(PartsTable_80224AEC)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = PT_MAIN, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_802249E0), - .defenseTable = N(defenseTable_80224A2C), + .idleAnimations = N(IdleAnimations_802249E0), + .defenseTable = N(DefenseTable_80224A2C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -91,10 +91,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_GROOVE_GUY, .level = 15, .maxHP = 7, - .partCount = ARRAY_COUNT(N(partsTable_80224AEC)), - .partsData = N(partsTable_80224AEC), + .partCount = ARRAY_COUNT( N(PartsTable_80224AEC)), + .partsData = N(PartsTable_80224AEC), .initScript = &N(init_80224B38), - .statusTable = N(statusTable_80224A40), + .statusTable = N(StatusTable_80224A40), .escapeChance = 50, .airLiftChance = 85, .hurricaneChance = 80, @@ -596,7 +596,7 @@ EvtScript N(randomSummon) = { EVT_EXEC_WAIT(N(802271A0)) EVT_END_SWITCH EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PT_MAIN, EVT_PTR(N(idleAnimations_802249E0))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, PT_MAIN, EVT_PTR(N(IdleAnimations_802249E0))) EVT_RETURN EVT_END }; diff --git a/src/battle/area/omo/actor/pink_shy_guy.c b/src/battle/area/omo/actor/pink_shy_guy.c index 1464e79b8e..9cec2859d7 100644 --- a/src/battle/area/omo/actor/pink_shy_guy.c +++ b/src/battle/area/omo/actor/pink_shy_guy.c @@ -5,19 +5,19 @@ #define NAMESPACE b_area_omo_pink_shy_guy -extern s32 N(idleAnimations_8021E41C)[]; +extern s32 N(IdleAnimations_8021E41C)[]; extern EvtScript N(init_8021E468); extern EvtScript N(takeTurn_8021FDB4); extern EvtScript N(idle_8021E4B4); extern EvtScript N(handleEvent_8021E628); -s32 N(defenseTable_8021E310)[] = { +s32 N(DefenseTable_8021E310)[] = { ELEMENT_NORMAL, 0, ELEMENT_SHOCK, 0, ELEMENT_END, }; -s32 N(statusTable_8021E324)[] = { +s32 N(StatusTable_8021E324)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 70, @@ -46,15 +46,15 @@ enum PartIDs { PT_MAIN = 1, }; -ActorPartBlueprint N(partsTable_8021E3D0)[] = { +ActorPartBlueprint N(PartsTable_8021E3D0)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = PT_MAIN, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021E41C), - .defenseTable = N(defenseTable_8021E310), + .idleAnimations = N(IdleAnimations_8021E41C), + .defenseTable = N(DefenseTable_8021E310), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, @@ -66,10 +66,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_SHY_GUY, .level = 14, .maxHP = 7, - .partCount = ARRAY_COUNT(N(partsTable_8021E3D0)), - .partsData = N(partsTable_8021E3D0), + .partCount = ARRAY_COUNT( N(PartsTable_8021E3D0)), + .partsData = N(PartsTable_8021E3D0), .initScript = &N(init_8021E468), - .statusTable = N(statusTable_8021E324), + .statusTable = N(StatusTable_8021E324), .escapeChance = 60, .airLiftChance = 85, .hurricaneChance = 80, @@ -84,7 +84,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations_8021E41C)[] = { +s32 N(IdleAnimations_8021E41C)[] = { STATUS_NORMAL, ANIM_ShyGuy_Pink_Anim01, STATUS_STONE, ANIM_ShyGuy_Pink_Anim00, STATUS_SLEEP, ANIM_ShyGuy_Pink_Anim12, diff --git a/src/battle/area/omo/actor/pyro_guy.c b/src/battle/area/omo/actor/pyro_guy.c index 52266a3fcf..4687808ead 100644 --- a/src/battle/area/omo/actor/pyro_guy.c +++ b/src/battle/area/omo/actor/pyro_guy.c @@ -11,7 +11,7 @@ extern EvtScript N(takeTurn_8022D344); extern EvtScript N(idle_8022CCCC); extern EvtScript N(handleEvent_8022CE60); -s32 N(idleAnimations_8022CB00)[] = { +s32 N(IdleAnimations_8022CB00)[] = { STATUS_NORMAL, ANIM_PyroGuy_Anim01, STATUS_STONE, ANIM_PyroGuy_Anim00, STATUS_SLEEP, ANIM_PyroGuy_Anim07, @@ -24,7 +24,7 @@ s32 N(idleAnimations_8022CB00)[] = { STATUS_END, }; -s32 N(defenseTable_8022CB4C)[] = { +s32 N(DefenseTable_8022CB4C)[] = { ELEMENT_NORMAL, 0, ELEMENT_WATER, -2, ELEMENT_ICE, -2, @@ -35,7 +35,7 @@ s32 N(defenseTable_8022CB4C)[] = { ELEMENT_END, }; -s32 N(statusTable_8022CB88)[] = { +s32 N(StatusTable_8022CB88)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 70, @@ -64,15 +64,15 @@ enum PartIDs { PT_MAIN = 1, }; -ActorPartBlueprint N(partsTable_8022CC34)[] = { +ActorPartBlueprint N(PartsTable_8022CC34)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = PT_MAIN, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8022CB00), - .defenseTable = N(defenseTable_8022CB4C), + .idleAnimations = N(IdleAnimations_8022CB00), + .defenseTable = N(DefenseTable_8022CB4C), .eventFlags = ACTOR_EVENT_FLAG_FIREY, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, @@ -84,10 +84,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_PYRO_GUY, .level = 15, .maxHP = 7, - .partCount = ARRAY_COUNT(N(partsTable_8022CC34)), - .partsData = N(partsTable_8022CC34), + .partCount = ARRAY_COUNT( N(PartsTable_8022CC34)), + .partsData = N(PartsTable_8022CC34), .initScript = &N(init_8022CC80), - .statusTable = N(statusTable_8022CB88), + .statusTable = N(StatusTable_8022CB88), .escapeChance = 60, .airLiftChance = 85, .hurricaneChance = 80, diff --git a/src/battle/area/omo/actor/sky_guy.c b/src/battle/area/omo/actor/sky_guy.c index 6168f77406..05efd4c3d1 100644 --- a/src/battle/area/omo/actor/sky_guy.c +++ b/src/battle/area/omo/actor/sky_guy.c @@ -7,7 +7,7 @@ #define NAMESPACE b_area_omo_sky_guy -extern s32 N(idleAnimations_8022B104)[]; +extern s32 N(IdleAnimations_8022B104)[]; extern EvtScript N(init_8022987C); extern EvtScript N(takeTurn_8022A9D0); extern EvtScript N(takeTurn_8022CA9C); @@ -16,7 +16,7 @@ extern EvtScript N(idle_8022B19C); extern EvtScript N(handleEvent_8022A398); extern EvtScript N(handleEvent_8022B310); -s32 N(idleAnimations_802294C0)[] = { +s32 N(IdleAnimations_802294C0)[] = { STATUS_NORMAL, ANIM_SkyGuy_Anim01, STATUS_STONE, ANIM_SkyGuy_Anim00, STATUS_SLEEP, ANIM_SkyGuy_Anim04, @@ -29,7 +29,7 @@ s32 N(idleAnimations_802294C0)[] = { STATUS_END, }; -s32 N(idleAnimations_8022950C)[] = { +s32 N(IdleAnimations_8022950C)[] = { STATUS_NORMAL, ANIM_SkyGuy_Anim10, STATUS_STONE, ANIM_SkyGuy_Anim0D, STATUS_SLEEP, ANIM_SkyGuy_Anim19, @@ -42,7 +42,7 @@ s32 N(idleAnimations_8022950C)[] = { STATUS_END, }; -s32 N(idleAnimations_80229558)[] = { +s32 N(IdleAnimations_80229558)[] = { STATUS_NORMAL, ANIM_SkyGuy_Anim0F, STATUS_STONE, ANIM_SkyGuy_Anim0C, STATUS_SLEEP, ANIM_SkyGuy_Anim18, @@ -55,7 +55,7 @@ s32 N(idleAnimations_80229558)[] = { STATUS_END, }; -s32 N(idleAnimations_802295A4)[] = { +s32 N(IdleAnimations_802295A4)[] = { STATUS_NORMAL, ANIM_SkyGuy_Anim11, STATUS_STONE, ANIM_SkyGuy_Anim0E, STATUS_SLEEP, ANIM_SkyGuy_Anim1A, @@ -68,24 +68,24 @@ s32 N(idleAnimations_802295A4)[] = { STATUS_END, }; -s32 N(idleAnimations_802295F0)[] = { +s32 N(IdleAnimations_802295F0)[] = { STATUS_NORMAL, ANIM_SkyGuy_Anim0B, STATUS_END, }; -s32 N(defenseTable_802295FC)[] = { +s32 N(DefenseTable_802295FC)[] = { ELEMENT_NORMAL, 0, ELEMENT_SHOCK, 0, ELEMENT_END, }; -s32 N(defenseTable_80229610)[] = { +s32 N(DefenseTable_80229610)[] = { ELEMENT_NORMAL, 0, ELEMENT_SHOCK, 0, ELEMENT_END, }; -s32 N(statusTable_80229624)[] = { +s32 N(StatusTable_80229624)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 70, @@ -110,7 +110,7 @@ s32 N(statusTable_80229624)[] = { STATUS_END, }; -s32 N(statusTable_802296D0)[] = { +s32 N(StatusTable_802296D0)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 70, @@ -144,15 +144,15 @@ enum PartIDs { PT_6 = 6, }; -ActorPartBlueprint N(partsTable_8022977C)[] = { +ActorPartBlueprint N(PartsTable_8022977C)[] = { { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, .index = PT_MAIN, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 32 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8022B104), - .defenseTable = N(defenseTable_80229610), + .idleAnimations = N(IdleAnimations_8022B104), + .defenseTable = N(DefenseTable_80229610), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -163,8 +163,8 @@ ActorPartBlueprint N(partsTable_8022977C)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_802294C0), - .defenseTable = N(defenseTable_802295FC), + .idleAnimations = N(IdleAnimations_802294C0), + .defenseTable = N(DefenseTable_802295FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, @@ -175,8 +175,8 @@ ActorPartBlueprint N(partsTable_8022977C)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 2, 50 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8022950C), - .defenseTable = N(defenseTable_802295FC), + .idleAnimations = N(IdleAnimations_8022950C), + .defenseTable = N(DefenseTable_802295FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, @@ -188,8 +188,8 @@ ActorPartBlueprint N(partsTable_8022977C)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80229558), - .defenseTable = N(defenseTable_802295FC), + .idleAnimations = N(IdleAnimations_80229558), + .defenseTable = N(DefenseTable_802295FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, @@ -200,8 +200,8 @@ ActorPartBlueprint N(partsTable_8022977C)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_802295A4), - .defenseTable = N(defenseTable_802295FC), + .idleAnimations = N(IdleAnimations_802295A4), + .defenseTable = N(DefenseTable_802295FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, @@ -212,8 +212,8 @@ ActorPartBlueprint N(partsTable_8022977C)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_802295F0), - .defenseTable = N(defenseTable_802295FC), + .idleAnimations = N(IdleAnimations_802295F0), + .defenseTable = N(DefenseTable_802295FC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, @@ -225,10 +225,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_SKY_GUY, .level = 14, .maxHP = 7, - .partCount = ARRAY_COUNT(N(partsTable_8022977C)), - .partsData = N(partsTable_8022977C), + .partCount = ARRAY_COUNT( N(PartsTable_8022977C)), + .partsData = N(PartsTable_8022977C), .initScript = &N(init_8022987C), - .statusTable = N(statusTable_80229624), + .statusTable = N(StatusTable_80229624), .escapeChance = 50, .airLiftChance = 90, .hurricaneChance = 90, @@ -599,7 +599,7 @@ EvtScript N(takeTurn_8022A9D0) = { EVT_END }; -s32 N(idleAnimations_8022B104)[] = { +s32 N(IdleAnimations_8022B104)[] = { STATUS_NORMAL, ANIM_ShyGuy_Red_Anim01, STATUS_STONE, ANIM_ShyGuy_Red_Anim00, STATUS_SLEEP, ANIM_ShyGuy_Red_Anim12, diff --git a/src/battle/area/omo/actor/spy_guy.c b/src/battle/area/omo/actor/spy_guy.c index dbe51d5384..7677c07d66 100644 --- a/src/battle/area/omo/actor/spy_guy.c +++ b/src/battle/area/omo/actor/spy_guy.c @@ -11,7 +11,7 @@ extern EvtScript N(takeTurn_802293DC); extern EvtScript N(idle_802276C4); extern EvtScript N(handleEvent_80227ABC); -s32 N(idleAnimations_80227400)[] = { +s32 N(IdleAnimations_80227400)[] = { STATUS_NORMAL, ANIM_SpyGuy_Anim03, STATUS_STONE, ANIM_SpyGuy_Anim01, STATUS_SLEEP, ANIM_SpyGuy_Anim0F, @@ -24,7 +24,7 @@ s32 N(idleAnimations_80227400)[] = { STATUS_END, }; -s32 N(idleAnimations_8022744C)[] = { +s32 N(IdleAnimations_8022744C)[] = { STATUS_NORMAL, ANIM_SpyGuy_Anim02, STATUS_STONE, ANIM_SpyGuy_Anim00, STATUS_SLEEP, ANIM_SpyGuy_Anim0F, @@ -37,18 +37,18 @@ s32 N(idleAnimations_8022744C)[] = { STATUS_END, }; -s32 N(idleAnimations_80227498)[] = { +s32 N(IdleAnimations_80227498)[] = { STATUS_NORMAL, ANIM_SpyGuy_Anim10, STATUS_END, }; -s32 N(defenseTable_802274A4)[] = { +s32 N(DefenseTable_802274A4)[] = { ELEMENT_NORMAL, 0, ELEMENT_SHOCK, 0, ELEMENT_END, }; -s32 N(statusTable_802274B8)[] = { +s32 N(StatusTable_802274B8)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 70, @@ -78,15 +78,15 @@ enum PartIDs { PT_2 = 2, }; -ActorPartBlueprint N(partsTable_80227564)[] = { +ActorPartBlueprint N(PartsTable_80227564)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = PT_MAIN, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 30 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80227400), - .defenseTable = N(defenseTable_802274A4), + .idleAnimations = N(IdleAnimations_80227400), + .defenseTable = N(DefenseTable_802274A4), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -13 }, @@ -97,8 +97,8 @@ ActorPartBlueprint N(partsTable_80227564)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80227498), - .defenseTable = N(defenseTable_802274A4), + .idleAnimations = N(IdleAnimations_80227498), + .defenseTable = N(DefenseTable_802274A4), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, @@ -110,10 +110,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_SPY_GUY, .level = 15, .maxHP = 7, - .partCount = ARRAY_COUNT(N(partsTable_80227564)), - .partsData = N(partsTable_80227564), + .partCount = ARRAY_COUNT( N(PartsTable_80227564)), + .partsData = N(PartsTable_80227564), .initScript = &N(init_802275D4), - .statusTable = N(statusTable_802274B8), + .statusTable = N(StatusTable_802274B8), .escapeChance = 50, .airLiftChance = 85, .hurricaneChance = 80, @@ -137,7 +137,7 @@ EvtScript N(init_802275D4) = { EVT_CALL(GetInstigatorValue, ACTOR_SELF, LVar0) EVT_IF_NE(LVar0, 0) EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PT_MAIN, EVT_PTR(N(idleAnimations_8022744C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, PT_MAIN, EVT_PTR(N(IdleAnimations_8022744C))) EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_SpyGuy_Anim02) EVT_END_IF EVT_RETURN @@ -181,7 +181,7 @@ EvtScript N(802276D4) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(0) EVT_CALL(SetActorVar, ACTOR_SELF, 2, 1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PT_MAIN, EVT_PTR(N(idleAnimations_80227400))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, PT_MAIN, EVT_PTR(N(IdleAnimations_80227400))) EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_SpyGuy_Anim17) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.4)) @@ -192,7 +192,7 @@ EvtScript N(802276D4) = { EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_SpyGuy_Anim03) EVT_CASE_EQ(1) EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PT_MAIN, EVT_PTR(N(idleAnimations_8022744C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, PT_MAIN, EVT_PTR(N(IdleAnimations_8022744C))) EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_SpyGuy_Anim18) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.4)) @@ -608,7 +608,7 @@ EvtScript N(takeTurn_802293DC) = { EVT_CALL(GetBattlePhase, LVar0) EVT_IF_EQ(LVar0, PHASE_FIRST_STRIKE) EVT_CALL(SetActorVar, ACTOR_SELF, 2, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, PT_MAIN, EVT_PTR(N(idleAnimations_8022744C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, PT_MAIN, EVT_PTR(N(IdleAnimations_8022744C))) EVT_CALL(SetAnimation, ACTOR_SELF, PT_MAIN, ANIM_SpyGuy_Anim02) EVT_END_IF EVT_CALL(GetActorVar, ACTOR_SELF, 2, LVar0) diff --git a/src/battle/area/omo/actor/yellow_shy_guy.c b/src/battle/area/omo/actor/yellow_shy_guy.c index 1057ec3dae..f1238f478e 100644 --- a/src/battle/area/omo/actor/yellow_shy_guy.c +++ b/src/battle/area/omo/actor/yellow_shy_guy.c @@ -5,19 +5,19 @@ #define NAMESPACE b_area_omo_yellow_shy_guy -extern s32 N(idleAnimations_8021C91C)[]; +extern s32 N(IdleAnimations_8021C91C)[]; extern EvtScript N(init_8021C968); extern EvtScript N(takeTurn_8021E2B4); extern EvtScript N(idle_8021C9B4); extern EvtScript N(handleEvent_8021CB28); -s32 N(defenseTable_8021C810)[] = { +s32 N(DefenseTable_8021C810)[] = { ELEMENT_NORMAL, 0, ELEMENT_SHOCK, 0, ELEMENT_END, }; -s32 N(statusTable_8021C824)[] = { +s32 N(StatusTable_8021C824)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 70, @@ -46,15 +46,15 @@ enum PartIDs { PT_MAIN = 1, }; -ActorPartBlueprint N(partsTable_8021C8D0)[] = { +ActorPartBlueprint N(PartsTable_8021C8D0)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = PT_MAIN, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021C91C), - .defenseTable = N(defenseTable_8021C810), + .idleAnimations = N(IdleAnimations_8021C91C), + .defenseTable = N(DefenseTable_8021C810), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, @@ -66,10 +66,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_SHY_GUY, .level = 14, .maxHP = 7, - .partCount = ARRAY_COUNT(N(partsTable_8021C8D0)), - .partsData = N(partsTable_8021C8D0), + .partCount = ARRAY_COUNT( N(PartsTable_8021C8D0)), + .partsData = N(PartsTable_8021C8D0), .initScript = &N(init_8021C968), - .statusTable = N(statusTable_8021C824), + .statusTable = N(StatusTable_8021C824), .escapeChance = 60, .airLiftChance = 85, .hurricaneChance = 80, @@ -84,7 +84,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations_8021C91C)[] = { +s32 N(IdleAnimations_8021C91C)[] = { STATUS_NORMAL, ANIM_ShyGuy_Yellow_Anim01, STATUS_STONE, ANIM_ShyGuy_Yellow_Anim00, STATUS_SLEEP, ANIM_ShyGuy_Yellow_Anim12, diff --git a/src/battle/area/omo2/actor/general_guy.c b/src/battle/area/omo2/actor/general_guy.c index 02560ee016..02d16f6b3b 100644 --- a/src/battle/area/omo2/actor/general_guy.c +++ b/src/battle/area/omo2/actor/general_guy.c @@ -18,20 +18,20 @@ extern EvtScript N(idle); extern EvtScript N(handleEvent); extern EvtScript N(attack_throw_bomb); extern EvtScript N(attack_lightning_shot); -extern s32 N(idleAnimations)[]; -extern s32 N(idleAnimations_bomb)[]; +extern s32 N(IdleAnimations)[]; +extern s32 N(IdleAnimations_bomb)[]; extern Formation N(formation_shy_squad); #include "common/FadeBackgroundToBlack.inc.c" #include "common/UnfadeBackgroundToBlack.inc.c" -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -63,8 +63,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 30 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, @@ -75,8 +75,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_bomb), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations_bomb), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, @@ -91,7 +91,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -106,7 +106,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_GeneralGuy_Anim02, STATUS_STONE, ANIM_GeneralGuy_Anim00, STATUS_SLEEP, ANIM_GeneralGuy_Anim00, @@ -121,12 +121,12 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations_bomb)[] = { +s32 N(IdleAnimations_bomb)[] = { STATUS_NORMAL, ANIM_GeneralGuyBomb_Anim00, STATUS_END, }; -s32 N(idleAnimations3)[] = { +s32 N(IdleAnimations3)[] = { STATUS_NORMAL, ANIM_GeneralGuy_Anim0E, STATUS_POISON, ANIM_GeneralGuy_Anim0E, STATUS_STOP, ANIM_GeneralGuy_Anim00, diff --git a/src/battle/area/omo2/actor/light_bulb.c b/src/battle/area/omo2/actor/light_bulb.c index ddffaa1424..9d8810153f 100644 --- a/src/battle/area/omo2/actor/light_bulb.c +++ b/src/battle/area/omo2/actor/light_bulb.c @@ -29,13 +29,13 @@ extern EvtScript N(onHit); extern EvtScript N(shake_tank); extern EvtScript N(onDeath); -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 1, ELEMENT_SHOCK, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -68,7 +68,7 @@ ActorPartBlueprint N(parts)[] = { .targetOffset = { 0, 35 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -14 }, @@ -83,7 +83,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, diff --git a/src/battle/area/omo2/actor/toy_tank.c b/src/battle/area/omo2/actor/toy_tank.c index 259f7d9175..fcada7e9ce 100644 --- a/src/battle/area/omo2/actor/toy_tank.c +++ b/src/battle/area/omo2/actor/toy_tank.c @@ -64,12 +64,12 @@ API_CALLABLE(func_802181F4_52B894) { #include "animation.inc.c" -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 2, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -102,7 +102,7 @@ ActorPartBlueprint N(parts)[] = { .targetOffset = { 0, 60 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -114,7 +114,7 @@ ActorPartBlueprint N(parts)[] = { .targetOffset = { 0, 50 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -127,7 +127,7 @@ ActorPartBlueprint N(parts)[] = { .targetOffset = { -10, 20 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -143,7 +143,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, diff --git a/src/battle/area/omo2_1/actor/shy_squad.c b/src/battle/area/omo2_1/actor/shy_squad.c index 69b8031693..2a82a60fd4 100644 --- a/src/battle/area/omo2_1/actor/shy_squad.c +++ b/src/battle/area/omo2_1/actor/shy_squad.c @@ -30,7 +30,7 @@ API_CALLABLE(N(GetActorPartSize)) { return ApiStatus_DONE2; } -extern s32 N(idleAnimations)[]; +extern s32 N(IdleAnimations)[]; extern EvtScript N(init); extern EvtScript N(takeTurn); extern EvtScript N(idle); @@ -47,12 +47,12 @@ extern EvtScript N(flee); extern EvtScript N(next_phase); extern EvtScript N(updateActorSize); -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -84,8 +84,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -96,8 +96,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -108,8 +108,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -120,8 +120,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -132,8 +132,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -144,8 +144,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -156,8 +156,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -168,8 +168,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -180,8 +180,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -192,8 +192,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -204,8 +204,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -216,8 +216,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -228,8 +228,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -240,8 +240,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -252,8 +252,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -264,8 +264,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -280,7 +280,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -295,7 +295,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_ShySquadGuy_Anim01, STATUS_STONE, ANIM_ShySquadGuy_Anim00, STATUS_SLEEP, ANIM_ShySquadGuy_Anim12, diff --git a/src/battle/area/omo2_2/actor/stilt_guy.c b/src/battle/area/omo2_2/actor/stilt_guy.c index 1e095850ba..d8c814e5da 100644 --- a/src/battle/area/omo2_2/actor/stilt_guy.c +++ b/src/battle/area/omo2_2/actor/stilt_guy.c @@ -17,7 +17,7 @@ API_CALLABLE(N(SetActorLevelToZero)) { #include "common/UnkBattleFunc1.inc.c" -extern s32 N(idleAnimations)[]; +extern s32 N(IdleAnimations)[]; extern EvtScript N(init); extern EvtScript N(takeTurn); extern EvtScript N(idle); @@ -33,7 +33,7 @@ extern EvtScript N(shy_guy_idle); extern EvtScript N(shy_guy_handleEvent); -s32 N(idleAnimations2)[] = { +s32 N(IdleAnimations2)[] = { STATUS_NORMAL, ANIM_StiltGuy_Anim01, STATUS_STONE, ANIM_StiltGuy_Anim00, STATUS_SLEEP, ANIM_StiltGuy_Anim04, @@ -47,7 +47,7 @@ s32 N(idleAnimations2)[] = { STATUS_END, }; -s32 N(idleAnimations3)[] = { +s32 N(IdleAnimations3)[] = { STATUS_NORMAL, ANIM_StiltGuyUnfold_Anim00, STATUS_END, }; @@ -57,13 +57,13 @@ s32 N(defenseTable2)[] = { ELEMENT_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_SHOCK, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 60, @@ -120,8 +120,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, @@ -132,7 +132,7 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 40 }, .opacity = 255, - .idleAnimations = N(idleAnimations2), + .idleAnimations = N(IdleAnimations2), .defenseTable = N(defenseTable2), .eventFlags = 0, .elementImmunityFlags = 0, @@ -168,7 +168,7 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations3), + .idleAnimations = N(IdleAnimations3), .defenseTable = N(defenseTable2), .eventFlags = 0, .elementImmunityFlags = 0, @@ -180,7 +180,7 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations3), + .idleAnimations = N(IdleAnimations3), .defenseTable = N(defenseTable2), .eventFlags = 0, .elementImmunityFlags = 0, @@ -192,7 +192,7 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations3), + .idleAnimations = N(IdleAnimations3), .defenseTable = N(defenseTable2), .eventFlags = 0, .elementImmunityFlags = 0, @@ -204,7 +204,7 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations3), + .idleAnimations = N(IdleAnimations3), .defenseTable = N(defenseTable2), .eventFlags = 0, .elementImmunityFlags = 0, @@ -220,7 +220,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -906,7 +906,7 @@ EvtScript N(shy_guy_on_spin_smash) = { EVT_END }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_ShyGuy_Red_Anim01, STATUS_STONE, ANIM_ShyGuy_Red_Anim00, STATUS_SLEEP, ANIM_ShyGuy_Red_Anim12, diff --git a/src/battle/area/omo2_3/actor/shy_stack.c b/src/battle/area/omo2_3/actor/shy_stack.c index 70402d68f7..e73392bb3c 100644 --- a/src/battle/area/omo2_3/actor/shy_stack.c +++ b/src/battle/area/omo2_3/actor/shy_stack.c @@ -17,10 +17,10 @@ API_CALLABLE(func_80231000_54CC70) { return ApiStatus_DONE2; } -extern s32 N(idleAnimations)[]; -extern s32 N(idleAnimations_rock)[]; -extern s32 N(idleAnimations_damage)[]; -extern s32 N(idleAnimations_shy_guy)[]; +extern s32 N(IdleAnimations)[]; +extern s32 N(IdleAnimations_rock)[]; +extern s32 N(IdleAnimations_damage)[]; +extern s32 N(IdleAnimations_shy_guy)[]; extern EvtScript N(init); extern EvtScript N(takeTurn); @@ -34,12 +34,12 @@ extern EvtScript N(onSpinSmash); extern EvtScript N(doSpinSmashHitLastGuy); extern EvtScript N(doSpinSmashHit); -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 60, @@ -71,8 +71,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 20 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -84,7 +84,7 @@ ActorPartBlueprint N(parts)[] = { .targetOffset = { -2, 67 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -96,7 +96,7 @@ ActorPartBlueprint N(parts)[] = { .targetOffset = { -2, 50 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -108,7 +108,7 @@ ActorPartBlueprint N(parts)[] = { .targetOffset = { -2, 33 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -120,7 +120,7 @@ ActorPartBlueprint N(parts)[] = { .targetOffset = { -2, 16 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -131,8 +131,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_rock), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations_rock), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -143,8 +143,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_rock), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations_rock), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -155,8 +155,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_rock), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations_rock), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -167,8 +167,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_rock), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations_rock), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -179,8 +179,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_damage), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations_damage), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -191,8 +191,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_shy_guy), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations_shy_guy), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -203,8 +203,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_shy_guy), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations_shy_guy), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -215,8 +215,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_shy_guy), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations_shy_guy), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -227,8 +227,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_shy_guy), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations_shy_guy), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -243,7 +243,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -258,7 +258,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 65 }, }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_ShyStackGuy_Anim04, STATUS_STONE, ANIM_ShyStackGuy_Anim00, STATUS_SLEEP, ANIM_ShyStackGuy_Anim00, @@ -273,7 +273,7 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations2)[] = { +s32 N(IdleAnimations2)[] = { STATUS_NORMAL, ANIM_ShyStackGuy_Anim05, STATUS_STONE, ANIM_ShyStackGuy_Anim01, STATUS_SLEEP, ANIM_ShyStackGuy_Anim01, @@ -288,7 +288,7 @@ s32 N(idleAnimations2)[] = { STATUS_END, }; -s32 N(idleAnimations3)[] = { +s32 N(IdleAnimations3)[] = { STATUS_NORMAL, ANIM_ShyStackGuy_Anim06, STATUS_STONE, ANIM_ShyStackGuy_Anim02, STATUS_SLEEP, ANIM_ShyStackGuy_Anim02, @@ -303,7 +303,7 @@ s32 N(idleAnimations3)[] = { STATUS_END, }; -s32 N(idleAnimations4)[] = { +s32 N(IdleAnimations4)[] = { STATUS_NORMAL, ANIM_ShyStackGuy_Anim07, STATUS_STONE, ANIM_ShyStackGuy_Anim03, STATUS_SLEEP, ANIM_ShyStackGuy_Anim03, @@ -318,17 +318,17 @@ s32 N(idleAnimations4)[] = { STATUS_END, }; -s32 N(idleAnimations_rock)[] = { +s32 N(IdleAnimations_rock)[] = { STATUS_NORMAL, ANIM_ShyStackRock_Anim00, STATUS_END, }; -s32 N(idleAnimations_damage)[] = { +s32 N(IdleAnimations_damage)[] = { STATUS_NORMAL, ANIM_ShyStackDamage_Anim00, STATUS_END, }; -s32 N(idleAnimations_shy_guy)[] = { +s32 N(IdleAnimations_shy_guy)[] = { STATUS_NORMAL, ANIM_ShyGuy_Red_Anim01, STATUS_END, }; @@ -969,7 +969,7 @@ EvtScript N(fall_apart) = { EVT_CALL(SetActorVar, ACTOR_SELF, 4, ANIM_ShyStackGuy_Anim11) EVT_CALL(SetActorVar, ACTOR_SELF, 5, ANIM_ShyStackGuy_Anim15) EVT_CALL(SetActorVar, ACTOR_SELF, 6, ANIM_ShyStackGuy_Anim1C) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations2))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations2))) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_MULTI_TARGET, FALSE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_NO_TARGET, FALSE) @@ -985,7 +985,7 @@ EvtScript N(fall_apart) = { EVT_CALL(SetActorVar, ACTOR_SELF, 4, ANIM_ShyStackGuy_Anim12) EVT_CALL(SetActorVar, ACTOR_SELF, 5, ANIM_ShyStackGuy_Anim16) EVT_CALL(SetActorVar, ACTOR_SELF, 6, ANIM_ShyStackGuy_Anim1D) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations3))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations3))) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_MULTI_TARGET, FALSE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_NO_TARGET, FALSE) @@ -1001,7 +1001,7 @@ EvtScript N(fall_apart) = { EVT_CALL(SetActorVar, ACTOR_SELF, 4, ANIM_ShyStackGuy_Anim13) EVT_CALL(SetActorVar, ACTOR_SELF, 5, ANIM_ShyStackGuy_Anim17) EVT_CALL(SetActorVar, ACTOR_SELF, 6, ANIM_ShyStackGuy_Anim1E) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations4))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations4))) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_MULTI_TARGET, FALSE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_NO_TARGET, FALSE) diff --git a/src/battle/area/omo2_4/actor/signal_guy.c b/src/battle/area/omo2_4/actor/signal_guy.c index 195251e3c8..d25a97bc08 100644 --- a/src/battle/area/omo2_4/actor/signal_guy.c +++ b/src/battle/area/omo2_4/actor/signal_guy.c @@ -6,19 +6,19 @@ #define NAMESPACE b_area_omo2_4_signal_guy -extern s32 N(idleAnimations)[]; +extern s32 N(IdleAnimations)[]; extern EvtScript N(init); extern EvtScript N(takeTurn); extern EvtScript N(idle); extern EvtScript N(handleEvent); -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -50,8 +50,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, @@ -66,7 +66,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -81,7 +81,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_MarshalGuy_Anim01, STATUS_END, }; diff --git a/src/battle/area/omo2_5/actor/shy_squad_dup.c b/src/battle/area/omo2_5/actor/shy_squad_dup.c index b3b7cf761b..8433bfeb86 100644 --- a/src/battle/area/omo2_5/actor/shy_squad_dup.c +++ b/src/battle/area/omo2_5/actor/shy_squad_dup.c @@ -6,7 +6,7 @@ #define NAMESPACE b_area_omo2_5_shy_squad_dup -extern s32 N(idleAnimations)[]; +extern s32 N(IdleAnimations)[]; extern EvtScript N(init); extern EvtScript N(takeTurn); extern EvtScript N(idle); @@ -23,12 +23,12 @@ extern EvtScript N(run_away); extern EvtScript N(attack); extern EvtScript N(run_squad_to_pos); -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -60,8 +60,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -72,8 +72,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -84,8 +84,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -96,8 +96,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -108,8 +108,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -120,8 +120,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -132,8 +132,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -144,8 +144,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -156,8 +156,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -168,8 +168,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -180,8 +180,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -192,8 +192,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -204,8 +204,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -216,8 +216,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -228,8 +228,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -240,8 +240,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -256,7 +256,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -271,13 +271,13 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_TankGuy_Anim01, STATUS_STOP, ANIM_TankGuy_Anim00, STATUS_END, }; -s32 N(idleAnimations_watt)[] = { +s32 N(IdleAnimations_watt)[] = { STATUS_NORMAL, ANIM_TankGuy_Anim07, STATUS_STOP, ANIM_TankGuy_Anim00, STATUS_END, @@ -426,17 +426,17 @@ EvtScript N(idle) = { EVT_LABEL(0) EVT_CALL(GetCurrentPartnerID, LVar0) EVT_IF_EQ(LVar0, PARTNER_WATT) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_watt))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_watt))) EVT_SET(LVar0, 2) EVT_LOOP(15) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, LVar0, EVT_PTR(N(idleAnimations_watt))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, LVar0, EVT_PTR(N(IdleAnimations_watt))) EVT_ADD(LVar0, 1) EVT_END_LOOP EVT_ELSE - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) EVT_SET(LVar0, 2) EVT_LOOP(15) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, LVar0, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, LVar0, EVT_PTR(N(IdleAnimations))) EVT_ADD(LVar0, 1) EVT_END_LOOP EVT_END_IF diff --git a/src/battle/area/omo2_6/actor/shy_guy_dup.c b/src/battle/area/omo2_6/actor/shy_guy_dup.c index 2cb3a82859..6dd9ad271b 100644 --- a/src/battle/area/omo2_6/actor/shy_guy_dup.c +++ b/src/battle/area/omo2_6/actor/shy_guy_dup.c @@ -5,19 +5,19 @@ #define NAMESPACE b_area_omo2_6_shy_guy_dup -extern s32 N(idleAnimations)[]; +extern s32 N(IdleAnimations)[]; extern EvtScript N(init); extern EvtScript N(takeTurn); extern EvtScript N(idle); extern EvtScript N(handleEvent); extern EvtScript N(run_to_pos); -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -50,7 +50,7 @@ ActorPartBlueprint N(parts)[] = { .targetOffset = { 0, 24 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -61,8 +61,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -73,8 +73,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -85,8 +85,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -97,8 +97,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -109,8 +109,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -121,8 +121,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -133,8 +133,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -145,8 +145,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -161,7 +161,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -176,7 +176,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_TankGuy_Anim01, STATUS_STONE, ANIM_TankGuy_Anim00, STATUS_SLEEP, ANIM_TankGuy_Anim00, diff --git a/src/battle/area/omo3/actor/big_lantern_ghost.c b/src/battle/area/omo3/actor/big_lantern_ghost.c index ccf5a4fc1f..2fcd96a7e3 100644 --- a/src/battle/area/omo3/actor/big_lantern_ghost.c +++ b/src/battle/area/omo3/actor/big_lantern_ghost.c @@ -7,7 +7,7 @@ #define NAMESPACE b_area_omo3_big_lantern_ghost -extern s32 N(idleAnimations)[]; +extern s32 N(IdleAnimations)[]; extern EvtScript N(init); extern EvtScript N(takeTurn); @@ -42,7 +42,7 @@ enum N(MoveIds) { N(MOVE_LIGHT_BEAM) = 2, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; @@ -52,7 +52,7 @@ s32 N(defenseTable2)[] = { ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 40, @@ -84,8 +84,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 54 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { -5, -10 }, @@ -96,7 +96,7 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { -40, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations), + .idleAnimations = N(IdleAnimations), .defenseTable = N(defenseTable2), .eventFlags = 0, .elementImmunityFlags = 0, @@ -113,7 +113,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -128,7 +128,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 20, 45 }, }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_BigLanternGhost_Anim01, STATUS_STONE, ANIM_BigLanternGhost_Anim00, STATUS_SLEEP, ANIM_BigLanternGhost_Anim0C, diff --git a/src/battle/area/pra/actor/albino_dino.c b/src/battle/area/pra/actor/albino_dino.c index de76ab41db..8fdd836e9c 100644 --- a/src/battle/area/pra/actor/albino_dino.c +++ b/src/battle/area/pra/actor/albino_dino.c @@ -11,7 +11,7 @@ extern EvtScript N(idle); extern EvtScript N(takeTurn); extern EvtScript N(handleEvent); -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_AlbinoDino_Anim03, STATUS_STONE, ANIM_AlbinoDino_Anim00, STATUS_SLEEP, ANIM_AlbinoDino_Anim03, @@ -24,13 +24,13 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 4, ELEMENT_FIRE, 99, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -62,8 +62,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -9, 46 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { -6, -17 }, @@ -78,7 +78,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 40, .airLiftChance = 15, .hurricaneChance = 10, diff --git a/src/battle/area/pra2/actor/crystal_bit.c b/src/battle/area/pra2/actor/crystal_bit.c index de90fce150..9fd9ca27e5 100644 --- a/src/battle/area/pra2/actor/crystal_bit.c +++ b/src/battle/area/pra2/actor/crystal_bit.c @@ -12,29 +12,29 @@ extern EvtScript N(idle); extern EvtScript N(handleEvent); extern EvtScript N(nextTurn); -s32 N(idleAnimations_1)[] = { +s32 N(IdleAnimations_1)[] = { STATUS_NORMAL, ANIM_CrystalKing_Anim0A, STATUS_END, }; -s32 N(idleAnimations_2)[] = { +s32 N(IdleAnimations_2)[] = { STATUS_NORMAL, ANIM_CrystalKing_Anim0B, STATUS_END, }; -s32 N(idleAnimations_3)[] = { +s32 N(IdleAnimations_3)[] = { STATUS_NORMAL, ANIM_CrystalKing_Anim0C, STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_FIRE, 0, ELEMENT_ICE, 99, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -66,8 +66,8 @@ ActorPartBlueprint N(parts_1)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 16 }, .opacity = 255, - .idleAnimations = N(idleAnimations_1), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations_1), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_ICY, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -79,7 +79,7 @@ ActorPartBlueprint N(parts_1)[] = { .targetOffset = { 0, -34 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_ICY, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -93,8 +93,8 @@ ActorPartBlueprint N(parts_2)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 16 }, .opacity = 255, - .idleAnimations = N(idleAnimations_2), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations_2), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_ICY, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -106,7 +106,7 @@ ActorPartBlueprint N(parts_2)[] = { .targetOffset = { 0, -34 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_ICY, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -120,8 +120,8 @@ ActorPartBlueprint N(parts_3)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 16 }, .opacity = 255, - .idleAnimations = N(idleAnimations_3), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations_3), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_ICY, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -133,7 +133,7 @@ ActorPartBlueprint N(parts_3)[] = { .targetOffset = { 0, -34 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_ICY, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -148,7 +148,7 @@ ActorBlueprint N(1) = { .partCount = ARRAY_COUNT(N(parts_1)), .partsData = N(parts_1), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -171,7 +171,7 @@ ActorBlueprint N(2) = { .partCount = ARRAY_COUNT(N(parts_2)), .partsData = N(parts_2), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -194,7 +194,7 @@ ActorBlueprint N(3) = { .partCount = ARRAY_COUNT(N(parts_3)), .partsData = N(parts_3), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, diff --git a/src/battle/area/pra2/actor/crystal_king.c b/src/battle/area/pra2/actor/crystal_king.c index c2beaf4f09..6358a79a05 100644 --- a/src/battle/area/pra2/actor/crystal_king.c +++ b/src/battle/area/pra2/actor/crystal_king.c @@ -55,7 +55,7 @@ extern EvtScript N(AttackIcyBreathWithClones); extern EvtScript N(NormalAttack); extern EvtScript N(Heal); -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_CrystalKing_Anim09, STATUS_SLEEP, ANIM_CrystalKing_Anim1B, STATUS_DIZZY, ANIM_CrystalKing_Anim1A, @@ -64,14 +64,14 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 2, ELEMENT_FIRE, 0, ELEMENT_ICE, 99, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 30, @@ -103,8 +103,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 54 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_ICY, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -22 }, @@ -119,7 +119,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, diff --git a/src/battle/area/sam/actor/frost_piranha.c b/src/battle/area/sam/actor/frost_piranha.c index 31b636e411..bcb65fe9b1 100644 --- a/src/battle/area/sam/actor/frost_piranha.c +++ b/src/battle/area/sam/actor/frost_piranha.c @@ -13,7 +13,7 @@ extern EvtScript N(handleEvent); extern EvtScript N(attack_bite); extern EvtScript N(attack_icy_breath); -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_LargePiranha_Frost_Anim01, STATUS_STONE, ANIM_LargePiranha_Frost_Anim00, STATUS_SLEEP, ANIM_LargePiranha_Frost_Anim00, @@ -26,14 +26,14 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_FIRE, -2, ELEMENT_ICE, 99, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 95, @@ -65,8 +65,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -15, 50 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_ICY, .elementImmunityFlags = 0, .projectileTargetOffset = { 3, -14 }, @@ -81,7 +81,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 70, .airLiftChance = 20, .hurricaneChance = 20, diff --git a/src/battle/area/sam/actor/gulpit.c b/src/battle/area/sam/actor/gulpit.c index 80e53c2463..68e2ac820e 100644 --- a/src/battle/area/sam/actor/gulpit.c +++ b/src/battle/area/sam/actor/gulpit.c @@ -11,7 +11,7 @@ extern EvtScript N(takeTurn); extern EvtScript N(idle); extern EvtScript N(handleEvent); -s32 N(idleAnimations1)[] = { +s32 N(IdleAnimations1)[] = { STATUS_NORMAL, ANIM_Gulpit_Anim01, STATUS_STONE, ANIM_Gulpit_Anim00, STATUS_SLEEP, ANIM_Gulpit_Anim0F, @@ -24,22 +24,22 @@ s32 N(idleAnimations1)[] = { STATUS_END, }; -s32 N(idleAnimations2)[] = { +s32 N(IdleAnimations2)[] = { STATUS_NORMAL, ANIM_Gulpit_Anim10, STATUS_END, }; -s32 N(idleAnimations3)[] = { +s32 N(IdleAnimations3)[] = { STATUS_NORMAL, ANIM_Gulpit_Anim12, STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 60, @@ -71,8 +71,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -7, 48 }, .opacity = 255, - .idleAnimations = N(idleAnimations1), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations1), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { -3, -23 }, @@ -83,8 +83,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations2), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations2), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -95,8 +95,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations3), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations3), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -111,7 +111,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 60, .airLiftChance = 50, .hurricaneChance = 50, diff --git a/src/battle/area/sam/actor/gulpit_rocks.c b/src/battle/area/sam/actor/gulpit_rocks.c index 0137545e21..09016c2507 100644 --- a/src/battle/area/sam/actor/gulpit_rocks.c +++ b/src/battle/area/sam/actor/gulpit_rocks.c @@ -11,22 +11,22 @@ extern EvtScript N(takeTurn); extern EvtScript N(idle); extern EvtScript N(handleEvent); -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_Gulpit_Anim10, STATUS_END, }; -s32 N(idleAnimations2)[] = { +s32 N(IdleAnimations2)[] = { STATUS_NORMAL, ANIM_Gulpit_Anim12, STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -58,8 +58,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 14 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -6 }, @@ -74,7 +74,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 100, .hurricaneChance = 0, @@ -96,12 +96,12 @@ EvtScript N(init) = { EVT_CALL(GetActorVar, ACTOR_SELF, 0, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Gulpit_Anim10) EVT_CALL(GetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(SetActorSize, ACTOR_SELF, 24, 15) EVT_CASE_EQ(1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations2))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations2))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Gulpit_Anim12) EVT_CALL(GetActorVar, ACTOR_SELF, 0, 1) EVT_CALL(SetActorSize, ACTOR_SELF, 10, 8) diff --git a/src/battle/area/sam2/actor/monstar.c b/src/battle/area/sam2/actor/monstar.c index 42899fe3b4..a8bb6aa26e 100644 --- a/src/battle/area/sam2/actor/monstar.c +++ b/src/battle/area/sam2/actor/monstar.c @@ -18,13 +18,13 @@ extern EvtScript N(nextTurn); extern EvtScript N(OnBurn); extern EvtScript N(OnDeath); -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_COSMIC, 99, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -49,7 +49,7 @@ s32 N(statusTable)[] = { STATUS_END, }; -extern s32 N(idleAnimations)[]; +extern s32 N(IdleAnimations)[]; ActorPartBlueprint N(parts)[] = { { @@ -58,8 +58,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_100, .elementImmunityFlags = 0, .projectileTargetOffset = { 1, -15 }, @@ -70,8 +70,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 50, 0 }, .targetOffset = { -6, 20 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_100, .elementImmunityFlags = 0, .projectileTargetOffset = { 1, -15 }, @@ -86,7 +86,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -101,7 +101,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_Monstar_Idle1, STATUS_STONE, ANIM_Monstar_Still, STATUS_SLEEP, ANIM_Monstar_Idle1, @@ -115,7 +115,7 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations2)[] = { +s32 N(IdleAnimations2)[] = { STATUS_NORMAL, ANIM_Monstar_GatherStrength1, STATUS_END, }; @@ -327,7 +327,7 @@ EvtScript N(unused) = { EVT_CALL(BattleCamTargetActor, ACTOR_SELF) EVT_CALL(MoveBattleCamOver, 30) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Monstar_GatherStrength1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations2))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations2))) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 40) EVT_SUB(LVar2, 5) @@ -424,7 +424,7 @@ EvtScript N(attack) = { EVT_SET(LVarA, LVar0) EVT_WAIT(170) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Monstar_Idle1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) EVT_CALL(MakeLerp, 200, 0, 60, EASING_LINEAR) EVT_LABEL(1) EVT_CALL(UpdateLerp) @@ -450,7 +450,7 @@ EvtScript N(attack) = { EVT_CASE_OR_EQ(HIT_RESULT_HIT) EVT_CASE_OR_EQ(HIT_RESULT_NO_DAMAGE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Monstar_Idle1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) EVT_CALL(MakeLerp, 200, 0, 60, EASING_LINEAR) EVT_LABEL(2) EVT_CALL(UpdateLerp) diff --git a/src/battle/area/tik/actor/dark_koopa.c b/src/battle/area/tik/actor/dark_koopa.c index ba6fa65a6f..cf16ef0887 100644 --- a/src/battle/area/tik/actor/dark_koopa.c +++ b/src/battle/area/tik/actor/dark_koopa.c @@ -11,9 +11,9 @@ extern EvtScript N(takeTurn); extern EvtScript N(idle); extern EvtScript N(handleEvent); -extern s32 N(idleAnimations)[]; +extern s32 N(IdleAnimations)[]; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 2, ELEMENT_SMASH, 2, ELEMENT_JUMP, 2, @@ -22,12 +22,12 @@ s32 N(defenseTable)[] = { ELEMENT_END, }; -s32 N(defenseTable_flipped)[] = { +s32 N(DefenseTable_flipped)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 80, @@ -59,8 +59,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -2, 36 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -7 }, @@ -75,7 +75,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 60, .airLiftChance = 85, .hurricaneChance = 75, @@ -90,7 +90,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 5, 32 }, }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_KoopaTroopa_Dark_Idle, STATUS_STONE, ANIM_KoopaTroopa_Dark_Still, STATUS_SLEEP, ANIM_KoopaTroopa_Dark_Sleep, @@ -103,7 +103,7 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations_step)[] = { +s32 N(IdleAnimations_step)[] = { STATUS_NORMAL, ANIM_KoopaTroopa_Dark_Walk, STATUS_STONE, ANIM_KoopaTroopa_Dark_Still, STATUS_SLEEP, ANIM_KoopaTroopa_Dark_Sleep, @@ -116,7 +116,7 @@ s32 N(idleAnimations_step)[] = { STATUS_END, }; -s32 N(idleAnimations_active)[] = { +s32 N(IdleAnimations_active)[] = { STATUS_NORMAL, ANIM_KoopaTroopa_Dark_Scramble, STATUS_STONE, ANIM_KoopaTroopa_Dark_Still, STATUS_SLEEP, ANIM_KoopaTroopa_Dark_Sleep, @@ -129,7 +129,7 @@ s32 N(idleAnimations_active)[] = { STATUS_END, }; -s32 N(idleAnimations_step_active)[] = { +s32 N(IdleAnimations_step_active)[] = { STATUS_NORMAL, ANIM_KoopaTroopa_Dark_Walk, STATUS_STONE, ANIM_KoopaTroopa_Dark_Still, STATUS_SLEEP, ANIM_KoopaTroopa_Dark_Sleep, @@ -142,7 +142,7 @@ s32 N(idleAnimations_step_active)[] = { STATUS_END, }; -s32 N(idleAnimations_flipped)[] = { +s32 N(IdleAnimations_flipped)[] = { STATUS_NORMAL, ANIM_KoopaTroopa_Dark_ToppleStruggle, STATUS_STONE, ANIM_KoopaTroopa_Dark_ToppleStill, STATUS_SLEEP, ANIM_KoopaTroopa_Dark_ToppleSleep, @@ -164,7 +164,7 @@ EvtScript N(init) = { EVT_CALL(SetActorVar, ACTOR_SELF, 8, 0) EVT_ELSE EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_active))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_active))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Scramble) EVT_END_IF EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) @@ -225,9 +225,9 @@ EvtScript N(idle) = { EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_step))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_step))) EVT_CASE_EQ(1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_step_active))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_step_active))) EVT_END_SWITCH EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) @@ -237,12 +237,12 @@ EvtScript N(idle) = { EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) EVT_CASE_EQ(1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_active))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_active))) EVT_CASE_OR_EQ(2) EVT_CASE_OR_EQ(3) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flipped))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_flipped))) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_LOOP(20) @@ -267,9 +267,9 @@ EvtScript N(idle) = { EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_step))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_step))) EVT_CASE_EQ(1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_step_active))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_step_active))) EVT_END_SWITCH EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 5) @@ -279,12 +279,12 @@ EvtScript N(idle) = { EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) EVT_CASE_EQ(1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_active))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_active))) EVT_CASE_OR_EQ(2) EVT_CASE_OR_EQ(3) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flipped))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_flipped))) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_LOOP(50) @@ -395,8 +395,8 @@ EvtScript N(handleEvent) = { EVT_CALL(SetActorVar, ACTOR_SELF, 8, 3) EVT_END_SWITCH EVT_CALL(SetActorVar, ACTOR_SELF, 9, 1) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_flipped))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flipped))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_flipped))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_flipped))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 15) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, TRUE) @@ -828,7 +828,7 @@ EvtScript N(standUp) = { EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 32) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -4) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE) @@ -837,10 +837,10 @@ EvtScript N(standUp) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(2) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) EVT_CASE_EQ(3) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_active))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_active))) EVT_END_SWITCH EVT_END_IF EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -861,20 +861,20 @@ EvtScript N(takeTurn) = { EVT_CALL(RandInt, 1000, LVar0) EVT_IF_LT(LVar0, 300) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) EVT_ELSE EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_active))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_active))) EVT_END_IF EVT_CASE_EQ(1) EVT_EXEC_WAIT(N(attackDizzyTornado)) EVT_CALL(RandInt, 1000, LVar0) EVT_IF_LT(LVar0, 300) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) EVT_ELSE EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_active))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_active))) EVT_END_IF EVT_CASE_OR_EQ(2) EVT_CASE_OR_EQ(3) diff --git a/src/battle/area/tik/actor/dark_paratroopa.c b/src/battle/area/tik/actor/dark_paratroopa.c index 9febfc5493..c1874d2821 100644 --- a/src/battle/area/tik/actor/dark_paratroopa.c +++ b/src/battle/area/tik/actor/dark_paratroopa.c @@ -18,11 +18,11 @@ extern EvtScript N(takeTurn_koopa); extern EvtScript N(idle_koopa); extern EvtScript N(handleEvent_koopa); -extern s32 N(idleAnimations)[]; -extern s32 N(idleAnimations2)[]; -extern s32 N(idleAnimations3)[]; +extern s32 N(IdleAnimations)[]; +extern s32 N(IdleAnimations2)[]; +extern s32 N(IdleAnimations3)[]; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 2, ELEMENT_SMASH, 2, ELEMENT_JUMP, 2, @@ -36,12 +36,12 @@ s32 N(defenseTable2)[] = { ELEMENT_END, }; -s32 N(defenseTable_koopa_flipped)[] = { +s32 N(DefenseTable_koopa_flipped)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_koopa)[] = { +s32 N(StatusTable_koopa)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 80, @@ -66,7 +66,7 @@ s32 N(statusTable_koopa)[] = { STATUS_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 80, @@ -98,8 +98,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -2, 36 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -7 }, @@ -110,7 +110,7 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -4, 36 }, .opacity = 255, - .idleAnimations = N(idleAnimations2), + .idleAnimations = N(IdleAnimations2), .defenseTable = N(defenseTable2), .eventFlags = ACTOR_EVENT_FLAG_GROUNDABLE, .elementImmunityFlags = 0, @@ -122,8 +122,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 32 }, .opacity = 255, - .idleAnimations = N(idleAnimations3), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations3), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -138,7 +138,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 50, .airLiftChance = 90, .hurricaneChance = 80, @@ -153,7 +153,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 8, 30 }, }; -s32 N(idleAnimations2)[] = { +s32 N(IdleAnimations2)[] = { STATUS_NORMAL, ANIM_ParaTroopa_Dark_Idle, STATUS_STONE, ANIM_ParaTroopa_Dark_Still, STATUS_SLEEP, ANIM_ParaTroopa_Dark_Sleep, @@ -166,7 +166,7 @@ s32 N(idleAnimations2)[] = { STATUS_END, }; -s32 N(idleAnimations_step)[] = { +s32 N(IdleAnimations_step)[] = { STATUS_NORMAL, ANIM_ParaTroopa_Dark_Idle, STATUS_STONE, ANIM_ParaTroopa_Dark_Still, STATUS_SLEEP, ANIM_ParaTroopa_Dark_Sleep, @@ -179,7 +179,7 @@ s32 N(idleAnimations_step)[] = { STATUS_END, }; -s32 N(idleAnimations3)[] = { +s32 N(IdleAnimations3)[] = { STATUS_NORMAL, ANIM_ParaTroopa_Dark_WingsStill, STATUS_STONE, ANIM_ParaTroopa_Dark_Still, STATUS_SLEEP, ANIM_ParaTroopa_Dark_Sleep, @@ -242,10 +242,10 @@ EvtScript N(idle) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(0.6)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_step))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations_step))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations2))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations2))) EVT_LOOP(20) EVT_LABEL(1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) @@ -259,10 +259,10 @@ EvtScript N(idle) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(0.6)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_step))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations_step))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations2))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations2))) EVT_LOOP(40) EVT_LABEL(2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) @@ -628,7 +628,7 @@ EvtScript N(fall) = { EVT_CALL(SetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Idle) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_koopa))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable_koopa))) EVT_CALL(BindNextTurn, ACTOR_SELF, 0) EVT_EXEC_WAIT(N(init_koopa)) EVT_CALL(SetActorType, ACTOR_SELF, ACTOR_TYPE_DARK_KOOPA) @@ -642,7 +642,7 @@ EvtScript N(fall) = { EVT_END }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_KoopaTroopa_Dark_Idle, STATUS_STONE, ANIM_KoopaTroopa_Dark_Still, STATUS_SLEEP, ANIM_KoopaTroopa_Dark_Sleep, @@ -655,7 +655,7 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations_koopa_step)[] = { +s32 N(IdleAnimations_koopa_step)[] = { STATUS_NORMAL, ANIM_KoopaTroopa_Dark_Walk, STATUS_STONE, ANIM_KoopaTroopa_Dark_Still, STATUS_SLEEP, ANIM_KoopaTroopa_Dark_Sleep, @@ -668,7 +668,7 @@ s32 N(idleAnimations_koopa_step)[] = { STATUS_END, }; -s32 N(idleAnimations_koopa_active)[] = { +s32 N(IdleAnimations_koopa_active)[] = { STATUS_NORMAL, ANIM_KoopaTroopa_Dark_Scramble, STATUS_STONE, ANIM_KoopaTroopa_Dark_Still, STATUS_SLEEP, ANIM_KoopaTroopa_Dark_Sleep, @@ -681,7 +681,7 @@ s32 N(idleAnimations_koopa_active)[] = { STATUS_END, }; -s32 N(idleAnimations_koopa_step_active)[] = { +s32 N(IdleAnimations_koopa_step_active)[] = { STATUS_NORMAL, ANIM_KoopaTroopa_Dark_Walk, STATUS_STONE, ANIM_KoopaTroopa_Dark_Still, STATUS_SLEEP, ANIM_KoopaTroopa_Dark_Sleep, @@ -694,7 +694,7 @@ s32 N(idleAnimations_koopa_step_active)[] = { STATUS_END, }; -s32 N(idleAnimations_koopa_flipped)[] = { +s32 N(IdleAnimations_koopa_flipped)[] = { STATUS_NORMAL, ANIM_KoopaTroopa_Dark_ToppleStruggle, STATUS_STONE, ANIM_KoopaTroopa_Dark_ToppleStill, STATUS_SLEEP, ANIM_KoopaTroopa_Dark_ToppleSleep, @@ -716,7 +716,7 @@ EvtScript N(init_koopa) = { EVT_CALL(SetActorVar, ACTOR_SELF, 8, 0) EVT_ELSE EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_koopa_active))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_koopa_active))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Dark_Scramble) EVT_END_IF EVT_CALL(SetActorVar, ACTOR_SELF, 1, 0) @@ -775,9 +775,9 @@ EvtScript N(idle_koopa) = { EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_koopa_step))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_koopa_step))) EVT_CASE_EQ(1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_koopa_step_active))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_koopa_step_active))) EVT_END_SWITCH EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) @@ -787,12 +787,12 @@ EvtScript N(idle_koopa) = { EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) EVT_CASE_EQ(1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_koopa_active))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_koopa_active))) EVT_CASE_OR_EQ(2) EVT_CASE_OR_EQ(3) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_koopa_flipped))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_koopa_flipped))) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_LOOP(20) @@ -817,9 +817,9 @@ EvtScript N(idle_koopa) = { EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_koopa_step))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_koopa_step))) EVT_CASE_EQ(1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_koopa_step_active))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_koopa_step_active))) EVT_END_SWITCH EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 5) @@ -829,12 +829,12 @@ EvtScript N(idle_koopa) = { EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) EVT_CASE_EQ(1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_koopa_active))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_koopa_active))) EVT_CASE_OR_EQ(2) EVT_CASE_OR_EQ(3) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_koopa_flipped))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_koopa_flipped))) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_LOOP(50) @@ -945,8 +945,8 @@ EvtScript N(handleEvent_koopa) = { EVT_CALL(SetActorVar, ACTOR_SELF, 8, 3) EVT_END_SWITCH EVT_CALL(SetActorVar, ACTOR_SELF, 9, 1) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_koopa_flipped))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_koopa_flipped))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_koopa_flipped))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_koopa_flipped))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 15) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, TRUE) @@ -1378,7 +1378,7 @@ EvtScript N(koopa_standUp) = { EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 32) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -4) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE) @@ -1387,10 +1387,10 @@ EvtScript N(koopa_standUp) = { EVT_SWITCH(LVar0) EVT_CASE_EQ(2) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) EVT_CASE_EQ(3) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_koopa_active))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_koopa_active))) EVT_END_SWITCH EVT_END_IF EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) @@ -1411,20 +1411,20 @@ EvtScript N(takeTurn_koopa) = { EVT_CALL(RandInt, 1000, LVar0) EVT_IF_LT(LVar0, 300) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) EVT_ELSE EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_koopa_active))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_koopa_active))) EVT_END_IF EVT_CASE_EQ(1) EVT_EXEC_WAIT(N(koopa_attackDizzyTornado)) EVT_CALL(RandInt, 1000, LVar0) EVT_IF_LT(LVar0, 300) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) EVT_ELSE EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_koopa_active))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_koopa_active))) EVT_END_IF EVT_CASE_OR_EQ(2) EVT_CASE_OR_EQ(3) diff --git a/src/battle/area/tik/actor/gloomba.c b/src/battle/area/tik/actor/gloomba.c index e48b47e668..b602d3341b 100644 --- a/src/battle/area/tik/actor/gloomba.c +++ b/src/battle/area/tik/actor/gloomba.c @@ -10,14 +10,14 @@ extern EvtScript N(takeTurn); extern EvtScript N(idle); extern EvtScript N(handleEvent); -extern s32 N(idleAnimations)[]; +extern s32 N(IdleAnimations)[]; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 70, @@ -49,8 +49,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 20 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -65,7 +65,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 70, .airLiftChance = 90, .hurricaneChance = 85, @@ -80,7 +80,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_Goomba_Dark_Idle, STATUS_STONE, ANIM_Goomba_Dark_Still, STATUS_SLEEP, ANIM_Goomba_Dark_Sleep, @@ -93,7 +93,7 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations_step)[] = { +s32 N(IdleAnimations_step)[] = { STATUS_NORMAL, ANIM_Goomba_Dark_Run, STATUS_STONE, ANIM_Goomba_Dark_Still, STATUS_SLEEP, ANIM_Goomba_Dark_Sleep, @@ -130,10 +130,10 @@ EvtScript N(idle) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_step))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_step))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) EVT_LOOP(20) EVT_LABEL(1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) @@ -146,10 +146,10 @@ EvtScript N(idle) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_step))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_step))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) EVT_LOOP(80) EVT_LABEL(2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) diff --git a/src/battle/area/tik/actor/paragloomba.c b/src/battle/area/tik/actor/paragloomba.c index cf2bf6477a..632371430a 100644 --- a/src/battle/area/tik/actor/paragloomba.c +++ b/src/battle/area/tik/actor/paragloomba.c @@ -17,12 +17,12 @@ extern EvtScript N(takeTurn_gloomba); extern EvtScript N(idle_gloomba); extern EvtScript N(handleEvent_gloomba); -extern s32 N(idleAnimations_gloomba)[]; -extern s32 N(idleAnimations)[]; -extern s32 N(idleAnimations_left_wing)[]; -extern s32 N(idleAnimations_right_wing)[]; +extern s32 N(IdleAnimations_gloomba)[]; +extern s32 N(IdleAnimations)[]; +extern s32 N(IdleAnimations_left_wing)[]; +extern s32 N(IdleAnimations_right_wing)[]; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; @@ -32,7 +32,7 @@ s32 N(defenseTable2)[] = { ELEMENT_END, }; -s32 N(statusTable_gloomba)[] = { +s32 N(StatusTable_gloomba)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 70, @@ -57,7 +57,7 @@ s32 N(statusTable_gloomba)[] = { STATUS_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 70, @@ -89,8 +89,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 20 }, .opacity = 255, - .idleAnimations = N(idleAnimations_gloomba), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations_gloomba), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -101,7 +101,7 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), + .idleAnimations = N(IdleAnimations), .defenseTable = N(defenseTable2), .eventFlags = ACTOR_EVENT_FLAG_GROUNDABLE, .elementImmunityFlags = 0, @@ -113,8 +113,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -16, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_left_wing), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations_left_wing), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -125,8 +125,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -16, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_right_wing), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations_right_wing), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -141,7 +141,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 65, .airLiftChance = 95, .hurricaneChance = 90, @@ -156,7 +156,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_Paragoomba_Dark_Idle, STATUS_STONE, ANIM_Paragoomba_Dark_Still, STATUS_SLEEP, ANIM_Paragoomba_Dark_Sleep, @@ -169,7 +169,7 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations_step)[] = { +s32 N(IdleAnimations_step)[] = { STATUS_NORMAL, ANIM_Paragoomba_Dark_Run, STATUS_STONE, ANIM_Paragoomba_Dark_Still, STATUS_SLEEP, ANIM_Paragoomba_Dark_Sleep, @@ -182,12 +182,12 @@ s32 N(idleAnimations_step)[] = { STATUS_END, }; -s32 N(idleAnimations_left_wing)[] = { +s32 N(IdleAnimations_left_wing)[] = { STATUS_NORMAL, ANIM_Paragoomba_Dark_LWingStill, STATUS_END, }; -s32 N(idleAnimations_right_wing)[] = { +s32 N(IdleAnimations_right_wing)[] = { STATUS_NORMAL, ANIM_Paragoomba_Dark_RWingStill, STATUS_END, }; @@ -216,7 +216,7 @@ EvtScript N(idle) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(0.6)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_step))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations_step))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) EVT_LOOP(20) @@ -233,7 +233,7 @@ EvtScript N(idle) = { EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(0.6)) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations))) EVT_LOOP(40) EVT_LABEL(2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) @@ -541,7 +541,7 @@ EvtScript N(fall) = { EVT_CALL(SetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Dark_Idle) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_gloomba))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable_gloomba))) EVT_CALL(SetActorType, ACTOR_SELF, ACTOR_TYPE_GLOOMBA) EVT_EXEC_WAIT(N(init_gloomba)) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_TYPE_CHANGED, TRUE) @@ -551,7 +551,7 @@ EvtScript N(fall) = { EVT_END }; -s32 N(idleAnimations_gloomba)[] = { +s32 N(IdleAnimations_gloomba)[] = { STATUS_NORMAL, ANIM_Goomba_Dark_Idle, STATUS_STONE, ANIM_Goomba_Dark_Still, STATUS_SLEEP, ANIM_Goomba_Dark_Sleep, @@ -564,7 +564,7 @@ s32 N(idleAnimations_gloomba)[] = { STATUS_END, }; -s32 N(idleAnimations_gloomba_step)[] = { +s32 N(IdleAnimations_gloomba_step)[] = { STATUS_NORMAL, ANIM_Goomba_Dark_Run, STATUS_STONE, ANIM_Goomba_Dark_Still, STATUS_SLEEP, ANIM_Goomba_Dark_Sleep, @@ -601,10 +601,10 @@ EvtScript N(idle_gloomba) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_gloomba_step))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_gloomba_step))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_gloomba))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_gloomba))) EVT_LOOP(20) EVT_LABEL(1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) @@ -617,10 +617,10 @@ EvtScript N(idle_gloomba) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_gloomba_step))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_gloomba_step))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_gloomba))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_gloomba))) EVT_LOOP(80) EVT_LABEL(2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) diff --git a/src/battle/area/tik/actor/spiked_gloomba.c b/src/battle/area/tik/actor/spiked_gloomba.c index ea2cce43e7..c8a54b71a7 100644 --- a/src/battle/area/tik/actor/spiked_gloomba.c +++ b/src/battle/area/tik/actor/spiked_gloomba.c @@ -11,14 +11,14 @@ extern EvtScript N(takeTurn); extern EvtScript N(idle); extern EvtScript N(handleEvent); -extern s32 N(idleAnimations)[]; +extern s32 N(IdleAnimations)[]; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 70, @@ -50,8 +50,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -12 }, @@ -66,7 +66,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 65, .airLiftChance = 90, .hurricaneChance = 85, @@ -81,7 +81,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_SpikedGoomba_Dark_Idle, STATUS_STONE, ANIM_SpikedGoomba_Dark_Still, STATUS_SLEEP, ANIM_SpikedGoomba_Dark_Sleep, @@ -94,7 +94,7 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations_step)[] = { +s32 N(IdleAnimations_step)[] = { STATUS_NORMAL, ANIM_SpikedGoomba_Dark_Run, STATUS_STONE, ANIM_SpikedGoomba_Dark_Still, STATUS_SLEEP, ANIM_SpikedGoomba_Dark_Sleep, @@ -131,10 +131,10 @@ EvtScript N(idle) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_step))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_step))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) EVT_LOOP(20) EVT_LABEL(1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) @@ -147,10 +147,10 @@ EvtScript N(idle) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_step))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_step))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) EVT_LOOP(80) EVT_LABEL(2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) diff --git a/src/battle/area/tik2/actor/blooper.c b/src/battle/area/tik2/actor/blooper.c index 46228526e5..c4ec858fd5 100644 --- a/src/battle/area/tik2/actor/blooper.c +++ b/src/battle/area/tik2/actor/blooper.c @@ -89,7 +89,7 @@ extern EvtScript N(onDeath); extern EvtScript N(attackSpinDrop); extern EvtScript N(attackInkBlast); -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_Blooper_Anim00, STATUS_STOP, ANIM_Blooper_Anim00, STATUS_SLEEP, ANIM_Blooper_Anim07, @@ -100,7 +100,7 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations2)[] = { +s32 N(IdleAnimations2)[] = { STATUS_NORMAL, ANIM_Blooper_Anim0C, STATUS_STOP, ANIM_Blooper_Anim00, STATUS_SLEEP, ANIM_Blooper_Anim07, @@ -111,7 +111,7 @@ s32 N(idleAnimations2)[] = { STATUS_END, }; -s32 N(idleAnimations3)[] = { +s32 N(IdleAnimations3)[] = { STATUS_NORMAL, ANIM_Blooper_Anim00, STATUS_STOP, ANIM_Blooper_Anim00, STATUS_SLEEP, ANIM_Blooper_Anim07, @@ -122,12 +122,12 @@ s32 N(idleAnimations3)[] = { STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 70, @@ -159,8 +159,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 50 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -172,7 +172,7 @@ ActorPartBlueprint N(parts)[] = { .targetOffset = { 0, 30 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -37 }, @@ -187,7 +187,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -227,7 +227,7 @@ EvtScript N(idle) = { EVT_IF_GE(LVar4, LVar1) EVT_GOTO(11) EVT_END_IF - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations2))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations2))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim00) EVT_WAIT(9) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim0C) @@ -248,7 +248,7 @@ EvtScript N(idle) = { EVT_IF_GE(LVar4, LVar1) EVT_GOTO(12) EVT_END_IF - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations2))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations2))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim00) EVT_WAIT(9) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim0C) @@ -263,7 +263,7 @@ EvtScript N(idle) = { EVT_WAIT(1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations3))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations3))) EVT_CALL(SetIdleGoalToHome, ACTOR_SELF) EVT_CALL(GetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, -10) diff --git a/src/battle/area/tik2/actor/blooper_baby.c b/src/battle/area/tik2/actor/blooper_baby.c index bc45ecbc07..c2187cfbb8 100644 --- a/src/battle/area/tik2/actor/blooper_baby.c +++ b/src/battle/area/tik2/actor/blooper_baby.c @@ -89,7 +89,7 @@ extern EvtScript N(idle); extern EvtScript N(handleEvent); extern EvtScript N(onDeath); -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_BabyBlooper_Anim00, STATUS_STOP, ANIM_BabyBlooper_Anim00, STATUS_SLEEP, ANIM_BabyBlooper_Anim06, @@ -100,7 +100,7 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations2)[] = { +s32 N(IdleAnimations2)[] = { STATUS_NORMAL, ANIM_BabyBlooper_Anim01, STATUS_STOP, ANIM_BabyBlooper_Anim00, STATUS_SLEEP, ANIM_BabyBlooper_Anim06, @@ -111,7 +111,7 @@ s32 N(idleAnimations2)[] = { STATUS_END, }; -s32 N(idleAnimations3)[] = { +s32 N(IdleAnimations3)[] = { STATUS_NORMAL, ANIM_BabyBlooper_Anim00, STATUS_STOP, ANIM_BabyBlooper_Anim00, STATUS_SLEEP, ANIM_BabyBlooper_Anim06, @@ -122,12 +122,12 @@ s32 N(idleAnimations3)[] = { STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 100, @@ -159,8 +159,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 85 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -172,7 +172,7 @@ ActorPartBlueprint N(parts)[] = { .targetOffset = { 0, 0 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 1, -13 }, @@ -187,7 +187,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -203,7 +203,7 @@ ActorBlueprint NAMESPACE = { }; #include "common/StartRumbleWithParams.inc.c" -#include "common/UnkBattleFunc2.inc.c" +#include "common/SpawnEnemyDrainFX.inc.c" EvtScript N(init) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn))) @@ -251,7 +251,7 @@ EvtScript N(idle) = { EVT_IF_GE(LVar4, LVar1) EVT_GOTO(11) EVT_END_IF - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations2))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations2))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BabyBlooper_Anim00) EVT_WAIT(9) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BabyBlooper_Anim01) @@ -272,7 +272,7 @@ EvtScript N(idle) = { EVT_IF_GE(LVar4, LVar1) EVT_GOTO(12) EVT_END_IF - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations2))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations2))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BabyBlooper_Anim00) EVT_WAIT(9) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BabyBlooper_Anim01) @@ -287,7 +287,7 @@ EvtScript N(idle) = { EVT_WAIT(1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations3))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations3))) EVT_CALL(SetGoalToHome, ACTOR_SELF) EVT_CALL(GetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, -5) @@ -563,11 +563,11 @@ EvtScript N(takeTurn) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) - EVT_CALL(N(UnkBattleFunc2), LVar0, LVar1, LVar2, LVar3) + EVT_CALL(N(SpawnDrainHealthStartFX), LVar0, LVar1, LVar2, LVar3) EVT_THREAD EVT_WAIT(15) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_25C) - EVT_CALL(N(UnkBattleFunc2_2), LVar0, LVar1, LVar2, LVar3) + EVT_CALL(N(SpawnDrainHealthContinueFX), LVar0, LVar1, LVar2, LVar3) EVT_END_THREAD EVT_ADD(LVar0, 20) EVT_ADD(LVar1, 20) diff --git a/src/battle/area/tik2/actor/electro_blooper.c b/src/battle/area/tik2/actor/electro_blooper.c index 7be95251f7..30aa55a9be 100644 --- a/src/battle/area/tik2/actor/electro_blooper.c +++ b/src/battle/area/tik2/actor/electro_blooper.c @@ -95,7 +95,7 @@ extern EvtScript N(attackSpinDrop); extern EvtScript N(attackInkBlast); extern EvtScript N(charge); -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_Blooper_Anim00, STATUS_STOP, ANIM_Blooper_Anim00, STATUS_SLEEP, ANIM_Blooper_Anim07, @@ -106,7 +106,7 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations2)[] = { +s32 N(IdleAnimations2)[] = { STATUS_NORMAL, ANIM_Blooper_Anim0C, STATUS_STOP, ANIM_Blooper_Anim00, STATUS_SLEEP, ANIM_Blooper_Anim07, @@ -117,7 +117,7 @@ s32 N(idleAnimations2)[] = { STATUS_END, }; -s32 N(idleAnimations3)[] = { +s32 N(IdleAnimations3)[] = { STATUS_NORMAL, ANIM_Blooper_Anim00, STATUS_STOP, ANIM_Blooper_Anim00, STATUS_SLEEP, ANIM_Blooper_Anim07, @@ -128,12 +128,12 @@ s32 N(idleAnimations3)[] = { STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 50, @@ -158,7 +158,7 @@ s32 N(statusTable)[] = { STATUS_END, }; -s32 N(statusTable_charged)[] = { +s32 N(StatusTable_charged)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 25, @@ -190,8 +190,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 80 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -203,7 +203,7 @@ ActorPartBlueprint N(parts)[] = { .targetOffset = { 0, 60 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -37 }, @@ -218,7 +218,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -329,7 +329,7 @@ EvtScript N(idle) = { EVT_IF_GE(LVar4, LVar1) EVT_GOTO(11) EVT_END_IF - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations2))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations2))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim00) EVT_WAIT(9) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim0C) @@ -350,7 +350,7 @@ EvtScript N(idle) = { EVT_IF_GE(LVar4, LVar1) EVT_GOTO(12) EVT_END_IF - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations2))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations2))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim00) EVT_WAIT(9) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim0C) @@ -365,7 +365,7 @@ EvtScript N(idle) = { EVT_WAIT(1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations3))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations3))) EVT_CALL(SetIdleGoalToHome, ACTOR_SELF) EVT_CALL(GetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, -10) @@ -867,7 +867,7 @@ EvtScript N(charge) = { EVT_CALL(SetPartEventFlags, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_ATTACK_CHARGED | ACTOR_EVENT_FLAG_ELECTRIFIED) EVT_CALL(func_8026ED20, ACTOR_SELF, 1, 1) EVT_CALL(func_8026EA7C, ACTOR_SELF, 1, 4) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_charged))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable_charged))) EVT_RETURN EVT_END }; @@ -886,7 +886,7 @@ EvtScript N(discharge) = { EVT_END_IF EVT_CALL(SetPartEventFlags, ACTOR_SELF, 2, 0) EVT_CALL(func_8026ED20, ACTOR_SELF, 1, 0) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable))) EVT_RETURN EVT_END }; diff --git a/src/battle/area/tik2/actor/super_blooper.c b/src/battle/area/tik2/actor/super_blooper.c index 0104e368ae..e2c4e52490 100644 --- a/src/battle/area/tik2/actor/super_blooper.c +++ b/src/battle/area/tik2/actor/super_blooper.c @@ -99,7 +99,7 @@ extern EvtScript N(unEnrage); extern Formation N(formation_baby_1); extern Formation N(formation_baby_2); -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_Blooper_Anim00, STATUS_STOP, ANIM_Blooper_Anim00, STATUS_SLEEP, ANIM_Blooper_Anim07, @@ -110,7 +110,7 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations2)[] = { +s32 N(IdleAnimations2)[] = { STATUS_NORMAL, ANIM_Blooper_Anim0C, STATUS_STOP, ANIM_Blooper_Anim00, STATUS_SLEEP, ANIM_Blooper_Anim07, @@ -121,7 +121,7 @@ s32 N(idleAnimations2)[] = { STATUS_END, }; -s32 N(idleAnimations3)[] = { +s32 N(IdleAnimations3)[] = { STATUS_NORMAL, ANIM_Blooper_Anim00, STATUS_STOP, ANIM_Blooper_Anim00, STATUS_SLEEP, ANIM_Blooper_Anim07, @@ -132,12 +132,12 @@ s32 N(idleAnimations3)[] = { STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 40, @@ -162,7 +162,7 @@ s32 N(statusTable)[] = { STATUS_END, }; -s32 N(statusTable_enraged)[] = { +s32 N(StatusTable_enraged)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -194,8 +194,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 80 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -207,7 +207,7 @@ ActorPartBlueprint N(parts)[] = { .targetOffset = { 0, 60 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -30 }, @@ -222,7 +222,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -284,7 +284,7 @@ EvtScript N(idle) = { EVT_IF_GE(LVar4, LVar1) EVT_GOTO(11) EVT_END_IF - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations2))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations2))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim00) EVT_WAIT(9) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim0C) @@ -305,7 +305,7 @@ EvtScript N(idle) = { EVT_IF_GE(LVar4, LVar1) EVT_GOTO(12) EVT_END_IF - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations2))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations2))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim00) EVT_WAIT(9) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Blooper_Anim0C) @@ -320,7 +320,7 @@ EvtScript N(idle) = { EVT_WAIT(1) EVT_GOTO(0) EVT_END_IF - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations3))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations3))) EVT_CALL(SetIdleGoalToHome, ACTOR_SELF) EVT_CALL(GetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, -10) @@ -874,7 +874,7 @@ EvtScript N(enrage) = { EVT_CALL(func_8026ED20, ACTOR_SELF, 1, 1) EVT_CALL(func_8026EBF8, ACTOR_SELF, 1, 0, 2, 0, 6, 12, 6, 0, 0) EVT_CALL(func_8026EA7C, ACTOR_SELF, 1, 15) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_enraged))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable_enraged))) EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_ATTACK_CHARGED, TRUE) EVT_RETURN EVT_END @@ -883,7 +883,7 @@ EvtScript N(enrage) = { EvtScript N(unEnrage) = { EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) EVT_CALL(func_8026ED20, ACTOR_SELF, 1, 0) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable))) EVT_CALL(SetPartEventBits, ACTOR_SELF, 2, ACTOR_EVENT_FLAG_ATTACK_CHARGED, FALSE) EVT_RETURN EVT_END diff --git a/src/battle/area/trd_part_1/actor/bill_blaster.c b/src/battle/area/trd_part_1/actor/bill_blaster.c index 39fc6dabc3..fafc6a9868 100644 --- a/src/battle/area/trd_part_1/actor/bill_blaster.c +++ b/src/battle/area/trd_part_1/actor/bill_blaster.c @@ -8,12 +8,12 @@ #define NAMESPACE A(bill_blaster) -s32 N(defenseTable_80219D20)[] = { +s32 N(DefenseTable_80219D20)[] = { ELEMENT_NORMAL, 1, ELEMENT_END, }; -s32 N(statusTable_80219D2C)[] = { +s32 N(StatusTable_80219D2C)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -38,18 +38,18 @@ s32 N(statusTable_80219D2C)[] = { STATUS_END, }; -extern s32 N(idleAnimations_80219E48)[]; +extern s32 N(IdleAnimations_80219E48)[]; extern EvtScript N(init_80219E6C); -ActorPartBlueprint N(partsTable_80219DD8)[] = { +ActorPartBlueprint N(PartsTable_80219DD8)[] = { { .flags = ACTOR_PART_FLAG_NO_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { -6, 29 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80219E48), - .defenseTable = N(defenseTable_80219D20), + .idleAnimations = N(IdleAnimations_80219E48), + .defenseTable = N(DefenseTable_80219D20), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -9 }, @@ -60,8 +60,8 @@ ActorPartBlueprint N(partsTable_80219DD8)[] = { .posOffset = { 100, 0, 0 }, .targetOffset = { -106, 29 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80219E48), - .defenseTable = N(defenseTable_80219D20), + .idleAnimations = N(IdleAnimations_80219E48), + .defenseTable = N(DefenseTable_80219D20), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -9 }, @@ -73,10 +73,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_BILL_BLASTER, .level = 10, .maxHP = 4, - .partCount = ARRAY_COUNT(N(partsTable_80219DD8)), - .partsData = N(partsTable_80219DD8), + .partCount = ARRAY_COUNT( N(PartsTable_80219DD8)), + .partsData = N(PartsTable_80219DD8), .initScript = &N(init_80219E6C), - .statusTable = N(statusTable_80219D2C), + .statusTable = N(StatusTable_80219D2C), .escapeChance = 0, .airLiftChance = 20, .hurricaneChance = 15, @@ -91,7 +91,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 5, 25 }, }; -s32 N(idleAnimations_80219E48)[] = { +s32 N(IdleAnimations_80219E48)[] = { STATUS_NORMAL, ANIM_BillBlaster_Anim01, STATUS_STONE, ANIM_BillBlaster_Anim00, STATUS_STOP, ANIM_BillBlaster_Anim00, diff --git a/src/battle/area/trd_part_1/actor/bob_omb.c b/src/battle/area/trd_part_1/actor/bob_omb.c index b7f77472a2..db2a6e3ee2 100644 --- a/src/battle/area/trd_part_1/actor/bob_omb.c +++ b/src/battle/area/trd_part_1/actor/bob_omb.c @@ -6,7 +6,7 @@ #define NAMESPACE b_area_trd_part_1_bob_omb -s32 N(idleAnimations_8021A510)[] = { +s32 N(IdleAnimations_8021A510)[] = { STATUS_NORMAL, ANIM_Bobomb_Anim02, STATUS_STONE, ANIM_Bobomb_Anim00, STATUS_SLEEP, ANIM_Bobomb_Anim18, @@ -19,7 +19,7 @@ s32 N(idleAnimations_8021A510)[] = { STATUS_END, }; -s32 N(idleAnimations_8021A55C)[] = { +s32 N(IdleAnimations_8021A55C)[] = { STATUS_NORMAL, ANIM_Bobomb_Anim05, STATUS_STONE, ANIM_Bobomb_Anim01, STATUS_SLEEP, ANIM_Bobomb_Anim18, @@ -32,12 +32,12 @@ s32 N(idleAnimations_8021A55C)[] = { STATUS_END, }; -s32 N(defenseTable_8021A5A8)[] = { +s32 N(DefenseTable_8021A5A8)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_8021A5B4)[] = { +s32 N(StatusTable_8021A5B4)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 75, @@ -62,7 +62,7 @@ s32 N(statusTable_8021A5B4)[] = { STATUS_END, }; -s32 N(statusTable_8021A660)[] = { +s32 N(StatusTable_8021A660)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -87,15 +87,15 @@ s32 N(statusTable_8021A660)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_8021A70C)[] = { +ActorPartBlueprint N(PartsTable_8021A70C)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021A510), - .defenseTable = N(defenseTable_8021A5A8), + .idleAnimations = N(IdleAnimations_8021A510), + .defenseTable = N(DefenseTable_8021A5A8), .eventFlags = ACTOR_EVENT_FLAG_EXPLODE_ON_IGNITION, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -9 }, @@ -109,10 +109,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_BOB_OMB, .level = 6, .maxHP = 3, - .partCount = ARRAY_COUNT(N(partsTable_8021A70C)), - .partsData = N(partsTable_8021A70C), + .partCount = ARRAY_COUNT( N(PartsTable_8021A70C)), + .partsData = N(PartsTable_8021A70C), .initScript = &N(init_8021A758), - .statusTable = N(statusTable_8021A5B4), + .statusTable = N(StatusTable_8021A5B4), .escapeChance = 70, .airLiftChance = 90, .hurricaneChance = 90, @@ -155,10 +155,10 @@ EvtScript N(ignite) = { EVT_END_IF EVT_LABEL(0) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021A55C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021A55C))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8021B4A8))) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_EXPLODE_ON_CONTACT, TRUE) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_8021A660))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable_8021A660))) EVT_CALL(PlayLoopingSoundAtActor, ACTOR_SELF, 0, 0x80000001) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Bobomb_Anim05) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) @@ -177,9 +177,9 @@ EvtScript N(ignite) = { EvtScript N(8021A9C8) = { EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_8021ACE8))) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021A510))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021A510))) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_EXPLODE_ON_CONTACT, FALSE) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_8021A5B4))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable_8021A5B4))) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar2, 2) EVT_PLAY_EFFECT(EFFECT_LANDING_DUST, 3, LVar0, LVar1, LVar2, 0, 0) diff --git a/src/battle/area/trd_part_1/actor/bullet_bill.c b/src/battle/area/trd_part_1/actor/bullet_bill.c index 6aacd54b81..17667291dd 100644 --- a/src/battle/area/trd_part_1/actor/bullet_bill.c +++ b/src/battle/area/trd_part_1/actor/bullet_bill.c @@ -6,12 +6,12 @@ #define NAMESPACE b_area_trd_part_1_bullet_bill -s32 N(defenseTable_80218F60)[] = { +s32 N(DefenseTable_80218F60)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_80218F6C)[] = { +s32 N(StatusTable_80218F6C)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -36,18 +36,18 @@ s32 N(statusTable_80218F6C)[] = { STATUS_END, }; -extern s32 N(idleAnimations_80219064)[]; +extern s32 N(IdleAnimations_80219064)[]; extern EvtScript N(init_80219088); -ActorPartBlueprint N(partsTable_80219018)[] = { +ActorPartBlueprint N(PartsTable_80219018)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 16 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80219064), - .defenseTable = N(defenseTable_80218F60), + .idleAnimations = N(IdleAnimations_80219064), + .defenseTable = N(DefenseTable_80218F60), .eventFlags = ACTOR_EVENT_FLAG_FIRE_EXPLODE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -6 }, @@ -59,10 +59,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_BULLET_BILL, .level = 5, .maxHP = 2, - .partCount = ARRAY_COUNT(N(partsTable_80219018)), - .partsData = N(partsTable_80219018), + .partCount = ARRAY_COUNT( N(PartsTable_80219018)), + .partsData = N(PartsTable_80219018), .initScript = &N(init_80219088), - .statusTable = N(statusTable_80218F6C), + .statusTable = N(StatusTable_80218F6C), .escapeChance = 50, .airLiftChance = 100, .hurricaneChance = 100, @@ -77,7 +77,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations_80219064)[] = { +s32 N(IdleAnimations_80219064)[] = { STATUS_NORMAL, ANIM_BulletBill_Anim01, STATUS_STONE, ANIM_BulletBill_Anim00, STATUS_STOP, ANIM_BulletBill_Anim00, diff --git a/src/battle/area/trd_part_2/actor/blue_ninja_koopa.c b/src/battle/area/trd_part_2/actor/blue_ninja_koopa.c index 36237dfd4a..c437d78ab8 100644 --- a/src/battle/area/trd_part_2/actor/blue_ninja_koopa.c +++ b/src/battle/area/trd_part_2/actor/blue_ninja_koopa.c @@ -6,24 +6,24 @@ #define NAMESPACE b_area_trd_part_2_blue_ninja_koopa -extern s32 N(idleAnimations_8022B5B0)[]; +extern s32 N(IdleAnimations_8022B5B0)[]; extern EvtScript N(init_8022DC2C); extern EvtScript N(idle_8022DD20); extern EvtScript N(handleEvent_8022DD88); extern EvtScript N(nextTurn_8022E424); extern EvtScript N(takeTurn_8022E414); -s32 N(defenseTable_8022B4A0)[] = { +s32 N(DefenseTable_8022B4A0)[] = { ELEMENT_NORMAL, 1, ELEMENT_END, }; -s32 N(defenseTable_8022B4AC)[] = { +s32 N(DefenseTable_8022B4AC)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_8022B4B8)[] = { +s32 N(StatusTable_8022B4B8)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 40, @@ -48,15 +48,15 @@ s32 N(statusTable_8022B4B8)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_8022B564)[] = { +ActorPartBlueprint N(PartsTable_8022B564)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { -5, 36 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8022B5B0), - .defenseTable = N(defenseTable_8022B4A0), + .idleAnimations = N(IdleAnimations_8022B5B0), + .defenseTable = N(DefenseTable_8022B4A0), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -68,10 +68,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_BLUE_NINJAKOOPA, .level = 17, .maxHP = 5, - .partCount = ARRAY_COUNT(N(partsTable_8022B564)), - .partsData = N(partsTable_8022B564), + .partCount = ARRAY_COUNT( N(PartsTable_8022B564)), + .partsData = N(PartsTable_8022B564), .initScript = &N(init_8022DC2C), - .statusTable = N(statusTable_8022B4B8), + .statusTable = N(StatusTable_8022B4B8), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -86,7 +86,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations_8022B5B0)[] = { +s32 N(IdleAnimations_8022B5B0)[] = { STATUS_NORMAL, ANIM_KoopaBros_Black_Anim04, STATUS_STONE, ANIM_KoopaBros_Black_Anim00, STATUS_SLEEP, ANIM_KoopaBros_Black_Anim15, @@ -100,7 +100,7 @@ s32 N(idleAnimations_8022B5B0)[] = { STATUS_END, }; -s32 N(idleAnimations_8022B604)[] = { +s32 N(IdleAnimations_8022B604)[] = { STATUS_NORMAL, ANIM_KoopaBros_Black_Anim05, STATUS_STONE, ANIM_KoopaBros_Black_Anim01, STATUS_POISON, ANIM_KoopaBros_Black_Anim01, @@ -111,7 +111,7 @@ s32 N(idleAnimations_8022B604)[] = { STATUS_END, }; -s32 N(idleAnimations_8022B640)[] = { +s32 N(IdleAnimations_8022B640)[] = { STATUS_NORMAL, ANIM_KoopaBros_Black_Anim0D, STATUS_STONE, ANIM_KoopaBros_Black_Anim01, STATUS_POISON, ANIM_KoopaBros_Black_Anim01, @@ -122,7 +122,7 @@ s32 N(idleAnimations_8022B640)[] = { STATUS_END, }; -s32 N(idleAnimations_8022B67C)[] = { +s32 N(IdleAnimations_8022B67C)[] = { STATUS_NORMAL, ANIM_KoopaBros_Black_Anim0C, STATUS_STONE, ANIM_KoopaBros_Black_Anim17, STATUS_SLEEP, ANIM_KoopaBros_Black_Anim17, @@ -136,12 +136,12 @@ s32 N(idleAnimations_8022B67C)[] = { STATUS_END, }; -s32 N(idleAnimations_8022B6D0)[] = { +s32 N(IdleAnimations_8022B6D0)[] = { STATUS_NORMAL, ANIM_KoopaBros_Black_Anim0A, STATUS_END, }; -s32 N(idleAnimations_8022B6DC)[] = { +s32 N(IdleAnimations_8022B6DC)[] = { STATUS_NORMAL, ANIM_KoopaBros_Black_Anim0C, STATUS_END, }; @@ -168,12 +168,12 @@ EvtScript N(8022B6E8) = { EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(3) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022B5B0))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022B5B0))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Black_Anim04) EVT_CASE_OR_EQ(4) EVT_CASE_OR_EQ(5) EVT_CASE_OR_EQ(6) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022B604))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022B604))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Black_Anim05) EVT_END_CASE_GROUP EVT_END_SWITCH @@ -185,7 +185,7 @@ EvtScript N(8022B6E8) = { EVT_CASE_OR_EQ(5) EVT_CASE_OR_EQ(6) EVT_WAIT(5) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022B640))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022B640))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Black_Anim0D) EVT_END_CASE_GROUP EVT_END_SWITCH @@ -202,10 +202,10 @@ EvtScript N(8022B6E8) = { EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) EVT_BITWISE_AND_CONST(LVar0, 192) EVT_IF_NE(LVar0, 192) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022B640))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022B640))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Black_Anim0D) EVT_ELSE - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022B6D0))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022B6D0))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Black_Anim0A) EVT_END_IF EVT_END_CASE_GROUP @@ -225,10 +225,10 @@ EvtScript N(8022B6E8) = { EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) EVT_BITWISE_AND_CONST(LVar0, 192) EVT_IF_NE(LVar0, 192) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022B640))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022B640))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Black_Anim0D) EVT_ELSE - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022B6D0))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022B6D0))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Black_Anim0A) EVT_END_IF EVT_END_CASE_GROUP @@ -266,7 +266,7 @@ EvtScript N(8022B6E8) = { EVT_CALL(N(UnkEnemyPosFunc), LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Black_Anim0A) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022B6D0))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022B6D0))) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_IF_EQ(LocalFlag(0), 1) EVT_CALL(N(StartRumbleWithParams), 256, 5) @@ -275,7 +275,7 @@ EvtScript N(8022B6E8) = { EVT_END_THREAD EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Black_Anim0C) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022B6DC))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022B6DC))) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HIDE_HP_BAR, FALSE) @@ -283,8 +283,8 @@ EvtScript N(8022B6E8) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022B67C))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_8022B4AC))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022B67C))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_8022B4AC))) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) EVT_CALL(SetActorVar, ACTOR_SELF, 2, 2) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 18) @@ -305,7 +305,7 @@ EvtScript N(8022B6E8) = { EVT_CALL(N(UnkEnemyPosFunc), LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Black_Anim0E) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022B6D0))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022B6D0))) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_IF_EQ(LocalFlag(0), 1) EVT_CALL(N(StartRumbleWithParams), 256, 5) @@ -321,7 +321,7 @@ EvtScript N(8022B6E8) = { EVT_DIVF(LVar3, EVT_FLOAT(10.0)) EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Black_Anim0C) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022B6DC))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022B6DC))) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HIDE_HP_BAR, FALSE) @@ -329,8 +329,8 @@ EvtScript N(8022B6E8) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022B67C))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_8022B4AC))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022B67C))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_8022B4AC))) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) EVT_CALL(SetActorVar, ACTOR_SELF, 2, 2) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 18) @@ -371,8 +371,8 @@ EvtScript N(8022B6E8) = { EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 36) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 2) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_8022B4A0))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022B5B0))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_8022B4A0))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022B5B0))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Black_Anim04) EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_END_IF @@ -736,8 +736,8 @@ EvtScript N(handleEvent_8022DD88) = { EVT_CASE_EQ(EVENT_FLIP_TRIGGER) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) EVT_CALL(SetActorVar, ACTOR_SELF, 2, 2) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022B67C))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_8022B4AC))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022B67C))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_8022B4AC))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 18) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) EVT_IF_EQ(LVar0, 0) diff --git a/src/battle/area/trd_part_2/actor/fake_bowser.c b/src/battle/area/trd_part_2/actor/fake_bowser.c index 7291270d20..e04e33e62d 100644 --- a/src/battle/area/trd_part_2/actor/fake_bowser.c +++ b/src/battle/area/trd_part_2/actor/fake_bowser.c @@ -31,18 +31,18 @@ BSS s32 D_80235FC0[31]; #include "world/common/atomic/UnkFunc27.inc.c" -s32 N(defenseTable_8021A670)[] = { +s32 N(DefenseTable_8021A670)[] = { ELEMENT_NORMAL, 1, ELEMENT_BLAST, 1, ELEMENT_END, }; -s32 N(defenseTable_8021A684)[] = { +s32 N(DefenseTable_8021A684)[] = { ELEMENT_NORMAL, 1, ELEMENT_END, }; -s32 N(statusTable_8021A690)[] = { +s32 N(StatusTable_8021A690)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, -1, STATUS_SLEEP, 0, @@ -67,20 +67,20 @@ s32 N(statusTable_8021A690)[] = { STATUS_END, }; -s32 N(idleAnimations_8021A73C)[] = { +s32 N(IdleAnimations_8021A73C)[] = { STATUS_NORMAL, ANIM_KoopaBros_Black_Anim04, STATUS_END, }; -ActorPartBlueprint N(partsTable_8021A748)[] = { +ActorPartBlueprint N(PartsTable_8021A748)[] = { { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 15 }, .targetOffset = { -46, 110 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021A73C), - .defenseTable = N(defenseTable_8021A670), + .idleAnimations = N(IdleAnimations_8021A73C), + .defenseTable = N(DefenseTable_8021A670), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -92,7 +92,7 @@ ActorPartBlueprint N(partsTable_8021A748)[] = { .targetOffset = { 0, 0 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable_8021A684), + .defenseTable = N(DefenseTable_8021A684), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -104,7 +104,7 @@ ActorPartBlueprint N(partsTable_8021A748)[] = { .targetOffset = { 0, 10 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable_8021A670), + .defenseTable = N(DefenseTable_8021A670), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -116,7 +116,7 @@ ActorPartBlueprint N(partsTable_8021A748)[] = { .targetOffset = { 0, 10 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable_8021A670), + .defenseTable = N(DefenseTable_8021A670), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -128,7 +128,7 @@ ActorPartBlueprint N(partsTable_8021A748)[] = { .targetOffset = { 0, 10 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable_8021A670), + .defenseTable = N(DefenseTable_8021A670), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -140,7 +140,7 @@ ActorPartBlueprint N(partsTable_8021A748)[] = { .targetOffset = { 0, 10 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable_8021A670), + .defenseTable = N(DefenseTable_8021A670), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -152,7 +152,7 @@ ActorPartBlueprint N(partsTable_8021A748)[] = { .targetOffset = { 0, 10 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable_8021A670), + .defenseTable = N(DefenseTable_8021A670), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -164,7 +164,7 @@ ActorPartBlueprint N(partsTable_8021A748)[] = { .targetOffset = { 0, 10 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable_8021A670), + .defenseTable = N(DefenseTable_8021A670), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -176,7 +176,7 @@ ActorPartBlueprint N(partsTable_8021A748)[] = { .targetOffset = { 0, 10 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable_8021A670), + .defenseTable = N(DefenseTable_8021A670), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -188,7 +188,7 @@ ActorPartBlueprint N(partsTable_8021A748)[] = { .targetOffset = { 0, 10 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable_8021A670), + .defenseTable = N(DefenseTable_8021A670), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -200,7 +200,7 @@ ActorPartBlueprint N(partsTable_8021A748)[] = { .targetOffset = { 0, 10 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable_8021A670), + .defenseTable = N(DefenseTable_8021A670), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -212,10 +212,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_FAKE_BOWSER, .level = 0, .maxHP = 10, - .partCount = ARRAY_COUNT(N(partsTable_8021A748)), - .partsData = N(partsTable_8021A748), + .partCount = ARRAY_COUNT( N(PartsTable_8021A748)), + .partsData = N(PartsTable_8021A748), .initScript = &N(init_8021A968), - .statusTable = N(statusTable_8021A690), + .statusTable = N(StatusTable_8021A690), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, diff --git a/src/battle/area/trd_part_2/actor/green_ninja_koopa.c b/src/battle/area/trd_part_2/actor/green_ninja_koopa.c index aa5c82558e..d8fd7ac1f7 100644 --- a/src/battle/area/trd_part_2/actor/green_ninja_koopa.c +++ b/src/battle/area/trd_part_2/actor/green_ninja_koopa.c @@ -6,24 +6,24 @@ #define NAMESPACE b_area_trd_part_2_green_ninja_koopa -extern s32 N(idleAnimations_80225670)[]; +extern s32 N(IdleAnimations_80225670)[]; extern EvtScript N(init_80227CEC); extern EvtScript N(idle_80227DE0); extern EvtScript N(handleEvent_80227E48); extern EvtScript N(nextTurn_802284E4); extern EvtScript N(takeTurn_802284D4); -s32 N(defenseTable_80225560)[] = { +s32 N(DefenseTable_80225560)[] = { ELEMENT_NORMAL, 1, ELEMENT_END, }; -s32 N(defenseTable_8022556C)[] = { +s32 N(DefenseTable_8022556C)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_80225578)[] = { +s32 N(StatusTable_80225578)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 70, @@ -48,15 +48,15 @@ s32 N(statusTable_80225578)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_80225624)[] = { +ActorPartBlueprint N(PartsTable_80225624)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { -5, 36 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80225670), - .defenseTable = N(defenseTable_80225560), + .idleAnimations = N(IdleAnimations_80225670), + .defenseTable = N(DefenseTable_80225560), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -68,10 +68,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_GREEN_NINJAKOOPA, .level = 16, .maxHP = 5, - .partCount = ARRAY_COUNT(N(partsTable_80225624)), - .partsData = N(partsTable_80225624), + .partCount = ARRAY_COUNT( N(PartsTable_80225624)), + .partsData = N(PartsTable_80225624), .initScript = &N(init_80227CEC), - .statusTable = N(statusTable_80225578), + .statusTable = N(StatusTable_80225578), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -86,7 +86,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations_80225670)[] = { +s32 N(IdleAnimations_80225670)[] = { STATUS_NORMAL, ANIM_KoopaBros_Green_Anim04, STATUS_STONE, ANIM_KoopaBros_Green_Anim00, STATUS_SLEEP, ANIM_KoopaBros_Green_Anim15, @@ -100,7 +100,7 @@ s32 N(idleAnimations_80225670)[] = { STATUS_END, }; -s32 N(idleAnimations_802256C4)[] = { +s32 N(IdleAnimations_802256C4)[] = { STATUS_NORMAL, ANIM_KoopaBros_Green_Anim05, STATUS_STONE, ANIM_KoopaBros_Green_Anim01, STATUS_POISON, ANIM_KoopaBros_Green_Anim01, @@ -111,7 +111,7 @@ s32 N(idleAnimations_802256C4)[] = { STATUS_END, }; -s32 N(idleAnimations_80225700)[] = { +s32 N(IdleAnimations_80225700)[] = { STATUS_NORMAL, ANIM_KoopaBros_Green_Anim0D, STATUS_STONE, ANIM_KoopaBros_Green_Anim01, STATUS_POISON, ANIM_KoopaBros_Green_Anim01, @@ -122,7 +122,7 @@ s32 N(idleAnimations_80225700)[] = { STATUS_END, }; -s32 N(idleAnimations_8022573C)[] = { +s32 N(IdleAnimations_8022573C)[] = { STATUS_NORMAL, ANIM_KoopaBros_Green_Anim0C, STATUS_STONE, ANIM_KoopaBros_Green_Anim17, STATUS_SLEEP, ANIM_KoopaBros_Green_Anim17, @@ -136,12 +136,12 @@ s32 N(idleAnimations_8022573C)[] = { STATUS_END, }; -s32 N(idleAnimations_80225790)[] = { +s32 N(IdleAnimations_80225790)[] = { STATUS_NORMAL, ANIM_KoopaBros_Green_Anim0A, STATUS_END, }; -s32 N(idleAnimations_8022579C)[] = { +s32 N(IdleAnimations_8022579C)[] = { STATUS_NORMAL, ANIM_KoopaBros_Green_Anim0C, STATUS_END, }; @@ -168,12 +168,12 @@ EvtScript N(802257A8) = { EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(3) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80225670))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80225670))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Green_Anim04) EVT_CASE_OR_EQ(4) EVT_CASE_OR_EQ(5) EVT_CASE_OR_EQ(6) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_802256C4))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_802256C4))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Green_Anim05) EVT_END_CASE_GROUP EVT_END_SWITCH @@ -185,7 +185,7 @@ EvtScript N(802257A8) = { EVT_CASE_OR_EQ(5) EVT_CASE_OR_EQ(6) EVT_WAIT(5) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80225700))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80225700))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Green_Anim0D) EVT_END_CASE_GROUP EVT_END_SWITCH @@ -202,10 +202,10 @@ EvtScript N(802257A8) = { EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) EVT_BITWISE_AND_CONST(LVar0, 192) EVT_IF_NE(LVar0, 192) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80225700))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80225700))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Green_Anim0D) EVT_ELSE - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80225790))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80225790))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Green_Anim0A) EVT_END_IF EVT_END_CASE_GROUP @@ -225,10 +225,10 @@ EvtScript N(802257A8) = { EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) EVT_BITWISE_AND_CONST(LVar0, 192) EVT_IF_NE(LVar0, 192) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80225700))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80225700))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Green_Anim0D) EVT_ELSE - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80225790))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80225790))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Green_Anim0A) EVT_END_IF EVT_END_CASE_GROUP @@ -266,7 +266,7 @@ EvtScript N(802257A8) = { EVT_CALL(N(UnkEnemyPosFunc), LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Green_Anim0A) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80225790))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80225790))) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_IF_EQ(LocalFlag(0), 1) EVT_CALL(N(StartRumbleWithParams), 256, 5) @@ -275,7 +275,7 @@ EvtScript N(802257A8) = { EVT_END_THREAD EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Green_Anim0C) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022579C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022579C))) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HIDE_HP_BAR, FALSE) @@ -283,8 +283,8 @@ EvtScript N(802257A8) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022573C))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_8022556C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022573C))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_8022556C))) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) EVT_CALL(SetActorVar, ACTOR_SELF, 2, 2) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 18) @@ -305,7 +305,7 @@ EvtScript N(802257A8) = { EVT_CALL(N(UnkEnemyPosFunc), LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Green_Anim0E) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80225790))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80225790))) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_IF_EQ(LocalFlag(0), 1) EVT_CALL(N(StartRumbleWithParams), 256, 5) @@ -321,7 +321,7 @@ EvtScript N(802257A8) = { EVT_DIVF(LVar3, EVT_FLOAT(10.0)) EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Green_Anim0C) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022579C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022579C))) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HIDE_HP_BAR, FALSE) @@ -329,8 +329,8 @@ EvtScript N(802257A8) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022573C))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_8022556C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022573C))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_8022556C))) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) EVT_CALL(SetActorVar, ACTOR_SELF, 2, 2) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 18) @@ -371,8 +371,8 @@ EvtScript N(802257A8) = { EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 36) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 2) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_80225560))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80225670))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_80225560))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80225670))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Green_Anim04) EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_END_IF @@ -736,8 +736,8 @@ EvtScript N(handleEvent_80227E48) = { EVT_CASE_EQ(EVENT_FLIP_TRIGGER) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) EVT_CALL(SetActorVar, ACTOR_SELF, 2, 2) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022573C))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_8022556C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022573C))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_8022556C))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 18) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) EVT_IF_EQ(LVar0, 0) diff --git a/src/battle/area/trd_part_2/actor/red_ninja_koopa.c b/src/battle/area/trd_part_2/actor/red_ninja_koopa.c index a23d76149a..830f274b0d 100644 --- a/src/battle/area/trd_part_2/actor/red_ninja_koopa.c +++ b/src/battle/area/trd_part_2/actor/red_ninja_koopa.c @@ -6,24 +6,24 @@ #define NAMESPACE b_area_trd_part_2_red_ninja_koopa -extern s32 N(idleAnimations_80228610)[]; +extern s32 N(IdleAnimations_80228610)[]; extern EvtScript N(init_8022AC8C); extern EvtScript N(idle_8022AD80); extern EvtScript N(handleEvent_8022ADE8); extern EvtScript N(nextTurn_8022B484); extern EvtScript N(takeTurn_8022B474); -s32 N(defenseTable_80228500)[] = { +s32 N(DefenseTable_80228500)[] = { ELEMENT_NORMAL, 1, ELEMENT_END, }; -s32 N(defenseTable_8022850C)[] = { +s32 N(DefenseTable_8022850C)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_80228518)[] = { +s32 N(StatusTable_80228518)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 30, @@ -48,15 +48,15 @@ s32 N(statusTable_80228518)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_802285C4)[] = { +ActorPartBlueprint N(PartsTable_802285C4)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { -5, 36 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80228610), - .defenseTable = N(defenseTable_80228500), + .idleAnimations = N(IdleAnimations_80228610), + .defenseTable = N(DefenseTable_80228500), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -68,10 +68,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_RED_NINJAKOOPA, .level = 17, .maxHP = 5, - .partCount = ARRAY_COUNT(N(partsTable_802285C4)), - .partsData = N(partsTable_802285C4), + .partCount = ARRAY_COUNT( N(PartsTable_802285C4)), + .partsData = N(PartsTable_802285C4), .initScript = &N(init_8022AC8C), - .statusTable = N(statusTable_80228518), + .statusTable = N(StatusTable_80228518), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -86,7 +86,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations_80228610)[] = { +s32 N(IdleAnimations_80228610)[] = { STATUS_NORMAL, ANIM_KoopaBros_Red_Anim04, STATUS_STONE, ANIM_KoopaBros_Red_Anim00, STATUS_SLEEP, ANIM_KoopaBros_Red_Anim15, @@ -100,7 +100,7 @@ s32 N(idleAnimations_80228610)[] = { STATUS_END, }; -s32 N(idleAnimations_80228664)[] = { +s32 N(IdleAnimations_80228664)[] = { STATUS_NORMAL, ANIM_KoopaBros_Red_Anim05, STATUS_STONE, ANIM_KoopaBros_Red_Anim01, STATUS_POISON, ANIM_KoopaBros_Red_Anim01, @@ -111,7 +111,7 @@ s32 N(idleAnimations_80228664)[] = { STATUS_END, }; -s32 N(idleAnimations_802286A0)[] = { +s32 N(IdleAnimations_802286A0)[] = { STATUS_NORMAL, ANIM_KoopaBros_Red_Anim0D, STATUS_STONE, ANIM_KoopaBros_Red_Anim01, STATUS_POISON, ANIM_KoopaBros_Red_Anim01, @@ -122,7 +122,7 @@ s32 N(idleAnimations_802286A0)[] = { STATUS_END, }; -s32 N(idleAnimations_802286DC)[] = { +s32 N(IdleAnimations_802286DC)[] = { STATUS_NORMAL, ANIM_KoopaBros_Red_Anim0C, STATUS_STONE, ANIM_KoopaBros_Red_Anim17, STATUS_SLEEP, ANIM_KoopaBros_Red_Anim17, @@ -136,12 +136,12 @@ s32 N(idleAnimations_802286DC)[] = { STATUS_END, }; -s32 N(idleAnimations_80228730)[] = { +s32 N(IdleAnimations_80228730)[] = { STATUS_NORMAL, ANIM_KoopaBros_Red_Anim0A, STATUS_END, }; -s32 N(idleAnimations_8022873C)[] = { +s32 N(IdleAnimations_8022873C)[] = { STATUS_NORMAL, ANIM_KoopaBros_Red_Anim0C, STATUS_END, }; @@ -168,12 +168,12 @@ EvtScript N(80228748) = { EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(3) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80228610))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80228610))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Red_Anim04) EVT_CASE_OR_EQ(4) EVT_CASE_OR_EQ(5) EVT_CASE_OR_EQ(6) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80228664))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80228664))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Red_Anim05) EVT_END_CASE_GROUP EVT_END_SWITCH @@ -185,7 +185,7 @@ EvtScript N(80228748) = { EVT_CASE_OR_EQ(5) EVT_CASE_OR_EQ(6) EVT_WAIT(5) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_802286A0))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_802286A0))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Red_Anim0D) EVT_END_CASE_GROUP EVT_END_SWITCH @@ -202,10 +202,10 @@ EvtScript N(80228748) = { EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) EVT_BITWISE_AND_CONST(LVar0, 192) EVT_IF_NE(LVar0, 192) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_802286A0))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_802286A0))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Red_Anim0D) EVT_ELSE - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80228730))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80228730))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Red_Anim0A) EVT_END_IF EVT_END_CASE_GROUP @@ -225,10 +225,10 @@ EvtScript N(80228748) = { EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) EVT_BITWISE_AND_CONST(LVar0, 192) EVT_IF_NE(LVar0, 192) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_802286A0))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_802286A0))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Red_Anim0D) EVT_ELSE - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80228730))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80228730))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Red_Anim0A) EVT_END_IF EVT_END_CASE_GROUP @@ -266,7 +266,7 @@ EvtScript N(80228748) = { EVT_CALL(N(UnkEnemyPosFunc), LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Red_Anim0A) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80228730))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80228730))) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_IF_EQ(LocalFlag(0), 1) EVT_CALL(N(StartRumbleWithParams), 256, 5) @@ -275,7 +275,7 @@ EvtScript N(80228748) = { EVT_END_THREAD EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Red_Anim0C) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022873C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022873C))) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HIDE_HP_BAR, FALSE) @@ -283,8 +283,8 @@ EvtScript N(80228748) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_802286DC))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_8022850C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_802286DC))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_8022850C))) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) EVT_CALL(SetActorVar, ACTOR_SELF, 2, 2) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 18) @@ -305,7 +305,7 @@ EvtScript N(80228748) = { EVT_CALL(N(UnkEnemyPosFunc), LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Red_Anim0E) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80228730))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80228730))) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_IF_EQ(LocalFlag(0), 1) EVT_CALL(N(StartRumbleWithParams), 256, 5) @@ -321,7 +321,7 @@ EvtScript N(80228748) = { EVT_DIVF(LVar3, EVT_FLOAT(10.0)) EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Red_Anim0C) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022873C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022873C))) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HIDE_HP_BAR, FALSE) @@ -329,8 +329,8 @@ EvtScript N(80228748) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_802286DC))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_8022850C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_802286DC))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_8022850C))) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) EVT_CALL(SetActorVar, ACTOR_SELF, 2, 2) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 18) @@ -371,8 +371,8 @@ EvtScript N(80228748) = { EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 36) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 2) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_80228500))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80228610))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_80228500))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80228610))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Red_Anim04) EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_END_IF @@ -736,8 +736,8 @@ EvtScript N(handleEvent_8022ADE8) = { EVT_CASE_EQ(EVENT_FLIP_TRIGGER) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) EVT_CALL(SetActorVar, ACTOR_SELF, 2, 2) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_802286DC))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_8022850C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_802286DC))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_8022850C))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 18) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) EVT_IF_EQ(LVar0, 0) diff --git a/src/battle/area/trd_part_2/actor/yellow_ninja_koopa.c b/src/battle/area/trd_part_2/actor/yellow_ninja_koopa.c index a3a06ce70b..788dc46253 100644 --- a/src/battle/area/trd_part_2/actor/yellow_ninja_koopa.c +++ b/src/battle/area/trd_part_2/actor/yellow_ninja_koopa.c @@ -6,24 +6,24 @@ #define NAMESPACE b_area_trd_part_2_yellow_ninja_koopa -extern s32 N(idleAnimations_8022E550)[]; +extern s32 N(IdleAnimations_8022E550)[]; extern EvtScript N(init_80230BCC); extern EvtScript N(idle_80230CC0); extern EvtScript N(handleEvent_80230D28); extern EvtScript N(nextTurn_802313C4); extern EvtScript N(takeTurn_802313B4); -s32 N(defenseTable_8022E440)[] = { +s32 N(DefenseTable_8022E440)[] = { ELEMENT_NORMAL, 1, ELEMENT_END, }; -s32 N(defenseTable_8022E44C)[] = { +s32 N(DefenseTable_8022E44C)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_8022E458)[] = { +s32 N(StatusTable_8022E458)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 60, @@ -48,15 +48,15 @@ s32 N(statusTable_8022E458)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_8022E504)[] = { +ActorPartBlueprint N(PartsTable_8022E504)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { -5, 36 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8022E550), - .defenseTable = N(defenseTable_8022E440), + .idleAnimations = N(IdleAnimations_8022E550), + .defenseTable = N(DefenseTable_8022E440), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -68,10 +68,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_YELLOW_NINJAKOOPA, .level = 16, .maxHP = 5, - .partCount = ARRAY_COUNT(N(partsTable_8022E504)), - .partsData = N(partsTable_8022E504), + .partCount = ARRAY_COUNT( N(PartsTable_8022E504)), + .partsData = N(PartsTable_8022E504), .initScript = &N(init_80230BCC), - .statusTable = N(statusTable_8022E458), + .statusTable = N(StatusTable_8022E458), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -86,7 +86,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations_8022E550)[] = { +s32 N(IdleAnimations_8022E550)[] = { STATUS_NORMAL, ANIM_KoopaBros_Yellow_Anim04, STATUS_STONE, ANIM_KoopaBros_Yellow_Anim00, STATUS_SLEEP, ANIM_KoopaBros_Yellow_Anim15, @@ -100,7 +100,7 @@ s32 N(idleAnimations_8022E550)[] = { STATUS_END, }; -s32 N(idleAnimations_8022E5A4)[] = { +s32 N(IdleAnimations_8022E5A4)[] = { STATUS_NORMAL, ANIM_KoopaBros_Yellow_Anim05, STATUS_STONE, ANIM_KoopaBros_Yellow_Anim01, STATUS_POISON, ANIM_KoopaBros_Yellow_Anim01, @@ -111,7 +111,7 @@ s32 N(idleAnimations_8022E5A4)[] = { STATUS_END, }; -s32 N(idleAnimations_8022E5E0)[] = { +s32 N(IdleAnimations_8022E5E0)[] = { STATUS_NORMAL, ANIM_KoopaBros_Yellow_Anim0D, STATUS_STONE, ANIM_KoopaBros_Yellow_Anim01, STATUS_POISON, ANIM_KoopaBros_Yellow_Anim01, @@ -122,7 +122,7 @@ s32 N(idleAnimations_8022E5E0)[] = { STATUS_END, }; -s32 N(idleAnimations_8022E61C)[] = { +s32 N(IdleAnimations_8022E61C)[] = { STATUS_NORMAL, ANIM_KoopaBros_Yellow_Anim0C, STATUS_STONE, ANIM_KoopaBros_Yellow_Anim17, STATUS_SLEEP, ANIM_KoopaBros_Yellow_Anim17, @@ -136,12 +136,12 @@ s32 N(idleAnimations_8022E61C)[] = { STATUS_END, }; -s32 N(idleAnimations_8022E670)[] = { +s32 N(IdleAnimations_8022E670)[] = { STATUS_NORMAL, ANIM_KoopaBros_Yellow_Anim0A, STATUS_END, }; -s32 N(idleAnimations_8022E67C)[] = { +s32 N(IdleAnimations_8022E67C)[] = { STATUS_NORMAL, ANIM_KoopaBros_Yellow_Anim0C, STATUS_END, }; @@ -168,12 +168,12 @@ EvtScript N(8022E688) = { EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(3) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022E550))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022E550))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Yellow_Anim04) EVT_CASE_OR_EQ(4) EVT_CASE_OR_EQ(5) EVT_CASE_OR_EQ(6) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022E5A4))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022E5A4))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Yellow_Anim05) EVT_END_CASE_GROUP EVT_END_SWITCH @@ -185,7 +185,7 @@ EvtScript N(8022E688) = { EVT_CASE_OR_EQ(5) EVT_CASE_OR_EQ(6) EVT_WAIT(5) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022E5E0))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022E5E0))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Yellow_Anim0D) EVT_END_CASE_GROUP EVT_END_SWITCH @@ -202,10 +202,10 @@ EvtScript N(8022E688) = { EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) EVT_BITWISE_AND_CONST(LVar0, 192) EVT_IF_NE(LVar0, 192) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022E5E0))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022E5E0))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Yellow_Anim0D) EVT_ELSE - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022E670))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022E670))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Yellow_Anim0A) EVT_END_IF EVT_END_CASE_GROUP @@ -225,10 +225,10 @@ EvtScript N(8022E688) = { EVT_CALL(GetActorVar, ACTOR_ENEMY4, 0, LVar0) EVT_BITWISE_AND_CONST(LVar0, 192) EVT_IF_NE(LVar0, 192) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022E5E0))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022E5E0))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Yellow_Anim0D) EVT_ELSE - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022E670))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022E670))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Yellow_Anim0A) EVT_END_IF EVT_END_CASE_GROUP @@ -266,7 +266,7 @@ EvtScript N(8022E688) = { EVT_CALL(N(UnkEnemyPosFunc), LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Yellow_Anim0A) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022E670))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022E670))) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_IF_EQ(LocalFlag(0), 1) EVT_CALL(N(StartRumbleWithParams), 256, 5) @@ -275,7 +275,7 @@ EvtScript N(8022E688) = { EVT_END_THREAD EVT_END_IF EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Yellow_Anim0C) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022E67C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022E67C))) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HIDE_HP_BAR, FALSE) @@ -283,8 +283,8 @@ EvtScript N(8022E688) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022E61C))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_8022E44C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022E61C))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_8022E44C))) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) EVT_CALL(SetActorVar, ACTOR_SELF, 2, 2) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 18) @@ -305,7 +305,7 @@ EvtScript N(8022E688) = { EVT_CALL(N(UnkEnemyPosFunc), LVar0, LVar1, LVar2) EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Yellow_Anim0E) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022E670))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022E670))) EVT_CALL(JumpToGoal, ACTOR_SELF, 20, FALSE, TRUE, FALSE) EVT_IF_EQ(LocalFlag(0), 1) EVT_CALL(N(StartRumbleWithParams), 256, 5) @@ -321,7 +321,7 @@ EvtScript N(8022E688) = { EVT_DIVF(LVar3, EVT_FLOAT(10.0)) EVT_PLAY_EFFECT(EFFECT_SMOKE_BURST, 0, LVar0, LVar1, LVar2, LVar3, 10, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Yellow_Anim0C) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022E67C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022E67C))) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) EVT_CALL(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_HIDE_HP_BAR, FALSE) @@ -329,8 +329,8 @@ EvtScript N(8022E688) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(ForceHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(HPBarToHome, ACTOR_SELF) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022E61C))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_8022E44C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022E61C))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_8022E44C))) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) EVT_CALL(SetActorVar, ACTOR_SELF, 2, 2) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 18) @@ -371,8 +371,8 @@ EvtScript N(8022E688) = { EVT_CALL(SetActorRotation, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 36) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 2) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_8022E440))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022E550))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_8022E440))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022E550))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaBros_Yellow_Anim04) EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_JUMP) EVT_END_IF @@ -736,8 +736,8 @@ EvtScript N(handleEvent_80230D28) = { EVT_CASE_EQ(EVENT_FLIP_TRIGGER) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) EVT_CALL(SetActorVar, ACTOR_SELF, 2, 2) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8022E61C))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_8022E44C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8022E61C))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_8022E44C))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 18) EVT_CALL(GetActorVar, ACTOR_SELF, 1, LVar0) EVT_IF_EQ(LVar0, 0) diff --git a/src/battle/common/actor/bandit.inc.c b/src/battle/common/actor/bandit.inc.c index 1a2e0d16ba..c4bc017b54 100644 --- a/src/battle/common/actor/bandit.inc.c +++ b/src/battle/common/actor/bandit.inc.c @@ -13,7 +13,7 @@ extern EvtScript N(handleEvent); BSS s32 N(thread_dropCoin)[1]; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_Bandit_Anim01, STATUS_STONE, ANIM_Bandit_Anim00, STATUS_SLEEP, ANIM_Bandit_Anim10, @@ -26,7 +26,7 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations_holdCoin)[] = { +s32 N(IdleAnimations_holdCoin)[] = { STATUS_NORMAL, ANIM_Bandit_Anim02, STATUS_STONE, ANIM_Bandit_Anim04, STATUS_SLEEP, ANIM_Bandit_Anim10, @@ -39,17 +39,17 @@ s32 N(idleAnimations_holdCoin)[] = { STATUS_END, }; -s32 N(idleAnimations_coin)[] = { +s32 N(IdleAnimations_coin)[] = { STATUS_NORMAL, ANIM_Bandit_Anim14, STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 70, @@ -81,8 +81,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -2, 28 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -12 }, @@ -93,8 +93,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 30, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_coin), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations_coin), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -108,8 +108,8 @@ ActorPartBlueprint N(parts_coin)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_coin), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations_coin), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -124,7 +124,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 40, .airLiftChance = 90, .hurricaneChance = 90, @@ -147,7 +147,7 @@ ActorBlueprint N(coin) = { .partCount = ARRAY_COUNT(N(parts_coin)), .partsData = N(parts_coin), .initScript = &N(init_coin), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 40, .airLiftChance = 90, .hurricaneChance = 90, @@ -201,7 +201,7 @@ EvtScript N(dropCoin) = { EVT_CASE_EQ(0) EVT_CASE_EQ(1) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_USE_ABSOLUTE_POSITION, FALSE) EVT_CALL(SummonEnemy, EVT_PTR(N(formation_coin)), 0) EVT_SET(LVarA, LVar0) @@ -659,7 +659,7 @@ EvtScript N(takeTurn) = { EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.8)) EVT_CALL(SetGoalPos, ACTOR_SELF, LVarA, LVarB, LVarC) EVT_CALL(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_holdCoin))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_holdCoin))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Bandit_Anim0E) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_WAIT(7) diff --git a/src/battle/common/actor/buzzy_beetle.inc.c b/src/battle/common/actor/buzzy_beetle.inc.c index 8f67a8147f..291b896873 100644 --- a/src/battle/common/actor/buzzy_beetle.inc.c +++ b/src/battle/common/actor/buzzy_beetle.inc.c @@ -4,7 +4,7 @@ #include "script_api/battle.h" #include "sprite/npc/BuzzyBeetle.h" -extern s32 N(idleAnimations)[]; +extern s32 N(IdleAnimations)[]; extern EvtScript N(init); extern EvtScript N(idle); extern EvtScript N(takeTurn_ceiling); @@ -12,19 +12,19 @@ extern EvtScript N(handleEvent_ceiling); extern EvtScript N(takeTurn); extern EvtScript N(handleEvent); -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 2, ELEMENT_FIRE, 99, ELEMENT_BLAST, 99, ELEMENT_END, }; -s32 N(defenseTable_flipped)[] = { +s32 N(DefenseTable_flipped)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 90, @@ -56,8 +56,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 16 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, .projectileTargetOffset = { 1, 7 }, @@ -72,7 +72,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 60, .airLiftChance = 75, .hurricaneChance = 75, @@ -87,7 +87,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 8, 13 }, }; -s32 N(idleAnimations_normal)[] = { +s32 N(IdleAnimations_normal)[] = { STATUS_NORMAL, ANIM_BuzzyBeetle_Anim01, STATUS_STONE, ANIM_BuzzyBeetle_Anim00, STATUS_SLEEP, ANIM_BuzzyBeetle_Anim09, @@ -100,7 +100,7 @@ s32 N(idleAnimations_normal)[] = { STATUS_END, }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_BuzzyBeetle_Anim0F, STATUS_STONE, ANIM_BuzzyBeetle_Anim0E, STATUS_SLEEP, ANIM_BuzzyBeetle_Anim14, @@ -113,7 +113,7 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations_flipped)[] = { +s32 N(IdleAnimations_flipped)[] = { STATUS_NORMAL, ANIM_BuzzyBeetle_Anim02, STATUS_STONE, ANIM_BuzzyBeetle_Anim1A, STATUS_SLEEP, ANIM_BuzzyBeetle_Anim1B, @@ -142,7 +142,7 @@ EvtScript N(init) = { EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -9) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_normal))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_normal))) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, TRUE) EVT_END_IF @@ -167,8 +167,8 @@ EvtScript N(fallOff) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent))) EVT_CALL(SetActorVar, ACTOR_SELF, 9, 1) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_flipped))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flipped))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_flipped))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_flipped))) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, TRUE) @@ -372,8 +372,8 @@ EvtScript N(handleEvent) = { EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 16) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -9) EVT_CALL(SetActorVar, ACTOR_SELF, 9, 1) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_flipped))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flipped))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_flipped))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_flipped))) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_BuzzyBeetle_Anim07) EVT_CALL(SetActorRotationOffset, ACTOR_SELF, 0, 12, 0) @@ -552,7 +552,7 @@ EvtScript N(takeTurn_ceiling) = { EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(takeTurn))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_normal))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_normal))) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, TRUE) EVT_CALL(GetIndexFromPos, ACTOR_SELF, LVar0) @@ -708,8 +708,8 @@ EvtScript N(takeTurn) = { EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 16) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -9) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_normal))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_normal))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle))) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE) EVT_END_IF diff --git a/src/battle/common/actor/bzzap.inc.c b/src/battle/common/actor/bzzap.inc.c index 0b717a5d4e..47765c80d8 100644 --- a/src/battle/common/actor/bzzap.inc.c +++ b/src/battle/common/actor/bzzap.inc.c @@ -8,7 +8,7 @@ extern EvtScript N(takeTurn); extern EvtScript N(idle); extern EvtScript N(handleEvent); -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_Bzzap_Anim01, STATUS_STONE, ANIM_Bzzap_Anim00, STATUS_SLEEP, ANIM_Bzzap_Anim09, @@ -21,12 +21,12 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 60, @@ -58,8 +58,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -7, 33 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 2, -10 }, @@ -70,8 +70,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -5 }, @@ -82,8 +82,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -5 }, @@ -94,8 +94,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -5 }, @@ -106,8 +106,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -5 }, @@ -118,8 +118,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -5 }, @@ -134,7 +134,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 40, .airLiftChance = 95, .hurricaneChance = 95, diff --git a/src/battle/common/actor/clubba.inc.c b/src/battle/common/actor/clubba.inc.c index 8f7112f7a9..0b4d109576 100644 --- a/src/battle/common/actor/clubba.inc.c +++ b/src/battle/common/actor/clubba.inc.c @@ -8,7 +8,7 @@ extern EvtScript N(takeTurn); extern EvtScript N(idle); extern EvtScript N(handleEvent); -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_BattleClubba_Anim01, STATUS_STONE, ANIM_BattleClubba_Anim00, STATUS_SLEEP, ANIM_BattleClubba_Anim03, @@ -21,12 +21,12 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 90, @@ -58,8 +58,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -12, 32 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 8, -3 }, @@ -74,7 +74,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 60, .airLiftChance = 60, .hurricaneChance = 70, diff --git a/src/battle/common/actor/duplighost.inc.c b/src/battle/common/actor/duplighost.inc.c index 47bdfb4b31..b97c912f53 100644 --- a/src/battle/common/actor/duplighost.inc.c +++ b/src/battle/common/actor/duplighost.inc.c @@ -10,7 +10,7 @@ extern EvtScript N(idle); extern EvtScript N(handleEvent); extern EvtScript N(nextTurn); -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_Duplighost_Anim02, STATUS_STONE, ANIM_Duplighost_Anim00, STATUS_SLEEP, ANIM_Duplighost_Anim0D, @@ -23,22 +23,22 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations2)[] = { +s32 N(IdleAnimations2)[] = { STATUS_NORMAL, ANIM_Duplighost_Anim0A, STATUS_END, }; -s32 N(idleAnimations3)[] = { +s32 N(IdleAnimations3)[] = { STATUS_NORMAL, ANIM_Duplighost_Anim04, STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 60, @@ -70,8 +70,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -5, 25 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { -2, -10 }, @@ -86,7 +86,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 50, .airLiftChance = 80, .hurricaneChance = 70, @@ -353,7 +353,7 @@ EvtScript N(OnHitElectric) = { EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) EVT_CALL(SetActorVar, LVarA, 8, 2) EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar0, ACTOR_PART_FLAG_INVISIBLE, TRUE) - EVT_CALL(SetIdleAnimations, LVarA, 1, EVT_PTR(N(idleAnimations2))) + EVT_CALL(SetIdleAnimations, LVarA, 1, EVT_PTR(N(IdleAnimations2))) EVT_CALL(SetAnimation, LVarA, 1, ANIM_Duplighost_Anim0A) EVT_WAIT(30) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -372,7 +372,7 @@ EvtScript N(OnHitElectric) = { EVT_END_IF EVT_CALL(ForceHomePos, LVarA, LVarB, LVarC, LVarD) EVT_CALL(HPBarToHome, LVarA) - EVT_CALL(SetIdleAnimations, LVarA, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, LVarA, 1, EVT_PTR(N(IdleAnimations))) EVT_CALL(SetAnimation, LVarA, 1, ANIM_Duplighost_Anim02) EVT_CALL(SetActorPos, ACTOR_SELF, NPC_DISPOSE_LOCATION) EVT_CALL(ForceHomePos, ACTOR_SELF, NPC_DISPOSE_LOCATION) @@ -422,7 +422,7 @@ EvtScript N(OnShockHit) = { EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_SHADOW, TRUE) EVT_CALL(SetActorVar, LVarA, 8, 3) EVT_CALL(SetPartFlagBits, ACTOR_SELF, LVar9, ACTOR_PART_FLAG_INVISIBLE, TRUE) - EVT_CALL(SetIdleAnimations, LVarA, 1, EVT_PTR(N(idleAnimations2))) + EVT_CALL(SetIdleAnimations, LVarA, 1, EVT_PTR(N(IdleAnimations2))) EVT_CALL(SetAnimation, LVarA, 1, ANIM_Duplighost_Anim0A) EVT_WAIT(15) EVT_CALL(UseBattleCamPreset, BTL_CAM_PRESET_C) @@ -441,7 +441,7 @@ EvtScript N(OnShockHit) = { EVT_WAIT(20) EVT_CALL(AddActorDecoration, LVarA, 1, 0, ACTOR_DECORATION_SWEAT) EVT_CALL(SetActorYaw, LVarA, 180) - EVT_CALL(SetIdleAnimations, LVarA, 1, EVT_PTR(N(idleAnimations3))) + EVT_CALL(SetIdleAnimations, LVarA, 1, EVT_PTR(N(IdleAnimations3))) EVT_CALL(SetAnimation, LVarA, 1, ANIM_Duplighost_Anim04) EVT_CALL(SetActorSpeed, LVarA, EVT_FLOAT(8.0)) EVT_CALL(SetGoalToHome, ACTOR_SELF) @@ -451,7 +451,7 @@ EvtScript N(OnShockHit) = { EVT_CALL(SetAnimation, LVarA, 1, ANIM_Duplighost_Anim02) EVT_CALL(SetActorYaw, LVarA, 0) EVT_CALL(RemoveActorDecoration, LVarA, 1, 0) - EVT_CALL(SetIdleAnimations, LVarA, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, LVarA, 1, EVT_PTR(N(IdleAnimations))) EVT_CALL(ForceHomePos, LVarA, LVarB, 0, LVarD) EVT_CALL(HPBarToHome, LVarA) EVT_CALL(SetActorPos, ACTOR_SELF, NPC_DISPOSE_LOCATION) diff --git a/src/battle/common/actor/ember.inc.c b/src/battle/common/actor/ember.inc.c index f8f760ef61..012da3fab6 100644 --- a/src/battle/common/actor/ember.inc.c +++ b/src/battle/common/actor/ember.inc.c @@ -3,7 +3,7 @@ #include "script_api/battle.h" #include "sprite/npc/LavaBubble.h" -s32 N(defenseTable_8021ACB0)[] = { +s32 N(DefenseTable_8021ACB0)[] = { ELEMENT_NORMAL, 0, ELEMENT_WATER, -2, ELEMENT_ICE, -2, @@ -11,7 +11,7 @@ s32 N(defenseTable_8021ACB0)[] = { ELEMENT_END, }; -s32 N(statusTable_8021ACD4)[] = { +s32 N(StatusTable_8021ACD4)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -36,18 +36,18 @@ s32 N(statusTable_8021ACD4)[] = { STATUS_END, }; -extern s32 N(idleAnimations_8021AE5C)[]; -extern s32 N(idleAnimations_8021AEA8)[]; +extern s32 N(IdleAnimations_8021AE5C)[]; +extern s32 N(IdleAnimations_8021AEA8)[]; -ActorPartBlueprint N(partsTable_8021AD80)[] = { +ActorPartBlueprint N(PartsTable_8021AD80)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { -2, 25 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021AE5C), - .defenseTable = N(defenseTable_8021ACB0), + .idleAnimations = N(IdleAnimations_8021AE5C), + .defenseTable = N(DefenseTable_8021ACB0), .eventFlags = ACTOR_EVENT_FLAG_FIREY, .elementImmunityFlags = 0, .projectileTargetOffset = { -3, -10 }, @@ -58,8 +58,8 @@ ActorPartBlueprint N(partsTable_8021AD80)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021AEA8), - .defenseTable = N(defenseTable_8021ACB0), + .idleAnimations = N(IdleAnimations_8021AEA8), + .defenseTable = N(DefenseTable_8021ACB0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, @@ -70,8 +70,8 @@ ActorPartBlueprint N(partsTable_8021AD80)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021AEA8), - .defenseTable = N(defenseTable_8021ACB0), + .idleAnimations = N(IdleAnimations_8021AEA8), + .defenseTable = N(DefenseTable_8021ACB0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, @@ -82,8 +82,8 @@ ActorPartBlueprint N(partsTable_8021AD80)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021AEA8), - .defenseTable = N(defenseTable_8021ACB0), + .idleAnimations = N(IdleAnimations_8021AEA8), + .defenseTable = N(DefenseTable_8021ACB0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, @@ -94,8 +94,8 @@ ActorPartBlueprint N(partsTable_8021AD80)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021AEA8), - .defenseTable = N(defenseTable_8021ACB0), + .idleAnimations = N(IdleAnimations_8021AEA8), + .defenseTable = N(DefenseTable_8021ACB0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, @@ -109,10 +109,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_EMBER, .level = 24, .maxHP = 10, - .partCount = ARRAY_COUNT(N(partsTable_8021AD80)), - .partsData = N(partsTable_8021AD80), + .partCount = ARRAY_COUNT( N(PartsTable_8021AD80)), + .partsData = N(PartsTable_8021AD80), .initScript = &N(init_8021AEB4), - .statusTable = N(statusTable_8021ACD4), + .statusTable = N(StatusTable_8021ACD4), .escapeChance = 60, .airLiftChance = 80, .hurricaneChance = 75, @@ -127,7 +127,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations_8021AE5C)[] = { +s32 N(IdleAnimations_8021AE5C)[] = { STATUS_NORMAL, ANIM_LavaBubble_Blue_Anim01, STATUS_STONE, ANIM_LavaBubble_Blue_Anim00, STATUS_SLEEP, ANIM_LavaBubble_Blue_Anim01, @@ -140,7 +140,7 @@ s32 N(idleAnimations_8021AE5C)[] = { STATUS_END, }; -s32 N(idleAnimations_8021AEA8)[] = { +s32 N(IdleAnimations_8021AEA8)[] = { STATUS_NORMAL, ANIM_LavaBubble_Blue_Anim01, STATUS_END, }; diff --git a/src/battle/common/actor/fuzzy.inc.c b/src/battle/common/actor/fuzzy.inc.c index f4fd2cffff..dbe69bc8da 100644 --- a/src/battle/common/actor/fuzzy.inc.c +++ b/src/battle/common/actor/fuzzy.inc.c @@ -4,12 +4,12 @@ #include "sprite/npc/Fuzzy.h" #include "effects.h" -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 95, @@ -34,7 +34,7 @@ s32 N(statusTable)[] = { STATUS_END, }; -extern s32 N(idleAnimations)[]; +extern s32 N(IdleAnimations)[]; ActorPartBlueprint N(parts)[] = { { @@ -43,8 +43,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 20 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -61,7 +61,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 50, .airLiftChance = 95, .hurricaneChance = 95, @@ -76,7 +76,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_Fuzzy_Idle, STATUS_STONE, ANIM_Fuzzy_Still, STATUS_SLEEP, ANIM_Fuzzy_Sleep, @@ -225,7 +225,7 @@ EvtScript N(handleEvent) = { EVT_END }; -#include "common/UnkBattleFunc2.inc.c" +#include "common/SpawnEnemyDrainFX.inc.c" EvtScript N(takeTurn) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) @@ -361,11 +361,11 @@ EvtScript N(takeTurn) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 10) - EVT_CALL(N(UnkBattleFunc2), LVar0, LVar1, LVar2, LVar3) + EVT_CALL(N(SpawnDrainHealthStartFX), LVar0, LVar1, LVar2, LVar3) EVT_THREAD EVT_WAIT(15) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_25C) - EVT_CALL(N(UnkBattleFunc2_2), LVar0, LVar1, LVar2, LVar3) + EVT_CALL(N(SpawnDrainHealthContinueFX), LVar0, LVar1, LVar2, LVar3) EVT_END_THREAD EVT_ADD(LVar0, 20) EVT_ADD(LVar1, 20) diff --git a/src/battle/common/actor/goomba.inc.c b/src/battle/common/actor/goomba.inc.c index 1a37de26fc..4aa5042d53 100644 --- a/src/battle/common/actor/goomba.inc.c +++ b/src/battle/common/actor/goomba.inc.c @@ -3,12 +3,12 @@ #include "script_api/battle.h" #include "sprite/npc/Goomba.h" -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 100, @@ -33,7 +33,7 @@ s32 N(statusTable)[] = { STATUS_END, }; -extern s32 N(idleAnimations)[]; +extern s32 N(IdleAnimations)[]; extern EvtScript N(init); ActorPartBlueprint N(parts)[] = { @@ -43,8 +43,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 20 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -59,7 +59,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 90, .airLiftChance = 100, .hurricaneChance = 90, @@ -74,7 +74,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_Goomba_Idle, STATUS_STONE, ANIM_Goomba_Still, STATUS_SLEEP, ANIM_Goomba_Sleep, @@ -87,7 +87,7 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations2)[] = { +s32 N(IdleAnimations2)[] = { STATUS_NORMAL, ANIM_Goomba_Run, STATUS_STONE, ANIM_Goomba_Still, STATUS_SLEEP, ANIM_Goomba_Sleep, @@ -128,10 +128,10 @@ EvtScript N(idle) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations2))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations2))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) EVT_LOOP(20) EVT_LABEL(1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) @@ -144,10 +144,10 @@ EvtScript N(idle) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations2))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations2))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) EVT_LOOP(80) EVT_LABEL(2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) diff --git a/src/battle/common/actor/gray_magikoopa.inc.c b/src/battle/common/actor/gray_magikoopa.inc.c index 35f6f06fc7..7ce4e6e280 100644 --- a/src/battle/common/actor/gray_magikoopa.inc.c +++ b/src/battle/common/actor/gray_magikoopa.inc.c @@ -11,21 +11,21 @@ extern EvtScript N(takeTurn); extern EvtScript N(flee); -extern s32 N(idleAnimations1)[]; -extern s32 N(idleAnimations2)[]; -extern s32 N(idleAnimations3)[]; +extern s32 N(IdleAnimations1)[]; +extern s32 N(IdleAnimations2)[]; +extern s32 N(IdleAnimations3)[]; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(defenseTable_flying)[] = { +s32 N(DefenseTable_flying)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 50, @@ -50,7 +50,7 @@ s32 N(statusTable)[] = { STATUS_END, }; -s32 N(statusTable_flying)[] = { +s32 N(StatusTable_flying)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 50, @@ -82,8 +82,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 2, 35 }, .opacity = 255, - .idleAnimations = N(idleAnimations1), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations1), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { -5, -12 }, @@ -97,8 +97,8 @@ ActorPartBlueprint N(parts_flying)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 2, 35 }, .opacity = 255, - .idleAnimations = N(idleAnimations1), - .defenseTable = N(defenseTable_flying), + .idleAnimations = N(IdleAnimations1), + .defenseTable = N(DefenseTable_flying), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { -5, -12 }, @@ -109,8 +109,8 @@ ActorPartBlueprint N(parts_flying)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -10, 35 }, .opacity = 255, - .idleAnimations = N(idleAnimations2), - .defenseTable = N(defenseTable_flying), + .idleAnimations = N(IdleAnimations2), + .defenseTable = N(DefenseTable_flying), .eventFlags = ACTOR_EVENT_FLAG_RIDING_BROOMSTICK, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -121,8 +121,8 @@ ActorPartBlueprint N(parts_flying)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations3), - .defenseTable = N(defenseTable_flying), + .idleAnimations = N(IdleAnimations3), + .defenseTable = N(DefenseTable_flying), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -137,7 +137,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 40, .airLiftChance = 80, .hurricaneChance = 70, @@ -160,7 +160,7 @@ ActorBlueprint N(flying) = { .partCount = ARRAY_COUNT(N(parts_flying)), .partsData = N(parts_flying), .initScript = &N(init_flying), - .statusTable = N(statusTable_flying), + .statusTable = N(StatusTable_flying), .escapeChance = 40, .airLiftChance = 95, .hurricaneChance = 75, @@ -175,7 +175,7 @@ ActorBlueprint N(flying) = { .statusMessageOffset = { 1, 34 }, }; -s32 N(idleAnimations1)[] = { +s32 N(IdleAnimations1)[] = { STATUS_NORMAL, ANIM_Magikoopa_Gray_Anim01, STATUS_STONE, ANIM_Magikoopa_Gray_Anim00, STATUS_SLEEP, ANIM_Magikoopa_Gray_Anim08, @@ -188,7 +188,7 @@ s32 N(idleAnimations1)[] = { STATUS_END, }; -s32 N(idleAnimations2)[] = { +s32 N(IdleAnimations2)[] = { STATUS_NORMAL, ANIM_FlyingMagikoopa_Gray_Anim01, STATUS_STONE, ANIM_FlyingMagikoopa_Gray_Anim00, STATUS_SLEEP, ANIM_FlyingMagikoopa_Gray_Anim08, @@ -201,7 +201,7 @@ s32 N(idleAnimations2)[] = { STATUS_END, }; -s32 N(idleAnimations3)[] = { +s32 N(IdleAnimations3)[] = { STATUS_NORMAL, ANIM_FlyingMagikoopa_Gray_Anim0A, STATUS_END, }; @@ -393,7 +393,7 @@ EvtScript N(knockOff) = { EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent))) EVT_CALL(SetActorType, ACTOR_SELF, ACTOR_TYPE_GRAY_MAGIKOOPA) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable))) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 32) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_TYPE_CHANGED, TRUE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) diff --git a/src/battle/common/actor/green_magikoopa.inc.c b/src/battle/common/actor/green_magikoopa.inc.c index 7f56b229d2..6e3aa19b4f 100644 --- a/src/battle/common/actor/green_magikoopa.inc.c +++ b/src/battle/common/actor/green_magikoopa.inc.c @@ -13,21 +13,21 @@ extern EvtScript N(handleEvent); extern EvtScript N(takeTurn); extern EvtScript N(flee); -extern s32 N(idleAnimations)[]; -extern s32 N(idleAnimations2)[]; -extern s32 N(idleAnimations3)[]; +extern s32 N(IdleAnimations)[]; +extern s32 N(IdleAnimations2)[]; +extern s32 N(IdleAnimations3)[]; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(defenseTable_flying)[] = { +s32 N(DefenseTable_flying)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 50, @@ -52,7 +52,7 @@ s32 N(statusTable)[] = { STATUS_END, }; -s32 N(statusTable_flying)[] = { +s32 N(StatusTable_flying)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 50, @@ -84,8 +84,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 2, 35 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { -5, -12 }, @@ -99,8 +99,8 @@ ActorPartBlueprint N(parts_flying)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 2, 35 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable_flying), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable_flying), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { -5, -12 }, @@ -111,8 +111,8 @@ ActorPartBlueprint N(parts_flying)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -10, 35 }, .opacity = 255, - .idleAnimations = N(idleAnimations2), - .defenseTable = N(defenseTable_flying), + .idleAnimations = N(IdleAnimations2), + .defenseTable = N(DefenseTable_flying), .eventFlags = ACTOR_EVENT_FLAG_RIDING_BROOMSTICK, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -123,8 +123,8 @@ ActorPartBlueprint N(parts_flying)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations3), - .defenseTable = N(defenseTable_flying), + .idleAnimations = N(IdleAnimations3), + .defenseTable = N(DefenseTable_flying), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -139,7 +139,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 40, .airLiftChance = 80, .hurricaneChance = 70, @@ -162,7 +162,7 @@ ActorBlueprint N(flying) = { .partCount = ARRAY_COUNT(N(parts_flying)), .partsData = N(parts_flying), .initScript = &N(init_flying), - .statusTable = N(statusTable_flying), + .statusTable = N(StatusTable_flying), .escapeChance = 40, .airLiftChance = 95, .hurricaneChance = 75, @@ -177,7 +177,7 @@ ActorBlueprint N(flying) = { .statusMessageOffset = { 1, 34 }, }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_Magikoopa_Green_Anim01, STATUS_STONE, ANIM_Magikoopa_Green_Anim00, STATUS_SLEEP, ANIM_Magikoopa_Green_Anim08, @@ -190,7 +190,7 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations2)[] = { +s32 N(IdleAnimations2)[] = { STATUS_NORMAL, ANIM_FlyingMagikoopa_Green_Anim01, STATUS_STONE, ANIM_FlyingMagikoopa_Green_Anim00, STATUS_SLEEP, ANIM_FlyingMagikoopa_Green_Anim08, @@ -203,7 +203,7 @@ s32 N(idleAnimations2)[] = { STATUS_END, }; -s32 N(idleAnimations3)[] = { +s32 N(IdleAnimations3)[] = { STATUS_NORMAL, ANIM_FlyingMagikoopa_Green_Anim0A, STATUS_END, }; @@ -395,7 +395,7 @@ EvtScript N(knockOff) = { EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent))) EVT_CALL(SetActorType, ACTOR_SELF, ACTOR_TYPE_GREEN_MAGIKOOPA) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable))) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 32) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_TYPE_CHANGED, TRUE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) diff --git a/src/battle/common/actor/hammer_bro.inc.c b/src/battle/common/actor/hammer_bro.inc.c index e1567db0d2..7f5b6be24a 100644 --- a/src/battle/common/actor/hammer_bro.inc.c +++ b/src/battle/common/actor/hammer_bro.inc.c @@ -8,7 +8,7 @@ extern EvtScript N(takeTurn); extern EvtScript N(idle); extern EvtScript N(handleEvent); -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_HammerBros_Anim02, STATUS_STONE, ANIM_HammerBros_Anim00, STATUS_SLEEP, ANIM_HammerBros_Anim11, @@ -21,17 +21,17 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations2)[] = { +s32 N(IdleAnimations2)[] = { STATUS_NORMAL, ANIM_HammerBros_Anim0D, STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 1, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 50, @@ -63,8 +63,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -3, 35 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { -3, -10 }, @@ -75,8 +75,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations2), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations2), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -87,8 +87,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations2), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations2), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -99,8 +99,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations2), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations2), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -111,8 +111,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations2), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations2), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -123,8 +123,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations2), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations2), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -139,7 +139,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 30, .airLiftChance = 75, .hurricaneChance = 60, diff --git a/src/battle/common/actor/koopa_troopa.inc.c b/src/battle/common/actor/koopa_troopa.inc.c index 8dcd71f2fc..77497a809b 100644 --- a/src/battle/common/actor/koopa_troopa.inc.c +++ b/src/battle/common/actor/koopa_troopa.inc.c @@ -4,7 +4,7 @@ #include "script_api/battle.h" #include "sprite/npc/KoopaTroopa.h" -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 1, ELEMENT_SMASH, 1, ELEMENT_JUMP, 1, @@ -13,12 +13,12 @@ s32 N(defenseTable)[] = { ELEMENT_END, }; -s32 N(defenseTable_flipped)[] = { +s32 N(DefenseTable_flipped)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 90, @@ -43,7 +43,7 @@ s32 N(statusTable)[] = { STATUS_END, }; -extern s32 N(idleAnimations)[]; +extern s32 N(IdleAnimations)[]; extern EvtScript N(init); ActorPartBlueprint N(parts)[] = { @@ -53,8 +53,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -2, 36 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -7 }, @@ -69,7 +69,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 70, .airLiftChance = 90, .hurricaneChance = 90, @@ -84,7 +84,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 5, 32 }, }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_KoopaTroopa_Idle, STATUS_STONE, ANIM_KoopaTroopa_Still, STATUS_SLEEP, ANIM_KoopaTroopa_Sleep, @@ -97,7 +97,7 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations_8021CADC)[] = { +s32 N(IdleAnimations_8021CADC)[] = { STATUS_NORMAL, ANIM_KoopaTroopa_Walk, STATUS_STONE, ANIM_KoopaTroopa_Still, STATUS_SLEEP, ANIM_KoopaTroopa_Sleep, @@ -110,7 +110,7 @@ s32 N(idleAnimations_8021CADC)[] = { STATUS_END, }; -s32 N(idleAnimations_flipped)[] = { +s32 N(IdleAnimations_flipped)[] = { STATUS_NORMAL, ANIM_KoopaTroopa_ToppleStruggle, STATUS_STONE, ANIM_KoopaTroopa_ToppleStill, STATUS_SLEEP, ANIM_KoopaTroopa_ToppleSleep, @@ -181,15 +181,15 @@ EvtScript N(idle) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021CADC))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021CADC))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) EVT_CASE_EQ(1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flipped))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_flipped))) EVT_END_SWITCH EVT_LOOP(20) EVT_LABEL(2) @@ -209,15 +209,15 @@ EvtScript N(idle) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021CADC))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021CADC))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) EVT_CASE_EQ(1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flipped))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_flipped))) EVT_END_SWITCH EVT_LOOP(80) EVT_LABEL(3) @@ -282,8 +282,8 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_FLIP_TRIGGER) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) EVT_CALL(SetActorVar, ACTOR_SELF, 9, 2) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_flipped))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flipped))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_flipped))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_flipped))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 15) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, TRUE) @@ -481,8 +481,8 @@ EvtScript N(takeTurn) = { EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Idle) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 32) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -4) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE) diff --git a/src/battle/common/actor/koopatrol.inc.c b/src/battle/common/actor/koopatrol.inc.c index 23bdfdce52..b57f7b27b5 100644 --- a/src/battle/common/actor/koopatrol.inc.c +++ b/src/battle/common/actor/koopatrol.inc.c @@ -23,7 +23,7 @@ extern EvtScript N(idle); extern EvtScript N(handleEvent); extern EvtScript N(nextTurn); -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_Koopatrol_Anim01, STATUS_STONE, ANIM_Koopatrol_Anim00, STATUS_SLEEP, ANIM_Koopatrol_Anim11, @@ -36,7 +36,7 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations_stepBack)[] = { +s32 N(IdleAnimations_stepBack)[] = { STATUS_NORMAL, ANIM_Koopatrol_Anim03, STATUS_STONE, ANIM_Koopatrol_Anim00, STATUS_SLEEP, ANIM_Koopatrol_Anim11, @@ -49,7 +49,7 @@ s32 N(idleAnimations_stepBack)[] = { STATUS_END, }; -s32 N(idleAnimations_flipped)[] = { +s32 N(IdleAnimations_flipped)[] = { STATUS_NORMAL, ANIM_Koopatrol_Anim0F, STATUS_STONE, ANIM_Koopatrol_Anim10, STATUS_SLEEP, ANIM_Koopatrol_Anim12, @@ -62,7 +62,7 @@ s32 N(idleAnimations_flipped)[] = { STATUS_END, }; -s32 N(idleAnimations_charged)[] = { +s32 N(IdleAnimations_charged)[] = { STATUS_NORMAL, ANIM_Koopatrol_Anim06, STATUS_STONE, ANIM_Koopatrol_Anim06, STATUS_SLEEP, ANIM_Koopatrol_Anim06, @@ -75,24 +75,24 @@ s32 N(idleAnimations_charged)[] = { STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 3, ELEMENT_SHOCK, 3, ELEMENT_END, }; -s32 N(defenseTable_flipped)[] = { +s32 N(DefenseTable_flipped)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(defenseTable_charged)[] = { +s32 N(DefenseTable_charged)[] = { ELEMENT_NORMAL, 3, ELEMENT_FIRE, 3, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 50, @@ -117,7 +117,7 @@ s32 N(statusTable)[] = { STATUS_END, }; -s32 N(statusTable_charged)[] = { +s32 N(StatusTable_charged)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -147,8 +147,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 32 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -12 }, @@ -163,7 +163,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 50, .airLiftChance = 75, .hurricaneChance = 65, @@ -263,15 +263,15 @@ EvtScript N(idle) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_stepBack))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_stepBack))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_STATE), LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(N(STATE_NORMAL)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) EVT_CASE_EQ(N(STATE_FLIPPED)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flipped))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_flipped))) EVT_END_SWITCH EVT_LOOP(20) EVT_LABEL(2) @@ -291,15 +291,15 @@ EvtScript N(idle) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_stepBack))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_stepBack))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_STATE), LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(N(STATE_NORMAL)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) EVT_CASE_EQ(N(STATE_FLIPPED)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flipped))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_flipped))) EVT_END_SWITCH EVT_LOOP(80) EVT_LABEL(3) @@ -400,8 +400,8 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_FLIP_TRIGGER) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_FLIPPED)) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_FLIPPED), 1) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_flipped))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flipped))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_flipped))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_flipped))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 15) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, FALSE) @@ -454,11 +454,11 @@ EvtScript N(handleEvent) = { EVT_CASE_EQ(EVENT_STAR_BEAM) EVT_CALL(GetActorVar, ACTOR_SELF, N(VAR_STATE), LVar0) EVT_IF_EQ(LVar0, N(STATE_CHARGED)) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable))) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, TRUE) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_NORMAL)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVarA) EVT_IF_NOT_FLAG(LVarA, STATUS_FLAG_DEFENSE_BOOST | STATUS_FLAG_ATTACK_BOOST) EVT_CALL(EnableActorGlow, ACTOR_SELF, FALSE) @@ -676,8 +676,8 @@ EvtScript N(attackShellToss) = { EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Koopatrol_Anim01) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_NORMAL)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 32) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -4) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, TRUE) @@ -833,11 +833,11 @@ EvtScript N(attackShellMissile) = { EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(0.5)) EVT_END_THREAD EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Koopatrol_Anim06) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_charged))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_charged))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable_charged))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_charged))) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, FALSE) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_CHARGED)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_charged))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_charged))) EVT_CALL(EnableActorGlow, ACTOR_SELF, TRUE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_ATTACK_CHARGED, TRUE) EVT_WAIT(10) @@ -905,11 +905,11 @@ EvtScript N(attackShellMissile) = { EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Koopatrol_Anim08) EVT_CALL(RemoveActorDecoration, ACTOR_SELF, 1, 0) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable))) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, TRUE) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_NORMAL)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) EVT_WAIT(10) EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) EVT_CALL(UseIdleAnimation, ACTOR_SELF, TRUE) @@ -967,11 +967,11 @@ EvtScript N(attackShellMissile) = { EVT_SET_CONST(LVar1, ANIM_Koopatrol_Anim04) EVT_EXEC_WAIT(DoReturnHome) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Koopatrol_Anim01) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable))) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, TRUE) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_STATE), N(STATE_NORMAL)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) EVT_END_CASE_GROUP EVT_END_SWITCH EVT_CALL(EnableIdleScript, ACTOR_SELF, 1) diff --git a/src/battle/common/actor/magikoopa.inc.c b/src/battle/common/actor/magikoopa.inc.c index 7e5d12e652..822aba7d02 100644 --- a/src/battle/common/actor/magikoopa.inc.c +++ b/src/battle/common/actor/magikoopa.inc.c @@ -39,21 +39,21 @@ extern EvtScript N(handleEvent); extern EvtScript N(init_flying); extern EvtScript N(handleEvent_flying); -extern s32 N(idleAnimations)[]; -extern s32 N(idleAnimations_flying)[]; +extern s32 N(IdleAnimations)[]; +extern s32 N(IdleAnimations_flying)[]; extern s32 N(idleAnimtions_broomstick)[]; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(defenseTable_flying)[] = { +s32 N(DefenseTable_flying)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 40, @@ -78,7 +78,7 @@ s32 N(statusTable)[] = { STATUS_END, }; -s32 N(statusTable_flying)[] = { +s32 N(StatusTable_flying)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 40, @@ -110,8 +110,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 2, 35 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { -5, -12 }, @@ -125,8 +125,8 @@ ActorPartBlueprint N(parts_flying)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 2, 35 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable_flying), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable_flying), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { -5, -12 }, @@ -137,8 +137,8 @@ ActorPartBlueprint N(parts_flying)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -10, 35 }, .opacity = 255, - .idleAnimations = N(idleAnimations_flying), - .defenseTable = N(defenseTable_flying), + .idleAnimations = N(IdleAnimations_flying), + .defenseTable = N(DefenseTable_flying), .eventFlags = ACTOR_EVENT_FLAG_RIDING_BROOMSTICK, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -150,7 +150,7 @@ ActorPartBlueprint N(parts_flying)[] = { .targetOffset = { 0, 0 }, .opacity = 255, .idleAnimations = N(idleAnimtions_broomstick), - .defenseTable = N(defenseTable_flying), + .defenseTable = N(DefenseTable_flying), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -165,7 +165,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 40, .airLiftChance = 80, .hurricaneChance = 70, @@ -188,7 +188,7 @@ ActorBlueprint N(flying) = { .partCount = ARRAY_COUNT(N(parts_flying)), .partsData = N(parts_flying), .initScript = &N(init_flying), - .statusTable = N(statusTable_flying), + .statusTable = N(StatusTable_flying), .escapeChance = 40, .airLiftChance = 85, .hurricaneChance = 75, @@ -203,7 +203,7 @@ ActorBlueprint N(flying) = { .statusMessageOffset = { 1, 34 }, }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_Magikoopa_Anim01, STATUS_STONE, ANIM_Magikoopa_Anim00, STATUS_SLEEP, ANIM_Magikoopa_Anim08, @@ -216,7 +216,7 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations_flying)[] = { +s32 N(IdleAnimations_flying)[] = { STATUS_NORMAL, ANIM_FlyingMagikoopa_Anim01, STATUS_STONE, ANIM_FlyingMagikoopa_Anim00, STATUS_SLEEP, ANIM_FlyingMagikoopa_Anim08, @@ -357,7 +357,7 @@ EvtScript N(knockOff) = { EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent))) EVT_CALL(SetActorType, ACTOR_SELF, ACTOR_TYPE_MAGIKOOPA) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable))) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 32) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_TYPE_CHANGED, TRUE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) @@ -1252,17 +1252,17 @@ EvtScript N(init_clone_flying) = { EVT_END }; -s32 N(defenseTable_clone)[] = { +s32 N(DefenseTable_clone)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(defenseTable_clone_flying)[] = { +s32 N(DefenseTable_clone_flying)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_clone)[] = { +s32 N(StatusTable_clone)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -1287,7 +1287,7 @@ s32 N(statusTable_clone)[] = { STATUS_END, }; -s32 N(statusTable_clone_flying)[] = { +s32 N(StatusTable_clone_flying)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -1319,8 +1319,8 @@ ActorPartBlueprint N(parts_clone)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 2, 35 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable_clone), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable_clone), .eventFlags = ACTOR_EVENT_FLAG_ILLUSORY, .elementImmunityFlags = 0, .projectileTargetOffset = { -5, -12 }, @@ -1334,8 +1334,8 @@ ActorPartBlueprint N(parts_clone_flying)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -10, 35 }, .opacity = 255, - .idleAnimations = N(idleAnimations_flying), - .defenseTable = N(defenseTable_clone_flying), + .idleAnimations = N(IdleAnimations_flying), + .defenseTable = N(DefenseTable_clone_flying), .eventFlags = ACTOR_EVENT_FLAG_ILLUSORY, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -1350,7 +1350,7 @@ ActorBlueprint N(clone) = { .partCount = ARRAY_COUNT(N(parts_clone)), .partsData = N(parts_clone), .initScript = &N(init_clone), - .statusTable = N(statusTable_clone), + .statusTable = N(StatusTable_clone), .escapeChance = 40, .airLiftChance = 0, .hurricaneChance = 0, @@ -1373,7 +1373,7 @@ ActorBlueprint N(clone_flying) = { .partCount = ARRAY_COUNT(N(parts_clone_flying)), .partsData = N(parts_clone_flying), .initScript = &N(init_clone_flying), - .statusTable = N(statusTable_clone_flying), + .statusTable = N(StatusTable_clone_flying), .escapeChance = 40, .airLiftChance = 0, .hurricaneChance = 0, diff --git a/src/battle/common/actor/medi_guy.inc.c b/src/battle/common/actor/medi_guy.inc.c index cdb856730f..7fdbb53eee 100644 --- a/src/battle/common/actor/medi_guy.inc.c +++ b/src/battle/common/actor/medi_guy.inc.c @@ -13,7 +13,7 @@ extern EvtScript N(handleEvent); #include "common/MediGuySpriteRotationFunc.inc.c" -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_MediGuy_Anim01, STATUS_STONE, ANIM_MediGuy_Anim00, STATUS_SLEEP, ANIM_MediGuy_Anim04, @@ -26,13 +26,13 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_SHOCK, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 70, @@ -64,8 +64,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -2, 38 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -5 }, @@ -80,7 +80,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 60, .airLiftChance = 90, .hurricaneChance = 95, diff --git a/src/battle/common/actor/monty_mole.inc.c b/src/battle/common/actor/monty_mole.inc.c index 733fbdf438..71d847b8fe 100644 --- a/src/battle/common/actor/monty_mole.inc.c +++ b/src/battle/common/actor/monty_mole.inc.c @@ -3,19 +3,19 @@ #include "script_api/battle.h" #include "sprite/npc/MontyMole.h" -extern s32 N(idleAnimations)[]; -extern s32 N(idleAnimations2)[]; +extern s32 N(IdleAnimations)[]; +extern s32 N(IdleAnimations2)[]; extern EvtScript N(init); extern EvtScript N(takeTurn); extern EvtScript N(idle); extern EvtScript N(handleEvent); -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 90, @@ -47,8 +47,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -2, 16 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -7 }, @@ -59,8 +59,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, -15 }, .targetOffset = { -2, 12 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -7 }, @@ -71,8 +71,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations2), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations2), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -87,7 +87,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 80, .airLiftChance = 70, .hurricaneChance = 50, @@ -102,7 +102,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_MontyMole_Anim01, STATUS_STONE, ANIM_MontyMole_Anim00, STATUS_SLEEP, ANIM_MontyMole_Anim14, @@ -115,18 +115,18 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations2)[] = { +s32 N(IdleAnimations2)[] = { STATUS_NORMAL, ANIM_MontyMole_Anim0F, STATUS_END, }; -s32 N(idleAnimations_hole)[] = { +s32 N(IdleAnimations_hole)[] = { STATUS_NORMAL, ANIM_MontyMole_Anim12, STATUS_END, }; -s32 N(idleAnimations_unused)[] = { +s32 N(IdleAnimations_unused)[] = { STATUS_NORMAL, ANIM_MontyMole_Anim06, STATUS_END, }; @@ -138,7 +138,7 @@ ActorPartBlueprint N(parts_hole)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_hole), + .idleAnimations = N(IdleAnimations_hole), .defenseTable = NULL, .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, @@ -301,7 +301,7 @@ EvtScript N(handleEvent) = { EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_MontyMole_Anim08) EVT_WAIT(15) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_TARGET_ONLY | ACTOR_FLAG_NO_DMG_APPLY, TRUE) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_hole))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_hole))) EVT_RETURN EVT_CASE_EQ(EVENT_BEGIN_AIR_LIFT) EVT_SET_CONST(LVar0, 1) diff --git a/src/battle/common/actor/paragoomba.inc.c b/src/battle/common/actor/paragoomba.inc.c index 7bf35e5a48..b4c2ee88f3 100644 --- a/src/battle/common/actor/paragoomba.inc.c +++ b/src/battle/common/actor/paragoomba.inc.c @@ -5,17 +5,17 @@ #include "sprite/npc/Goomba.h" #include "sprite/npc/Paragoomba.h" -s32 N(defenseTable_8021B110)[] = { +s32 N(DefenseTable_8021B110)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(defenseTable_8021B11C)[] = { +s32 N(DefenseTable_8021B11C)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_8021B128)[] = { +s32 N(StatusTable_8021B128)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 100, @@ -40,7 +40,7 @@ s32 N(statusTable_8021B128)[] = { STATUS_END, }; -s32 N(statusTable_8021B1D4)[] = { +s32 N(StatusTable_8021B1D4)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 100, @@ -65,21 +65,21 @@ s32 N(statusTable_8021B1D4)[] = { STATUS_END, }; -extern s32 N(idleAnimations_8021CAFC)[]; -extern s32 N(idleAnimations_8021B338)[]; -extern s32 N(idleAnimations_8021B3D0)[]; -extern s32 N(idleAnimations_8021B3DC)[]; +extern s32 N(IdleAnimations_8021CAFC)[]; +extern s32 N(IdleAnimations_8021B338)[]; +extern s32 N(IdleAnimations_8021B3D0)[]; +extern s32 N(IdleAnimations_8021B3DC)[]; extern EvtScript N(init_8021B3E8); -ActorPartBlueprint N(partsTable_8021B280)[] = { +ActorPartBlueprint N(PartsTable_8021B280)[] = { { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 20 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021CAFC), - .defenseTable = N(defenseTable_8021B110), + .idleAnimations = N(IdleAnimations_8021CAFC), + .defenseTable = N(DefenseTable_8021B110), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -90,8 +90,8 @@ ActorPartBlueprint N(partsTable_8021B280)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021B338), - .defenseTable = N(defenseTable_8021B11C), + .idleAnimations = N(IdleAnimations_8021B338), + .defenseTable = N(DefenseTable_8021B11C), .eventFlags = ACTOR_EVENT_FLAG_GROUNDABLE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -102,8 +102,8 @@ ActorPartBlueprint N(partsTable_8021B280)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -16, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021B3D0), - .defenseTable = N(defenseTable_8021B110), + .idleAnimations = N(IdleAnimations_8021B3D0), + .defenseTable = N(DefenseTable_8021B110), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -114,8 +114,8 @@ ActorPartBlueprint N(partsTable_8021B280)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -16, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021B3DC), - .defenseTable = N(defenseTable_8021B110), + .idleAnimations = N(IdleAnimations_8021B3DC), + .defenseTable = N(DefenseTable_8021B110), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -127,10 +127,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_PARAGOOMBA, .level = 6, .maxHP = 2, - .partCount = ARRAY_COUNT(N(partsTable_8021B280)), - .partsData = N(partsTable_8021B280), + .partCount = ARRAY_COUNT( N(PartsTable_8021B280)), + .partsData = N(PartsTable_8021B280), .initScript = &N(init_8021B3E8), - .statusTable = N(statusTable_8021B1D4), + .statusTable = N(StatusTable_8021B1D4), .escapeChance = 90, .airLiftChance = 100, .hurricaneChance = 100, @@ -145,7 +145,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations_8021B338)[] = { +s32 N(IdleAnimations_8021B338)[] = { STATUS_NORMAL, ANIM_Paragoomba_Idle, STATUS_STONE, ANIM_Paragoomba_Still, STATUS_SLEEP, ANIM_Paragoomba_Sleep, @@ -158,7 +158,7 @@ s32 N(idleAnimations_8021B338)[] = { STATUS_END, }; -s32 N(idleAnimations_8021B384)[] = { +s32 N(IdleAnimations_8021B384)[] = { STATUS_NORMAL, ANIM_Paragoomba_Run, STATUS_STONE, ANIM_Paragoomba_Still, STATUS_SLEEP, ANIM_Paragoomba_Sleep, @@ -171,12 +171,12 @@ s32 N(idleAnimations_8021B384)[] = { STATUS_END, }; -s32 N(idleAnimations_8021B3D0)[] = { +s32 N(IdleAnimations_8021B3D0)[] = { STATUS_NORMAL, ANIM_Paragoomba_LWingStill, STATUS_END, }; -s32 N(idleAnimations_8021B3DC)[] = { +s32 N(IdleAnimations_8021B3DC)[] = { STATUS_NORMAL, ANIM_Paragoomba_RWingStill, STATUS_END, }; @@ -209,7 +209,7 @@ EvtScript N(idle_8021B434) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(0.6)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021B384))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations_8021B384))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) EVT_LOOP(20) @@ -226,7 +226,7 @@ EvtScript N(idle_8021B434) = { EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(0.6)) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021B338))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations_8021B338))) EVT_LOOP(40) EVT_LABEL(2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) @@ -538,7 +538,7 @@ EvtScript N(8021C574) = { EVT_CALL(SetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Goomba_Idle) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_8021B128))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable_8021B128))) EVT_CALL(SetActorType, ACTOR_SELF, ACTOR_TYPE_GOOMBA) EVT_EXEC_WAIT(N(8021CB94)) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_TYPE_CHANGED, TRUE) @@ -551,7 +551,7 @@ EvtScript N(8021C574) = { // Copy of goomba.c follows.................. // TODO: deduplicate -s32 N(idleAnimations_8021CAFC)[] = { +s32 N(IdleAnimations_8021CAFC)[] = { STATUS_NORMAL, ANIM_Goomba_Idle, STATUS_STONE, ANIM_Goomba_Still, STATUS_SLEEP, ANIM_Goomba_Sleep, @@ -564,7 +564,7 @@ s32 N(idleAnimations_8021CAFC)[] = { STATUS_END, }; -s32 N(idleAnimations_8021CB48)[] = { +s32 N(IdleAnimations_8021CB48)[] = { STATUS_NORMAL, ANIM_Goomba_Run, STATUS_STONE, ANIM_Goomba_Still, STATUS_SLEEP, ANIM_Goomba_Sleep, @@ -605,10 +605,10 @@ EvtScript N(idle_8021CBE0) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021CB48))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021CB48))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021CAFC))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021CAFC))) EVT_LOOP(20) EVT_LABEL(1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) @@ -621,10 +621,10 @@ EvtScript N(idle_8021CBE0) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021CB48))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021CB48))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021CAFC))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021CAFC))) EVT_LOOP(80) EVT_LABEL(2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) diff --git a/src/battle/common/actor/paratroopa.inc.c b/src/battle/common/actor/paratroopa.inc.c index 11028e035f..0d3f3e0a59 100644 --- a/src/battle/common/actor/paratroopa.inc.c +++ b/src/battle/common/actor/paratroopa.inc.c @@ -5,7 +5,7 @@ #include "sprite/npc/KoopaTroopa.h" #include "sprite/npc/ParaTroopa.h" -s32 N(defenseTable_8021EAD0)[] = { +s32 N(DefenseTable_8021EAD0)[] = { ELEMENT_NORMAL, 1, ELEMENT_SMASH, 1, ELEMENT_JUMP, 1, @@ -14,17 +14,17 @@ s32 N(defenseTable_8021EAD0)[] = { ELEMENT_END, }; -s32 N(defenseTable_8021EAFC)[] = { +s32 N(DefenseTable_8021EAFC)[] = { ELEMENT_NORMAL, 1, ELEMENT_END, }; -s32 N(defenseTable_8021EB08)[] = { +s32 N(DefenseTable_8021EB08)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_8021EB14)[] = { +s32 N(StatusTable_8021EB14)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 90, @@ -49,7 +49,7 @@ s32 N(statusTable_8021EB14)[] = { STATUS_END, }; -s32 N(statusTable_8021EBC0)[] = { +s32 N(StatusTable_8021EBC0)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 90, @@ -74,20 +74,20 @@ s32 N(statusTable_8021EBC0)[] = { STATUS_END, }; -extern s32 N(idleAnimations_80220AA0)[]; -extern s32 N(idleAnimations_8021ED00)[]; -extern s32 N(idleAnimations_8021ED98)[]; +extern s32 N(IdleAnimations_80220AA0)[]; +extern s32 N(IdleAnimations_8021ED00)[]; +extern s32 N(IdleAnimations_8021ED98)[]; extern EvtScript N(init_8021EE0C); -ActorPartBlueprint N(partsTable_8021EC6C)[] = { +ActorPartBlueprint N(PartsTable_8021EC6C)[] = { { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { -2, 36 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80220AA0), - .defenseTable = N(defenseTable_8021EAD0), + .idleAnimations = N(IdleAnimations_80220AA0), + .defenseTable = N(DefenseTable_8021EAD0), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -7 }, @@ -98,8 +98,8 @@ ActorPartBlueprint N(partsTable_8021EC6C)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -4, 36 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021ED00), - .defenseTable = N(defenseTable_8021EAFC), + .idleAnimations = N(IdleAnimations_8021ED00), + .defenseTable = N(DefenseTable_8021EAFC), .eventFlags = ACTOR_EVENT_FLAG_GROUNDABLE, .elementImmunityFlags = 0, .projectileTargetOffset = { 2, -14 }, @@ -110,8 +110,8 @@ ActorPartBlueprint N(partsTable_8021EC6C)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 32 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021ED98), - .defenseTable = N(defenseTable_8021EAD0), + .idleAnimations = N(IdleAnimations_8021ED98), + .defenseTable = N(DefenseTable_8021EAD0), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -10 }, @@ -123,10 +123,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_PARATROOPA, .level = 6, .maxHP = 4, - .partCount = ARRAY_COUNT(N(partsTable_8021EC6C)), - .partsData = N(partsTable_8021EC6C), + .partCount = ARRAY_COUNT( N(PartsTable_8021EC6C)), + .partsData = N(PartsTable_8021EC6C), .initScript = &N(init_8021EE0C), - .statusTable = N(statusTable_8021EBC0), + .statusTable = N(StatusTable_8021EBC0), .escapeChance = 60, .airLiftChance = 95, .hurricaneChance = 100, @@ -141,7 +141,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 8, 30 }, }; -s32 N(idleAnimations_8021ED00)[] = { +s32 N(IdleAnimations_8021ED00)[] = { STATUS_NORMAL, ANIM_ParaTroopa_Idle, STATUS_STONE, ANIM_ParaTroopa_Still, STATUS_SLEEP, ANIM_ParaTroopa_Sleep, @@ -154,7 +154,7 @@ s32 N(idleAnimations_8021ED00)[] = { STATUS_END, }; -s32 N(idleAnimations_8021ED4C)[] = { +s32 N(IdleAnimations_8021ED4C)[] = { STATUS_NORMAL, ANIM_ParaTroopa_Idle, STATUS_STONE, ANIM_ParaTroopa_Still, STATUS_SLEEP, ANIM_ParaTroopa_Sleep, @@ -167,7 +167,7 @@ s32 N(idleAnimations_8021ED4C)[] = { STATUS_END, }; -s32 N(idleAnimations_8021ED98)[] = { +s32 N(IdleAnimations_8021ED98)[] = { STATUS_NORMAL, ANIM_ParaTroopa_WingsStill, STATUS_STONE, ANIM_ParaTroopa_Still, STATUS_SLEEP, ANIM_ParaTroopa_Sleep, @@ -235,10 +235,10 @@ EvtScript N(idle_8021EF5C) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(0.6)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021ED4C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations_8021ED4C))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021ED00))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021ED00))) EVT_LOOP(20) EVT_LABEL(1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) @@ -252,10 +252,10 @@ EvtScript N(idle_8021EF5C) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(0.6)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021ED4C))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations_8021ED4C))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleFlyToGoal, ACTOR_SELF, 0, -5, EASING_LINEAR) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(idleAnimations_8021ED00))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 2, EVT_PTR(N(IdleAnimations_8021ED00))) EVT_LOOP(40) EVT_LABEL(2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) @@ -625,7 +625,7 @@ EvtScript N(802204DC) = { EVT_CALL(SetHomePos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Idle) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_8021EB14))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable_8021EB14))) EVT_CALL(BindNextTurn, ACTOR_SELF, 0) EVT_EXEC_WAIT(N(80220B84)) EVT_CALL(SetActorType, ACTOR_SELF, ACTOR_TYPE_KOOPA_TROOPA) @@ -639,7 +639,7 @@ EvtScript N(802204DC) = { EVT_END }; -s32 N(idleAnimations_80220AA0)[] = { +s32 N(IdleAnimations_80220AA0)[] = { STATUS_NORMAL, ANIM_KoopaTroopa_Idle, STATUS_STONE, ANIM_KoopaTroopa_Still, STATUS_SLEEP, ANIM_KoopaTroopa_Sleep, @@ -652,7 +652,7 @@ s32 N(idleAnimations_80220AA0)[] = { STATUS_END, }; -s32 N(idleAnimations_80220AEC)[] = { +s32 N(IdleAnimations_80220AEC)[] = { STATUS_NORMAL, ANIM_KoopaTroopa_Walk, STATUS_STONE, ANIM_KoopaTroopa_Still, STATUS_SLEEP, ANIM_KoopaTroopa_Sleep, @@ -665,7 +665,7 @@ s32 N(idleAnimations_80220AEC)[] = { STATUS_END, }; -s32 N(idleAnimations_80220B38)[] = { +s32 N(IdleAnimations_80220B38)[] = { STATUS_NORMAL, ANIM_KoopaTroopa_ToppleStruggle, STATUS_STONE, ANIM_KoopaTroopa_ToppleStill, STATUS_SLEEP, ANIM_KoopaTroopa_ToppleSleep, @@ -734,15 +734,15 @@ EvtScript N(idle_80220D40) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80220AEC))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80220AEC))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80220AA0))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80220AA0))) EVT_CASE_EQ(1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80220B38))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80220B38))) EVT_END_SWITCH EVT_LOOP(20) EVT_LABEL(2) @@ -762,15 +762,15 @@ EvtScript N(idle_80220D40) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80220AEC))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80220AEC))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) EVT_CALL(GetActorVar, ACTOR_SELF, 8, LVar0) EVT_SWITCH(LVar0) EVT_CASE_EQ(0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80220AA0))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80220AA0))) EVT_CASE_EQ(1) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80220B38))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80220B38))) EVT_END_SWITCH EVT_LOOP(80) EVT_LABEL(3) @@ -839,8 +839,8 @@ EvtScript N(handleEvent_80221228) = { EVT_CASE_EQ(EVENT_FLIP_TRIGGER) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) EVT_CALL(SetActorVar, ACTOR_SELF, 9, 2) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_8021EB08))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80220B38))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_8021EB08))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80220B38))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -5, 15) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, 0) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, TRUE) @@ -1038,8 +1038,8 @@ EvtScript N(takeTurn_80221DAC) = { EVT_CALL(SetActorDispOffset, ACTOR_SELF, 0, 0, 0) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_KoopaTroopa_Idle) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_80220AA0))) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_8021EAD0))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_80220AA0))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_8021EAD0))) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, -4, 32) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -4) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE) diff --git a/src/battle/common/actor/pokey.inc.c b/src/battle/common/actor/pokey.inc.c index b04658da64..c76ce29108 100644 --- a/src/battle/common/actor/pokey.inc.c +++ b/src/battle/common/actor/pokey.inc.c @@ -17,8 +17,8 @@ enum N(ActorVars) { N(VAR_SUMMON_COUNT) = 10, }; -extern s32 N(idleAnimations)[]; -extern s32 N(idleAnimations_thrownBodyPart)[]; +extern s32 N(IdleAnimations)[]; +extern s32 N(IdleAnimations_thrownBodyPart)[]; extern EvtScript N(init); extern EvtScript N(takeTurn); extern EvtScript N(idle); @@ -32,12 +32,12 @@ extern EvtScript N(doSpinSmashHit); extern EvtScript N(onHit); extern EvtScript N(flee); -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 90, @@ -69,8 +69,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 20 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -82,7 +82,7 @@ ActorPartBlueprint N(parts)[] = { .targetOffset = { 0, 72 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -94,7 +94,7 @@ ActorPartBlueprint N(parts)[] = { .targetOffset = { 0, 54 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -106,7 +106,7 @@ ActorPartBlueprint N(parts)[] = { .targetOffset = { 0, 36 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -118,7 +118,7 @@ ActorPartBlueprint N(parts)[] = { .targetOffset = { 0, 16 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -129,8 +129,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_thrownBodyPart), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations_thrownBodyPart), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -145,7 +145,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 70, .airLiftChance = 90, .hurricaneChance = 85, @@ -160,7 +160,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 65 }, }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_Pokey_Anim04, STATUS_STONE, ANIM_Pokey_Anim00, STATUS_SLEEP, ANIM_Pokey_Anim25, @@ -171,7 +171,7 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations_3bodyParts)[] = { +s32 N(IdleAnimations_3bodyParts)[] = { STATUS_NORMAL, ANIM_Pokey_Anim05, STATUS_STONE, ANIM_Pokey_Anim01, STATUS_SLEEP, ANIM_Pokey_Anim26, @@ -182,7 +182,7 @@ s32 N(idleAnimations_3bodyParts)[] = { STATUS_END, }; -s32 N(idleAnimations_2bodyParts)[] = { +s32 N(IdleAnimations_2bodyParts)[] = { STATUS_NORMAL, ANIM_Pokey_Anim06, STATUS_STONE, ANIM_Pokey_Anim02, STATUS_SLEEP, ANIM_Pokey_Anim27, @@ -193,7 +193,7 @@ s32 N(idleAnimations_2bodyParts)[] = { STATUS_END, }; -s32 N(idleAnimations_1bodyPart)[] = { +s32 N(IdleAnimations_1bodyPart)[] = { STATUS_NORMAL, ANIM_Pokey_Anim07, STATUS_STONE, ANIM_Pokey_Anim03, STATUS_SLEEP, ANIM_Pokey_Anim28, @@ -204,7 +204,7 @@ s32 N(idleAnimations_1bodyPart)[] = { STATUS_END, }; -s32 N(idleAnimations_thrownBodyPart)[] = { +s32 N(IdleAnimations_thrownBodyPart)[] = { STATUS_NORMAL, ANIM_Pokey_Anim16, STATUS_END, }; @@ -1167,7 +1167,7 @@ EvtScript N(afterPartThrown) = { EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_ANIM_THROW2), ANIM_Pokey_Anim13) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_ANIM_BURN), ANIM_Pokey_Anim1A) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_ANIM_BURN2), ANIM_Pokey_Anim1B) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_3bodyParts))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_3bodyParts))) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_MULTI_TARGET, FALSE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 2, ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_NO_TARGET, FALSE) @@ -1184,7 +1184,7 @@ EvtScript N(afterPartThrown) = { EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_ANIM_THROW2), ANIM_Pokey_Anim15) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_ANIM_BURN), ANIM_Pokey_Anim1C) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_ANIM_BURN2), ANIM_Pokey_Anim1D) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_2bodyParts))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_2bodyParts))) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_MULTI_TARGET, FALSE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 3, ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_NO_TARGET, FALSE) @@ -1199,7 +1199,7 @@ EvtScript N(afterPartThrown) = { EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_ANIM_HIT), ANIM_Pokey_Anim0F) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_ANIM_BURN), ANIM_Pokey_Anim1E) EVT_CALL(SetActorVar, ACTOR_SELF, N(VAR_ANIM_BURN2), ANIM_Pokey_Anim1F) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_1bodyPart))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_1bodyPart))) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_MULTI_TARGET, FALSE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 4, ACTOR_PART_FLAG_NO_TARGET, TRUE) EVT_CALL(SetPartFlagBits, ACTOR_SELF, 5, ACTOR_PART_FLAG_NO_TARGET, FALSE) diff --git a/src/battle/common/actor/putrid_piranha.inc.c b/src/battle/common/actor/putrid_piranha.inc.c index 9c289e56a2..3f49d51107 100644 --- a/src/battle/common/actor/putrid_piranha.inc.c +++ b/src/battle/common/actor/putrid_piranha.inc.c @@ -10,7 +10,7 @@ extern EvtScript N(handleEvent_8021B3D0); extern EvtScript N(bite); extern EvtScript N(breath); -s32 N(idleAnimations_8021B0A0)[] = { +s32 N(IdleAnimations_8021B0A0)[] = { STATUS_NORMAL, ANIM_LargePiranha_Putrid_Anim01, STATUS_STONE, ANIM_LargePiranha_Putrid_Anim00, STATUS_SLEEP, ANIM_LargePiranha_Putrid_Anim00, @@ -23,13 +23,13 @@ s32 N(idleAnimations_8021B0A0)[] = { STATUS_END, }; -s32 N(defenseTable_8021B0EC)[] = { +s32 N(DefenseTable_8021B0EC)[] = { ELEMENT_NORMAL, 0, ELEMENT_FIRE, 0, ELEMENT_END, }; -s32 N(statusTable_8021B100)[] = { +s32 N(StatusTable_8021B100)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 95, @@ -54,15 +54,15 @@ s32 N(statusTable_8021B100)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_8021B1AC)[] = { +ActorPartBlueprint N(PartsTable_8021B1AC)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { -15, 50 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021B0A0), - .defenseTable = N(defenseTable_8021B0EC), + .idleAnimations = N(IdleAnimations_8021B0A0), + .defenseTable = N(DefenseTable_8021B0EC), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 3, -14 }, @@ -74,10 +74,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_PUTRID_PIRANHA, .level = 17, .maxHP = 12, - .partCount = ARRAY_COUNT(N(partsTable_8021B1AC)), - .partsData = N(partsTable_8021B1AC), + .partCount = ARRAY_COUNT( N(PartsTable_8021B1AC)), + .partsData = N(PartsTable_8021B1AC), .initScript = &N(init_8021B1F8), - .statusTable = N(statusTable_8021B100), + .statusTable = N(StatusTable_8021B100), .escapeChance = 60, .airLiftChance = 20, .hurricaneChance = 20, diff --git a/src/battle/common/actor/red_magikoopa.inc.c b/src/battle/common/actor/red_magikoopa.inc.c index d86b32ef72..a54d64bf57 100644 --- a/src/battle/common/actor/red_magikoopa.inc.c +++ b/src/battle/common/actor/red_magikoopa.inc.c @@ -11,21 +11,21 @@ extern EvtScript N(init_flying); extern EvtScript N(flee); -extern s32 N(idleAnimations1)[]; -extern s32 N(idleAnimations2)[]; -extern s32 N(idleAnimations3)[]; +extern s32 N(IdleAnimations1)[]; +extern s32 N(IdleAnimations2)[]; +extern s32 N(IdleAnimations3)[]; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(defenseTable_flying)[] = { +s32 N(DefenseTable_flying)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 50, @@ -50,7 +50,7 @@ s32 N(statusTable)[] = { STATUS_END, }; -s32 N(statusTable_flying)[] = { +s32 N(StatusTable_flying)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 50, @@ -82,8 +82,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 2, 35 }, .opacity = 255, - .idleAnimations = N(idleAnimations1), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations1), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { -5, -12 }, @@ -97,8 +97,8 @@ ActorPartBlueprint N(parts_flying)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 2, 35 }, .opacity = 255, - .idleAnimations = N(idleAnimations1), - .defenseTable = N(defenseTable_flying), + .idleAnimations = N(IdleAnimations1), + .defenseTable = N(DefenseTable_flying), .eventFlags = ACTOR_EVENT_FLAG_RIDING_BROOMSTICK, .elementImmunityFlags = 0, .projectileTargetOffset = { -5, -12 }, @@ -109,8 +109,8 @@ ActorPartBlueprint N(parts_flying)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -10, 35 }, .opacity = 255, - .idleAnimations = N(idleAnimations2), - .defenseTable = N(defenseTable_flying), + .idleAnimations = N(IdleAnimations2), + .defenseTable = N(DefenseTable_flying), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -121,8 +121,8 @@ ActorPartBlueprint N(parts_flying)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations3), - .defenseTable = N(defenseTable_flying), + .idleAnimations = N(IdleAnimations3), + .defenseTable = N(DefenseTable_flying), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -137,7 +137,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 40, .airLiftChance = 80, .hurricaneChance = 70, @@ -160,7 +160,7 @@ ActorBlueprint N(flying) = { .partCount = ARRAY_COUNT(N(parts_flying)), .partsData = N(parts_flying), .initScript = &N(init_flying), - .statusTable = N(statusTable_flying), + .statusTable = N(StatusTable_flying), .escapeChance = 40, .airLiftChance = 95, .hurricaneChance = 75, @@ -175,7 +175,7 @@ ActorBlueprint N(flying) = { .statusMessageOffset = { 1, 34 }, }; -s32 N(idleAnimations1)[] = { +s32 N(IdleAnimations1)[] = { STATUS_NORMAL, ANIM_Magikoopa_Red_Anim01, STATUS_STONE, ANIM_Magikoopa_Red_Anim00, STATUS_SLEEP, ANIM_Magikoopa_Red_Anim08, @@ -188,7 +188,7 @@ s32 N(idleAnimations1)[] = { STATUS_END, }; -s32 N(idleAnimations2)[] = { +s32 N(IdleAnimations2)[] = { STATUS_NORMAL, ANIM_FlyingMagikoopa_Red_Anim01, STATUS_STONE, ANIM_FlyingMagikoopa_Red_Anim00, STATUS_SLEEP, ANIM_FlyingMagikoopa_Red_Anim08, @@ -201,7 +201,7 @@ s32 N(idleAnimations2)[] = { STATUS_END, }; -s32 N(idleAnimations3)[] = { +s32 N(IdleAnimations3)[] = { STATUS_NORMAL, ANIM_FlyingMagikoopa_Red_Anim0A, STATUS_END, }; @@ -393,7 +393,7 @@ EvtScript N(knockOff) = { EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent))) EVT_CALL(SetActorType, ACTOR_SELF, ACTOR_TYPE_RED_MAGIKOOPA) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable))) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 32) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_TYPE_CHANGED, TRUE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) diff --git a/src/battle/common/actor/red_shy_guy.inc.c b/src/battle/common/actor/red_shy_guy.inc.c index cc8c1eb63a..2aa427add5 100644 --- a/src/battle/common/actor/red_shy_guy.inc.c +++ b/src/battle/common/actor/red_shy_guy.inc.c @@ -3,19 +3,19 @@ #include "script_api/battle.h" #include "sprite/npc/ShyGuy.h" -extern s32 N(idleAnimations)[]; +extern s32 N(IdleAnimations)[]; extern EvtScript N(init); extern EvtScript N(takeTurn); extern EvtScript N(idle); extern EvtScript N(handleEvent); -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_SHOCK, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 70, @@ -47,8 +47,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -1, -10 }, @@ -63,7 +63,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 60, .airLiftChance = 85, .hurricaneChance = 80, @@ -78,7 +78,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_ShyGuy_Red_Anim01, STATUS_STONE, ANIM_ShyGuy_Red_Anim00, STATUS_SLEEP, ANIM_ShyGuy_Red_Anim12, diff --git a/src/battle/common/actor/slot_machine.inc.c b/src/battle/common/actor/slot_machine.inc.c index a7489d0357..44f7ea5ec2 100644 --- a/src/battle/common/actor/slot_machine.inc.c +++ b/src/battle/common/actor/slot_machine.inc.c @@ -13,12 +13,12 @@ s32 N(intTable1)[] = { 0, 1, 0, 2, 0, 2, 0, 2, }; s32 N(intTable2)[] = { 0, 1, 0, 2, 1, 2, 0, 2, }; s32 N(intTable3)[] = { 0, 1, 0, 2, 0, 2, 0, 2, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -51,7 +51,7 @@ ActorPartBlueprint N(parts)[] = { .targetOffset = { 0, 0 }, .opacity = 255, .idleAnimations = NULL, - .defenseTable = N(defenseTable), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -66,7 +66,7 @@ ActorBlueprint N(slot_machine_stop) = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -89,7 +89,7 @@ ActorBlueprint N(slot_machine_start) = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, diff --git a/src/battle/common/actor/spike_top.inc.c b/src/battle/common/actor/spike_top.inc.c index c1e006a97e..5238bb4814 100644 --- a/src/battle/common/actor/spike_top.inc.c +++ b/src/battle/common/actor/spike_top.inc.c @@ -4,7 +4,7 @@ #include "script_api/battle.h" #include "sprite/npc/SpikeTop.h" -extern s32 N(idleAnimations)[]; +extern s32 N(IdleAnimations)[]; extern EvtScript N(init); extern EvtScript N(idle); extern EvtScript N(spikeTop_TakeTurn_Ceiling); @@ -12,19 +12,19 @@ extern EvtScript N(spikeTop_HandleEvent_Ceiling); extern EvtScript N(spikeTop_TakeTurn_Floor); extern EvtScript N(spikeTop_HandleEvent_Floor); -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 4, ELEMENT_FIRE, 99, ELEMENT_BLAST, 99, ELEMENT_END, }; -s32 N(defenseTable_8021C8CC)[] = { +s32 N(DefenseTable_8021C8CC)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 60, @@ -56,8 +56,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP | ACTOR_EVENT_FLAG_FLIPABLE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 14 }, @@ -72,7 +72,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 60, .airLiftChance = 70, .hurricaneChance = 65, @@ -87,7 +87,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 8, 13 }, }; -s32 N(idleAnimations_8021C9D0)[] = { +s32 N(IdleAnimations_8021C9D0)[] = { STATUS_NORMAL, ANIM_SpikeTop_Anim03, STATUS_STONE, ANIM_SpikeTop_Anim00, STATUS_SLEEP, ANIM_SpikeTop_Anim1B, @@ -100,7 +100,7 @@ s32 N(idleAnimations_8021C9D0)[] = { STATUS_END, }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_SpikeTop_Anim04, STATUS_STONE, ANIM_SpikeTop_Anim01, STATUS_SLEEP, ANIM_SpikeTop_Anim1C, @@ -113,7 +113,7 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations_8021CA68)[] = { +s32 N(IdleAnimations_8021CA68)[] = { STATUS_NORMAL, ANIM_SpikeTop_Anim05, STATUS_STONE, ANIM_SpikeTop_Anim02, STATUS_SLEEP, ANIM_SpikeTop_Anim1D, @@ -142,7 +142,7 @@ EvtScript N(init) = { EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -9) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(spikeTop_TakeTurn_Floor))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(spikeTop_HandleEvent_Floor))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021C9D0))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021C9D0))) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, TRUE) EVT_END_IF @@ -167,8 +167,8 @@ EvtScript N(spikeTop_FallDown) = { EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(spikeTop_TakeTurn_Floor))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(spikeTop_HandleEvent_Floor))) EVT_CALL(SetActorVar, ACTOR_SELF, 9, 1) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_8021C8CC))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021CA68))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_8021C8CC))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021CA68))) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, TRUE) @@ -373,8 +373,8 @@ EvtScript N(spikeTop_HandleEvent_Floor) = { EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 1, 20) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -3, -8) EVT_CALL(SetActorVar, ACTOR_SELF, 9, 1) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_8021C8CC))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021CA68))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_8021C8CC))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021CA68))) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, FALSE) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, TRUE) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_SpikeTop_Anim13) @@ -555,7 +555,7 @@ EvtScript N(spikeTop_TakeTurn_Ceiling) = { EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) EVT_CALL(BindTakeTurn, ACTOR_SELF, EVT_PTR(N(spikeTop_TakeTurn_Floor))) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(spikeTop_HandleEvent_Floor))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021C9D0))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021C9D0))) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_FLIPABLE, TRUE) EVT_CALL(GetIndexFromPos, ACTOR_SELF, LVar0) @@ -711,8 +711,8 @@ EvtScript N(spikeTop_TakeTurn_Floor) = { EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 24) EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, -1, -9) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021C9D0))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021C9D0))) EVT_CALL(BindIdle, ACTOR_SELF, EVT_PTR(N(idle))) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_SPIKY_TOP, TRUE) diff --git a/src/battle/common/actor/spiked_goomba.inc.c b/src/battle/common/actor/spiked_goomba.inc.c index eccfdc4ef7..310f5f30f6 100644 --- a/src/battle/common/actor/spiked_goomba.inc.c +++ b/src/battle/common/actor/spiked_goomba.inc.c @@ -4,12 +4,12 @@ #include "script_api/battle.h" #include "sprite/npc/SpikedGoomba.h" -s32 N(defenseTable_8021E3B0)[] = { +s32 N(DefenseTable_8021E3B0)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_8021E3BC)[] = { +s32 N(StatusTable_8021E3BC)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 100, @@ -34,18 +34,18 @@ s32 N(statusTable_8021E3BC)[] = { STATUS_END, }; -extern s32 N(idleAnimations_8021E4B4)[]; +extern s32 N(IdleAnimations_8021E4B4)[]; extern EvtScript N(init_8021E54C); -ActorPartBlueprint N(partsTable_8021E468)[] = { +ActorPartBlueprint N(PartsTable_8021E468)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 24 }, .opacity = 255, - .idleAnimations = N(idleAnimations_8021E4B4), - .defenseTable = N(defenseTable_8021E3B0), + .idleAnimations = N(IdleAnimations_8021E4B4), + .defenseTable = N(DefenseTable_8021E3B0), .eventFlags = ACTOR_EVENT_FLAG_SPIKY_TOP, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -12 }, @@ -57,10 +57,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_SPIKED_GOOMBA, .level = 6, .maxHP = 2, - .partCount = ARRAY_COUNT(N(partsTable_8021E468)), - .partsData = N(partsTable_8021E468), + .partCount = ARRAY_COUNT( N(PartsTable_8021E468)), + .partsData = N(PartsTable_8021E468), .initScript = &N(init_8021E54C), - .statusTable = N(statusTable_8021E3BC), + .statusTable = N(StatusTable_8021E3BC), .escapeChance = 90, .airLiftChance = 95, .hurricaneChance = 90, @@ -75,7 +75,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, 20 }, }; -s32 N(idleAnimations_8021E4B4)[] = { +s32 N(IdleAnimations_8021E4B4)[] = { STATUS_NORMAL, ANIM_SpikedGoomba_Idle, STATUS_STONE, ANIM_SpikedGoomba_Still, STATUS_SLEEP, ANIM_SpikedGoomba_Sleep, @@ -88,7 +88,7 @@ s32 N(idleAnimations_8021E4B4)[] = { STATUS_END, }; -s32 N(idleAnimations_8021E500)[] = { +s32 N(IdleAnimations_8021E500)[] = { STATUS_NORMAL, ANIM_SpikedGoomba_Run, STATUS_STONE, ANIM_SpikedGoomba_Still, STATUS_SLEEP, ANIM_SpikedGoomba_Sleep, @@ -129,10 +129,10 @@ EvtScript N(idle_8021E598) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021E500))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021E500))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021E4B4))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021E4B4))) EVT_LOOP(20) EVT_LABEL(1) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) @@ -145,10 +145,10 @@ EvtScript N(idle_8021E598) = { EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_SUB(LVar0, 5) EVT_CALL(SetActorIdleSpeed, ACTOR_SELF, EVT_FLOAT(1.0)) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021E500))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021E500))) EVT_CALL(SetIdleGoal, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_CALL(IdleRunToGoal, ACTOR_SELF, 0) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_8021E4B4))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_8021E4B4))) EVT_LOOP(80) EVT_LABEL(2) EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar1) diff --git a/src/battle/common/actor/spiny.inc.c b/src/battle/common/actor/spiny.inc.c index e8eb2c62b9..0e0e1a3710 100644 --- a/src/battle/common/actor/spiny.inc.c +++ b/src/battle/common/actor/spiny.inc.c @@ -10,7 +10,7 @@ extern EvtScript N(takeTurn); extern EvtScript N(idle); extern EvtScript N(handleEvent); -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_Spiny_Anim01, STATUS_STONE, ANIM_Spiny_Anim00, STATUS_SLEEP, ANIM_Spiny_Anim10, @@ -23,7 +23,7 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations_flipped)[] = { +s32 N(IdleAnimations_flipped)[] = { STATUS_NORMAL, ANIM_Spiny_Anim02, STATUS_STONE, ANIM_Spiny_Anim15, STATUS_SLEEP, ANIM_Spiny_Anim11, @@ -36,22 +36,22 @@ s32 N(idleAnimations_flipped)[] = { STATUS_END, }; -s32 N(idleAnimations_2)[] = { +s32 N(IdleAnimations_2)[] = { STATUS_NORMAL, ANIM_Lakitu_Anim0B, STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 3, ELEMENT_END, }; -s32 N(defenseTable_flipped)[] = { +s32 N(DefenseTable_flipped)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 60, @@ -83,8 +83,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 20 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_FLIPABLE | ACTOR_EVENT_FLAG_200000, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -4 }, @@ -95,8 +95,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_2), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations_2), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -111,7 +111,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 60, .airLiftChance = 75, .hurricaneChance = 75, @@ -242,8 +242,8 @@ EvtScript N(handleEvent) = { EVT_END_IF EVT_CALL(SetActorVar, ACTOR_SELF, 0, 1) EVT_CALL(SetActorVar, ACTOR_SELF, 1, 1) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable_flipped))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flipped))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable_flipped))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_flipped))) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_200000, FALSE) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, TRUE) EVT_USE_BUF(N(bounceArray)) @@ -382,8 +382,8 @@ EvtScript N(takeTurn) = { EVT_SET_CONST(LVar2, ANIM_Spiny_Anim01) EVT_EXEC_WAIT(D_8029BBB4) EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) - EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetDefenseTable, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) EVT_CALL(SetPartEventBits, ACTOR_SELF, 1, ACTOR_EVENT_FLAG_200000, TRUE) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLIPPED, FALSE) EVT_END_IF diff --git a/src/battle/common/actor/swooper.inc.c b/src/battle/common/actor/swooper.inc.c index 3e33b06382..1301b93c56 100644 --- a/src/battle/common/actor/swooper.inc.c +++ b/src/battle/common/actor/swooper.inc.c @@ -3,18 +3,18 @@ #include "script_api/battle.h" #include "sprite/npc/Swooper.h" -extern s32 N(idleAnimations)[]; +extern s32 N(IdleAnimations)[]; extern EvtScript N(init); extern EvtScript N(takeTurn); extern EvtScript N(idle); extern EvtScript N(handleEvent); -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 80, @@ -46,8 +46,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 29 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 1, 15 }, @@ -62,7 +62,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 50, .airLiftChance = 100, .hurricaneChance = 95, @@ -77,7 +77,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, -20 }, }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_Swooper_Anim0C, STATUS_STONE, ANIM_Swooper_Anim0B, STATUS_SLEEP, ANIM_Swooper_Anim0F, @@ -90,7 +90,7 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations_flying)[] = { +s32 N(IdleAnimations_flying)[] = { STATUS_NORMAL, ANIM_Swooper_Anim02, STATUS_STONE, ANIM_Swooper_Anim01, STATUS_SLEEP, ANIM_Swooper_Anim13, @@ -129,7 +129,7 @@ EvtScript N(returnHome) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 0, -24, 0) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_SIN_OUT) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, TRUE) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Anim0C) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 24) @@ -269,7 +269,7 @@ EvtScript N(knockDown) = { EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -10) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 22) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flying))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_flying))) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, TRUE) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) @@ -392,7 +392,7 @@ EvtScript N(handleEvent) = { EVT_RETURN EVT_CASE_EQ(EVENT_BEGIN_FIRST_STRIKE) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flying))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_flying))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Anim02) EVT_CALL(SetActorPos, ACTOR_SELF, 20, 0, 0) EVT_CALL(HPBarToCurrent, ACTOR_SELF) diff --git a/src/battle/common/actor/swoopula.inc.c b/src/battle/common/actor/swoopula.inc.c index eed9fc7050..8ca0eeb09f 100644 --- a/src/battle/common/actor/swoopula.inc.c +++ b/src/battle/common/actor/swoopula.inc.c @@ -10,14 +10,14 @@ extern EvtScript N(idle); extern EvtScript N(takeTurn); extern EvtScript N(handleEvent); -extern s32 N(idleAnimations)[]; +extern s32 N(IdleAnimations)[]; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 60, @@ -49,8 +49,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 29 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 1, 15 }, @@ -65,7 +65,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 30, .airLiftChance = 95, .hurricaneChance = 95, @@ -80,7 +80,7 @@ ActorBlueprint NAMESPACE = { .statusMessageOffset = { 10, -20 }, }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_Swooper_Gray_Anim0C, STATUS_STONE, ANIM_Swooper_Gray_Anim0B, STATUS_SLEEP, ANIM_Swooper_Gray_Anim0F, @@ -93,7 +93,7 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations_flying)[] = { +s32 N(IdleAnimations_flying)[] = { STATUS_NORMAL, ANIM_Swooper_Gray_Anim02, STATUS_STONE, ANIM_Swooper_Gray_Anim01, STATUS_SLEEP, ANIM_Swooper_Gray_Anim13, @@ -130,7 +130,7 @@ EvtScript N(returnHome) = { EVT_CALL(AddGoalPos, ACTOR_SELF, 0, -24, 0) EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_SIN_OUT) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, TRUE) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Gray_Anim0C) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 24) @@ -272,7 +272,7 @@ EvtScript N(knockDown) = { EVT_CALL(SetProjectileTargetOffset, ACTOR_SELF, 1, 0, -10) EVT_CALL(SetTargetOffset, ACTOR_SELF, 1, 0, 22) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 20) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flying))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_flying))) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, TRUE) EVT_CALL(HPBarToHome, ACTOR_SELF) EVT_CALL(SetActorVar, ACTOR_SELF, 8, 1) @@ -395,7 +395,7 @@ EvtScript N(handleEvent) = { EVT_RETURN EVT_CASE_EQ(EVENT_BEGIN_FIRST_STRIKE) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_UPSIDE_DOWN, FALSE) - EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(idleAnimations_flying))) + EVT_CALL(SetIdleAnimations, ACTOR_SELF, 1, EVT_PTR(N(IdleAnimations_flying))) EVT_CALL(SetAnimation, ACTOR_SELF, 1, ANIM_Swooper_Gray_Anim02) EVT_CALL(SetActorPos, ACTOR_SELF, 20, 0, 0) EVT_CALL(HPBarToCurrent, ACTOR_SELF) @@ -419,7 +419,7 @@ EvtScript N(handleEvent) = { EVT_END }; -#include "common/UnkBattleFunc2.inc.c" +#include "common/SpawnEnemyDrainFX.inc.c" EvtScript N(takeTurn_flying) = { EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE) @@ -827,11 +827,11 @@ EvtScript N(takeTurn_flying) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) - EVT_CALL(N(UnkBattleFunc2), LVar0, LVar1, LVar2, LVar3) + EVT_CALL(N(SpawnDrainHealthStartFX), LVar0, LVar1, LVar2, LVar3) EVT_THREAD EVT_WAIT(15) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_25C) - EVT_CALL(N(UnkBattleFunc2_2), LVar0, LVar1, LVar2, LVar3) + EVT_CALL(N(SpawnDrainHealthContinueFX), LVar0, LVar1, LVar2, LVar3) EVT_END_THREAD EVT_ADD(LVar0, 20) EVT_ADD(LVar1, 20) @@ -1132,11 +1132,11 @@ EvtScript N(takeTurn) = { EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_214) EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2) EVT_ADD(LVar1, 15) - EVT_CALL(N(UnkBattleFunc2), LVar0, LVar1, LVar2, LVar3) + EVT_CALL(N(SpawnDrainHealthStartFX), LVar0, LVar1, LVar2, LVar3) EVT_THREAD EVT_WAIT(15) EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_25C) - EVT_CALL(N(UnkBattleFunc2_2), LVar0, LVar1, LVar2, LVar3) + EVT_CALL(N(SpawnDrainHealthContinueFX), LVar0, LVar1, LVar2, LVar3) EVT_END_THREAD EVT_ADD(LVar0, 20) EVT_ADD(LVar1, 20) diff --git a/src/battle/common/actor/whacka.inc.c b/src/battle/common/actor/whacka.inc.c index 3d7e5a4ce5..02ca08eab6 100644 --- a/src/battle/common/actor/whacka.inc.c +++ b/src/battle/common/actor/whacka.inc.c @@ -10,7 +10,7 @@ extern EvtScript N(handleEvent); extern EvtScript N(spawnWhackasBump); extern EvtScript N(die); -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_Whacka_Idle, STATUS_STONE, ANIM_Whacka_Still, STATUS_SLEEP, ANIM_Whacka_Idle, @@ -23,12 +23,12 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 0, @@ -60,8 +60,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 30 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -5 }, @@ -76,7 +76,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, diff --git a/src/battle/common/actor/white_clubba.inc.c b/src/battle/common/actor/white_clubba.inc.c index 51c764f39e..9babe98ac9 100644 --- a/src/battle/common/actor/white_clubba.inc.c +++ b/src/battle/common/actor/white_clubba.inc.c @@ -8,7 +8,7 @@ extern EvtScript N(idle); extern EvtScript N(takeTurn); extern EvtScript N(handleEvent); -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_BattleClubba_Frost_Anim01, STATUS_STONE, ANIM_BattleClubba_Frost_Anim00, STATUS_SLEEP, ANIM_BattleClubba_Frost_Anim03, @@ -21,14 +21,14 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_FIRE, -2, ELEMENT_ICE, 99, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 80, @@ -60,8 +60,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -12, 32 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_ICY, .elementImmunityFlags = 0, .projectileTargetOffset = { 8, -3 }, @@ -76,7 +76,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 50, .airLiftChance = 50, .hurricaneChance = 60, diff --git a/src/battle/common/actor/white_magikoopa.inc.c b/src/battle/common/actor/white_magikoopa.inc.c index eecdaa8aa4..e1d8429a9c 100644 --- a/src/battle/common/actor/white_magikoopa.inc.c +++ b/src/battle/common/actor/white_magikoopa.inc.c @@ -4,25 +4,25 @@ #include "sprite/npc/FlyingMagikoopa.h" #include "sprite/npc/Magikoopa.h" -extern s32 N(idleAnimations_80223D70)[]; -extern s32 N(idleAnimations_80223DBC)[]; -extern s32 N(idleAnimations_80223E08)[]; +extern s32 N(IdleAnimations_80223D70)[]; +extern s32 N(IdleAnimations_80223DBC)[]; +extern s32 N(IdleAnimations_80223E08)[]; extern EvtScript N(init_80225F58); extern EvtScript N(init_80225FBC); extern EvtScript N(takeTurn_802274E4); extern EvtScript N(run_away); -s32 N(defenseTable_80223B20)[] = { +s32 N(DefenseTable_80223B20)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(defenseTable_80223B2C)[] = { +s32 N(DefenseTable_80223B2C)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable_80223B38)[] = { +s32 N(StatusTable_80223B38)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 50, @@ -47,7 +47,7 @@ s32 N(statusTable_80223B38)[] = { STATUS_END, }; -s32 N(statusTable_80223BE4)[] = { +s32 N(StatusTable_80223BE4)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 50, @@ -72,30 +72,30 @@ s32 N(statusTable_80223BE4)[] = { STATUS_END, }; -ActorPartBlueprint N(partsTable_80223C90)[] = { +ActorPartBlueprint N(PartsTable_80223C90)[] = { { .flags = ACTOR_PART_FLAG_MULTI_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 2, 35 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80223D70), - .defenseTable = N(defenseTable_80223B20), + .idleAnimations = N(IdleAnimations_80223D70), + .defenseTable = N(DefenseTable_80223B20), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -5, -12 }, }, }; -ActorPartBlueprint N(partsTable_80223CB4)[] = { +ActorPartBlueprint N(PartsTable_80223CB4)[] = { { .flags = ACTOR_PART_FLAG_INVISIBLE | ACTOR_PART_FLAG_NO_TARGET, .index = 1, .posOffset = { 0, 0, 0 }, .targetOffset = { 2, 35 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80223D70), - .defenseTable = N(defenseTable_80223B2C), + .idleAnimations = N(IdleAnimations_80223D70), + .defenseTable = N(DefenseTable_80223B2C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { -5, -12 }, @@ -106,8 +106,8 @@ ActorPartBlueprint N(partsTable_80223CB4)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -10, 35 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80223DBC), - .defenseTable = N(defenseTable_80223B2C), + .idleAnimations = N(IdleAnimations_80223DBC), + .defenseTable = N(DefenseTable_80223B2C), .eventFlags = ACTOR_EVENT_FLAG_RIDING_BROOMSTICK, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -118,8 +118,8 @@ ActorPartBlueprint N(partsTable_80223CB4)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_80223E08), - .defenseTable = N(defenseTable_80223B2C), + .idleAnimations = N(IdleAnimations_80223E08), + .defenseTable = N(DefenseTable_80223B2C), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -131,10 +131,10 @@ ActorBlueprint NAMESPACE = { .type = ACTOR_TYPE_WHITE_MAGIKOOPA, .level = 21, .maxHP = 11, - .partCount = ARRAY_COUNT(N(partsTable_80223C90)), - .partsData = N(partsTable_80223C90), + .partCount = ARRAY_COUNT( N(PartsTable_80223C90)), + .partsData = N(PartsTable_80223C90), .initScript = &N(init_80225F58), - .statusTable = N(statusTable_80223B38), + .statusTable = N(StatusTable_80223B38), .escapeChance = 40, .airLiftChance = 80, .hurricaneChance = 70, @@ -154,10 +154,10 @@ ActorBlueprint N(flying) = { .type = ACTOR_TYPE_FLYING_WHITE_MAGIKOOPA, .level = 21, .maxHP = 11, - .partCount = ARRAY_COUNT(N(partsTable_80223CB4)), - .partsData = N(partsTable_80223CB4), + .partCount = ARRAY_COUNT( N(PartsTable_80223CB4)), + .partsData = N(PartsTable_80223CB4), .initScript = &N(init_80225FBC), - .statusTable = N(statusTable_80223BE4), + .statusTable = N(StatusTable_80223BE4), .escapeChance = 40, .airLiftChance = 95, .hurricaneChance = 75, @@ -172,7 +172,7 @@ ActorBlueprint N(flying) = { .statusMessageOffset = { 1, 34 }, }; -s32 N(idleAnimations_80223D70)[] = { +s32 N(IdleAnimations_80223D70)[] = { STATUS_NORMAL, ANIM_Magikoopa_White_Anim01, STATUS_STONE, ANIM_Magikoopa_White_Anim00, STATUS_SLEEP, ANIM_Magikoopa_White_Anim08, @@ -185,7 +185,7 @@ s32 N(idleAnimations_80223D70)[] = { STATUS_END, }; -s32 N(idleAnimations_80223DBC)[] = { +s32 N(IdleAnimations_80223DBC)[] = { STATUS_NORMAL, ANIM_FlyingMagikoopa_White_Anim01, STATUS_STONE, ANIM_FlyingMagikoopa_White_Anim00, STATUS_SLEEP, ANIM_FlyingMagikoopa_White_Anim08, @@ -198,7 +198,7 @@ s32 N(idleAnimations_80223DBC)[] = { STATUS_END, }; -s32 N(idleAnimations_80223E08)[] = { +s32 N(IdleAnimations_80223E08)[] = { STATUS_NORMAL, ANIM_FlyingMagikoopa_White_Anim0A, STATUS_END, }; @@ -398,7 +398,7 @@ EvtScript N(knockOff) = { EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent_80223E24))) EVT_CALL(SetActorType, ACTOR_SELF, ACTOR_TYPE_WHITE_MAGIKOOPA) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable_80223B38))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable_80223B38))) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 32) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_TYPE_CHANGED, TRUE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) diff --git a/src/battle/common/actor/yellow_magikoopa.inc.c b/src/battle/common/actor/yellow_magikoopa.inc.c index 88059bf361..771d18d3d2 100644 --- a/src/battle/common/actor/yellow_magikoopa.inc.c +++ b/src/battle/common/actor/yellow_magikoopa.inc.c @@ -5,8 +5,8 @@ #include "sprite/npc/Magikoopa.h" #include "sprite/npc/FlyingMagikoopa.h" -extern s32 N(idleAnimations)[]; -extern s32 N(idleAnimations_flying)[]; +extern s32 N(IdleAnimations)[]; +extern s32 N(IdleAnimations_flying)[]; extern s32 N(80225248)[]; extern EvtScript N(init); @@ -14,17 +14,17 @@ extern EvtScript N(takeTurn); extern EvtScript N(init_flying); extern EvtScript N(flee); -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(defenseTable_flying)[] = { +s32 N(DefenseTable_flying)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 50, @@ -49,7 +49,7 @@ s32 N(statusTable)[] = { STATUS_END, }; -s32 N(statusTable_flying)[] = { +s32 N(StatusTable_flying)[] = { STATUS_NORMAL, 0, STATUS_DEFAULT, 0, STATUS_SLEEP, 50, @@ -81,8 +81,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 2, 35 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { -5, -12 }, @@ -96,8 +96,8 @@ ActorPartBlueprint N(parts_flying)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 2, 35 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable_flying), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable_flying), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { -5, -12 }, @@ -108,8 +108,8 @@ ActorPartBlueprint N(parts_flying)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { -10, 35 }, .opacity = 255, - .idleAnimations = N(idleAnimations_flying), - .defenseTable = N(defenseTable_flying), + .idleAnimations = N(IdleAnimations_flying), + .defenseTable = N(DefenseTable_flying), .eventFlags = ACTOR_EVENT_FLAG_RIDING_BROOMSTICK, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, -8 }, @@ -121,7 +121,7 @@ ActorPartBlueprint N(parts_flying)[] = { .targetOffset = { 0, 0 }, .opacity = 255, .idleAnimations = N(80225248), - .defenseTable = N(defenseTable_flying), + .defenseTable = N(DefenseTable_flying), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -136,7 +136,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 40, .airLiftChance = 80, .hurricaneChance = 70, @@ -159,7 +159,7 @@ ActorBlueprint N(flying) = { .partCount = ARRAY_COUNT(N(parts_flying)), .partsData = N(parts_flying), .initScript = &N(init_flying), - .statusTable = N(statusTable_flying), + .statusTable = N(StatusTable_flying), .escapeChance = 40, .airLiftChance = 95, .hurricaneChance = 75, @@ -174,7 +174,7 @@ ActorBlueprint N(flying) = { .statusMessageOffset = { 1, 34 }, }; -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_Magikoopa_Yellow_Anim01, STATUS_STONE, ANIM_Magikoopa_Yellow_Anim00, STATUS_SLEEP, ANIM_Magikoopa_Yellow_Anim08, @@ -187,7 +187,7 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(idleAnimations_flying)[] = { +s32 N(IdleAnimations_flying)[] = { STATUS_NORMAL, ANIM_FlyingMagikoopa_Yellow_Anim01, STATUS_STONE, ANIM_FlyingMagikoopa_Yellow_Anim00, STATUS_SLEEP, ANIM_FlyingMagikoopa_Yellow_Anim08, @@ -392,7 +392,7 @@ EvtScript N(knockOff) = { EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_FLYING, FALSE) EVT_CALL(BindHandleEvent, ACTOR_SELF, EVT_PTR(N(handleEvent))) EVT_CALL(SetActorType, ACTOR_SELF, ACTOR_TYPE_YELLOW_MAGIKOOPA) - EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(statusTable))) + EVT_CALL(SetStatusTable, ACTOR_SELF, EVT_PTR(N(StatusTable))) EVT_CALL(N(UnkBattleFunc1), -10, 20, 10, 32) EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_TYPE_CHANGED, TRUE) EVT_CALL(ResetAllActorSounds, ACTOR_SELF) diff --git a/src/battle/partner/bombette.c b/src/battle/partner/bombette.c index bf71e6343d..a63b3b401b 100644 --- a/src/battle/partner/bombette.c +++ b/src/battle/partner/bombette.c @@ -250,7 +250,7 @@ API_CALLABLE(N(GetMegaBombDamage)) { return ApiStatus_DONE2; } -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_BattleBombette_Walk, STATUS_STONE, ANIM_BattleBombette_Still, STATUS_SLEEP, ANIM_BattleBombette_Sleep, @@ -261,12 +261,12 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 100, STATUS_DEFAULT, 100, STATUS_SLEEP, 100, @@ -298,8 +298,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 9, 20 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -314,7 +314,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, diff --git a/src/battle/partner/bow.c b/src/battle/partner/bow.c index 278e15c8b2..405338a821 100644 --- a/src/battle/partner/bow.c +++ b/src/battle/partner/bow.c @@ -144,7 +144,7 @@ API_CALLABLE(N(AverageSpookChance)) { return ApiStatus_DONE2; } -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_BattleBow_Walk, STATUS_STONE, ANIM_BattleBow_Still, STATUS_SLEEP, ANIM_BattleBow_Pray, @@ -155,12 +155,12 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 100, STATUS_DEFAULT, 100, STATUS_SLEEP, 100, @@ -192,8 +192,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 9, 19 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -208,7 +208,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, diff --git a/src/battle/partner/goombario.c b/src/battle/partner/goombario.c index 6b436b8b21..34208bef54 100644 --- a/src/battle/partner/goombario.c +++ b/src/battle/partner/goombario.c @@ -477,7 +477,7 @@ API_CALLABLE(N(GetChargeMessage)) { return ApiStatus_DONE2; } -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_BattleGoombario_Walk, STATUS_STONE, ANIM_BattleGoombario_Still, STATUS_SLEEP, ANIM_BattleGoombario_CloseEyes, @@ -488,12 +488,12 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 100, STATUS_DEFAULT, 100, STATUS_SLEEP, 100, @@ -525,8 +525,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 8, 22 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, }, @@ -540,7 +540,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, diff --git a/src/battle/partner/goompa.c b/src/battle/partner/goompa.c index e45d71d1ae..2806129c6b 100644 --- a/src/battle/partner/goompa.c +++ b/src/battle/partner/goompa.c @@ -14,17 +14,17 @@ extern EvtScript N(runAway); extern EvtScript N(runAwayFail); extern EvtScript N(executeAction); -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_Goompa_Walk, STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 100, STATUS_DEFAULT, 100, STATUS_SLEEP, 100, @@ -53,8 +53,8 @@ ActorPartBlueprint N(parts)[] = { { .index = 1, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), }, }; @@ -65,7 +65,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .spinSmashReq = 4, .powerBounceChance = 80, .size = { 29, 26 }, diff --git a/src/battle/partner/kooper.c b/src/battle/partner/kooper.c index 250f7ae30f..4f2af0d15f 100644 --- a/src/battle/partner/kooper.c +++ b/src/battle/partner/kooper.c @@ -177,7 +177,7 @@ API_CALLABLE(N(GetFireShellSpeedAndDamage)) { return ApiStatus_DONE2; } -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_BattleKooper_Walk, STATUS_STONE, ANIM_BattleKooper_Still, STATUS_SLEEP, ANIM_BattleKooper_Pray, @@ -188,12 +188,12 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 100, STATUS_DEFAULT, 100, STATUS_SLEEP, 100, @@ -225,8 +225,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 8, 27 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -241,7 +241,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, diff --git a/src/battle/partner/lakilester.c b/src/battle/partner/lakilester.c index 910ed09ac1..6871194bb2 100644 --- a/src/battle/partner/lakilester.c +++ b/src/battle/partner/lakilester.c @@ -85,24 +85,24 @@ API_CALLABLE(N(SpinyFlipUpdatePopup)) { } -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_BattleLakilester_Walk, STATUS_DAZE, ANIM_BattleLakilester_Injured, STATUS_TURN_DONE, ANIM_BattleLakilester_Still, STATUS_END, }; -s32 N(idleAnimations_spiny)[] = { +s32 N(IdleAnimations_spiny)[] = { STATUS_NORMAL, ANIM_BattleLakilester_Spiny, STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 100, STATUS_DEFAULT, 100, STATUS_SLEEP, 100, @@ -134,8 +134,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 12, 30 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -146,8 +146,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations_spiny), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations_spiny), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -162,7 +162,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, diff --git a/src/battle/partner/parakarry.c b/src/battle/partner/parakarry.c index 80ba969b5b..63cb6e33e9 100644 --- a/src/battle/partner/parakarry.c +++ b/src/battle/partner/parakarry.c @@ -609,7 +609,7 @@ API_CALLABLE(N(GetAirRaidDamage)) { return ApiStatus_DONE2; } -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_BattleParakarry_Walk, STATUS_STONE, ANIM_BattleParakarry_Still, STATUS_SLEEP, ANIM_BattleParakarry_Pray, @@ -620,12 +620,12 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 100, STATUS_DEFAULT, 100, STATUS_SLEEP, 100, @@ -657,8 +657,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 11, 28 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_GROUNDABLE, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -673,7 +673,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, diff --git a/src/battle/partner/sushie.c b/src/battle/partner/sushie.c index 1b91e790e2..18963da118 100644 --- a/src/battle/partner/sushie.c +++ b/src/battle/partner/sushie.c @@ -383,7 +383,7 @@ API_CALLABLE(N(SetScaleTidalWaveCharge)) { return ApiStatus_DONE2; } -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_BattleSushie_Walk, STATUS_STONE, ANIM_BattleSushie_Still, STATUS_SLEEP, ANIM_BattleSushie_Pray, @@ -394,12 +394,12 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 100, STATUS_DEFAULT, 100, STATUS_SLEEP, 100, @@ -431,8 +431,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 12, 17 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -447,7 +447,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, diff --git a/src/battle/partner/twink.c b/src/battle/partner/twink.c index 1aeaba741a..7e2ca93071 100644 --- a/src/battle/partner/twink.c +++ b/src/battle/partner/twink.c @@ -27,18 +27,18 @@ API_CALLABLE(func_80238000_714CF0) { return ApiStatus_DONE2; } -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_Twink_Angry, STATUS_TURN_DONE, ANIM_Twink_Still, STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 100, STATUS_DEFAULT, 100, STATUS_SLEEP, 100, @@ -70,8 +70,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 0, 0 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = 0, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -86,7 +86,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, @@ -111,7 +111,7 @@ EvtScript N(init) = { EVT_CALL(SetActorFlagBits, ACTOR_SELF, ACTOR_FLAG_NO_ATTACK, TRUE) EVT_END_IF EVT_CALL(SetActorVar, ACTOR_SELF, 0, 0) - EVT_CALL(SetActorVar, ACTOR_SELF, 1, EVT_PTR(N(defenseTable))) + EVT_CALL(SetActorVar, ACTOR_SELF, 1, EVT_PTR(N(DefenseTable))) EVT_CALL(AddActorDecoration, ACTOR_SELF, 1, 0, ACTOR_DECORATION_9) EVT_CALL(ModifyActorDecoration, ACTOR_SELF, 1, 0, 0, 0, 0, 0) EVT_RETURN diff --git a/src/battle/partner/watt.c b/src/battle/partner/watt.c index 511bbccce5..071892f1e5 100644 --- a/src/battle/partner/watt.c +++ b/src/battle/partner/watt.c @@ -439,7 +439,7 @@ API_CALLABLE(N(AverageTargetParalyzeChance)) { return ApiStatus_DONE2; } -s32 N(idleAnimations)[] = { +s32 N(IdleAnimations)[] = { STATUS_NORMAL, ANIM_BattleWatt_Walk, STATUS_STONE, ANIM_BattleWatt_Still, STATUS_SLEEP, ANIM_BattleWatt_Sleep, @@ -450,13 +450,13 @@ s32 N(idleAnimations)[] = { STATUS_END, }; -s32 N(defenseTable)[] = { +s32 N(DefenseTable)[] = { ELEMENT_NORMAL, 0, ELEMENT_SHOCK, 99, ELEMENT_END, }; -s32 N(statusTable)[] = { +s32 N(StatusTable)[] = { STATUS_NORMAL, 100, STATUS_DEFAULT, 100, STATUS_SLEEP, 100, @@ -488,8 +488,8 @@ ActorPartBlueprint N(parts)[] = { .posOffset = { 0, 0, 0 }, .targetOffset = { 10, 22 }, .opacity = 255, - .idleAnimations = N(idleAnimations), - .defenseTable = N(defenseTable), + .idleAnimations = N(IdleAnimations), + .defenseTable = N(DefenseTable), .eventFlags = ACTOR_EVENT_FLAG_ELECTRIFIED, .elementImmunityFlags = 0, .projectileTargetOffset = { 0, 0 }, @@ -504,7 +504,7 @@ ActorBlueprint NAMESPACE = { .partCount = ARRAY_COUNT(N(parts)), .partsData = N(parts), .initScript = &N(init), - .statusTable = N(statusTable), + .statusTable = N(StatusTable), .escapeChance = 0, .airLiftChance = 0, .hurricaneChance = 0, diff --git a/src/common/UnkBattleFunc2.inc.c b/src/common/SpawnEnemyDrainFX.inc.c similarity index 87% rename from src/common/UnkBattleFunc2.inc.c rename to src/common/SpawnEnemyDrainFX.inc.c index aa6bd04b40..2735c75329 100644 --- a/src/common/UnkBattleFunc2.inc.c +++ b/src/common/SpawnEnemyDrainFX.inc.c @@ -1,7 +1,7 @@ #include "common.h" #include "npc.h" -API_CALLABLE(N(UnkBattleFunc2)) { +API_CALLABLE(N(SpawnDrainHealthStartFX)) { Bytecode* args = script->ptrReadPos; s32 x = evt_get_variable(script, *args++); s32 y = evt_get_variable(script, *args++); @@ -12,7 +12,7 @@ API_CALLABLE(N(UnkBattleFunc2)) { return ApiStatus_DONE2; } -API_CALLABLE(N(UnkBattleFunc2_2)) { +API_CALLABLE(N(SpawnDrainHealthContinueFX)) { Bytecode* args = script->ptrReadPos; s32 x = evt_get_variable(script, *args++); s32 y = evt_get_variable(script, *args++); diff --git a/tools/star_rod_idx_to_c.py b/tools/star_rod_idx_to_c.py index 20e73c6db5..5dc3b88dbe 100755 --- a/tools/star_rod_idx_to_c.py +++ b/tools/star_rod_idx_to_c.py @@ -854,8 +854,8 @@ def disassemble(bytes, midx, symbol_map={}, comments=True, romstart=0, namespace out += INDENT + INDENT + f".posOffset = {{ {d[2]}, {d[3]}, {d[4]} }},\n" out += INDENT + INDENT + f".targetOffset = {{ {d[5]}, {d[6]} }},\n" out += INDENT + INDENT + f".opacity = {d[7]},\n" - out += INDENT + INDENT + f".idleAnimations = N(idleAnimations_{d[8]:08X}),\n" - out += INDENT + INDENT + f".defenseTable = N(defenseTable_{d[9]:08X}),\n" + out += INDENT + INDENT + f".idleAnimations = N(IdleAnimations_{d[8]:08X}),\n" + out += INDENT + INDENT + f".defenseTable = N(DefenseTable_{d[9]:08X}),\n" out += INDENT + INDENT + f".eventFlags = {read_flags(d[10], 'ActorEventFlags')},\n" out += INDENT + INDENT + f".elementImmunityFlags = {read_flags(d[11], 'ElementImmunityFlags')},\n" out += INDENT + INDENT + f".unk_1C = {d[12]},\n" diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index a5a15acca0..8591e4ef0e 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -9377,46 +9377,46 @@ b_area_kmr_part_1_Formation_0A = 0x80219480; // type:data rom:0x431E20 b_area_kmr_part_1_Formation_0B = 0x8021949C; // type:data rom:0x431E3C b_area_kmr_part_1_Formations = 0x802194D4; // type:data rom:0x431E74 b_area_kmr_part_1_Stages = 0x802195D8; // type:data rom:0x431F78 -b_area_kmr_part_1_goomba_defenseTable_80219750 = 0x80219610; // type:data rom:0x431FB0 -b_area_kmr_part_1_goomba_statusTable_8021975C = 0x8021961C; // type:data rom:0x431FBC -b_area_kmr_part_1_goomba_partsTable_80219808 = 0x802196C8; // type:data rom:0x432068 +b_area_kmr_part_1_goomba_DefenseTable_80219750 = 0x80219610; // type:data rom:0x431FB0 +b_area_kmr_part_1_goomba_StatusTable_8021975C = 0x8021961C; // type:data rom:0x431FBC +b_area_kmr_part_1_goomba_PartsTable_80219808 = 0x802196C8; // type:data rom:0x432068 b_area_kmr_part_1_goomba = 0x802196EC; // type:data rom:0x43208C -b_area_kmr_part_1_goomba_idleAnimations_80219854 = 0x80219714; // type:data rom:0x4320B4 -b_area_kmr_part_1_goomba_idleAnimations_802198A0 = 0x80219760; // type:data rom:0x432100 +b_area_kmr_part_1_goomba_IdleAnimations_80219854 = 0x80219714; // type:data rom:0x4320B4 +b_area_kmr_part_1_goomba_IdleAnimations_802198A0 = 0x80219760; // type:data rom:0x432100 b_area_kmr_part_1_goomba_init_802198EC = 0x802197AC; // type:data rom:0x43214C b_area_kmr_part_1_goomba_idle_80219938 = 0x802197F8; // type:data rom:0x432198 b_area_kmr_part_1_goomba_handleEvent_80219C14 = 0x80219AD4; // type:data rom:0x432474 b_area_kmr_part_1_goomba_sinTable = 0x8021A194; // type:data rom:0x432B34 b_area_kmr_part_1_goomba_takeTurn_8021A440 = 0x8021A300; // type:data rom:0x432CA0 -b_area_kmr_part_1_spiked_goomba_defenseTable_8021E3B0 = 0x8021AFD0; // type:data rom:0x433970 -b_area_kmr_part_1_spiked_goomba_statusTable_8021E3BC = 0x8021AFDC; // type:data rom:0x43397C -b_area_kmr_part_1_spiked_goomba_partsTable_8021E468 = 0x8021B088; // type:data rom:0x433A28 +b_area_kmr_part_1_spiked_goomba_DefenseTable_8021E3B0 = 0x8021AFD0; // type:data rom:0x433970 +b_area_kmr_part_1_spiked_goomba_StatusTable_8021E3BC = 0x8021AFDC; // type:data rom:0x43397C +b_area_kmr_part_1_spiked_goomba_PartsTable_8021E468 = 0x8021B088; // type:data rom:0x433A28 b_area_kmr_part_1_spiked_goomba = 0x8021B0AC; // type:data rom:0x433A4C -b_area_kmr_part_1_spiked_goomba_idleAnimations_8021E4B4 = 0x8021B0D4; // type:data rom:0x433A74 -b_area_kmr_part_1_spiked_goomba_idleAnimations_8021E500 = 0x8021B120; // type:data rom:0x433AC0 +b_area_kmr_part_1_spiked_goomba_IdleAnimations_8021E4B4 = 0x8021B0D4; // type:data rom:0x433A74 +b_area_kmr_part_1_spiked_goomba_IdleAnimations_8021E500 = 0x8021B120; // type:data rom:0x433AC0 b_area_kmr_part_1_spiked_goomba_init_8021E54C = 0x8021B16C; // type:data rom:0x433B0C b_area_kmr_part_1_spiked_goomba_idle_8021E598 = 0x8021B1B8; // type:data rom:0x433B58 b_area_kmr_part_1_spiked_goomba_handleEvent_8021E874 = 0x8021B494; // type:data rom:0x433E34 b_area_kmr_part_1_spiked_goomba_sinTable = 0x8021BC70; // type:data rom:0x434610 b_area_kmr_part_1_spiked_goomba_takeTurn_8021F1BC = 0x8021BDDC; // type:data rom:0x43477C -b_area_kmr_part_1_paragoomba_defenseTable_8021B110 = 0x8021CB00; // type:data rom:0x4354A0 -b_area_kmr_part_1_paragoomba_defenseTable_8021B11C = 0x8021CB0C; // type:data rom:0x4354AC -b_area_kmr_part_1_paragoomba_statusTable_8021B128 = 0x8021CB18; // type:data rom:0x4354B8 -b_area_kmr_part_1_paragoomba_statusTable_8021B1D4 = 0x8021CBC4; // type:data rom:0x435564 -b_area_kmr_part_1_paragoomba_partsTable_8021B280 = 0x8021CC70; // type:data rom:0x435610 +b_area_kmr_part_1_paragoomba_DefenseTable_8021B110 = 0x8021CB00; // type:data rom:0x4354A0 +b_area_kmr_part_1_paragoomba_DefenseTable_8021B11C = 0x8021CB0C; // type:data rom:0x4354AC +b_area_kmr_part_1_paragoomba_StatusTable_8021B128 = 0x8021CB18; // type:data rom:0x4354B8 +b_area_kmr_part_1_paragoomba_StatusTable_8021B1D4 = 0x8021CBC4; // type:data rom:0x435564 +b_area_kmr_part_1_paragoomba_PartsTable_8021B280 = 0x8021CC70; // type:data rom:0x435610 b_area_kmr_part_1_paragoomba = 0x8021CD00; // type:data rom:0x4356A0 -b_area_kmr_part_1_paragoomba_idleAnimations_8021B338 = 0x8021CD28; // type:data rom:0x4356C8 -b_area_kmr_part_1_paragoomba_idleAnimations_8021B384 = 0x8021CD74; // type:data rom:0x435714 -b_area_kmr_part_1_paragoomba_idleAnimations_8021B3D0 = 0x8021CDC0; // type:data rom:0x435760 -b_area_kmr_part_1_paragoomba_idleAnimations_8021B3DC = 0x8021CDCC; // type:data rom:0x43576C +b_area_kmr_part_1_paragoomba_IdleAnimations_8021B338 = 0x8021CD28; // type:data rom:0x4356C8 +b_area_kmr_part_1_paragoomba_IdleAnimations_8021B384 = 0x8021CD74; // type:data rom:0x435714 +b_area_kmr_part_1_paragoomba_IdleAnimations_8021B3D0 = 0x8021CDC0; // type:data rom:0x435760 +b_area_kmr_part_1_paragoomba_IdleAnimations_8021B3DC = 0x8021CDCC; // type:data rom:0x43576C b_area_kmr_part_1_paragoomba_init_8021B3E8 = 0x8021CDD8; // type:data rom:0x435778 b_area_kmr_part_1_paragoomba_idle_8021B434 = 0x8021CE24; // type:data rom:0x4357C4 b_area_kmr_part_1_paragoomba_8021B6F0 = 0x8021D0E0; // type:data rom:0x435A80 b_area_kmr_part_1_paragoomba_handleEvent_8021B768 = 0x8021D158; // type:data rom:0x435AF8 b_area_kmr_part_1_paragoomba_takeTurn_8021BD5C = 0x8021D74C; // type:data rom:0x4360EC b_area_kmr_part_1_paragoomba_8021C574 = 0x8021DF64; // type:data rom:0x436904 -b_area_kmr_part_1_paragoomba_idleAnimations_8021CAFC = 0x8021E4EC; // type:data rom:0x436E8C -b_area_kmr_part_1_paragoomba_idleAnimations_8021CB48 = 0x8021E538; // type:data rom:0x436ED8 +b_area_kmr_part_1_paragoomba_IdleAnimations_8021CAFC = 0x8021E4EC; // type:data rom:0x436E8C +b_area_kmr_part_1_paragoomba_IdleAnimations_8021CB48 = 0x8021E538; // type:data rom:0x436ED8 b_area_kmr_part_1_paragoomba_8021CB94 = 0x8021E584; // type:data rom:0x436F24 b_area_kmr_part_1_paragoomba_idle_8021CBE0 = 0x8021E5D0; // type:data rom:0x436F70 b_area_kmr_part_1_paragoomba_handleEvent_8021CEBC = 0x8021E8AC; // type:data rom:0x43724C @@ -9481,12 +9481,12 @@ b_area_kmr_part_2_pos05 = 0x802197C4; // type:data rom:0x43B254 b_area_kmr_part_2_Formation_01 = 0x802197D0; // type:data rom:0x43B260 b_area_kmr_part_2_Formations = 0x80219840; // type:data rom:0x43B2D0 b_area_kmr_part_2_Stages = 0x8021987C; // type:data rom:0x43B30C -b_area_kmr_part_2_blue_goomba_defenseTable_802198B0 = 0x802198B0; // type:data rom:0x43B340 -b_area_kmr_part_2_blue_goomba_statusTable_802198BC = 0x802198BC; // type:data rom:0x43B34C -b_area_kmr_part_2_blue_goomba_partsTable_80219968 = 0x80219968; // type:data rom:0x43B3F8 +b_area_kmr_part_2_blue_goomba_DefenseTable_802198B0 = 0x802198B0; // type:data rom:0x43B340 +b_area_kmr_part_2_blue_goomba_StatusTable_802198BC = 0x802198BC; // type:data rom:0x43B34C +b_area_kmr_part_2_blue_goomba_PartsTable_80219968 = 0x80219968; // type:data rom:0x43B3F8 b_area_kmr_part_2_blue_goomba = 0x8021998C; // type:data rom:0x43B41C -b_area_kmr_part_2_blue_goomba_idleAnimations_802199B4 = 0x802199B4; // type:data rom:0x43B444 -b_area_kmr_part_2_blue_goomba_idleAnimations_80219A00 = 0x80219A00; // type:data rom:0x43B490 +b_area_kmr_part_2_blue_goomba_IdleAnimations_802199B4 = 0x802199B4; // type:data rom:0x43B444 +b_area_kmr_part_2_blue_goomba_IdleAnimations_80219A00 = 0x80219A00; // type:data rom:0x43B490 b_area_kmr_part_2_blue_goomba_init_80219A4C = 0x80219A4C; // type:data rom:0x43B4DC b_area_kmr_part_2_blue_goomba_idle_80219A98 = 0x80219A98; // type:data rom:0x43B528 b_area_kmr_part_2_blue_goomba_handleEvent_80219D74 = 0x80219D74; // type:data rom:0x43B804 @@ -9495,12 +9495,12 @@ b_area_kmr_part_2_blue_goomba_takeTurn_8021A5A0 = 0x8021A5A0; // type:data rom:0 b_area_kmr_part_2_blue_goomba_init_8021B268 = 0x8021B268; // type:data rom:0x43CCF8 b_area_kmr_part_2_blue_goomba_takeTurn_8021B2C8 = 0x8021B2C8; // type:data rom:0x43CD58 b_area_kmr_part_2_blue_goomba_doDeath_8021B388 = 0x8021B388; // type:data rom:0x43CE18 -b_area_kmr_part_2_red_goomba_defenseTable_8021B6C0 = 0x8021B6C0; // type:data rom:0x43D150 -b_area_kmr_part_2_red_goomba_statusTable_8021B6CC = 0x8021B6CC; // type:data rom:0x43D15C -b_area_kmr_part_2_red_goomba_partsTable_8021B778 = 0x8021B778; // type:data rom:0x43D208 +b_area_kmr_part_2_red_goomba_DefenseTable_8021B6C0 = 0x8021B6C0; // type:data rom:0x43D150 +b_area_kmr_part_2_red_goomba_StatusTable_8021B6CC = 0x8021B6CC; // type:data rom:0x43D15C +b_area_kmr_part_2_red_goomba_PartsTable_8021B778 = 0x8021B778; // type:data rom:0x43D208 b_area_kmr_part_2_red_goomba = 0x8021B79C; // type:data rom:0x43D22C -b_area_kmr_part_2_red_goomba_idleAnimations_8021B7C4 = 0x8021B7C4; // type:data rom:0x43D254 -b_area_kmr_part_2_red_goomba_idleAnimations_8021B810 = 0x8021B810; // type:data rom:0x43D2A0 +b_area_kmr_part_2_red_goomba_IdleAnimations_8021B7C4 = 0x8021B7C4; // type:data rom:0x43D254 +b_area_kmr_part_2_red_goomba_IdleAnimations_8021B810 = 0x8021B810; // type:data rom:0x43D2A0 b_area_kmr_part_2_red_goomba_init_8021B85C = 0x8021B85C; // type:data rom:0x43D2EC b_area_kmr_part_2_red_goomba_idle_8021B8A8 = 0x8021B8A8; // type:data rom:0x43D338 b_area_kmr_part_2_red_goomba_handleEvent_8021BB84 = 0x8021BB84; // type:data rom:0x43D614 @@ -9508,37 +9508,37 @@ b_area_kmr_part_2_red_goomba_sinTable = 0x8021C244; // type:data rom:0x43DCD4 b_area_kmr_part_2_red_goomba_takeTurn_8021C3B0 = 0x8021C3B0; // type:data rom:0x43DE40 b_area_kmr_part_2_red_goomba_init_8021D078 = 0x8021D078; // type:data rom:0x43EB08 b_area_kmr_part_2_red_goomba_doDeath_8021D0C4 = 0x8021D0C4; // type:data rom:0x43EB54 -b_area_kmr_part_2_blue_goomba_2_defenseTable_8021D400 = 0x8021D400; // type:data rom:0x43EE90 -b_area_kmr_part_2_blue_goomba_2_statusTable_8021D40C = 0x8021D40C; // type:data rom:0x43EE9C -b_area_kmr_part_2_blue_goomba_2_partsTable_8021D4B8 = 0x8021D4B8; // type:data rom:0x43EF48 +b_area_kmr_part_2_blue_goomba_2_DefenseTable_8021D400 = 0x8021D400; // type:data rom:0x43EE90 +b_area_kmr_part_2_blue_goomba_2_StatusTable_8021D40C = 0x8021D40C; // type:data rom:0x43EE9C +b_area_kmr_part_2_blue_goomba_2_PartsTable_8021D4B8 = 0x8021D4B8; // type:data rom:0x43EF48 b_area_kmr_part_2_blue_goomba_2 = 0x8021D4DC; // type:data rom:0x43EF6C -b_area_kmr_part_2_blue_goomba_2_idleAnimations_8021D504 = 0x8021D504; // type:data rom:0x43EF94 -b_area_kmr_part_2_blue_goomba_2_idleAnimations_8021D550 = 0x8021D550; // type:data rom:0x43EFE0 +b_area_kmr_part_2_blue_goomba_2_IdleAnimations_8021D504 = 0x8021D504; // type:data rom:0x43EF94 +b_area_kmr_part_2_blue_goomba_2_IdleAnimations_8021D550 = 0x8021D550; // type:data rom:0x43EFE0 b_area_kmr_part_2_blue_goomba_2_init_8021D59C = 0x8021D59C; // type:data rom:0x43F02C b_area_kmr_part_2_blue_goomba_2_idle_8021D5E8 = 0x8021D5E8; // type:data rom:0x43F078 b_area_kmr_part_2_blue_goomba_2_handleEvent_8021D8C4 = 0x8021D8C4; // type:data rom:0x43F354 b_area_kmr_part_2_blue_goomba_2_sinTable = 0x8021DF84; // type:data rom:0x43FA14 b_area_kmr_part_2_blue_goomba_2_takeTurn_8021E0F0 = 0x8021E0F0; // type:data rom:0x43FB80 b_area_kmr_part_2_blue_goomba_2_init_8021EDB8 = 0x8021EDB8; // type:data rom:0x440848 -b_area_kmr_part_2_red_goomba_2_defenseTable_8021EE00 = 0x8021EE00; // type:data rom:0x440890 -b_area_kmr_part_2_red_goomba_2_statusTable_8021EE0C = 0x8021EE0C; // type:data rom:0x44089C -b_area_kmr_part_2_red_goomba_2_partsTable_8021EEB8 = 0x8021EEB8; // type:data rom:0x440948 +b_area_kmr_part_2_red_goomba_2_DefenseTable_8021EE00 = 0x8021EE00; // type:data rom:0x440890 +b_area_kmr_part_2_red_goomba_2_StatusTable_8021EE0C = 0x8021EE0C; // type:data rom:0x44089C +b_area_kmr_part_2_red_goomba_2_PartsTable_8021EEB8 = 0x8021EEB8; // type:data rom:0x440948 b_area_kmr_part_2_red_goomba_2 = 0x8021EEDC; // type:data rom:0x44096C -b_area_kmr_part_2_red_goomba_2_idleAnimations_8021EF04 = 0x8021EF04; // type:data rom:0x440994 -b_area_kmr_part_2_red_goomba_2_idleAnimations_8021EF50 = 0x8021EF50; // type:data rom:0x4409E0 +b_area_kmr_part_2_red_goomba_2_IdleAnimations_8021EF04 = 0x8021EF04; // type:data rom:0x440994 +b_area_kmr_part_2_red_goomba_2_IdleAnimations_8021EF50 = 0x8021EF50; // type:data rom:0x4409E0 b_area_kmr_part_2_red_goomba_2_init_8021EF9C = 0x8021EF9C; // type:data rom:0x440A2C b_area_kmr_part_2_red_goomba_2_idle_8021EFE8 = 0x8021EFE8; // type:data rom:0x440A78 b_area_kmr_part_2_red_goomba_2_handleEvent_8021F2C4 = 0x8021F2C4; // type:data rom:0x440D54 b_area_kmr_part_2_red_goomba_2_sinTable = 0x8021F984; // type:data rom:0x441414 b_area_kmr_part_2_red_goomba_2_takeTurn_8021FAF0 = 0x8021FAF0; // type:data rom:0x441580 b_area_kmr_part_2_red_goomba_2_init_802207B8 = 0x802207B8; // type:data rom:0x442248 -b_area_kmr_part_2_goomba_king_idleAnimations_80220800 = 0x80220800; // type:data rom:0x442290 -b_area_kmr_part_2_goomba_king_idleAnimations_80220844 = 0x80220844; // type:data rom:0x4422D4 -b_area_kmr_part_2_goomba_king_idleAnimations_80220888 = 0x80220888; // type:data rom:0x442318 -b_area_kmr_part_2_goomba_king_idleAnimations_802208CC = 0x802208CC; // type:data rom:0x44235C -b_area_kmr_part_2_goomba_king_defenseTable_80220910 = 0x80220910; // type:data rom:0x4423A0 -b_area_kmr_part_2_goomba_king_statusTable_8022091C = 0x8022091C; // type:data rom:0x4423AC -b_area_kmr_part_2_goomba_king_partsTable_802209C8 = 0x802209C8; // type:data rom:0x442458 +b_area_kmr_part_2_goomba_king_IdleAnimations_80220800 = 0x80220800; // type:data rom:0x442290 +b_area_kmr_part_2_goomba_king_IdleAnimations_80220844 = 0x80220844; // type:data rom:0x4422D4 +b_area_kmr_part_2_goomba_king_IdleAnimations_80220888 = 0x80220888; // type:data rom:0x442318 +b_area_kmr_part_2_goomba_king_IdleAnimations_802208CC = 0x802208CC; // type:data rom:0x44235C +b_area_kmr_part_2_goomba_king_DefenseTable_80220910 = 0x80220910; // type:data rom:0x4423A0 +b_area_kmr_part_2_goomba_king_StatusTable_8022091C = 0x8022091C; // type:data rom:0x4423AC +b_area_kmr_part_2_goomba_king_PartsTable_802209C8 = 0x802209C8; // type:data rom:0x442458 b_area_kmr_part_2_goomba_king = 0x80220A10; // type:data rom:0x4424A0 b_area_kmr_part_2_goomba_king_init_80220A38 = 0x80220A38; // type:data rom:0x4424C8 b_area_kmr_part_2_goomba_king_idle_80220B50 = 0x80220B50; // type:data rom:0x4425E0 @@ -9550,10 +9550,10 @@ b_area_kmr_part_2_goomba_king_80221CD4 = 0x80221CD4; // type:data rom:0x443764 b_area_kmr_part_2_goomba_king_nextTurn_802229C4 = 0x802229C4; // type:data rom:0x444454 b_area_kmr_part_2_goomba_king_80222D9C = 0x80222D9C; // type:data rom:0x44482C b_area_kmr_part_2_goomba_king_doDeath_80222F50 = 0x80222F50; // type:data rom:0x4449E0 -b_area_kmr_part_2_goomnut_tree_idleAnimations_802232D0 = 0x802232D0; // type:data rom:0x444D60 -b_area_kmr_part_2_goomnut_tree_defenseTable_802232DC = 0x802232DC; // type:data rom:0x444D6C -b_area_kmr_part_2_goomnut_tree_statusTable_802232F0 = 0x802232F0; // type:data rom:0x444D80 -b_area_kmr_part_2_goomnut_tree_partsTable_8022339C = 0x8022339C; // type:data rom:0x444E2C +b_area_kmr_part_2_goomnut_tree_IdleAnimations_802232D0 = 0x802232D0; // type:data rom:0x444D60 +b_area_kmr_part_2_goomnut_tree_DefenseTable_802232DC = 0x802232DC; // type:data rom:0x444D6C +b_area_kmr_part_2_goomnut_tree_StatusTable_802232F0 = 0x802232F0; // type:data rom:0x444D80 +b_area_kmr_part_2_goomnut_tree_PartsTable_8022339C = 0x8022339C; // type:data rom:0x444E2C b_area_kmr_part_2_goomnut_tree = 0x80223450; // type:data rom:0x444EE0 b_area_kmr_part_2_goomnut_tree_unk_missing_80223478 = 0x80223478; // type:data rom:0x444F08 b_area_kmr_part_2_goomnut_tree_init_80223488 = 0x80223488; // type:data rom:0x444F18 @@ -9636,12 +9636,12 @@ b_area_kmr_part_3_Formation_06 = 0x8021A274; // type:data rom:0x4496B4 b_area_kmr_part_3_Formation_07 = 0x8021A290; // type:data rom:0x4496D0 b_area_kmr_part_3_Formations = 0x8021A2AC; // type:data rom:0x4496EC b_area_kmr_part_3_Stages = 0x8021A360; // type:data rom:0x4497A0 -b_area_kmr_part_3_spiked_goomba_defenseTable_8021A390 = 0x8021A390; // type:data rom:0x4497D0 -b_area_kmr_part_3_spiked_goomba_statusTable_8021A39C = 0x8021A39C; // type:data rom:0x4497DC -b_area_kmr_part_3_spiked_goomba_partsTable_8021A448 = 0x8021A448; // type:data rom:0x449888 +b_area_kmr_part_3_spiked_goomba_DefenseTable_8021A390 = 0x8021A390; // type:data rom:0x4497D0 +b_area_kmr_part_3_spiked_goomba_StatusTable_8021A39C = 0x8021A39C; // type:data rom:0x4497DC +b_area_kmr_part_3_spiked_goomba_PartsTable_8021A448 = 0x8021A448; // type:data rom:0x449888 b_area_kmr_part_3_spiked_goomba = 0x8021A46C; // type:data rom:0x4498AC -b_area_kmr_part_3_spiked_goomba_idleAnimations_8021A494 = 0x8021A494; // type:data rom:0x4498D4 -b_area_kmr_part_3_spiked_goomba_idleAnimations_8021A4E0 = 0x8021A4E0; // type:data rom:0x449920 +b_area_kmr_part_3_spiked_goomba_IdleAnimations_8021A494 = 0x8021A494; // type:data rom:0x4498D4 +b_area_kmr_part_3_spiked_goomba_IdleAnimations_8021A4E0 = 0x8021A4E0; // type:data rom:0x449920 b_area_kmr_part_3_spiked_goomba_8021A52C = 0x8021A52C; // type:data rom:0x44996C b_area_kmr_part_3_spiked_goomba_idle_8021A578 = 0x8021A578; // type:data rom:0x4499B8 b_area_kmr_part_3_spiked_goomba_handleEvent_8021A854 = 0x8021A854; // type:data rom:0x449C94 @@ -9650,24 +9650,24 @@ b_area_kmr_part_3_spiked_goomba_takeTurn_8021B19C = 0x8021B19C; // type:data rom b_area_kmr_part_3_spiked_goomba_init_8021BEBC = 0x8021BEBC; // type:data rom:0x44B2FC b_area_kmr_part_3_spiked_goomba_8021BF1C = 0x8021BF1C; // type:data rom:0x44B35C b_area_kmr_part_3_spiked_goomba_nextTurn_8021C0FC = 0x8021C0FC; // type:data rom:0x44B53C -b_area_kmr_part_3_paragoomba1_defenseTable_8021C1B0 = 0x8021C1B0; // type:data rom:0x44B5F0 -b_area_kmr_part_3_paragoomba1_defenseTable_8021C1BC = 0x8021C1BC; // type:data rom:0x44B5FC -b_area_kmr_part_3_paragoomba1_statusTable_8021C1C8 = 0x8021C1C8; // type:data rom:0x44B608 -b_area_kmr_part_3_paragoomba1_statusTable_8021C274 = 0x8021C274; // type:data rom:0x44B6B4 -b_area_kmr_part_3_paragoomba1_partsTable = 0x8021C320; // type:data rom:0x44B760 +b_area_kmr_part_3_paragoomba1_DefenseTable_8021C1B0 = 0x8021C1B0; // type:data rom:0x44B5F0 +b_area_kmr_part_3_paragoomba1_DefenseTable_8021C1BC = 0x8021C1BC; // type:data rom:0x44B5FC +b_area_kmr_part_3_paragoomba1_StatusTable_8021C1C8 = 0x8021C1C8; // type:data rom:0x44B608 +b_area_kmr_part_3_paragoomba1_StatusTable_8021C274 = 0x8021C274; // type:data rom:0x44B6B4 +b_area_kmr_part_3_paragoomba1_PartsTable = 0x8021C320; // type:data rom:0x44B760 b_area_kmr_part_3_paragoomba1 = 0x8021C3B0; // type:data rom:0x44B7F0 -b_area_kmr_part_3_paragoomba1_idleAnimations_8021C3D8 = 0x8021C3D8; // type:data rom:0x44B818 -b_area_kmr_part_3_paragoomba1_idleAnimations_8021C424 = 0x8021C424; // type:data rom:0x44B864 -b_area_kmr_part_3_paragoomba1_idleAnimations_8021C470 = 0x8021C470; // type:data rom:0x44B8B0 -b_area_kmr_part_3_paragoomba1_idleAnimations_8021C47C = 0x8021C47C; // type:data rom:0x44B8BC +b_area_kmr_part_3_paragoomba1_IdleAnimations_8021C3D8 = 0x8021C3D8; // type:data rom:0x44B818 +b_area_kmr_part_3_paragoomba1_IdleAnimations_8021C424 = 0x8021C424; // type:data rom:0x44B864 +b_area_kmr_part_3_paragoomba1_IdleAnimations_8021C470 = 0x8021C470; // type:data rom:0x44B8B0 +b_area_kmr_part_3_paragoomba1_IdleAnimations_8021C47C = 0x8021C47C; // type:data rom:0x44B8BC b_area_kmr_part_3_paragoomba1_8021C488 = 0x8021C488; // type:data rom:0x44B8C8 b_area_kmr_part_3_paragoomba1_idle_8021C4D4 = 0x8021C4D4; // type:data rom:0x44B914 b_area_kmr_part_3_paragoomba1_8021C790 = 0x8021C790; // type:data rom:0x44BBD0 b_area_kmr_part_3_paragoomba1_handleEvent_8021C808 = 0x8021C808; // type:data rom:0x44BC48 b_area_kmr_part_3_paragoomba1_takeTurn_8021CDFC = 0x8021CDFC; // type:data rom:0x44C23C b_area_kmr_part_3_paragoomba1_8021D614 = 0x8021D614; // type:data rom:0x44CA54 -b_area_kmr_part_3_paragoomba1_idleAnimations_8021DB9C = 0x8021DB9C; // type:data rom:0x44CFDC -b_area_kmr_part_3_paragoomba1_idleAnimations_8021DBE8 = 0x8021DBE8; // type:data rom:0x44D028 +b_area_kmr_part_3_paragoomba1_IdleAnimations_8021DB9C = 0x8021DB9C; // type:data rom:0x44CFDC +b_area_kmr_part_3_paragoomba1_IdleAnimations_8021DBE8 = 0x8021DBE8; // type:data rom:0x44D028 b_area_kmr_part_3_paragoomba1_8021DC34 = 0x8021DC34; // type:data rom:0x44D074 b_area_kmr_part_3_paragoomba1_idle = 0x8021DC80; // type:data rom:0x44D0C0 b_area_kmr_part_3_paragoomba1_handleEvent_8021DF5C = 0x8021DF5C; // type:data rom:0x44D39C @@ -9676,55 +9676,55 @@ b_area_kmr_part_3_paragoomba1_takeTurn_8021E788 = 0x8021E788; // type:data rom:0 b_area_kmr_part_3_paragoomba1_init_8021F450 = 0x8021F450; // type:data rom:0x44E890 b_area_kmr_part_3_paragoomba1_8021F4B0 = 0x8021F4B0; // type:data rom:0x44E8F0 b_area_kmr_part_3_paragoomba1_nextTurn_8021F690 = 0x8021F690; // type:data rom:0x44EAD0 -b_area_kmr_part_3_paragoomba2_defenseTable_8021B110 = 0x8021F750; // type:data rom:0x44EB90 -b_area_kmr_part_3_paragoomba2_defenseTable_8021B11C = 0x8021F75C; // type:data rom:0x44EB9C -b_area_kmr_part_3_paragoomba2_statusTable_8021B128 = 0x8021F768; // type:data rom:0x44EBA8 -b_area_kmr_part_3_paragoomba2_statusTable_8021B1D4 = 0x8021F814; // type:data rom:0x44EC54 -b_area_kmr_part_3_paragoomba2_partsTable_8021B280 = 0x8021F8C0; // type:data rom:0x44ED00 +b_area_kmr_part_3_paragoomba2_DefenseTable_8021B110 = 0x8021F750; // type:data rom:0x44EB90 +b_area_kmr_part_3_paragoomba2_DefenseTable_8021B11C = 0x8021F75C; // type:data rom:0x44EB9C +b_area_kmr_part_3_paragoomba2_StatusTable_8021B128 = 0x8021F768; // type:data rom:0x44EBA8 +b_area_kmr_part_3_paragoomba2_StatusTable_8021B1D4 = 0x8021F814; // type:data rom:0x44EC54 +b_area_kmr_part_3_paragoomba2_PartsTable_8021B280 = 0x8021F8C0; // type:data rom:0x44ED00 b_area_kmr_part_3_paragoomba2 = 0x8021F950; // type:data rom:0x44ED90 -b_area_kmr_part_3_paragoomba2_idleAnimations_8021B338 = 0x8021F978; // type:data rom:0x44EDB8 -b_area_kmr_part_3_paragoomba2_idleAnimations_8021B384 = 0x8021F9C4; // type:data rom:0x44EE04 -b_area_kmr_part_3_paragoomba2_idleAnimations_8021B3D0 = 0x8021FA10; // type:data rom:0x44EE50 -b_area_kmr_part_3_paragoomba2_idleAnimations_8021B3DC = 0x8021FA1C; // type:data rom:0x44EE5C +b_area_kmr_part_3_paragoomba2_IdleAnimations_8021B338 = 0x8021F978; // type:data rom:0x44EDB8 +b_area_kmr_part_3_paragoomba2_IdleAnimations_8021B384 = 0x8021F9C4; // type:data rom:0x44EE04 +b_area_kmr_part_3_paragoomba2_IdleAnimations_8021B3D0 = 0x8021FA10; // type:data rom:0x44EE50 +b_area_kmr_part_3_paragoomba2_IdleAnimations_8021B3DC = 0x8021FA1C; // type:data rom:0x44EE5C b_area_kmr_part_3_paragoomba2_init_8021B3E8 = 0x8021FA28; // type:data rom:0x44EE68 b_area_kmr_part_3_paragoomba2_idle_8021B434 = 0x8021FA74; // type:data rom:0x44EEB4 b_area_kmr_part_3_paragoomba2_8021B6F0 = 0x8021FD30; // type:data rom:0x44F170 b_area_kmr_part_3_paragoomba2_handleEvent_8021B768 = 0x8021FDA8; // type:data rom:0x44F1E8 b_area_kmr_part_3_paragoomba2_takeTurn_8021BD5C = 0x8022039C; // type:data rom:0x44F7DC b_area_kmr_part_3_paragoomba2_8021C574 = 0x80220BB4; // type:data rom:0x44FFF4 -b_area_kmr_part_3_paragoomba2_idleAnimations_8021CAFC = 0x8022113C; // type:data rom:0x45057C -b_area_kmr_part_3_paragoomba2_idleAnimations_8021CB48 = 0x80221188; // type:data rom:0x4505C8 +b_area_kmr_part_3_paragoomba2_IdleAnimations_8021CAFC = 0x8022113C; // type:data rom:0x45057C +b_area_kmr_part_3_paragoomba2_IdleAnimations_8021CB48 = 0x80221188; // type:data rom:0x4505C8 b_area_kmr_part_3_paragoomba2_8021CB94 = 0x802211D4; // type:data rom:0x450614 b_area_kmr_part_3_paragoomba2_idle_8021CBE0 = 0x80221220; // type:data rom:0x450660 b_area_kmr_part_3_paragoomba2_handleEvent_8021CEBC = 0x802214FC; // type:data rom:0x45093C b_area_kmr_part_3_paragoomba2_sinTable = 0x80221BBC; // type:data rom:0x450FFC b_area_kmr_part_3_paragoomba2_takeTurn_8021D6E8 = 0x80221D28; // type:data rom:0x451168 -b_area_kmr_part_3_jr_troopa_idleAnimations_802229F0 = 0x802229F0; // type:data rom:0x451E30 -b_area_kmr_part_3_jr_troopa_defenseTable_80222A2C = 0x80222A2C; // type:data rom:0x451E6C -b_area_kmr_part_3_jr_troopa_statusTable_80222A38 = 0x80222A38; // type:data rom:0x451E78 -b_area_kmr_part_3_jr_troopa_partsTable_80222AE4 = 0x80222AE4; // type:data rom:0x451F24 +b_area_kmr_part_3_jr_troopa_IdleAnimations_802229F0 = 0x802229F0; // type:data rom:0x451E30 +b_area_kmr_part_3_jr_troopa_DefenseTable_80222A2C = 0x80222A2C; // type:data rom:0x451E6C +b_area_kmr_part_3_jr_troopa_StatusTable_80222A38 = 0x80222A38; // type:data rom:0x451E78 +b_area_kmr_part_3_jr_troopa_PartsTable_80222AE4 = 0x80222AE4; // type:data rom:0x451F24 b_area_kmr_part_3_jr_troopa = 0x80222B08; // type:data rom:0x451F48 b_area_kmr_part_3_jr_troopa_80222B30 = 0x80222B30; // type:data rom:0x451F70 b_area_kmr_part_3_jr_troopa_80222BC8 = 0x80222BC8; // type:data rom:0x452008 b_area_kmr_part_3_jr_troopa_80222C08 = 0x80222C08; // type:data rom:0x452048 -b_area_kmr_part_3_jr_troopa_idleAnimations_80222C6C = 0x80222C6C; // type:data rom:0x4520AC +b_area_kmr_part_3_jr_troopa_IdleAnimations_80222C6C = 0x80222C6C; // type:data rom:0x4520AC b_area_kmr_part_3_jr_troopa_80222C78 = 0x80222C78; // type:data rom:0x4520B8 b_area_kmr_part_3_jr_troopa_init_80223180 = 0x80223180; // type:data rom:0x4525C0 b_area_kmr_part_3_jr_troopa_8022325C = 0x8022325C; // type:data rom:0x45269C b_area_kmr_part_3_jr_troopa_handleEvent_80223290 = 0x80223290; // type:data rom:0x4526D0 b_area_kmr_part_3_jr_troopa_takeTurn_802234A4 = 0x802234A4; // type:data rom:0x4528E4 b_area_kmr_part_3_jr_troopa_nextTurn_80223D2C = 0x80223D2C; // type:data rom:0x45316C -b_area_kmr_part_3_egg_jr_troopa_idleAnimations_80224380 = 0x80224380; // type:data rom:0x4537C0 -b_area_kmr_part_3_egg_jr_troopa_idleAnimations_802243BC = 0x802243BC; // type:data rom:0x4537FC -b_area_kmr_part_3_egg_jr_troopa_idleAnimations_802243F8 = 0x802243F8; // type:data rom:0x453838 -b_area_kmr_part_3_egg_jr_troopa_defenseTable_8022440C = 0x8022440C; // type:data rom:0x45384C -b_area_kmr_part_3_egg_jr_troopa_statusTable_80224418 = 0x80224418; // type:data rom:0x453858 -b_area_kmr_part_3_egg_jr_troopa_partsTable_802244C4 = 0x802244C4; // type:data rom:0x453904 +b_area_kmr_part_3_egg_jr_troopa_IdleAnimations_80224380 = 0x80224380; // type:data rom:0x4537C0 +b_area_kmr_part_3_egg_jr_troopa_IdleAnimations_802243BC = 0x802243BC; // type:data rom:0x4537FC +b_area_kmr_part_3_egg_jr_troopa_IdleAnimations_802243F8 = 0x802243F8; // type:data rom:0x453838 +b_area_kmr_part_3_egg_jr_troopa_DefenseTable_8022440C = 0x8022440C; // type:data rom:0x45384C +b_area_kmr_part_3_egg_jr_troopa_StatusTable_80224418 = 0x80224418; // type:data rom:0x453858 +b_area_kmr_part_3_egg_jr_troopa_PartsTable_802244C4 = 0x802244C4; // type:data rom:0x453904 b_area_kmr_part_3_egg_jr_troopa = 0x802244E8; // type:data rom:0x453928 b_area_kmr_part_3_egg_jr_troopa_80224510 = 0x80224510; // type:data rom:0x453950 b_area_kmr_part_3_egg_jr_troopa_802245A8 = 0x802245A8; // type:data rom:0x4539E8 b_area_kmr_part_3_egg_jr_troopa_802245E8 = 0x802245E8; // type:data rom:0x453A28 -b_area_kmr_part_3_egg_jr_troopa_idleAnimations_8022464C = 0x8022464C; // type:data rom:0x453A8C +b_area_kmr_part_3_egg_jr_troopa_IdleAnimations_8022464C = 0x8022464C; // type:data rom:0x453A8C b_area_kmr_part_3_egg_jr_troopa_80224658 = 0x80224658; // type:data rom:0x453A98 b_area_kmr_part_3_egg_jr_troopa_80224964 = 0x80224964; // type:data rom:0x453DA4 b_area_kmr_part_3_egg_jr_troopa_init_80224A94 = 0x80224A94; // type:data rom:0x453ED4 @@ -9734,12 +9734,12 @@ b_area_kmr_part_3_egg_jr_troopa_802250E4 = 0x802250E4; // type:data rom:0x454524 b_area_kmr_part_3_egg_jr_troopa_802251CC = 0x802251CC; // type:data rom:0x45460C b_area_kmr_part_3_egg_jr_troopa_takeTurn_80225314 = 0x80225314; // type:data rom:0x454754 b_area_kmr_part_3_egg_jr_troopa_nextTurn_80225B4C = 0x80225B4C; // type:data rom:0x454F8C -b_area_kmr_part_3_para_jr_troopa_idleAnimations_80225DC0 = 0x80225DC0; // type:data rom:0x455200 -b_area_kmr_part_3_para_jr_troopa_idleAnimations_80225E04 = 0x80225E04; // type:data rom:0x455244 -b_area_kmr_part_3_para_jr_troopa_idleAnimations_80225E48 = 0x80225E48; // type:data rom:0x455288 -b_area_kmr_part_3_para_jr_troopa_defenseTable_80225E54 = 0x80225E54; // type:data rom:0x455294 -b_area_kmr_part_3_para_jr_troopa_statusTable_80225E60 = 0x80225E60; // type:data rom:0x4552A0 -b_area_kmr_part_3_para_jr_troopa_partsTable_80225F0C = 0x80225F0C; // type:data rom:0x45534C +b_area_kmr_part_3_para_jr_troopa_IdleAnimations_80225DC0 = 0x80225DC0; // type:data rom:0x455200 +b_area_kmr_part_3_para_jr_troopa_IdleAnimations_80225E04 = 0x80225E04; // type:data rom:0x455244 +b_area_kmr_part_3_para_jr_troopa_IdleAnimations_80225E48 = 0x80225E48; // type:data rom:0x455288 +b_area_kmr_part_3_para_jr_troopa_DefenseTable_80225E54 = 0x80225E54; // type:data rom:0x455294 +b_area_kmr_part_3_para_jr_troopa_StatusTable_80225E60 = 0x80225E60; // type:data rom:0x4552A0 +b_area_kmr_part_3_para_jr_troopa_PartsTable_80225F0C = 0x80225F0C; // type:data rom:0x45534C b_area_kmr_part_3_para_jr_troopa = 0x80225F54; // type:data rom:0x455394 b_area_kmr_part_3_para_jr_troopa_80225F7C = 0x80225F7C; // type:data rom:0x4553BC b_area_kmr_part_3_para_jr_troopa_802260AC = 0x802260AC; // type:data rom:0x4554EC @@ -9755,12 +9755,12 @@ b_area_kmr_part_3_para_jr_troopa_nextTurn_80227724 = 0x80227724; // type:data ro b_area_kmr_part_3_para_jr_troopa_802279B0 = 0x802279B0; // type:data rom:0x456DF0 b_area_kmr_part_3_para_jr_troopa_80227D38 = 0x80227D38; // type:data rom:0x457178 b_area_kmr_part_3_para_jr_troopa_80227E1C = 0x80227E1C; // type:data rom:0x45725C -b_area_kmr_part_3_spiked_para_jr_troopa_idleAnimations_80227F00 = 0x80227F00; // type:data rom:0x457340 -b_area_kmr_part_3_spiked_para_jr_troopa_idleAnimations_80227F44 = 0x80227F44; // type:data rom:0x457384 -b_area_kmr_part_3_spiked_para_jr_troopa_idleAnimations_80227F50 = 0x80227F50; // type:data rom:0x457390 -b_area_kmr_part_3_spiked_para_jr_troopa_defenseTable_80227F5C = 0x80227F5C; // type:data rom:0x45739C -b_area_kmr_part_3_spiked_para_jr_troopa_statusTable_80227F68 = 0x80227F68; // type:data rom:0x4573A8 -b_area_kmr_part_3_spiked_para_jr_troopa_partsTable_80228014 = 0x80228014; // type:data rom:0x457454 +b_area_kmr_part_3_spiked_para_jr_troopa_IdleAnimations_80227F00 = 0x80227F00; // type:data rom:0x457340 +b_area_kmr_part_3_spiked_para_jr_troopa_IdleAnimations_80227F44 = 0x80227F44; // type:data rom:0x457384 +b_area_kmr_part_3_spiked_para_jr_troopa_IdleAnimations_80227F50 = 0x80227F50; // type:data rom:0x457390 +b_area_kmr_part_3_spiked_para_jr_troopa_DefenseTable_80227F5C = 0x80227F5C; // type:data rom:0x45739C +b_area_kmr_part_3_spiked_para_jr_troopa_StatusTable_80227F68 = 0x80227F68; // type:data rom:0x4573A8 +b_area_kmr_part_3_spiked_para_jr_troopa_PartsTable_80228014 = 0x80228014; // type:data rom:0x457454 b_area_kmr_part_3_spiked_para_jr_troopa = 0x8022805C; // type:data rom:0x45749C b_area_kmr_part_3_spiked_para_jr_troopa_80228084 = 0x80228084; // type:data rom:0x4574C4 b_area_kmr_part_3_spiked_para_jr_troopa_802281B4 = 0x802281B4; // type:data rom:0x4575F4 @@ -9778,13 +9778,13 @@ b_area_kmr_part_3_spiked_para_jr_troopa_nextTurn_80229B38 = 0x80229B38; // type: b_area_kmr_part_3_spiked_para_jr_troopa_8022A018 = 0x8022A018; // type:data rom:0x459458 b_area_kmr_part_3_spiked_para_jr_troopa_8022A39C = 0x8022A39C; // type:data rom:0x4597DC b_area_kmr_part_3_spiked_para_jr_troopa_8022A480 = 0x8022A480; // type:data rom:0x4598C0 -b_area_kmr_part_3_mage_jr_troopa_idleAnimations_8022A550 = 0x8022A550; // type:data rom:0x459990 -b_area_kmr_part_3_mage_jr_troopa_idleAnimations_8022A594 = 0x8022A594; // type:data rom:0x4599D4 -b_area_kmr_part_3_mage_jr_troopa_idleAnimations_8022A5D8 = 0x8022A5D8; // type:data rom:0x459A18 -b_area_kmr_part_3_mage_jr_troopa_idleAnimations_8022A61C = 0x8022A61C; // type:data rom:0x459A5C -b_area_kmr_part_3_mage_jr_troopa_defenseTable_8022A628 = 0x8022A628; // type:data rom:0x459A68 -b_area_kmr_part_3_mage_jr_troopa_statusTable_8022A634 = 0x8022A634; // type:data rom:0x459A74 -b_area_kmr_part_3_mage_jr_troopa_partsTable_8022A6E0 = 0x8022A6E0; // type:data rom:0x459B20 +b_area_kmr_part_3_mage_jr_troopa_IdleAnimations_8022A550 = 0x8022A550; // type:data rom:0x459990 +b_area_kmr_part_3_mage_jr_troopa_IdleAnimations_8022A594 = 0x8022A594; // type:data rom:0x4599D4 +b_area_kmr_part_3_mage_jr_troopa_IdleAnimations_8022A5D8 = 0x8022A5D8; // type:data rom:0x459A18 +b_area_kmr_part_3_mage_jr_troopa_IdleAnimations_8022A61C = 0x8022A61C; // type:data rom:0x459A5C +b_area_kmr_part_3_mage_jr_troopa_DefenseTable_8022A628 = 0x8022A628; // type:data rom:0x459A68 +b_area_kmr_part_3_mage_jr_troopa_StatusTable_8022A634 = 0x8022A634; // type:data rom:0x459A74 +b_area_kmr_part_3_mage_jr_troopa_PartsTable_8022A6E0 = 0x8022A6E0; // type:data rom:0x459B20 b_area_kmr_part_3_mage_jr_troopa = 0x8022A728; // type:data rom:0x459B68 b_area_kmr_part_3_mage_jr_troopa_8022A750 = 0x8022A750; // type:data rom:0x459B90 b_area_kmr_part_3_mage_jr_troopa_8022A880 = 0x8022A880; // type:data rom:0x459CC0 @@ -9798,24 +9798,24 @@ b_area_kmr_part_3_mage_jr_troopa_takeTurn_8022B4F0 = 0x8022B4F0; // type:data ro b_area_kmr_part_3_mage_jr_troopa_nextTurn_8022BB44 = 0x8022BB44; // type:data rom:0x45AF84 b_area_kmr_part_3_mage_jr_troopa_8022BF1C = 0x8022BF1C; // type:data rom:0x45B35C b_area_kmr_part_3_mage_jr_troopa_8022C2A4 = 0x8022C2A4; // type:data rom:0x45B6E4 -b_area_kmr_part_3_final_jr_troopa_idleAnimations_8022C370 = 0x8022C370; // type:data rom:0x45B7B0 -b_area_kmr_part_3_final_jr_troopa_idleAnimations_8022C3A4 = 0x8022C3A4; // type:data rom:0x45B7E4 -b_area_kmr_part_3_final_jr_troopa_idleAnimations_8022C3D8 = 0x8022C3D8; // type:data rom:0x45B818 -b_area_kmr_part_3_final_jr_troopa_idleAnimations_8022C40C = 0x8022C40C; // type:data rom:0x45B84C -b_area_kmr_part_3_final_jr_troopa_defenseTable_8022C418 = 0x8022C418; // type:data rom:0x45B858 -b_area_kmr_part_3_final_jr_troopa_defenseTable_8022C424 = 0x8022C424; // type:data rom:0x45B864 -b_area_kmr_part_3_final_jr_troopa_defenseTable_8022C430 = 0x8022C430; // type:data rom:0x45B870 -b_area_kmr_part_3_final_jr_troopa_statusTable_8022C43C = 0x8022C43C; // type:data rom:0x45B87C -b_area_kmr_part_3_final_jr_troopa_statusTable_8022C4E8 = 0x8022C4E8; // type:data rom:0x45B928 -b_area_kmr_part_3_final_jr_troopa_statusTable_8022C594 = 0x8022C594; // type:data rom:0x45B9D4 -b_area_kmr_part_3_final_jr_troopa_partsTable_8022C640 = 0x8022C640; // type:data rom:0x45BA80 +b_area_kmr_part_3_final_jr_troopa_IdleAnimations_8022C370 = 0x8022C370; // type:data rom:0x45B7B0 +b_area_kmr_part_3_final_jr_troopa_IdleAnimations_8022C3A4 = 0x8022C3A4; // type:data rom:0x45B7E4 +b_area_kmr_part_3_final_jr_troopa_IdleAnimations_8022C3D8 = 0x8022C3D8; // type:data rom:0x45B818 +b_area_kmr_part_3_final_jr_troopa_IdleAnimations_8022C40C = 0x8022C40C; // type:data rom:0x45B84C +b_area_kmr_part_3_final_jr_troopa_DefenseTable_8022C418 = 0x8022C418; // type:data rom:0x45B858 +b_area_kmr_part_3_final_jr_troopa_DefenseTable_8022C424 = 0x8022C424; // type:data rom:0x45B864 +b_area_kmr_part_3_final_jr_troopa_DefenseTable_8022C430 = 0x8022C430; // type:data rom:0x45B870 +b_area_kmr_part_3_final_jr_troopa_StatusTable_8022C43C = 0x8022C43C; // type:data rom:0x45B87C +b_area_kmr_part_3_final_jr_troopa_StatusTable_8022C4E8 = 0x8022C4E8; // type:data rom:0x45B928 +b_area_kmr_part_3_final_jr_troopa_StatusTable_8022C594 = 0x8022C594; // type:data rom:0x45B9D4 +b_area_kmr_part_3_final_jr_troopa_PartsTable_8022C640 = 0x8022C640; // type:data rom:0x45BA80 b_area_kmr_part_3_final_jr_troopa = 0x8022C6AC; // type:data rom:0x45BAEC b_area_kmr_part_3_final_jr_troopa_8022C6D4 = 0x8022C6D4; // type:data rom:0x45BB14 b_area_kmr_part_3_final_jr_troopa_8022C804 = 0x8022C804; // type:data rom:0x45BC44 b_area_kmr_part_3_final_jr_troopa_8022CB2C = 0x8022CB2C; // type:data rom:0x45BF6C b_area_kmr_part_3_final_jr_troopa_8022CBC4 = 0x8022CBC4; // type:data rom:0x45C004 b_area_kmr_part_3_final_jr_troopa_8022CC04 = 0x8022CC04; // type:data rom:0x45C044 -b_area_kmr_part_3_final_jr_troopa_idleAnimations_8022CC68 = 0x8022CC68; // type:data rom:0x45C0A8 +b_area_kmr_part_3_final_jr_troopa_IdleAnimations_8022CC68 = 0x8022CC68; // type:data rom:0x45C0A8 b_area_kmr_part_3_final_jr_troopa_8022CC74 = 0x8022CC74; // type:data rom:0x45C0B4 b_area_kmr_part_3_final_jr_troopa_init_8022CF80 = 0x8022CF80; // type:data rom:0x45C3C0 b_area_kmr_part_3_final_jr_troopa_idle_8022D058 = 0x8022D058; // type:data rom:0x45C498 @@ -9917,14 +9917,14 @@ b_area_mac_lee_SetBackgroundAlpha = 0x80219780; // type:func rom:0x465C10 func_802197B8_465C48 = 0x802197B8; // type:func rom:0x465C48 func_80219824_465CB4 = 0x80219824; // type:func rom:0x465CB4 func_80219900_465D90 = 0x80219900; // type:func rom:0x465D90 -b_area_mac_chan_defenseTable_80219D50 = 0x80219D50; // type:data rom:0x4661E0 -b_area_mac_chan_defenseTable_80219D6C = 0x80219D6C; // type:data rom:0x4661FC -b_area_mac_chan_statusTable_80219D78 = 0x80219D78; // type:data rom:0x466208 -b_area_mac_chan_partsTable_80219E24 = 0x80219E24; // type:data rom:0x4662B4 +b_area_mac_chan_DefenseTable_80219D50 = 0x80219D50; // type:data rom:0x4661E0 +b_area_mac_chan_DefenseTable_80219D6C = 0x80219D6C; // type:data rom:0x4661FC +b_area_mac_chan_StatusTable_80219D78 = 0x80219D78; // type:data rom:0x466208 +b_area_mac_chan_PartsTable_80219E24 = 0x80219E24; // type:data rom:0x4662B4 b_area_mac_chan = 0x80219E48; // type:data rom:0x4662D8 -b_area_mac_chan_idleAnimations_80219E70 = 0x80219E70; // type:data rom:0x466300 -b_area_mac_chan_idleAnimations_80219EBC = 0x80219EBC; // type:data rom:0x46634C -b_area_mac_chan_idleAnimations_80219F08 = 0x80219F08; // type:data rom:0x466398 +b_area_mac_chan_IdleAnimations_80219E70 = 0x80219E70; // type:data rom:0x466300 +b_area_mac_chan_IdleAnimations_80219EBC = 0x80219EBC; // type:data rom:0x46634C +b_area_mac_chan_IdleAnimations_80219F08 = 0x80219F08; // type:data rom:0x466398 b_area_mac_chan_80219F4C = 0x80219F4C; // type:data rom:0x4663DC b_area_mac_chan_idle_8021A11C = 0x8021A11C; // type:data rom:0x4665AC b_area_mac_chan_8021A12C = 0x8021A12C; // type:data rom:0x4665BC @@ -9937,12 +9937,12 @@ b_area_mac_chan_takeTurn_Chan = 0x8021C2D4; // type:data rom:0x468764 b_area_mac_chan_init_8021CCDC = 0x8021CCDC; // type:data rom:0x46916C b_area_mac_chan_nextTurn_8021CD7C = 0x8021CD7C; // type:data rom:0x46920C b_area_mac_chan_handleEvent_8021D0CC = 0x8021D0CC; // type:data rom:0x46955C -b_area_mac_lee_idleAnimations_8021D360 = 0x8021D360; // type:data rom:0x4697F0 -b_area_mac_lee_idleAnimations_8021D3AC = 0x8021D3AC; // type:data rom:0x46983C +b_area_mac_lee_IdleAnimations_8021D360 = 0x8021D360; // type:data rom:0x4697F0 +b_area_mac_lee_IdleAnimations_8021D3AC = 0x8021D3AC; // type:data rom:0x46983C b_area_mac_lee_unk_missing_8021D3B8 = 0x8021D3B8; // type:data rom:0x469848 -b_area_mac_lee_defenseTable_8021D3C4 = 0x8021D3C4; // type:data rom:0x469854 -b_area_mac_lee_statusTable_8021D3D0 = 0x8021D3D0; // type:data rom:0x469860 -b_area_mac_lee_partsTable_8021D47C = 0x8021D47C; // type:data rom:0x46990C +b_area_mac_lee_DefenseTable_8021D3C4 = 0x8021D3C4; // type:data rom:0x469854 +b_area_mac_lee_StatusTable_8021D3D0 = 0x8021D3D0; // type:data rom:0x469860 +b_area_mac_lee_PartsTable_8021D47C = 0x8021D47C; // type:data rom:0x46990C b_area_mac_lee = 0x8021D4A0; // type:data rom:0x469930 b_area_mac_lee_init_8021D4C8 = 0x8021D4C8; // type:data rom:0x469958 b_area_mac_lee_idle_8021D5B4 = 0x8021D5B4; // type:data rom:0x469A44 @@ -9953,10 +9953,10 @@ b_area_mac_lee_8021E0E0 = 0x8021E0E0; // type:data rom:0x46A570 b_area_mac_lee_8021E118 = 0x8021E118; // type:data rom:0x46A5A8 b_area_mac_lee_8021E5DC = 0x8021E5DC; // type:data rom:0x46AA6C b_area_mac_lee_vector3D_8021E940 = 0x8021E940; // type:data rom:0x46ADD0 -b_area_mac_lee_idleAnimations_8021E94C = 0x8021E94C; // type:data rom:0x46ADDC -b_area_mac_lee_defenseTable_8021E998 = 0x8021E998; // type:data rom:0x46AE28 -b_area_mac_lee_statusTable_8021E9A4 = 0x8021E9A4; // type:data rom:0x46AE34 -b_area_mac_lee_partsTable_8021EA50 = 0x8021EA50; // type:data rom:0x46AEE0 +b_area_mac_lee_IdleAnimations_8021E94C = 0x8021E94C; // type:data rom:0x46ADDC +b_area_mac_lee_DefenseTable_8021E998 = 0x8021E998; // type:data rom:0x46AE28 +b_area_mac_lee_StatusTable_8021E9A4 = 0x8021E9A4; // type:data rom:0x46AE34 +b_area_mac_lee_PartsTable_8021EA50 = 0x8021EA50; // type:data rom:0x46AEE0 b_area_mac_lee_goombario = 0x8021EA74; // type:data rom:0x46AF04 b_area_mac_lee_init_Goombario = 0x8021EA9C; // type:data rom:0x46AF2C b_area_mac_lee_idle_8021EB14 = 0x8021EB14; // type:data rom:0x46AFA4 @@ -9969,12 +9969,12 @@ b_area_mac_lee_80220100 = 0x80220100; // type:data rom:0x46C590 b_area_mac_lee_takeTurn_802203F4 = 0x802203F4; // type:data rom:0x46C884 b_area_mac_lee_nextTurn_80220450 = 0x80220450; // type:data rom:0x46C8E0 b_area_mac_lee_formation_goombario = 0x80220524; // type:data rom:0x46C9B4 -b_area_mac_lee_idleAnimations_80220540 = 0x80220540; // type:data rom:0x46C9D0 -b_area_mac_lee_idleAnimations_8022058C = 0x8022058C; // type:data rom:0x46CA1C -b_area_mac_lee_defenseTable_802205D8 = 0x802205D8; // type:data rom:0x46CA68 -b_area_mac_lee_defenseTable_802205E4 = 0x802205E4; // type:data rom:0x46CA74 -b_area_mac_lee_statusTable_802205F0 = 0x802205F0; // type:data rom:0x46CA80 -b_area_mac_lee_partsTable_8022069C = 0x8022069C; // type:data rom:0x46CB2C +b_area_mac_lee_IdleAnimations_80220540 = 0x80220540; // type:data rom:0x46C9D0 +b_area_mac_lee_IdleAnimations_8022058C = 0x8022058C; // type:data rom:0x46CA1C +b_area_mac_lee_DefenseTable_802205D8 = 0x802205D8; // type:data rom:0x46CA68 +b_area_mac_lee_DefenseTable_802205E4 = 0x802205E4; // type:data rom:0x46CA74 +b_area_mac_lee_StatusTable_802205F0 = 0x802205F0; // type:data rom:0x46CA80 +b_area_mac_lee_PartsTable_8022069C = 0x8022069C; // type:data rom:0x46CB2C b_area_mac_lee_kooper = 0x802206C0; // type:data rom:0x46CB50 b_area_mac_lee_init_Kooper = 0x802206E8; // type:data rom:0x46CB78 b_area_mac_lee_idle_80220790 = 0x80220790; // type:data rom:0x46CC20 @@ -9983,10 +9983,10 @@ b_area_mac_lee_handleEvent_80220908 = 0x80220908; // type:data rom:0x46CD98 b_area_mac_lee_takeTurn_80221200 = 0x80221200; // type:data rom:0x46D690 b_area_mac_lee_nextTurn_802221A0 = 0x802221A0; // type:data rom:0x46E630 b_area_mac_lee_formation_kooper = 0x80222274; // type:data rom:0x46E704 -b_area_mac_lee_idleAnimations_80222290 = 0x80222290; // type:data rom:0x46E720 -b_area_mac_lee_defenseTable_802222DC = 0x802222DC; // type:data rom:0x46E76C -b_area_mac_lee_statusTable_802222E8 = 0x802222E8; // type:data rom:0x46E778 -b_area_mac_lee_partsTable_80222394 = 0x80222394; // type:data rom:0x46E824 +b_area_mac_lee_IdleAnimations_80222290 = 0x80222290; // type:data rom:0x46E720 +b_area_mac_lee_DefenseTable_802222DC = 0x802222DC; // type:data rom:0x46E76C +b_area_mac_lee_StatusTable_802222E8 = 0x802222E8; // type:data rom:0x46E778 +b_area_mac_lee_PartsTable_80222394 = 0x80222394; // type:data rom:0x46E824 b_area_mac_lee_bombette = 0x802223B8; // type:data rom:0x46E848 b_area_mac_lee_init_LeeBombette = 0x802223E0; // type:data rom:0x46E870 b_area_mac_lee_idle_80222458 = 0x80222458; // type:data rom:0x46E8E8 @@ -9994,10 +9994,10 @@ b_area_mac_lee_handleEvent_80222468 = 0x80222468; // type:data rom:0x46E8F8 b_area_mac_lee_takeTurn_802229C4 = 0x802229C4; // type:data rom:0x46EE54 b_area_mac_lee_nextTurn_80223298 = 0x80223298; // type:data rom:0x46F728 b_area_mac_lee_formation_bombette = 0x8022336C; // type:data rom:0x46F7FC -b_area_mac_lee_idleAnimations_80223388 = 0x80223388; // type:data rom:0x46F818 -b_area_mac_lee_defenseTable_802233D4 = 0x802233D4; // type:data rom:0x46F864 -b_area_mac_lee_statusTable_802233E0 = 0x802233E0; // type:data rom:0x46F870 -b_area_mac_lee_partsTable_8022348C = 0x8022348C; // type:data rom:0x46F91C +b_area_mac_lee_IdleAnimations_80223388 = 0x80223388; // type:data rom:0x46F818 +b_area_mac_lee_DefenseTable_802233D4 = 0x802233D4; // type:data rom:0x46F864 +b_area_mac_lee_StatusTable_802233E0 = 0x802233E0; // type:data rom:0x46F870 +b_area_mac_lee_PartsTable_8022348C = 0x8022348C; // type:data rom:0x46F91C b_area_mac_lee_parakarry = 0x802234D4; // type:data rom:0x46F964 b_area_mac_lee_init_Parakarry = 0x802234FC; // type:data rom:0x46F98C b_area_mac_lee_idle_80223574 = 0x80223574; // type:data rom:0x46FA04 @@ -10006,10 +10006,10 @@ b_area_mac_lee_80223B74 = 0x80223B74; // type:data rom:0x470004 b_area_mac_lee_takeTurn_80224304 = 0x80224304; // type:data rom:0x470794 b_area_mac_lee_nextTurn_80224320 = 0x80224320; // type:data rom:0x4707B0 b_area_mac_lee_formation_parakarry = 0x802243F4; // type:data rom:0x470884 -b_area_mac_lee_idleAnimations_80224410 = 0x80224410; // type:data rom:0x4708A0 -b_area_mac_lee_defenseTable_8022445C = 0x8022445C; // type:data rom:0x4708EC -b_area_mac_lee_statusTable_80224468 = 0x80224468; // type:data rom:0x4708F8 -b_area_mac_lee_partsTable_80224514 = 0x80224514; // type:data rom:0x4709A4 +b_area_mac_lee_IdleAnimations_80224410 = 0x80224410; // type:data rom:0x4708A0 +b_area_mac_lee_DefenseTable_8022445C = 0x8022445C; // type:data rom:0x4708EC +b_area_mac_lee_StatusTable_80224468 = 0x80224468; // type:data rom:0x4708F8 +b_area_mac_lee_PartsTable_80224514 = 0x80224514; // type:data rom:0x4709A4 b_area_mac_lee_bow = 0x8022455C; // type:data rom:0x4709EC b_area_mac_lee_init_Bow = 0x80224584; // type:data rom:0x470A14 b_area_mac_lee_idle_802245FC = 0x802245FC; // type:data rom:0x470A8C @@ -10017,10 +10017,10 @@ b_area_mac_lee_handleEvent_8022460C = 0x8022460C; // type:data rom:0x470A9C b_area_mac_lee_takeTurn_80224CA0 = 0x80224CA0; // type:data rom:0x471130 b_area_mac_lee_nextTurn_80225884 = 0x80225884; // type:data rom:0x471D14 b_area_mac_lee_formation_bow = 0x80225958; // type:data rom:0x471DE8 -b_area_mac_lee_idleAnimations_80225974 = 0x80225974; // type:data rom:0x471E04 -b_area_mac_lee_defenseTable_802259C0 = 0x802259C0; // type:data rom:0x471E50 -b_area_mac_lee_statusTable_802259D4 = 0x802259D4; // type:data rom:0x471E64 -b_area_mac_lee_partsTable_80225A80 = 0x80225A80; // type:data rom:0x471F10 +b_area_mac_lee_IdleAnimations_80225974 = 0x80225974; // type:data rom:0x471E04 +b_area_mac_lee_DefenseTable_802259C0 = 0x802259C0; // type:data rom:0x471E50 +b_area_mac_lee_StatusTable_802259D4 = 0x802259D4; // type:data rom:0x471E64 +b_area_mac_lee_PartsTable_80225A80 = 0x80225A80; // type:data rom:0x471F10 b_area_mac_lee_watt = 0x80225AC8; // type:data rom:0x471F58 b_area_mac_lee_init_Watt = 0x80225AF0; // type:data rom:0x471F80 b_area_mac_lee_idle_80225B68 = 0x80225B68; // type:data rom:0x471FF8 @@ -10028,10 +10028,10 @@ b_area_mac_lee_handleEvent_80225B90 = 0x80225B90; // type:data rom:0x472020 b_area_mac_lee_takeTurn_80226004 = 0x80226004; // type:data rom:0x472494 b_area_mac_lee_nextTurn_80226880 = 0x80226880; // type:data rom:0x472D10 b_area_mac_lee_formation_watt = 0x80226960; // type:data rom:0x472DF0 -b_area_mac_lee_idleAnimations_8022697C = 0x8022697C; // type:data rom:0x472E0C -b_area_mac_lee_defenseTable_802269C8 = 0x802269C8; // type:data rom:0x472E58 -b_area_mac_lee_statusTable_802269D4 = 0x802269D4; // type:data rom:0x472E64 -b_area_mac_lee_partsTable_80226A80 = 0x80226A80; // type:data rom:0x472F10 +b_area_mac_lee_IdleAnimations_8022697C = 0x8022697C; // type:data rom:0x472E0C +b_area_mac_lee_DefenseTable_802269C8 = 0x802269C8; // type:data rom:0x472E58 +b_area_mac_lee_StatusTable_802269D4 = 0x802269D4; // type:data rom:0x472E64 +b_area_mac_lee_PartsTable_80226A80 = 0x80226A80; // type:data rom:0x472F10 b_area_mac_lee_sushie = 0x80226AA4; // type:data rom:0x472F34 b_area_mac_lee_init_Sushie = 0x80226ACC; // type:data rom:0x472F5C b_area_mac_lee_idle_80226B44 = 0x80226B44; // type:data rom:0x472FD4 @@ -10039,11 +10039,11 @@ b_area_mac_lee_handleEvent_80226B54 = 0x80226B54; // type:data rom:0x472FE4 b_area_mac_lee_takeTurn_802270BC = 0x802270BC; // type:data rom:0x47354C b_area_mac_lee_nextTurn_8022831C = 0x8022831C; // type:data rom:0x4747AC b_area_mac_lee_formation_sushie = 0x802283F0; // type:data rom:0x474880 -b_area_mac_lee_idleAnimations_8022840C = 0x8022840C; // type:data rom:0x47489C -b_area_mac_lee_idleAnimations_80228458 = 0x80228458; // type:data rom:0x4748E8 -b_area_mac_lee_defenseTable_80228464 = 0x80228464; // type:data rom:0x4748F4 -b_area_mac_lee_statusTable_80228470 = 0x80228470; // type:data rom:0x474900 -b_area_mac_lee_partsTable_8022851C = 0x8022851C; // type:data rom:0x4749AC +b_area_mac_lee_IdleAnimations_8022840C = 0x8022840C; // type:data rom:0x47489C +b_area_mac_lee_IdleAnimations_80228458 = 0x80228458; // type:data rom:0x4748E8 +b_area_mac_lee_DefenseTable_80228464 = 0x80228464; // type:data rom:0x4748F4 +b_area_mac_lee_StatusTable_80228470 = 0x80228470; // type:data rom:0x474900 +b_area_mac_lee_PartsTable_8022851C = 0x8022851C; // type:data rom:0x4749AC b_area_mac_lee_lakilester = 0x80228564; // type:data rom:0x4749F4 b_area_mac_lee_init_Lakilester = 0x8022858C; // type:data rom:0x474A1C b_area_mac_lee_idle_80228604 = 0x80228604; // type:data rom:0x474A94 @@ -10054,10 +10054,10 @@ b_area_mac_lee_formation_lakilester = 0x8022972C; // type:data rom:0x475BBC b_area_mac_lee_copyPartner = 0x80229748; // type:data rom:0x475BD8 b_area_mac_lee_takeTurn_80229F9C = 0x80229F9C; // type:data rom:0x47642C b_area_mac_lee_nextTurn_8022A038 = 0x8022A038; // type:data rom:0x4764C8 -b_area_mac_master1_idleAnimations_8022A260 = 0x8022A260; // type:data rom:0x4766F0 -b_area_mac_master1_defenseTable_8022A2AC = 0x8022A2AC; // type:data rom:0x47673C -b_area_mac_master1_statusTable_8022A2B8 = 0x8022A2B8; // type:data rom:0x476748 -b_area_mac_master1_partsTable_8022A364 = 0x8022A364; // type:data rom:0x4767F4 +b_area_mac_master1_IdleAnimations_8022A260 = 0x8022A260; // type:data rom:0x4766F0 +b_area_mac_master1_DefenseTable_8022A2AC = 0x8022A2AC; // type:data rom:0x47673C +b_area_mac_master1_StatusTable_8022A2B8 = 0x8022A2B8; // type:data rom:0x476748 +b_area_mac_master1_PartsTable_8022A364 = 0x8022A364; // type:data rom:0x4767F4 b_area_mac_master1 = 0x8022A388; // type:data rom:0x476818 b_area_mac_master1_init_8022A3B0 = 0x8022A3B0; // type:data rom:0x476840 b_area_mac_master1_idle_8022A494 = 0x8022A494; // type:data rom:0x476924 @@ -10065,11 +10065,11 @@ b_area_mac_master1_8022A4A4 = 0x8022A4A4; // type:data rom:0x476934 b_area_mac_master1_takeTurn_8022AA54 = 0x8022AA54; // type:data rom:0x476EE4 b_area_mac_master1_nextTurn_8022B06C = 0x8022B06C; // type:data rom:0x4774FC b_area_mac_master1_handleEvent_8022B2CC = 0x8022B2CC; // type:data rom:0x47775C -b_area_mac_master2_idleAnimations_8022B640 = 0x8022B640; // type:data rom:0x477AD0 -b_area_mac_master2_idleAnimations_8022B68C = 0x8022B68C; // type:data rom:0x477B1C -b_area_mac_master2_defenseTable_8022B6D8 = 0x8022B6D8; // type:data rom:0x477B68 -b_area_mac_master2_statusTable_8022B6E4 = 0x8022B6E4; // type:data rom:0x477B74 -b_area_mac_master2_partsTable_8022B790 = 0x8022B790; // type:data rom:0x477C20 +b_area_mac_master2_IdleAnimations_8022B640 = 0x8022B640; // type:data rom:0x477AD0 +b_area_mac_master2_IdleAnimations_8022B68C = 0x8022B68C; // type:data rom:0x477B1C +b_area_mac_master2_DefenseTable_8022B6D8 = 0x8022B6D8; // type:data rom:0x477B68 +b_area_mac_master2_StatusTable_8022B6E4 = 0x8022B6E4; // type:data rom:0x477B74 +b_area_mac_master2_PartsTable_8022B790 = 0x8022B790; // type:data rom:0x477C20 b_area_mac_master2 = 0x8022B7B4; // type:data rom:0x477C44 b_area_mac_master2_init_8022B7DC = 0x8022B7DC; // type:data rom:0x477C6C b_area_mac_master2_idle_8022B8B0 = 0x8022B8B0; // type:data rom:0x477D40 @@ -10079,11 +10079,11 @@ b_area_mac_master2_doubleStrike2 = 0x8022C5D0; // type:data rom:0x478A60 b_area_mac_master2_takeTurn_8022CF48 = 0x8022CF48; // type:data rom:0x4793D8 b_area_mac_master2_nextTurn_8022CFFC = 0x8022CFFC; // type:data rom:0x47948C b_area_mac_master2_handleEvent_8022D634 = 0x8022D634; // type:data rom:0x479AC4 -b_area_mac_master3_idleAnimations_8022D9A0 = 0x8022D9A0; // type:data rom:0x479E30 -b_area_mac_master3_idleAnimations_8022D9EC = 0x8022D9EC; // type:data rom:0x479E7C -b_area_mac_master3_defenseTable_8022DA38 = 0x8022DA38; // type:data rom:0x479EC8 -b_area_mac_master3_statusTable_8022DA44 = 0x8022DA44; // type:data rom:0x479ED4 -b_area_mac_master3_partsTable_8022DAF0 = 0x8022DAF0; // type:data rom:0x479F80 +b_area_mac_master3_IdleAnimations_8022D9A0 = 0x8022D9A0; // type:data rom:0x479E30 +b_area_mac_master3_IdleAnimations_8022D9EC = 0x8022D9EC; // type:data rom:0x479E7C +b_area_mac_master3_DefenseTable_8022DA38 = 0x8022DA38; // type:data rom:0x479EC8 +b_area_mac_master3_StatusTable_8022DA44 = 0x8022DA44; // type:data rom:0x479ED4 +b_area_mac_master3_PartsTable_8022DAF0 = 0x8022DAF0; // type:data rom:0x479F80 b_area_mac_master3 = 0x8022DB38; // type:data rom:0x479FC8 b_area_mac_master3_init_8022DB60 = 0x8022DB60; // type:data rom:0x479FF0 b_area_mac_master3_idle_8022DC34 = 0x8022DC34; // type:data rom:0x47A0C4 @@ -10129,22 +10129,22 @@ func_802184C0_47F570 = 0x802184C0; // type:func rom:0x47F570 func_802186B8_47F768 = 0x802186B8; // type:func rom:0x47F768 func_802189D0_47FA80 = 0x802189D0; // type:func rom:0x47FA80 func_80218CEC_47FD9C = 0x80218CEC; // type:func rom:0x47FD9C -b_area_hos_goombario_tutor_idleAnimations_80219010 = 0x80219010; // type:data rom:0x4800C0 -b_area_hos_goombario_tutor_defenseTable_8021905C = 0x8021905C; // type:data rom:0x48010C -b_area_hos_goombario_tutor_statusTable_80219068 = 0x80219068; // type:data rom:0x480118 -b_area_hos_goombario_tutor_partsTable_80219114 = 0x80219114; // type:data rom:0x4801C4 +b_area_hos_goombario_tutor_IdleAnimations_80219010 = 0x80219010; // type:data rom:0x4800C0 +b_area_hos_goombario_tutor_DefenseTable_8021905C = 0x8021905C; // type:data rom:0x48010C +b_area_hos_goombario_tutor_StatusTable_80219068 = 0x80219068; // type:data rom:0x480118 +b_area_hos_goombario_tutor_PartsTable_80219114 = 0x80219114; // type:data rom:0x4801C4 b_area_hos_goombario_tutor = 0x80219138; // type:data rom:0x4801E8 b_area_hos_goombario_tutor_init_80219160 = 0x80219160; // type:data rom:0x480210 b_area_hos_goombario_tutor_idle_802191D0 = 0x802191D0; // type:data rom:0x480280 b_area_hos_goombario_tutor_handleEvent_802191E0 = 0x802191E0; // type:data rom:0x480290 b_area_hos_goombario_tutor_takeTurn_80219444 = 0x80219444; // type:data rom:0x4804F4 b_area_hos_goombario_tutor_80219C74 = 0x80219C74; // type:data rom:0x480D24 -b_area_hos_ember_defenseTable_8021ACB0 = 0x8021ACB0; // type:data rom:0x481D60 -b_area_hos_ember_statusTable_8021ACD4 = 0x8021ACD4; // type:data rom:0x481D84 -b_area_hos_ember_partsTable_8021AD80 = 0x8021AD80; // type:data rom:0x481E30 +b_area_hos_ember_DefenseTable_8021ACB0 = 0x8021ACB0; // type:data rom:0x481D60 +b_area_hos_ember_StatusTable_8021ACD4 = 0x8021ACD4; // type:data rom:0x481D84 +b_area_hos_ember_PartsTable_8021AD80 = 0x8021AD80; // type:data rom:0x481E30 b_area_hos_ember = 0x8021AE34; // type:data rom:0x481EE4 -b_area_hos_ember_idleAnimations_8021AE5C = 0x8021AE5C; // type:data rom:0x481F0C -b_area_hos_ember_idleAnimations_8021AEA8 = 0x8021AEA8; // type:data rom:0x481F58 +b_area_hos_ember_IdleAnimations_8021AE5C = 0x8021AE5C; // type:data rom:0x481F0C +b_area_hos_ember_IdleAnimations_8021AEA8 = 0x8021AEA8; // type:data rom:0x481F58 b_area_hos_ember_init_8021AEB4 = 0x8021AEB4; // type:data rom:0x481F64 b_area_hos_ember_idle_8021B07C = 0x8021B07C; // type:data rom:0x48212C b_area_hos_ember_8021B2FC = 0x8021B2FC; // type:data rom:0x4823AC @@ -10159,17 +10159,17 @@ b_area_hos_ember_8021C5F8 = 0x8021C5F8; // type:data rom:0x4836A8 b_area_hos_ember_8021C654 = 0x8021C654; // type:data rom:0x483704 b_area_hos_ember_8021CBC8 = 0x8021CBC8; // type:data rom:0x483C78 b_area_hos_ember_takeTurn_8021D284 = 0x8021D284; // type:data rom:0x484334 -b_area_hos_magikoopa_defenseTable_8021D480 = 0x8021D480; // type:data rom:0x484530 -b_area_hos_magikoopa_defenseTable_8021D48C = 0x8021D48C; // type:data rom:0x48453C -b_area_hos_magikoopa_statusTable_8021D498 = 0x8021D498; // type:data rom:0x484548 -b_area_hos_magikoopa_statusTable_8021D544 = 0x8021D544; // type:data rom:0x4845F4 -b_area_hos_magikoopa_partsTable_8021D5F0 = 0x8021D5F0; // type:data rom:0x4846A0 -b_area_hos_magikoopa_partsTable_8021D614 = 0x8021D614; // type:data rom:0x4846C4 +b_area_hos_magikoopa_DefenseTable = 0x8021D480; // type:data rom:0x484530 +b_area_hos_magikoopa_DefenseTable_flying = 0x8021D48C; // type:data rom:0x48453C +b_area_hos_magikoopa_StatusTable_8021D498 = 0x8021D498; // type:data rom:0x484548 +b_area_hos_magikoopa_StatusTable_8021D544 = 0x8021D544; // type:data rom:0x4845F4 +b_area_hos_magikoopa_PartsTable_8021D5F0 = 0x8021D5F0; // type:data rom:0x4846A0 +b_area_hos_magikoopa_PartsTable_8021D614 = 0x8021D614; // type:data rom:0x4846C4 b_area_hos_magikoopa = 0x8021D680; // type:data rom:0x484730 b_area_hos_magikoopa_flying = 0x8021D6A8; // type:data rom:0x484758 -b_area_hos_magikoopa_idleAnimations_8021D6D0 = 0x8021D6D0; // type:data rom:0x484780 -b_area_hos_magikoopa_idleAnimations_8021D71C = 0x8021D71C; // type:data rom:0x4847CC -b_area_hos_magikoopa_idleAnimations_8021D768 = 0x8021D768; // type:data rom:0x484818 +b_area_hos_magikoopa_IdleAnimations_8021D6D0 = 0x8021D6D0; // type:data rom:0x484780 +b_area_hos_magikoopa_IdleAnimations_8021D71C = 0x8021D71C; // type:data rom:0x4847CC +b_area_hos_magikoopa_IdleAnimations_8021D768 = 0x8021D768; // type:data rom:0x484818 b_area_hos_magikoopa_idle_8021D774 = 0x8021D774; // type:data rom:0x484824 b_area_hos_magikoopa_8021D784 = 0x8021D784; // type:data rom:0x484834 b_area_hos_magikoopa_8021D890 = 0x8021D890; // type:data rom:0x484940 @@ -10187,12 +10187,12 @@ b_area_hos_magikoopa_80221144 = 0x80221144; // type:data rom:0x4881F4 b_area_hos_magikoopa_handleEvent_8022142C = 0x8022142C; // type:data rom:0x4884DC b_area_hos_magikoopa_init_8022143C = 0x8022143C; // type:data rom:0x4884EC b_area_hos_magikoopa_init_80221478 = 0x80221478; // type:data rom:0x488528 -b_area_hos_magikoopa_defenseTable_802214B4 = 0x802214B4; // type:data rom:0x488564 -b_area_hos_magikoopa_defenseTable_802214C0 = 0x802214C0; // type:data rom:0x488570 -b_area_hos_magikoopa_statusTable_802214CC = 0x802214CC; // type:data rom:0x48857C -b_area_hos_magikoopa_statusTable_80221578 = 0x80221578; // type:data rom:0x488628 -b_area_hos_magikoopa_partsTable_80221624 = 0x80221624; // type:data rom:0x4886D4 -b_area_hos_magikoopa_partsTable_80221648 = 0x80221648; // type:data rom:0x4886F8 +b_area_hos_magikoopa_DefenseTable_802214B4 = 0x802214B4; // type:data rom:0x488564 +b_area_hos_magikoopa_DefenseTable_802214C0 = 0x802214C0; // type:data rom:0x488570 +b_area_hos_magikoopa_StatusTable_802214CC = 0x802214CC; // type:data rom:0x48857C +b_area_hos_magikoopa_StatusTable_80221578 = 0x80221578; // type:data rom:0x488628 +b_area_hos_magikoopa_PartsTable_80221624 = 0x80221624; // type:data rom:0x4886D4 +b_area_hos_magikoopa_PartsTable_80221648 = 0x80221648; // type:data rom:0x4886F8 b_area_hos_magikoopa_clone = 0x8022166C; // type:data rom:0x48871C b_area_hos_magikoopa_flying_clone = 0x80221694; // type:data rom:0x488744 b_area_hos_magikoopa_vector3D_802216BC = 0x802216BC; // type:data rom:0x48876C @@ -10238,8 +10238,8 @@ b_area_nok_paragoomba_CalculateRotationZ = 0x80218464; // type:func rom:0x48D604 b_area_nok_spiked_goomba_ArcsinDeg = 0x80218560; // type:func rom:0x48D700 b_area_nok_spiked_goomba_CalculateRotationZ = 0x802186EC; // type:func rom:0x48D88C b_area_nok_koopa_troopa_UnkBattleFunc1 = 0x802187E0; // type:func rom:0x48D980 -b_area_nok_fuzzy_UnkBattleFunc2 = 0x802188B0; // type:func rom:0x48DA50 -b_area_nok_fuzzy_UnkBattleFunc2_2 = 0x80218964; // type:func rom:0x48DB04 +b_area_nok_fuzzy_SpawnDrainHealthStartFX = 0x802188B0; // type:func rom:0x48DA50 +b_area_nok_fuzzy_SpawnDrainHealthContinueFX = 0x80218964; // type:func rom:0x48DB04 b_area_nok_paratroopa_StartRumbleWithParams = 0x80218A20; // type:func rom:0x48DBC0 b_area_nok_paratroopa_UnkBattleFunc1 = 0x80218A78; // type:func rom:0x48DC18 b_area_nok_kent_c_koopa_StartRumbleWithParams = 0x80218B50; // type:func rom:0x48DCF0 @@ -10273,84 +10273,84 @@ b_area_nok_Formation_17 = 0x80219494; // type:data rom:0x48E634 b_area_nok_Formation_18 = 0x80219504; // type:data rom:0x48E6A4 b_area_nok_Formations = 0x80219520; // type:data rom:0x48E6C0 b_area_nok_Stages = 0x80219728; // type:data rom:0x48E8C8 -b_area_nok_goomba_defenseTable_80219750 = 0x80219750; // type:data rom:0x48E8F0 -b_area_nok_goomba_statusTable_8021975C = 0x8021975C; // type:data rom:0x48E8FC -b_area_nok_goomba_partsTable_80219808 = 0x80219808; // type:data rom:0x48E9A8 +b_area_nok_goomba_DefenseTable_80219750 = 0x80219750; // type:data rom:0x48E8F0 +b_area_nok_goomba_StatusTable_8021975C = 0x8021975C; // type:data rom:0x48E8FC +b_area_nok_goomba_PartsTable_80219808 = 0x80219808; // type:data rom:0x48E9A8 b_area_nok_goomba = 0x8021982C; // type:data rom:0x48E9CC -b_area_nok_goomba_idleAnimations_80219854 = 0x80219854; // type:data rom:0x48E9F4 -b_area_nok_goomba_idleAnimations_802198A0 = 0x802198A0; // type:data rom:0x48EA40 +b_area_nok_goomba_IdleAnimations_80219854 = 0x80219854; // type:data rom:0x48E9F4 +b_area_nok_goomba_IdleAnimations_802198A0 = 0x802198A0; // type:data rom:0x48EA40 b_area_nok_goomba_init_802198EC = 0x802198EC; // type:data rom:0x48EA8C b_area_nok_goomba_idle_80219938 = 0x80219938; // type:data rom:0x48EAD8 b_area_nok_goomba_handleEvent_80219C14 = 0x80219C14; // type:data rom:0x48EDB4 b_area_nok_goomba_sinTable = 0x8021A2D4; // type:data rom:0x48F474 b_area_nok_goomba_takeTurn_8021A440 = 0x8021A440; // type:data rom:0x48F5E0 -b_area_nok_paragoomba_defenseTable_8021B110 = 0x8021B110; // type:data rom:0x4902B0 -b_area_nok_paragoomba_defenseTable_8021B11C = 0x8021B11C; // type:data rom:0x4902BC -b_area_nok_paragoomba_statusTable_8021B128 = 0x8021B128; // type:data rom:0x4902C8 -b_area_nok_paragoomba_statusTable_8021B1D4 = 0x8021B1D4; // type:data rom:0x490374 -b_area_nok_paragoomba_partsTable_8021B280 = 0x8021B280; // type:data rom:0x490420 +b_area_nok_paragoomba_DefenseTable_8021B110 = 0x8021B110; // type:data rom:0x4902B0 +b_area_nok_paragoomba_DefenseTable_8021B11C = 0x8021B11C; // type:data rom:0x4902BC +b_area_nok_paragoomba_StatusTable_8021B128 = 0x8021B128; // type:data rom:0x4902C8 +b_area_nok_paragoomba_StatusTable_8021B1D4 = 0x8021B1D4; // type:data rom:0x490374 +b_area_nok_paragoomba_PartsTable_8021B280 = 0x8021B280; // type:data rom:0x490420 b_area_nok_paragoomba = 0x8021B310; // type:data rom:0x4904B0 -b_area_nok_paragoomba_idleAnimations_8021B338 = 0x8021B338; // type:data rom:0x4904D8 -b_area_nok_paragoomba_idleAnimations_8021B384 = 0x8021B384; // type:data rom:0x490524 -b_area_nok_paragoomba_idleAnimations_8021B3D0 = 0x8021B3D0; // type:data rom:0x490570 -b_area_nok_paragoomba_idleAnimations_8021B3DC = 0x8021B3DC; // type:data rom:0x49057C +b_area_nok_paragoomba_IdleAnimations_8021B338 = 0x8021B338; // type:data rom:0x4904D8 +b_area_nok_paragoomba_IdleAnimations_8021B384 = 0x8021B384; // type:data rom:0x490524 +b_area_nok_paragoomba_IdleAnimations_8021B3D0 = 0x8021B3D0; // type:data rom:0x490570 +b_area_nok_paragoomba_IdleAnimations_8021B3DC = 0x8021B3DC; // type:data rom:0x49057C b_area_nok_paragoomba_init_8021B3E8 = 0x8021B3E8; // type:data rom:0x490588 b_area_nok_paragoomba_idle_8021B434 = 0x8021B434; // type:data rom:0x4905D4 b_area_nok_paragoomba_8021B6F0 = 0x8021B6F0; // type:data rom:0x490890 b_area_nok_paragoomba_handleEvent_8021B768 = 0x8021B768; // type:data rom:0x490908 b_area_nok_paragoomba_takeTurn_8021BD5C = 0x8021BD5C; // type:data rom:0x490EFC b_area_nok_paragoomba_8021C574 = 0x8021C574; // type:data rom:0x491714 -b_area_nok_paragoomba_idleAnimations_8021CAFC = 0x8021CAFC; // type:data rom:0x491C9C -b_area_nok_paragoomba_idleAnimations_8021CB48 = 0x8021CB48; // type:data rom:0x491CE8 +b_area_nok_paragoomba_IdleAnimations_8021CAFC = 0x8021CAFC; // type:data rom:0x491C9C +b_area_nok_paragoomba_IdleAnimations_8021CB48 = 0x8021CB48; // type:data rom:0x491CE8 b_area_nok_paragoomba_8021CB94 = 0x8021CB94; // type:data rom:0x491D34 b_area_nok_paragoomba_idle_8021CBE0 = 0x8021CBE0; // type:data rom:0x491D80 b_area_nok_paragoomba_handleEvent_8021CEBC = 0x8021CEBC; // type:data rom:0x49205C b_area_nok_paragoomba_sinTable = 0x8021D57C; // type:data rom:0x49271C b_area_nok_paragoomba_takeTurn_8021D6E8 = 0x8021D6E8; // type:data rom:0x492888 -b_area_nok_spiked_goomba_defenseTable_8021E3B0 = 0x8021E3B0; // type:data rom:0x493550 -b_area_nok_spiked_goomba_statusTable_8021E3BC = 0x8021E3BC; // type:data rom:0x49355C -b_area_nok_spiked_goomba_partsTable_8021E468 = 0x8021E468; // type:data rom:0x493608 +b_area_nok_spiked_goomba_DefenseTable_8021E3B0 = 0x8021E3B0; // type:data rom:0x493550 +b_area_nok_spiked_goomba_StatusTable_8021E3BC = 0x8021E3BC; // type:data rom:0x49355C +b_area_nok_spiked_goomba_PartsTable_8021E468 = 0x8021E468; // type:data rom:0x493608 b_area_nok_spiked_goomba = 0x8021E48C; // type:data rom:0x49362C -b_area_nok_spiked_goomba_idleAnimations_8021E4B4 = 0x8021E4B4; // type:data rom:0x493654 -b_area_nok_spiked_goomba_idleAnimations_8021E500 = 0x8021E500; // type:data rom:0x4936A0 +b_area_nok_spiked_goomba_IdleAnimations_8021E4B4 = 0x8021E4B4; // type:data rom:0x493654 +b_area_nok_spiked_goomba_IdleAnimations_8021E500 = 0x8021E500; // type:data rom:0x4936A0 b_area_nok_spiked_goomba_init_8021E54C = 0x8021E54C; // type:data rom:0x4936EC b_area_nok_spiked_goomba_idle_8021E598 = 0x8021E598; // type:data rom:0x493738 b_area_nok_spiked_goomba_handleEvent_8021E874 = 0x8021E874; // type:data rom:0x493A14 b_area_nok_spiked_goomba_sinTable = 0x8021F050; // type:data rom:0x4941F0 b_area_nok_spiked_goomba_takeTurn_8021F1BC = 0x8021F1BC; // type:data rom:0x49435C -b_area_nok_koopa_troopa_defenseTable_8021C960 = 0x8021FEE0; // type:data rom:0x495080 -b_area_nok_koopa_troopa_defenseTable_8021C98C = 0x8021FF0C; // type:data rom:0x4950AC -b_area_nok_koopa_troopa_statusTable_8021C998 = 0x8021FF18; // type:data rom:0x4950B8 -b_area_nok_koopa_troopa_partsTable_8021CA44 = 0x8021FFC4; // type:data rom:0x495164 +b_area_nok_koopa_troopa_DefenseTable_8021C960 = 0x8021FEE0; // type:data rom:0x495080 +b_area_nok_koopa_troopa_DefenseTable_8021C98C = 0x8021FF0C; // type:data rom:0x4950AC +b_area_nok_koopa_troopa_StatusTable_8021C998 = 0x8021FF18; // type:data rom:0x4950B8 +b_area_nok_koopa_troopa_PartsTable_8021CA44 = 0x8021FFC4; // type:data rom:0x495164 b_area_nok_koopa_troopa = 0x8021FFE8; // type:data rom:0x495188 -b_area_nok_koopa_troopa_idleAnimations_8021CA90 = 0x80220010; // type:data rom:0x4951B0 -b_area_nok_koopa_troopa_idleAnimations_8021CADC = 0x8022005C; // type:data rom:0x4951FC -b_area_nok_koopa_troopa_idleAnimations_8021CB28 = 0x802200A8; // type:data rom:0x495248 +b_area_nok_koopa_troopa_IdleAnimations_8021CA90 = 0x80220010; // type:data rom:0x4951B0 +b_area_nok_koopa_troopa_IdleAnimations_8021CADC = 0x8022005C; // type:data rom:0x4951FC +b_area_nok_koopa_troopa_IdleAnimations_8021CB28 = 0x802200A8; // type:data rom:0x495248 b_area_nok_koopa_troopa_init_8021CB74 = 0x802200F4; // type:data rom:0x495294 b_area_nok_koopa_troopa_8021CBD8 = 0x80220158; // type:data rom:0x4952F8 b_area_nok_koopa_troopa_idle_8021CD30 = 0x802202B0; // type:data rom:0x495450 b_area_nok_koopa_troopa_intTable_8021D1C0 = 0x80220740; // type:data rom:0x4958E0 b_area_nok_koopa_troopa_handleEvent_8021D218 = 0x80220798; // type:data rom:0x495938 b_area_nok_koopa_troopa_takeTurn_8021DD9C = 0x8022131C; // type:data rom:0x4964BC -b_area_nok_fuzzy_defenseTable_80222050 = 0x80222050; // type:data rom:0x4971F0 -b_area_nok_fuzzy_statusTable_8022205C = 0x8022205C; // type:data rom:0x4971FC -b_area_nok_fuzzy_partsTable_80222108 = 0x80222108; // type:data rom:0x4972A8 +b_area_nok_fuzzy_DefenseTable_80222050 = 0x80222050; // type:data rom:0x4971F0 +b_area_nok_fuzzy_StatusTable_8022205C = 0x8022205C; // type:data rom:0x4971FC +b_area_nok_fuzzy_PartsTable_80222108 = 0x80222108; // type:data rom:0x4972A8 b_area_nok_fuzzy = 0x8022212C; // type:data rom:0x4972CC -b_area_nok_fuzzy_idleAnimations_80222154 = 0x80222154; // type:data rom:0x4972F4 +b_area_nok_fuzzy_IdleAnimations_80222154 = 0x80222154; // type:data rom:0x4972F4 b_area_nok_fuzzy_init_802221A0 = 0x802221A0; // type:data rom:0x497340 b_area_nok_fuzzy_idle_802221EC = 0x802221EC; // type:data rom:0x49738C b_area_nok_fuzzy_handleEvent_802221FC = 0x802221FC; // type:data rom:0x49739C b_area_nok_fuzzy_takeTurn_80222860 = 0x80222860; // type:data rom:0x497A00 -b_area_nok_paratroopa_defenseTable_8021EAD0 = 0x80223900; // type:data rom:0x498AA0 -b_area_nok_paratroopa_defenseTable_8021EAFC = 0x8022392C; // type:data rom:0x498ACC -b_area_nok_paratroopa_defenseTable_8021EB08 = 0x80223938; // type:data rom:0x498AD8 -b_area_nok_paratroopa_statusTable_8021EB14 = 0x80223944; // type:data rom:0x498AE4 -b_area_nok_paratroopa_statusTable_8021EBC0 = 0x802239F0; // type:data rom:0x498B90 -b_area_nok_paratroopa_partsTable_8021EC6C = 0x80223A9C; // type:data rom:0x498C3C +b_area_nok_paratroopa_DefenseTable_8021EAD0 = 0x80223900; // type:data rom:0x498AA0 +b_area_nok_paratroopa_DefenseTable_8021EAFC = 0x8022392C; // type:data rom:0x498ACC +b_area_nok_paratroopa_DefenseTable_8021EB08 = 0x80223938; // type:data rom:0x498AD8 +b_area_nok_paratroopa_StatusTable_8021EB14 = 0x80223944; // type:data rom:0x498AE4 +b_area_nok_paratroopa_StatusTable_8021EBC0 = 0x802239F0; // type:data rom:0x498B90 +b_area_nok_paratroopa_PartsTable_8021EC6C = 0x80223A9C; // type:data rom:0x498C3C b_area_nok_paratroopa = 0x80223B08; // type:data rom:0x498CA8 -b_area_nok_paratroopa_idleAnimations_8021ED00 = 0x80223B30; // type:data rom:0x498CD0 -b_area_nok_paratroopa_idleAnimations_8021ED4C = 0x80223B7C; // type:data rom:0x498D1C -b_area_nok_paratroopa_idleAnimations_8021ED98 = 0x80223BC8; // type:data rom:0x498D68 +b_area_nok_paratroopa_IdleAnimations_8021ED00 = 0x80223B30; // type:data rom:0x498CD0 +b_area_nok_paratroopa_IdleAnimations_8021ED4C = 0x80223B7C; // type:data rom:0x498D1C +b_area_nok_paratroopa_IdleAnimations_8021ED98 = 0x80223BC8; // type:data rom:0x498D68 b_area_nok_paratroopa_nextTurn_8021EDE4 = 0x80223C14; // type:data rom:0x498DB4 b_area_nok_paratroopa_init_8021EE0C = 0x80223C3C; // type:data rom:0x498DDC b_area_nok_paratroopa_8021EE84 = 0x80223CB4; // type:data rom:0x498E54 @@ -10359,9 +10359,9 @@ b_area_nok_paratroopa_8021F26C = 0x8022409C; // type:data rom:0x49923C b_area_nok_paratroopa_handleEvent_8021F2EC = 0x8022411C; // type:data rom:0x4992BC b_area_nok_paratroopa_takeTurn_8021FA24 = 0x80224854; // type:data rom:0x4999F4 b_area_nok_paratroopa_802204DC = 0x8022530C; // type:data rom:0x49A4AC -b_area_nok_paratroopa_idleAnimations_80220AA0 = 0x802258D0; // type:data rom:0x49AA70 -b_area_nok_paratroopa_idleAnimations_80220AEC = 0x8022591C; // type:data rom:0x49AABC -b_area_nok_paratroopa_idleAnimations_80220B38 = 0x80225968; // type:data rom:0x49AB08 +b_area_nok_paratroopa_IdleAnimations_80220AA0 = 0x802258D0; // type:data rom:0x49AA70 +b_area_nok_paratroopa_IdleAnimations_80220AEC = 0x8022591C; // type:data rom:0x49AABC +b_area_nok_paratroopa_IdleAnimations_80220B38 = 0x80225968; // type:data rom:0x49AB08 b_area_nok_paratroopa_80220B84 = 0x802259B4; // type:data rom:0x49AB54 b_area_nok_paratroopa_80220BE8 = 0x80225A18; // type:data rom:0x49ABB8 b_area_nok_paratroopa_idle_80220D40 = 0x80225B70; // type:data rom:0x49AD10 @@ -10369,14 +10369,14 @@ b_area_nok_paratroopa_intTable_802211D0 = 0x80226000; // type:data rom:0x49B1A0 b_area_nok_paratroopa_handleEvent_80221228 = 0x80226058; // type:data rom:0x49B1F8 b_area_nok_paratroopa_takeTurn_80221DAC = 0x80226BDC; // type:data rom:0x49BD7C b_area_nok_kent_c_koopa_intTable_80227910 = 0x80227910; // type:data rom:0x49CAB0 -b_area_nok_kent_c_koopa_idleAnimations_80227968 = 0x80227968; // type:data rom:0x49CB08 -b_area_nok_kent_c_koopa_idleAnimations_802279B4 = 0x802279B4; // type:data rom:0x49CB54 -b_area_nok_kent_c_koopa_idleAnimations_802279D0 = 0x802279D0; // type:data rom:0x49CB70 -b_area_nok_kent_c_koopa_defenseTable_802279DC = 0x802279DC; // type:data rom:0x49CB7C -b_area_nok_kent_c_koopa_defenseTable_802279F0 = 0x802279F0; // type:data rom:0x49CB90 -b_area_nok_kent_c_koopa_defenseTable_802279FC = 0x802279FC; // type:data rom:0x49CB9C -b_area_nok_kent_c_koopa_statusTable_80227A08 = 0x80227A08; // type:data rom:0x49CBA8 -b_area_nok_kent_c_koopa_partsTable_80227AB4 = 0x80227AB4; // type:data rom:0x49CC54 +b_area_nok_kent_c_koopa_IdleAnimations_80227968 = 0x80227968; // type:data rom:0x49CB08 +b_area_nok_kent_c_koopa_IdleAnimations_802279B4 = 0x802279B4; // type:data rom:0x49CB54 +b_area_nok_kent_c_koopa_IdleAnimations_802279D0 = 0x802279D0; // type:data rom:0x49CB70 +b_area_nok_kent_c_koopa_DefenseTable_802279DC = 0x802279DC; // type:data rom:0x49CB7C +b_area_nok_kent_c_koopa_DefenseTable_802279F0 = 0x802279F0; // type:data rom:0x49CB90 +b_area_nok_kent_c_koopa_DefenseTable_802279FC = 0x802279FC; // type:data rom:0x49CB9C +b_area_nok_kent_c_koopa_StatusTable_80227A08 = 0x80227A08; // type:data rom:0x49CBA8 +b_area_nok_kent_c_koopa_PartsTable_80227AB4 = 0x80227AB4; // type:data rom:0x49CC54 b_area_nok_kent_c_koopa = 0x80227BF8; // type:data rom:0x49CD98 b_area_nok_kent_c_koopa_init_80227C20 = 0x80227C20; // type:data rom:0x49CDC0 b_area_nok_kent_c_koopa_nextTurn_80227D2C = 0x80227D2C; // type:data rom:0x49CECC @@ -10446,22 +10446,22 @@ b_area_trd_part_1_Formation_19 = 0x80218C40; // type:data rom:0x4A1CE0 b_area_trd_part_1_Formation_1A = 0x80218C5C; // type:data rom:0x4A1CFC b_area_trd_part_1_Formations = 0x80218CB0; // type:data rom:0x4A1D50 b_area_trd_part_1_Stages = 0x80218EE0; // type:data rom:0x4A1F80 -b_area_trd_part_1_bullet_bill_defenseTable_80218F60 = 0x80218F60; // type:data rom:0x4A2000 -b_area_trd_part_1_bullet_bill_statusTable_80218F6C = 0x80218F6C; // type:data rom:0x4A200C -b_area_trd_part_1_bullet_bill_partsTable_80219018 = 0x80219018; // type:data rom:0x4A20B8 +b_area_trd_part_1_bullet_bill_DefenseTable_80218F60 = 0x80218F60; // type:data rom:0x4A2000 +b_area_trd_part_1_bullet_bill_StatusTable_80218F6C = 0x80218F6C; // type:data rom:0x4A200C +b_area_trd_part_1_bullet_bill_PartsTable_80219018 = 0x80219018; // type:data rom:0x4A20B8 b_area_trd_part_1_bullet_bill = 0x8021903C; // type:data rom:0x4A20DC -b_area_trd_part_1_bullet_bill_idleAnimations_80219064 = 0x80219064; // type:data rom:0x4A2104 +b_area_trd_part_1_bullet_bill_IdleAnimations_80219064 = 0x80219064; // type:data rom:0x4A2104 b_area_trd_part_1_bullet_bill_init_80219088 = 0x80219088; // type:data rom:0x4A2128 b_area_trd_part_1_bullet_bill_idle_80219380 = 0x80219380; // type:data rom:0x4A2420 b_area_trd_part_1_bullet_bill_80219390 = 0x80219390; // type:data rom:0x4A2430 b_area_trd_part_1_bullet_bill_handleEvent_802193E8 = 0x802193E8; // type:data rom:0x4A2488 b_area_trd_part_1_bullet_bill_takeTurn_802197C0 = 0x802197C0; // type:data rom:0x4A2860 b_area_trd_part_1_bullet_bill_80219BE0 = 0x80219BE0; // type:data rom:0x4A2C80 -b_area_trd_part_1_bill_blaster_defenseTable_80219D20 = 0x80219D20; // type:data rom:0x4A2DC0 -b_area_trd_part_1_bill_blaster_statusTable_80219D2C = 0x80219D2C; // type:data rom:0x4A2DCC -b_area_trd_part_1_bill_blaster_partsTable_80219DD8 = 0x80219DD8; // type:data rom:0x4A2E78 +b_area_trd_part_1_bill_blaster_DefenseTable_80219D20 = 0x80219D20; // type:data rom:0x4A2DC0 +b_area_trd_part_1_bill_blaster_StatusTable_80219D2C = 0x80219D2C; // type:data rom:0x4A2DCC +b_area_trd_part_1_bill_blaster_PartsTable_80219DD8 = 0x80219DD8; // type:data rom:0x4A2E78 b_area_trd_part_1_bill_blaster = 0x80219E20; // type:data rom:0x4A2EC0 -b_area_trd_part_1_bill_blaster_idleAnimations_80219E48 = 0x80219E48; // type:data rom:0x4A2EE8 +b_area_trd_part_1_bill_blaster_IdleAnimations_80219E48 = 0x80219E48; // type:data rom:0x4A2EE8 b_area_trd_part_1_bill_blaster_init_80219E6C = 0x80219E6C; // type:data rom:0x4A2F0C b_area_trd_part_1_bill_blaster_idle_80219ED0 = 0x80219ED0; // type:data rom:0x4A2F70 b_area_trd_part_1_bill_blaster_handleEvent_80219EE0 = 0x80219EE0; // type:data rom:0x4A2F80 @@ -10470,12 +10470,12 @@ b_area_trd_part_1_bill_blaster_8021A2BC = 0x8021A2BC; // type:data rom:0x4A335C b_area_trd_part_1_bill_blaster_8021A470 = 0x8021A470; // type:data rom:0x4A3510 b_area_trd_part_1_bill_blaster_vector3D_8021A4DC = 0x8021A4DC; // type:data rom:0x4A357C b_area_trd_part_1_bill_blaster_specialFormation_8021A4E8 = 0x8021A4E8; // type:data rom:0x4A3588 -b_area_trd_part_1_bob_omb_idleAnimations_8021A510 = 0x8021A510; // type:data rom:0x4A35B0 -b_area_trd_part_1_bob_omb_idleAnimations_8021A55C = 0x8021A55C; // type:data rom:0x4A35FC -b_area_trd_part_1_bob_omb_defenseTable_8021A5A8 = 0x8021A5A8; // type:data rom:0x4A3648 -b_area_trd_part_1_bob_omb_statusTable_8021A5B4 = 0x8021A5B4; // type:data rom:0x4A3654 -b_area_trd_part_1_bob_omb_statusTable_8021A660 = 0x8021A660; // type:data rom:0x4A3700 -b_area_trd_part_1_bob_omb_partsTable_8021A70C = 0x8021A70C; // type:data rom:0x4A37AC +b_area_trd_part_1_bob_omb_IdleAnimations_8021A510 = 0x8021A510; // type:data rom:0x4A35B0 +b_area_trd_part_1_bob_omb_IdleAnimations_8021A55C = 0x8021A55C; // type:data rom:0x4A35FC +b_area_trd_part_1_bob_omb_DefenseTable_8021A5A8 = 0x8021A5A8; // type:data rom:0x4A3648 +b_area_trd_part_1_bob_omb_StatusTable_8021A5B4 = 0x8021A5B4; // type:data rom:0x4A3654 +b_area_trd_part_1_bob_omb_StatusTable_8021A660 = 0x8021A660; // type:data rom:0x4A3700 +b_area_trd_part_1_bob_omb_PartsTable_8021A70C = 0x8021A70C; // type:data rom:0x4A37AC b_area_trd_part_1_bob_omb = 0x8021A730; // type:data rom:0x4A37D0 b_area_trd_part_1_bob_omb_init_8021A758 = 0x8021A758; // type:data rom:0x4A37F8 b_area_trd_part_1_bob_omb_idle_8021A7D4 = 0x8021A7D4; // type:data rom:0x4A3874 @@ -10488,30 +10488,30 @@ b_area_trd_part_1_bob_omb_handleEvent_8021B4A8 = 0x8021B4A8; // type:data rom:0x b_area_trd_part_1_bob_omb_tackleAttack = 0x8021BB40; // type:data rom:0x4A4BE0 b_area_trd_part_1_bob_omb_blastAttack = 0x8021C3F4; // type:data rom:0x4A5494 b_area_trd_part_1_bob_omb_takeTurn_8021C89C = 0x8021C89C; // type:data rom:0x4A593C -b_area_trd_part_1_koopa_troopa_defenseTable_8021C960 = 0x8021C960; // type:data rom:0x4A5A00 -b_area_trd_part_1_koopa_troopa_defenseTable_8021C98C = 0x8021C98C; // type:data rom:0x4A5A2C -b_area_trd_part_1_koopa_troopa_statusTable_8021C998 = 0x8021C998; // type:data rom:0x4A5A38 -b_area_trd_part_1_koopa_troopa_partsTable_8021CA44 = 0x8021CA44; // type:data rom:0x4A5AE4 +b_area_trd_part_1_koopa_troopa_DefenseTable_8021C960 = 0x8021C960; // type:data rom:0x4A5A00 +b_area_trd_part_1_koopa_troopa_DefenseTable_8021C98C = 0x8021C98C; // type:data rom:0x4A5A2C +b_area_trd_part_1_koopa_troopa_StatusTable_8021C998 = 0x8021C998; // type:data rom:0x4A5A38 +b_area_trd_part_1_koopa_troopa_PartsTable_8021CA44 = 0x8021CA44; // type:data rom:0x4A5AE4 b_area_trd_part_1_koopa_troopa = 0x8021CA68; // type:data rom:0x4A5B08 -b_area_trd_part_1_koopa_troopa_idleAnimations_8021CA90 = 0x8021CA90; // type:data rom:0x4A5B30 -b_area_trd_part_1_koopa_troopa_idleAnimations_8021CADC = 0x8021CADC; // type:data rom:0x4A5B7C -b_area_trd_part_1_koopa_troopa_idleAnimations_8021CB28 = 0x8021CB28; // type:data rom:0x4A5BC8 +b_area_trd_part_1_koopa_troopa_IdleAnimations_8021CA90 = 0x8021CA90; // type:data rom:0x4A5B30 +b_area_trd_part_1_koopa_troopa_IdleAnimations_8021CADC = 0x8021CADC; // type:data rom:0x4A5B7C +b_area_trd_part_1_koopa_troopa_IdleAnimations_8021CB28 = 0x8021CB28; // type:data rom:0x4A5BC8 b_area_trd_part_1_koopa_troopa_init_8021CB74 = 0x8021CB74; // type:data rom:0x4A5C14 b_area_trd_part_1_koopa_troopa_8021CBD8 = 0x8021CBD8; // type:data rom:0x4A5C78 b_area_trd_part_1_koopa_troopa_idle_8021CD30 = 0x8021CD30; // type:data rom:0x4A5DD0 b_area_trd_part_1_koopa_troopa_intTable_8021D1C0 = 0x8021D1C0; // type:data rom:0x4A6260 b_area_trd_part_1_koopa_troopa_handleEvent_8021D218 = 0x8021D218; // type:data rom:0x4A62B8 b_area_trd_part_1_koopa_troopa_takeTurn_8021DD9C = 0x8021DD9C; // type:data rom:0x4A6E3C -b_area_trd_part_1_paratroopa_defenseTable_8021EAD0 = 0x8021EAD0; // type:data rom:0x4A7B70 -b_area_trd_part_1_paratroopa_defenseTable_8021EAFC = 0x8021EAFC; // type:data rom:0x4A7B9C -b_area_trd_part_1_paratroopa_defenseTable_8021EB08 = 0x8021EB08; // type:data rom:0x4A7BA8 -b_area_trd_part_1_paratroopa_statusTable_8021EB14 = 0x8021EB14; // type:data rom:0x4A7BB4 -b_area_trd_part_1_paratroopa_statusTable_8021EBC0 = 0x8021EBC0; // type:data rom:0x4A7C60 -b_area_trd_part_1_paratroopa_partsTable_8021EC6C = 0x8021EC6C; // type:data rom:0x4A7D0C +b_area_trd_part_1_paratroopa_DefenseTable_8021EAD0 = 0x8021EAD0; // type:data rom:0x4A7B70 +b_area_trd_part_1_paratroopa_DefenseTable_8021EAFC = 0x8021EAFC; // type:data rom:0x4A7B9C +b_area_trd_part_1_paratroopa_DefenseTable_8021EB08 = 0x8021EB08; // type:data rom:0x4A7BA8 +b_area_trd_part_1_paratroopa_StatusTable_8021EB14 = 0x8021EB14; // type:data rom:0x4A7BB4 +b_area_trd_part_1_paratroopa_StatusTable_8021EBC0 = 0x8021EBC0; // type:data rom:0x4A7C60 +b_area_trd_part_1_paratroopa_PartsTable_8021EC6C = 0x8021EC6C; // type:data rom:0x4A7D0C b_area_trd_part_1_paratroopa = 0x8021ECD8; // type:data rom:0x4A7D78 -b_area_trd_part_1_paratroopa_idleAnimations_8021ED00 = 0x8021ED00; // type:data rom:0x4A7DA0 -b_area_trd_part_1_paratroopa_idleAnimations_8021ED4C = 0x8021ED4C; // type:data rom:0x4A7DEC -b_area_trd_part_1_paratroopa_idleAnimations_8021ED98 = 0x8021ED98; // type:data rom:0x4A7E38 +b_area_trd_part_1_paratroopa_IdleAnimations_8021ED00 = 0x8021ED00; // type:data rom:0x4A7DA0 +b_area_trd_part_1_paratroopa_IdleAnimations_8021ED4C = 0x8021ED4C; // type:data rom:0x4A7DEC +b_area_trd_part_1_paratroopa_IdleAnimations_8021ED98 = 0x8021ED98; // type:data rom:0x4A7E38 b_area_trd_part_1_paratroopa_nextTurn_8021EDE4 = 0x8021EDE4; // type:data rom:0x4A7E84 b_area_trd_part_1_paratroopa_init_8021EE0C = 0x8021EE0C; // type:data rom:0x4A7EAC b_area_trd_part_1_paratroopa_8021EE84 = 0x8021EE84; // type:data rom:0x4A7F24 @@ -10520,9 +10520,9 @@ b_area_trd_part_1_paratroopa_8021F26C = 0x8021F26C; // type:data rom:0x4A830C b_area_trd_part_1_paratroopa_handleEvent_8021F2EC = 0x8021F2EC; // type:data rom:0x4A838C b_area_trd_part_1_paratroopa_takeTurn_8021FA24 = 0x8021FA24; // type:data rom:0x4A8AC4 b_area_trd_part_1_paratroopa_802204DC = 0x802204DC; // type:data rom:0x4A957C -b_area_trd_part_1_paratroopa_idleAnimations_80220AA0 = 0x80220AA0; // type:data rom:0x4A9B40 -b_area_trd_part_1_paratroopa_idleAnimations_80220AEC = 0x80220AEC; // type:data rom:0x4A9B8C -b_area_trd_part_1_paratroopa_idleAnimations_80220B38 = 0x80220B38; // type:data rom:0x4A9BD8 +b_area_trd_part_1_paratroopa_IdleAnimations_80220AA0 = 0x80220AA0; // type:data rom:0x4A9B40 +b_area_trd_part_1_paratroopa_IdleAnimations_80220AEC = 0x80220AEC; // type:data rom:0x4A9B8C +b_area_trd_part_1_paratroopa_IdleAnimations_80220B38 = 0x80220B38; // type:data rom:0x4A9BD8 b_area_trd_part_1_paratroopa_80220B84 = 0x80220B84; // type:data rom:0x4A9C24 b_area_trd_part_1_paratroopa_80220BE8 = 0x80220BE8; // type:data rom:0x4A9C88 b_area_trd_part_1_paratroopa_idle_80220D40 = 0x80220D40; // type:data rom:0x4A9DE0 @@ -10630,11 +10630,11 @@ b_area_trd_part_2_trd_03_UnkAngleFunc2 = 0x8021A2E0; // type:func rom:0x4B34D0 b_area_trd_part_2_Formation_00 = 0x8021A550; // type:data rom:0x4B3740 b_area_trd_part_2_Formations = 0x8021A5DC; // type:data rom:0x4B37CC b_area_trd_part_2_Stages = 0x8021A604; // type:data rom:0x4B37F4 -b_area_trd_part_2_fake_bowser_defenseTable_8021A670 = 0x8021A670; // type:data rom:0x4B3860 -b_area_trd_part_2_fake_bowser_defenseTable_8021A684 = 0x8021A684; // type:data rom:0x4B3874 -b_area_trd_part_2_fake_bowser_statusTable_8021A690 = 0x8021A690; // type:data rom:0x4B3880 -b_area_trd_part_2_fake_bowser_idleAnimations_8021A73C = 0x8021A73C; // type:data rom:0x4B392C -b_area_trd_part_2_fake_bowser_partsTable_8021A748 = 0x8021A748; // type:data rom:0x4B3938 +b_area_trd_part_2_fake_bowser_DefenseTable_8021A670 = 0x8021A670; // type:data rom:0x4B3860 +b_area_trd_part_2_fake_bowser_DefenseTable_8021A684 = 0x8021A684; // type:data rom:0x4B3874 +b_area_trd_part_2_fake_bowser_StatusTable_8021A690 = 0x8021A690; // type:data rom:0x4B3880 +b_area_trd_part_2_fake_bowser_IdleAnimations_8021A73C = 0x8021A73C; // type:data rom:0x4B392C +b_area_trd_part_2_fake_bowser_PartsTable_8021A748 = 0x8021A748; // type:data rom:0x4B3938 b_area_trd_part_2_fake_bowser = 0x8021A8D4; // type:data rom:0x4B3AC4 b_area_trd_part_2_fake_bowser_D_8021A8FC_48BAEC = 0x8021A8FC; // type:data rom:0x4B3AEC b_area_trd_part_2_fake_bowser_init_8021A968 = 0x8021A968; // type:data rom:0x4B3B58 @@ -10689,17 +10689,17 @@ b_area_trd_part_2_fake_bowser_idle_802239BC = 0x802239BC; // type:data rom:0x4BC b_area_trd_part_2_fake_bowser_handleEvent_802242FC = 0x802242FC; // type:data rom:0x4BD4EC b_area_trd_part_2_fake_bowser_takeTurn_80224D84 = 0x80224D84; // type:data rom:0x4BDF74 b_area_trd_part_2_fake_bowser_nextTurn_80225438 = 0x80225438; // type:data rom:0x4BE628 -b_area_trd_part_2_green_ninja_koopa_defenseTable_80225560 = 0x80225560; // type:data rom:0x4BE750 -b_area_trd_part_2_green_ninja_koopa_defenseTable_8022556C = 0x8022556C; // type:data rom:0x4BE75C -b_area_trd_part_2_green_ninja_koopa_statusTable_80225578 = 0x80225578; // type:data rom:0x4BE768 -b_area_trd_part_2_green_ninja_koopa_partsTable_80225624 = 0x80225624; // type:data rom:0x4BE814 +b_area_trd_part_2_green_ninja_koopa_DefenseTable_80225560 = 0x80225560; // type:data rom:0x4BE750 +b_area_trd_part_2_green_ninja_koopa_DefenseTable_8022556C = 0x8022556C; // type:data rom:0x4BE75C +b_area_trd_part_2_green_ninja_koopa_StatusTable_80225578 = 0x80225578; // type:data rom:0x4BE768 +b_area_trd_part_2_green_ninja_koopa_PartsTable_80225624 = 0x80225624; // type:data rom:0x4BE814 b_area_trd_part_2_green_ninja_koopa = 0x80225648; // type:data rom:0x4BE838 -b_area_trd_part_2_green_ninja_koopa_idleAnimations_80225670 = 0x80225670; // type:data rom:0x4BE860 -b_area_trd_part_2_green_ninja_koopa_idleAnimations_802256C4 = 0x802256C4; // type:data rom:0x4BE8B4 -b_area_trd_part_2_green_ninja_koopa_idleAnimations_80225700 = 0x80225700; // type:data rom:0x4BE8F0 -b_area_trd_part_2_green_ninja_koopa_idleAnimations_8022573C = 0x8022573C; // type:data rom:0x4BE92C -b_area_trd_part_2_green_ninja_koopa_idleAnimations_80225790 = 0x80225790; // type:data rom:0x4BE980 -b_area_trd_part_2_green_ninja_koopa_idleAnimations_8022579C = 0x8022579C; // type:data rom:0x4BE98C +b_area_trd_part_2_green_ninja_koopa_IdleAnimations_80225670 = 0x80225670; // type:data rom:0x4BE860 +b_area_trd_part_2_green_ninja_koopa_IdleAnimations_802256C4 = 0x802256C4; // type:data rom:0x4BE8B4 +b_area_trd_part_2_green_ninja_koopa_IdleAnimations_80225700 = 0x80225700; // type:data rom:0x4BE8F0 +b_area_trd_part_2_green_ninja_koopa_IdleAnimations_8022573C = 0x8022573C; // type:data rom:0x4BE92C +b_area_trd_part_2_green_ninja_koopa_IdleAnimations_80225790 = 0x80225790; // type:data rom:0x4BE980 +b_area_trd_part_2_green_ninja_koopa_IdleAnimations_8022579C = 0x8022579C; // type:data rom:0x4BE98C b_area_trd_part_2_green_ninja_koopa_802257A8 = 0x802257A8; // type:data rom:0x4BE998 b_area_trd_part_2_green_ninja_koopa_init_80227CEC = 0x80227CEC; // type:data rom:0x4C0EDC b_area_trd_part_2_green_ninja_koopa_idle_80227DE0 = 0x80227DE0; // type:data rom:0x4C0FD0 @@ -10707,17 +10707,17 @@ b_area_trd_part_2_green_ninja_koopa_intTable_80227DF0 = 0x80227DF0; // type:data b_area_trd_part_2_green_ninja_koopa_handleEvent_80227E48 = 0x80227E48; // type:data rom:0x4C1038 b_area_trd_part_2_green_ninja_koopa_takeTurn_802284D4 = 0x802284D4; // type:data rom:0x4C16C4 b_area_trd_part_2_green_ninja_koopa_nextTurn_802284E4 = 0x802284E4; // type:data rom:0x4C16D4 -b_area_trd_part_2_red_ninja_koopa_defenseTable_80228500 = 0x80228500; // type:data rom:0x4C16F0 -b_area_trd_part_2_red_ninja_koopa_defenseTable_8022850C = 0x8022850C; // type:data rom:0x4C16FC -b_area_trd_part_2_red_ninja_koopa_statusTable_80228518 = 0x80228518; // type:data rom:0x4C1708 -b_area_trd_part_2_red_ninja_koopa_partsTable_802285C4 = 0x802285C4; // type:data rom:0x4C17B4 +b_area_trd_part_2_red_ninja_koopa_DefenseTable_80228500 = 0x80228500; // type:data rom:0x4C16F0 +b_area_trd_part_2_red_ninja_koopa_DefenseTable_8022850C = 0x8022850C; // type:data rom:0x4C16FC +b_area_trd_part_2_red_ninja_koopa_StatusTable_80228518 = 0x80228518; // type:data rom:0x4C1708 +b_area_trd_part_2_red_ninja_koopa_PartsTable_802285C4 = 0x802285C4; // type:data rom:0x4C17B4 b_area_trd_part_2_red_ninja_koopa = 0x802285E8; // type:data rom:0x4C17D8 -b_area_trd_part_2_red_ninja_koopa_idleAnimations_80228610 = 0x80228610; // type:data rom:0x4C1800 -b_area_trd_part_2_red_ninja_koopa_idleAnimations_80228664 = 0x80228664; // type:data rom:0x4C1854 -b_area_trd_part_2_red_ninja_koopa_idleAnimations_802286A0 = 0x802286A0; // type:data rom:0x4C1890 -b_area_trd_part_2_red_ninja_koopa_idleAnimations_802286DC = 0x802286DC; // type:data rom:0x4C18CC -b_area_trd_part_2_red_ninja_koopa_idleAnimations_80228730 = 0x80228730; // type:data rom:0x4C1920 -b_area_trd_part_2_red_ninja_koopa_idleAnimations_8022873C = 0x8022873C; // type:data rom:0x4C192C +b_area_trd_part_2_red_ninja_koopa_IdleAnimations_80228610 = 0x80228610; // type:data rom:0x4C1800 +b_area_trd_part_2_red_ninja_koopa_IdleAnimations_80228664 = 0x80228664; // type:data rom:0x4C1854 +b_area_trd_part_2_red_ninja_koopa_IdleAnimations_802286A0 = 0x802286A0; // type:data rom:0x4C1890 +b_area_trd_part_2_red_ninja_koopa_IdleAnimations_802286DC = 0x802286DC; // type:data rom:0x4C18CC +b_area_trd_part_2_red_ninja_koopa_IdleAnimations_80228730 = 0x80228730; // type:data rom:0x4C1920 +b_area_trd_part_2_red_ninja_koopa_IdleAnimations_8022873C = 0x8022873C; // type:data rom:0x4C192C b_area_trd_part_2_red_ninja_koopa_80228748 = 0x80228748; // type:data rom:0x4C1938 b_area_trd_part_2_red_ninja_koopa_init_8022AC8C = 0x8022AC8C; // type:data rom:0x4C3E7C D_8022AD80_4C3F70 = 0x8022AD80; // type:data rom:0x4C3F70 @@ -10725,17 +10725,17 @@ b_area_trd_part_2_red_ninja_koopa_intTable_8022AD90 = 0x8022AD90; // type:data r b_area_trd_part_2_red_ninja_koopa_handleEvent_8022ADE8 = 0x8022ADE8; // type:data rom:0x4C3FD8 b_area_trd_part_2_red_ninja_koopa_takeTurn_8022B474 = 0x8022B474; // type:data rom:0x4C4664 b_area_trd_part_2_red_ninja_koopa_nextTurn_8022B484 = 0x8022B484; // type:data rom:0x4C4674 -b_area_trd_part_2_blue_ninja_koopa_defenseTable_8022B4A0 = 0x8022B4A0; // type:data rom:0x4C4690 -b_area_trd_part_2_blue_ninja_koopa_defenseTable_8022B4AC = 0x8022B4AC; // type:data rom:0x4C469C -b_area_trd_part_2_blue_ninja_koopa_statusTable_8022B4B8 = 0x8022B4B8; // type:data rom:0x4C46A8 -b_area_trd_part_2_blue_ninja_koopa_partsTable_8022B564 = 0x8022B564; // type:data rom:0x4C4754 +b_area_trd_part_2_blue_ninja_koopa_DefenseTable_8022B4A0 = 0x8022B4A0; // type:data rom:0x4C4690 +b_area_trd_part_2_blue_ninja_koopa_DefenseTable_8022B4AC = 0x8022B4AC; // type:data rom:0x4C469C +b_area_trd_part_2_blue_ninja_koopa_StatusTable_8022B4B8 = 0x8022B4B8; // type:data rom:0x4C46A8 +b_area_trd_part_2_blue_ninja_koopa_PartsTable_8022B564 = 0x8022B564; // type:data rom:0x4C4754 b_area_trd_part_2_blue_ninja_koopa = 0x8022B588; // type:data rom:0x4C4778 -b_area_trd_part_2_blue_ninja_koopa_idleAnimations_8022B5B0 = 0x8022B5B0; // type:data rom:0x4C47A0 -b_area_trd_part_2_blue_ninja_koopa_idleAnimations_8022B604 = 0x8022B604; // type:data rom:0x4C47F4 -b_area_trd_part_2_blue_ninja_koopa_idleAnimations_8022B640 = 0x8022B640; // type:data rom:0x4C4830 -b_area_trd_part_2_blue_ninja_koopa_idleAnimations_8022B67C = 0x8022B67C; // type:data rom:0x4C486C -b_area_trd_part_2_blue_ninja_koopa_idleAnimations_8022B6D0 = 0x8022B6D0; // type:data rom:0x4C48C0 -b_area_trd_part_2_blue_ninja_koopa_idleAnimations_8022B6DC = 0x8022B6DC; // type:data rom:0x4C48CC +b_area_trd_part_2_blue_ninja_koopa_IdleAnimations_8022B5B0 = 0x8022B5B0; // type:data rom:0x4C47A0 +b_area_trd_part_2_blue_ninja_koopa_IdleAnimations_8022B604 = 0x8022B604; // type:data rom:0x4C47F4 +b_area_trd_part_2_blue_ninja_koopa_IdleAnimations_8022B640 = 0x8022B640; // type:data rom:0x4C4830 +b_area_trd_part_2_blue_ninja_koopa_IdleAnimations_8022B67C = 0x8022B67C; // type:data rom:0x4C486C +b_area_trd_part_2_blue_ninja_koopa_IdleAnimations_8022B6D0 = 0x8022B6D0; // type:data rom:0x4C48C0 +b_area_trd_part_2_blue_ninja_koopa_IdleAnimations_8022B6DC = 0x8022B6DC; // type:data rom:0x4C48CC b_area_trd_part_2_blue_ninja_koopa_8022B6E8 = 0x8022B6E8; // type:data rom:0x4C48D8 b_area_trd_part_2_blue_ninja_koopa_init_8022DC2C = 0x8022DC2C; // type:data rom:0x4C6E1C b_area_trd_part_2_blue_ninja_koopa_idle_8022DD20 = 0x8022DD20; // type:data rom:0x4C6F10 @@ -10743,17 +10743,17 @@ b_area_trd_part_2_blue_ninja_koopa_intTable_8022DD30 = 0x8022DD30; // type:data b_area_trd_part_2_blue_ninja_koopa_handleEvent_8022DD88 = 0x8022DD88; // type:data rom:0x4C6F78 b_area_trd_part_2_blue_ninja_koopa_takeTurn_8022E414 = 0x8022E414; // type:data rom:0x4C7604 b_area_trd_part_2_blue_ninja_koopa_nextTurn_8022E424 = 0x8022E424; // type:data rom:0x4C7614 -b_area_trd_part_2_yellow_ninja_koopa_defenseTable_8022E440 = 0x8022E440; // type:data rom:0x4C7630 -b_area_trd_part_2_yellow_ninja_koopa_defenseTable_8022E44C = 0x8022E44C; // type:data rom:0x4C763C -b_area_trd_part_2_yellow_ninja_koopa_statusTable_8022E458 = 0x8022E458; // type:data rom:0x4C7648 -b_area_trd_part_2_yellow_ninja_koopa_partsTable_8022E504 = 0x8022E504; // type:data rom:0x4C76F4 +b_area_trd_part_2_yellow_ninja_koopa_DefenseTable_8022E440 = 0x8022E440; // type:data rom:0x4C7630 +b_area_trd_part_2_yellow_ninja_koopa_DefenseTable_8022E44C = 0x8022E44C; // type:data rom:0x4C763C +b_area_trd_part_2_yellow_ninja_koopa_StatusTable_8022E458 = 0x8022E458; // type:data rom:0x4C7648 +b_area_trd_part_2_yellow_ninja_koopa_PartsTable_8022E504 = 0x8022E504; // type:data rom:0x4C76F4 b_area_trd_part_2_yellow_ninja_koopa = 0x8022E528; // type:data rom:0x4C7718 -b_area_trd_part_2_yellow_ninja_koopa_idleAnimations_8022E550 = 0x8022E550; // type:data rom:0x4C7740 -b_area_trd_part_2_yellow_ninja_koopa_idleAnimations_8022E5A4 = 0x8022E5A4; // type:data rom:0x4C7794 -b_area_trd_part_2_yellow_ninja_koopa_idleAnimations_8022E5E0 = 0x8022E5E0; // type:data rom:0x4C77D0 -b_area_trd_part_2_yellow_ninja_koopa_idleAnimations_8022E61C = 0x8022E61C; // type:data rom:0x4C780C -b_area_trd_part_2_yellow_ninja_koopa_idleAnimations_8022E670 = 0x8022E670; // type:data rom:0x4C7860 -b_area_trd_part_2_yellow_ninja_koopa_idleAnimations_8022E67C = 0x8022E67C; // type:data rom:0x4C786C +b_area_trd_part_2_yellow_ninja_koopa_IdleAnimations_8022E550 = 0x8022E550; // type:data rom:0x4C7740 +b_area_trd_part_2_yellow_ninja_koopa_IdleAnimations_8022E5A4 = 0x8022E5A4; // type:data rom:0x4C7794 +b_area_trd_part_2_yellow_ninja_koopa_IdleAnimations_8022E5E0 = 0x8022E5E0; // type:data rom:0x4C77D0 +b_area_trd_part_2_yellow_ninja_koopa_IdleAnimations_8022E61C = 0x8022E61C; // type:data rom:0x4C780C +b_area_trd_part_2_yellow_ninja_koopa_IdleAnimations_8022E670 = 0x8022E670; // type:data rom:0x4C7860 +b_area_trd_part_2_yellow_ninja_koopa_IdleAnimations_8022E67C = 0x8022E67C; // type:data rom:0x4C786C b_area_trd_part_2_yellow_ninja_koopa_8022E688 = 0x8022E688; // type:data rom:0x4C7878 b_area_trd_part_2_yellow_ninja_koopa_init_80230BCC = 0x80230BCC; // type:data rom:0x4C9DBC b_area_trd_part_2_yellow_ninja_koopa_idle_80230CC0 = 0x80230CC0; // type:data rom:0x4C9EB0 @@ -10836,11 +10836,11 @@ func_802181F8_4CF3A8 = 0x802181F8; // type:func rom:0x4CF3A8 b_area_trd_part_3_Formation_00 = 0x80218220; // type:data rom:0x4CF3D0 b_area_trd_part_3_Formations = 0x8021823C; // type:data rom:0x4CF3EC b_area_trd_part_3_Stages = 0x80218264; // type:data rom:0x4CF414 -b_area_trd_part_3_eldstar_idleAnimations_80218280 = 0x80218280; // type:data rom:0x4CF430 -b_area_trd_part_3_eldstar_defenseTable_8021828C = 0x8021828C; // type:data rom:0x4CF43C -b_area_trd_part_3_eldstar_statusTable_80218298 = 0x80218298; // type:data rom:0x4CF448 +b_area_trd_part_3_eldstar_IdleAnimations_80218280 = 0x80218280; // type:data rom:0x4CF430 +b_area_trd_part_3_eldstar_DefenseTable_8021828C = 0x8021828C; // type:data rom:0x4CF43C +b_area_trd_part_3_eldstar_StatusTable_80218298 = 0x80218298; // type:data rom:0x4CF448 b_area_trd_part_2_red_ninja_koopa_effectUnk = 0x802362D0; // type:data rom:0x4CF4C0 -b_area_trd_part_3_eldstar_partsTable_80218344 = 0x80218344; // type:data rom:0x4CF4F4 +b_area_trd_part_3_eldstar_PartsTable_80218344 = 0x80218344; // type:data rom:0x4CF4F4 b_area_trd_part_3_eldstar = 0x80218368; // type:data rom:0x4CF518 b_area_trd_part_3_eldstar_init_80218390 = 0x80218390; // type:data rom:0x4CF540 b_area_trd_part_3_eldstar_idle_802183E8 = 0x802183E8; // type:data rom:0x4CF598 @@ -10877,13 +10877,13 @@ b_area_iwa_Formation_0C = 0x80218548; // type:data rom:0x4D0738 b_area_iwa_Formation_0D = 0x80218564; // type:data rom:0x4D0754 b_area_iwa_Formations = 0x802185B8; // type:data rom:0x4D07A8 b_area_iwa_Stages = 0x802186E4; // type:data rom:0x4D08D4 -b_area_iwa_cleft_defenseTable_80218710 = 0x80218710; // type:data rom:0x4D0900 -b_area_iwa_cleft_defenseTable_8021872C = 0x8021872C; // type:data rom:0x4D091C -b_area_iwa_cleft_statusTable_80218740 = 0x80218740; // type:data rom:0x4D0930 -b_area_iwa_cleft_partsTable_802187EC = 0x802187EC; // type:data rom:0x4D09DC +b_area_iwa_cleft_DefenseTable_80218710 = 0x80218710; // type:data rom:0x4D0900 +b_area_iwa_cleft_DefenseTable_8021872C = 0x8021872C; // type:data rom:0x4D091C +b_area_iwa_cleft_StatusTable_80218740 = 0x80218740; // type:data rom:0x4D0930 +b_area_iwa_cleft_PartsTable_802187EC = 0x802187EC; // type:data rom:0x4D09DC b_area_iwa_cleft = 0x80218810; // type:data rom:0x4D0A00 -b_area_iwa_cleft_idleAnimations_80218838 = 0x80218838; // type:data rom:0x4D0A28 -b_area_iwa_cleft_idleAnimations_80218884 = 0x80218884; // type:data rom:0x4D0A74 +b_area_iwa_cleft_IdleAnimations_80218838 = 0x80218838; // type:data rom:0x4D0A28 +b_area_iwa_cleft_IdleAnimations_80218884 = 0x80218884; // type:data rom:0x4D0A74 b_area_iwa_cleft_init_802188D0 = 0x802188D0; // type:data rom:0x4D0AC0 b_area_iwa_cleft_idle_80218934 = 0x80218934; // type:data rom:0x4D0B24 b_area_iwa_cleft_80218944 = 0x80218944; // type:data rom:0x4D0B34 @@ -10891,15 +10891,15 @@ b_area_iwa_cleft_handleEvent_80218C3C = 0x80218C3C; // type:data rom:0x4D0E2C b_area_iwa_cleft_802197AC = 0x802197AC; // type:data rom:0x4D199C b_area_iwa_cleft_80219BA0 = 0x80219BA0; // type:data rom:0x4D1D90 b_area_iwa_cleft_takeTurn_8021A3EC = 0x8021A3EC; // type:data rom:0x4D25DC -b_area_iwa_monty_mole_defenseTable_8021A450 = 0x8021A450; // type:data rom:0x4D2640 -b_area_iwa_monty_mole_statusTable_8021A45C = 0x8021A45C; // type:data rom:0x4D264C -b_area_iwa_monty_mole_partsTable_8021A508 = 0x8021A508; // type:data rom:0x4D26F8 +b_area_iwa_monty_mole_DefenseTable_8021A450 = 0x8021A450; // type:data rom:0x4D2640 +b_area_iwa_monty_mole_StatusTable_8021A45C = 0x8021A45C; // type:data rom:0x4D264C +b_area_iwa_monty_mole_PartsTable_8021A508 = 0x8021A508; // type:data rom:0x4D26F8 b_area_iwa_monty_mole_1 = 0x8021A574; // type:data rom:0x4D2764 -b_area_iwa_monty_mole_idleAnimations_8021A59C = 0x8021A59C; // type:data rom:0x4D278C -b_area_iwa_monty_mole_idleAnimations_8021A5E8 = 0x8021A5E8; // type:data rom:0x4D27D8 -b_area_iwa_monty_mole_idleAnimations_8021A5F4 = 0x8021A5F4; // type:data rom:0x4D27E4 +b_area_iwa_monty_mole_IdleAnimations_8021A59C = 0x8021A59C; // type:data rom:0x4D278C +b_area_iwa_monty_mole_IdleAnimations_8021A5E8 = 0x8021A5E8; // type:data rom:0x4D27D8 +b_area_iwa_monty_mole_IdleAnimations_8021A5F4 = 0x8021A5F4; // type:data rom:0x4D27E4 b_area_iwa_monty_mole_unk_missing_8021A600 = 0x8021A600; // type:data rom:0x4D27F0 -b_area_iwa_monty_mole_partsTable_8021A60C = 0x8021A60C; // type:data rom:0x4D27FC +b_area_iwa_monty_mole_PartsTable_8021A60C = 0x8021A60C; // type:data rom:0x4D27FC b_area_iwa_monty_mole_init_8021A630 = 0x8021A630; // type:data rom:0x4D2820 b_area_iwa_monty_mole_2 = 0x8021A690; // type:data rom:0x4D2880 b_area_iwa_monty_mole_vector3D_8021A6B8 = 0x8021A6B8; // type:data rom:0x4D28A8 @@ -10910,31 +10910,31 @@ b_area_iwa_monty_mole_init_8021A7B0 = 0x8021A7B0; // type:data rom:0x4D29A0 b_area_iwa_monty_mole_idle_8021A814 = 0x8021A814; // type:data rom:0x4D2A04 b_area_iwa_monty_mole_handleEvent_8021A824 = 0x8021A824; // type:data rom:0x4D2A14 b_area_iwa_monty_mole_takeTurn_8021AFAC = 0x8021AFAC; // type:data rom:0x4D319C -b_area_iwa_buzzar_idleAnimations_8021B600 = 0x8021B600; // type:data rom:0x4D37F0 -b_area_iwa_buzzar_idleAnimations_8021B644 = 0x8021B644; // type:data rom:0x4D3834 -b_area_iwa_buzzar_defenseTable_8021B650 = 0x8021B650; // type:data rom:0x4D3840 -b_area_iwa_buzzar_statusTable_8021B65C = 0x8021B65C; // type:data rom:0x4D384C -b_area_iwa_buzzar_partsTable_8021B708 = 0x8021B708; // type:data rom:0x4D38F8 +b_area_iwa_buzzar_IdleAnimations_8021B600 = 0x8021B600; // type:data rom:0x4D37F0 +b_area_iwa_buzzar_IdleAnimations_8021B644 = 0x8021B644; // type:data rom:0x4D3834 +b_area_iwa_buzzar_DefenseTable = 0x8021B650; // type:data rom:0x4D3840 +b_area_iwa_buzzar_StatusTable = 0x8021B65C; // type:data rom:0x4D384C +b_area_iwa_buzzar_PartsTable = 0x8021B708; // type:data rom:0x4D38F8 b_area_iwa_buzzar = 0x8021B7BC; // type:data rom:0x4D39AC -b_area_iwa_buzzar_init_8021B7E4 = 0x8021B7E4; // type:data rom:0x4D39D4 -b_area_iwa_buzzar_nextTurn_8021B918 = 0x8021B918; // type:data rom:0x4D3B08 -b_area_iwa_buzzar_idle_8021B930 = 0x8021B930; // type:data rom:0x4D3B20 -b_area_iwa_buzzar_handleEvent_8021B940 = 0x8021B940; // type:data rom:0x4D3B30 -b_area_iwa_buzzar_takeTurn_8021BCD8 = 0x8021BCD8; // type:data rom:0x4D3EC8 -b_area_iwa_buzzar_8021BEBC = 0x8021BEBC; // type:data rom:0x4D40AC -b_area_iwa_buzzar_8021CCE8 = 0x8021CCE8; // type:data rom:0x4D4ED8 -b_area_iwa_buzzar_8021DCB8 = 0x8021DCB8; // type:data rom:0x4D5EA8 -b_area_iwa_buzzar_8021DF2C = 0x8021DF2C; // type:data rom:0x4D611C -b_area_iwa_buzzar_8021F030 = 0x8021F030; // type:data rom:0x4D7220 -b_area_iwa_buzzar_8021F7EC = 0x8021F7EC; // type:data rom:0x4D79DC -b_area_iwa_buzzar_8021F808 = 0x8021F808; // type:data rom:0x4D79F8 -b_area_iwa_buzzar_8021F824 = 0x8021F824; // type:data rom:0x4D7A14 -b_area_iwa_buzzar_8021FA2C = 0x8021FA2C; // type:data rom:0x4D7C1C +b_area_iwa_buzzar_EVS_Init = 0x8021B7E4; // type:data rom:0x4D39D4 +b_area_iwa_buzzar_EVS_NextTurn = 0x8021B918; // type:data rom:0x4D3B08 +b_area_iwa_buzzar_EVS_Idle = 0x8021B930; // type:data rom:0x4D3B20 +b_area_iwa_buzzar_EVS_HandleEvent = 0x8021B940; // type:data rom:0x4D3B30 +b_area_iwa_buzzar_EVS_TakeTurn = 0x8021BCD8; // type:data rom:0x4D3EC8 +b_area_iwa_buzzar_EVS_Attack_WindBlast = 0x8021BEBC; // type:data rom:0x4D40AC +b_area_iwa_buzzar_EVS_Attack_FeatherFling = 0x8021CCE8; // type:data rom:0x4D4ED8 +b_area_iwa_buzzar_EVS_LiftMario = 0x8021DCB8; // type:data rom:0x4D5EA8 +b_area_iwa_buzzar_EVS_Attack_GrappleDrop = 0x8021DF2C; // type:data rom:0x4D611C +b_area_iwa_buzzar_EVS_Attack_ClawSwipe = 0x8021F030; // type:data rom:0x4D7220 +b_area_iwa_buzzar_EVS_FlyToHome = 0x8021F7EC; // type:data rom:0x4D79DC +b_area_iwa_buzzar_EVS_FlyToHome_GrappleFail = 0x8021F808; // type:data rom:0x4D79F8 +b_area_iwa_buzzar_EVS_flyToHome_Impl = 0x8021F824; // type:data rom:0x4D7A14 +b_area_iwa_buzzar_EVS_flyToHome_GrappleFail_Impl = 0x8021FA2C; // type:data rom:0x4D7C1C b_area_iwa_buzzar_8021FC34 = 0x8021FC34; // type:data rom:0x4D7E24 -b_area_iwa_whacka_idleAnimations_8021FC50 = 0x8021FC50; // type:data rom:0x4D7E40 -b_area_iwa_whacka_defenseTable_8021FC9C = 0x8021FC9C; // type:data rom:0x4D7E8C -b_area_iwa_whacka_statusTable_8021FCA8 = 0x8021FCA8; // type:data rom:0x4D7E98 -b_area_iwa_whacka_partsTable_8021FD54 = 0x8021FD54; // type:data rom:0x4D7F44 +b_area_iwa_whacka_IdleAnimations_8021FC50 = 0x8021FC50; // type:data rom:0x4D7E40 +b_area_iwa_whacka_DefenseTable_8021FC9C = 0x8021FC9C; // type:data rom:0x4D7E8C +b_area_iwa_whacka_StatusTable_8021FCA8 = 0x8021FCA8; // type:data rom:0x4D7E98 +b_area_iwa_whacka_PartsTable_8021FD54 = 0x8021FD54; // type:data rom:0x4D7F44 b_area_iwa_whacka = 0x8021FD78; // type:data rom:0x4D7F68 b_area_iwa_whacka_init_8021FDA0 = 0x8021FDA0; // type:data rom:0x4D7F90 b_area_iwa_whacka_idle_8021FE5C = 0x8021FE5C; // type:data rom:0x4D804C @@ -10948,10 +10948,10 @@ b_area_iwa_iwa_01_ForegroundModels = 0x802208A4; // type:data rom:0x4D8A94 b_area_iwa_iwa_01 = 0x802208B0; // type:data rom:0x4D8AA0 b_area_iwa_iwa_01_vector3D_802208D8 = 0x802208D8; // type:data rom:0x4D8AC8 b_area_iwa_iwa_01_specialFormation_802208E4 = 0x802208E4; // type:data rom:0x4D8AD4 -b_area_iwa_iwa_01_idleAnimations_80220900 = 0x80220900; // type:data rom:0x4D8AF0 -b_area_iwa_iwa_01_defenseTable_8022094C = 0x8022094C; // type:data rom:0x4D8B3C -b_area_iwa_iwa_01_statusTable_80220958 = 0x80220958; // type:data rom:0x4D8B48 -b_area_iwa_iwa_01_partsTable_80220A04 = 0x80220A04; // type:data rom:0x4D8BF4 +b_area_iwa_iwa_01_IdleAnimations_80220900 = 0x80220900; // type:data rom:0x4D8AF0 +b_area_iwa_iwa_01_DefenseTable_8022094C = 0x8022094C; // type:data rom:0x4D8B3C +b_area_iwa_iwa_01_StatusTable_80220958 = 0x80220958; // type:data rom:0x4D8B48 +b_area_iwa_iwa_01_PartsTable_80220A04 = 0x80220A04; // type:data rom:0x4D8BF4 b_area_iwa_iwa_01_whacka = 0x80220A28; // type:data rom:0x4D8C18 b_area_iwa_iwa_01_init_80220A50 = 0x80220A50; // type:data rom:0x4D8C40 b_area_iwa_iwa_01_idle_80220B0C = 0x80220B0C; // type:data rom:0x4D8CFC @@ -10969,10 +10969,10 @@ b_area_iwa_iwa_02_ForegroundModels = 0x802215C0; // type:data rom:0x4D97B0 b_area_iwa_iwa_02 = 0x802215CC; // type:data rom:0x4D97BC b_area_iwa_iwa_02_D_802215F4_4B17E4 = 0x802215F4; // type:data rom:0x4D97E4 b_area_iwa_iwa_02_specialFormation_whacka = 0x80221600; // type:data rom:0x4D97F0 -b_area_iwa_iwa_02_idleAnimations_8022161C = 0x8022161C; // type:data rom:0x4D980C -b_area_iwa_iwa_02_defenseTable_80221668 = 0x80221668; // type:data rom:0x4D9858 -b_area_iwa_iwa_02_statusTable_80221674 = 0x80221674; // type:data rom:0x4D9864 -b_area_iwa_iwa_02_partsTable_80221720 = 0x80221720; // type:data rom:0x4D9910 +b_area_iwa_iwa_02_IdleAnimations_8022161C = 0x8022161C; // type:data rom:0x4D980C +b_area_iwa_iwa_02_DefenseTable_80221668 = 0x80221668; // type:data rom:0x4D9858 +b_area_iwa_iwa_02_StatusTable_80221674 = 0x80221674; // type:data rom:0x4D9864 +b_area_iwa_iwa_02_PartsTable_80221720 = 0x80221720; // type:data rom:0x4D9910 b_area_iwa_iwa_02_whacka = 0x80221744; // type:data rom:0x4D9934 b_area_iwa_iwa_02_init_8022176C = 0x8022176C; // type:data rom:0x4D995C b_area_iwa_iwa_02_idle_80221828 = 0x80221828; // type:data rom:0x4D9A18 @@ -10983,15 +10983,15 @@ b_area_iwa_iwa_02_80222130 = 0x80222130; // type:data rom:0x4DA320 b_area_sbk_pokey_UnkBattleFunc1 = 0x80218000; // type:func rom:0x4DA5E0 b_area_sbk_sbk_02_UpdateSunPos = 0x802180D0; // type:func rom:0x4DA6B0 b_area_sbk_sbk_02_GetModelPos = 0x80218220; // type:func rom:0x4DA800 -b_area_sbk_pokey_defenseTable_80218280 = 0x80218280; // type:data rom:0x4DA860 -b_area_sbk_pokey_statusTable_8021828C = 0x8021828C; // type:data rom:0x4DA86C -b_area_sbk_pokey_partsTable_80218338 = 0x80218338; // type:data rom:0x4DA918 +b_area_sbk_pokey_DefenseTable_80218280 = 0x80218280; // type:data rom:0x4DA860 +b_area_sbk_pokey_StatusTable_8021828C = 0x8021828C; // type:data rom:0x4DA86C +b_area_sbk_pokey_PartsTable_80218338 = 0x80218338; // type:data rom:0x4DA918 b_area_sbk_pokey = 0x80218410; // type:data rom:0x4DA9F0 -b_area_sbk_pokey_idleAnimations_80218438 = 0x80218438; // type:data rom:0x4DAA18 -b_area_sbk_pokey_idleAnimations_80218474 = 0x80218474; // type:data rom:0x4DAA54 -b_area_sbk_pokey_idleAnimations_802184B0 = 0x802184B0; // type:data rom:0x4DAA90 -b_area_sbk_pokey_idleAnimations_802184EC = 0x802184EC; // type:data rom:0x4DAACC -b_area_sbk_pokey_idleAnimations_80218528 = 0x80218528; // type:data rom:0x4DAB08 +b_area_sbk_pokey_IdleAnimations_80218438 = 0x80218438; // type:data rom:0x4DAA18 +b_area_sbk_pokey_IdleAnimations_80218474 = 0x80218474; // type:data rom:0x4DAA54 +b_area_sbk_pokey_IdleAnimations_802184B0 = 0x802184B0; // type:data rom:0x4DAA90 +b_area_sbk_pokey_IdleAnimations_802184EC = 0x802184EC; // type:data rom:0x4DAACC +b_area_sbk_pokey_IdleAnimations_80218528 = 0x80218528; // type:data rom:0x4DAB08 b_area_sbk_pokey_init_80218534 = 0x80218534; // type:data rom:0x4DAB14 b_area_sbk_pokey_idle_802186B0 = 0x802186B0; // type:data rom:0x4DAC90 b_area_sbk_pokey_handleEvent_802186C0 = 0x802186C0; // type:data rom:0x4DACA0 @@ -11009,13 +11009,13 @@ b_area_sbk_pokey_8021C574 = 0x8021C574; // type:data rom:0x4DEB54 b_area_sbk_pokey_8021C860 = 0x8021C860; // type:data rom:0x4DEE40 b_area_sbk_pokey_8021CCAC = 0x8021CCAC; // type:data rom:0x4DF28C b_area_sbk_pokey_8021D184 = 0x8021D184; // type:data rom:0x4DF764 -b_area_sbk_bandit_idleAnimations_8021D510 = 0x8021D510; // type:data rom:0x4DFAF0 -b_area_sbk_bandit_idleAnimations_8021D55C = 0x8021D55C; // type:data rom:0x4DFB3C -b_area_sbk_bandit_idleAnimations_8021D5A8 = 0x8021D5A8; // type:data rom:0x4DFB88 -b_area_sbk_bandit_defenseTable_8021D5B4 = 0x8021D5B4; // type:data rom:0x4DFB94 -b_area_sbk_bandit_statusTable_8021D5C0 = 0x8021D5C0; // type:data rom:0x4DFBA0 -b_area_sbk_bandit_partsTable_8021D66C = 0x8021D66C; // type:data rom:0x4DFC4C -b_area_sbk_bandit_partsTable_8021D6B4 = 0x8021D6B4; // type:data rom:0x4DFC94 +b_area_sbk_bandit_IdleAnimations_8021D510 = 0x8021D510; // type:data rom:0x4DFAF0 +b_area_sbk_bandit_IdleAnimations_8021D55C = 0x8021D55C; // type:data rom:0x4DFB3C +b_area_sbk_bandit_IdleAnimations_8021D5A8 = 0x8021D5A8; // type:data rom:0x4DFB88 +b_area_sbk_bandit_DefenseTable_8021D5B4 = 0x8021D5B4; // type:data rom:0x4DFB94 +b_area_sbk_bandit_StatusTable_8021D5C0 = 0x8021D5C0; // type:data rom:0x4DFBA0 +b_area_sbk_bandit_PartsTable_8021D66C = 0x8021D66C; // type:data rom:0x4DFC4C +b_area_sbk_bandit_PartsTable_8021D6B4 = 0x8021D6B4; // type:data rom:0x4DFC94 b_area_sbk_bandit = 0x8021D6D8; // type:data rom:0x4DFCB8 b_area_sbk_bandit_2 = 0x8021D700; // type:data rom:0x4DFCE0 b_area_sbk_bandit_vector3D_8021D728 = 0x8021D728; // type:data rom:0x4DFD08 @@ -11070,15 +11070,15 @@ func_80218B30_4E3270 = 0x80218B30; // type:func rom:0x4E3270 func_80218B78_4E32B8 = 0x80218B78; // type:func rom:0x4E32B8 func_80218BA0_4E32E0 = 0x80218BA0; // type:func rom:0x4E32E0 func_80218BE8_4E3328 = 0x80218BE8; // type:func rom:0x4E3328 -b_area_isk_part_1_pokey_mummy_defenseTable_80218C10 = 0x80218C10; // type:data rom:0x4E3350 -b_area_isk_part_1_pokey_mummy_statusTable_80218C1C = 0x80218C1C; // type:data rom:0x4E335C -b_area_isk_part_1_pokey_mummy_partsTable_80218CC8 = 0x80218CC8; // type:data rom:0x4E3408 +b_area_isk_part_1_pokey_mummy_DefenseTable_80218C10 = 0x80218C10; // type:data rom:0x4E3350 +b_area_isk_part_1_pokey_mummy_StatusTable_80218C1C = 0x80218C1C; // type:data rom:0x4E335C +b_area_isk_part_1_pokey_mummy_PartsTable_80218CC8 = 0x80218CC8; // type:data rom:0x4E3408 b_area_isk_part_1_pokey_mummy = 0x80218DA0; // type:data rom:0x4E34E0 -b_area_isk_part_1_pokey_mummy_idleAnimations_80218DC8 = 0x80218DC8; // type:data rom:0x4E3508 -b_area_isk_part_1_pokey_mummy_idleAnimations_80218E04 = 0x80218E04; // type:data rom:0x4E3544 -b_area_isk_part_1_pokey_mummy_idleAnimations_80218E40 = 0x80218E40; // type:data rom:0x4E3580 -b_area_isk_part_1_pokey_mummy_idleAnimations_80218E7C = 0x80218E7C; // type:data rom:0x4E35BC -b_area_isk_part_1_pokey_mummy_idleAnimations_80218EB8 = 0x80218EB8; // type:data rom:0x4E35F8 +b_area_isk_part_1_pokey_mummy_IdleAnimations_80218DC8 = 0x80218DC8; // type:data rom:0x4E3508 +b_area_isk_part_1_pokey_mummy_IdleAnimations_80218E04 = 0x80218E04; // type:data rom:0x4E3544 +b_area_isk_part_1_pokey_mummy_IdleAnimations_80218E40 = 0x80218E40; // type:data rom:0x4E3580 +b_area_isk_part_1_pokey_mummy_IdleAnimations_80218E7C = 0x80218E7C; // type:data rom:0x4E35BC +b_area_isk_part_1_pokey_mummy_IdleAnimations_80218EB8 = 0x80218EB8; // type:data rom:0x4E35F8 b_area_isk_part_1_pokey_mummy_init_80218EC4 = 0x80218EC4; // type:data rom:0x4E3604 b_area_isk_part_1_pokey_mummy_idle_80219040 = 0x80219040; // type:data rom:0x4E3780 b_area_isk_part_1_pokey_mummy_handleEvent_80219050 = 0x80219050; // type:data rom:0x4E3790 @@ -11090,12 +11090,12 @@ b_area_isk_part_1_pokey_mummy_8021B6AC = 0x8021B6AC; // type:data rom:0x4E5DEC b_area_isk_part_1_pokey_mummy_8021B998 = 0x8021B998; // type:data rom:0x4E60D8 b_area_isk_part_1_pokey_mummy_8021BDE4 = 0x8021BDE4; // type:data rom:0x4E6524 b_area_isk_part_1_pokey_mummy_8021C2BC = 0x8021C2BC; // type:data rom:0x4E69FC -b_area_isk_part_1_swooper_defenseTable_8021C4B0 = 0x8021C4B0; // type:data rom:0x4E6BF0 -b_area_isk_part_1_swooper_statusTable_8021C4BC = 0x8021C4BC; // type:data rom:0x4E6BFC -b_area_isk_part_1_swooper_partsTable_8021C568 = 0x8021C568; // type:data rom:0x4E6CA8 +b_area_isk_part_1_swooper_DefenseTable_8021C4B0 = 0x8021C4B0; // type:data rom:0x4E6BF0 +b_area_isk_part_1_swooper_StatusTable_8021C4BC = 0x8021C4BC; // type:data rom:0x4E6BFC +b_area_isk_part_1_swooper_PartsTable_8021C568 = 0x8021C568; // type:data rom:0x4E6CA8 b_area_isk_part_1_swooper = 0x8021C58C; // type:data rom:0x4E6CCC -b_area_isk_part_1_swooper_idleAnimations_8021C5B4 = 0x8021C5B4; // type:data rom:0x4E6CF4 -b_area_isk_part_1_swooper_idleAnimations_8021C600 = 0x8021C600; // type:data rom:0x4E6D40 +b_area_isk_part_1_swooper_IdleAnimations_8021C5B4 = 0x8021C5B4; // type:data rom:0x4E6CF4 +b_area_isk_part_1_swooper_IdleAnimations_8021C600 = 0x8021C600; // type:data rom:0x4E6D40 b_area_isk_part_1_swooper_init_8021C64C = 0x8021C64C; // type:data rom:0x4E6D8C b_area_isk_part_1_swooper_idle_8021C6B0 = 0x8021C6B0; // type:data rom:0x4E6DF0 b_area_isk_part_1_swooper_8021C6C0 = 0x8021C6C0; // type:data rom:0x4E6E00 @@ -11104,14 +11104,14 @@ b_area_isk_part_1_swooper_8021CD04 = 0x8021CD04; // type:data rom:0x4E7444 b_area_isk_part_1_swooper_handleEvent_8021D064 = 0x8021D064; // type:data rom:0x4E77A4 b_area_isk_part_1_swooper_8021D7E4 = 0x8021D7E4; // type:data rom:0x4E7F24 b_area_isk_part_1_swooper_takeTurn_8021DED4 = 0x8021DED4; // type:data rom:0x4E8614 -b_area_isk_part_1_buzzy_beetle_defenseTable_8021E4C0 = 0x8021E4C0; // type:data rom:0x4E8C00 -b_area_isk_part_1_buzzy_beetle_defenseTable_8021E4DC = 0x8021E4DC; // type:data rom:0x4E8C1C -b_area_isk_part_1_buzzy_beetle_statusTable_8021E4E8 = 0x8021E4E8; // type:data rom:0x4E8C28 -b_area_isk_part_1_buzzy_beetle_partsTable_8021E594 = 0x8021E594; // type:data rom:0x4E8CD4 +b_area_isk_part_1_buzzy_beetle_DefenseTable_8021E4C0 = 0x8021E4C0; // type:data rom:0x4E8C00 +b_area_isk_part_1_buzzy_beetle_DefenseTable_8021E4DC = 0x8021E4DC; // type:data rom:0x4E8C1C +b_area_isk_part_1_buzzy_beetle_StatusTable_8021E4E8 = 0x8021E4E8; // type:data rom:0x4E8C28 +b_area_isk_part_1_buzzy_beetle_PartsTable_8021E594 = 0x8021E594; // type:data rom:0x4E8CD4 b_area_isk_part_1_buzzy_beetle = 0x8021E5B8; // type:data rom:0x4E8CF8 -b_area_isk_part_1_buzzy_beetle_idleAnimations_8021E5E0 = 0x8021E5E0; // type:data rom:0x4E8D20 -b_area_isk_part_1_buzzy_beetle_idleAnimations_8021E62C = 0x8021E62C; // type:data rom:0x4E8D6C -b_area_isk_part_1_buzzy_beetle_idleAnimations_8021E678 = 0x8021E678; // type:data rom:0x4E8DB8 +b_area_isk_part_1_buzzy_beetle_IdleAnimations_8021E5E0 = 0x8021E5E0; // type:data rom:0x4E8D20 +b_area_isk_part_1_buzzy_beetle_IdleAnimations_8021E62C = 0x8021E62C; // type:data rom:0x4E8D6C +b_area_isk_part_1_buzzy_beetle_IdleAnimations_8021E678 = 0x8021E678; // type:data rom:0x4E8DB8 b_area_isk_part_1_buzzy_beetle_init_8021E6BC = 0x8021E6BC; // type:data rom:0x4E8DFC b_area_isk_part_1_buzzy_beetle_idle_8021E88C = 0x8021E88C; // type:data rom:0x4E8FCC b_area_isk_part_1_buzzy_beetle_8021E89C = 0x8021E89C; // type:data rom:0x4E8FDC @@ -11121,14 +11121,14 @@ b_area_isk_part_1_buzzy_beetle_intTable_8021F1DC = 0x8021F1DC; // type:data rom: b_area_isk_part_1_buzzy_beetle_handleEvent_8021F228 = 0x8021F228; // type:data rom:0x4E9968 b_area_isk_part_1_buzzy_beetle_takeTurn_8021FF8C = 0x8021FF8C; // type:data rom:0x4EA6CC b_area_isk_part_1_buzzy_beetle_takeTurn_80220A44 = 0x80220A44; // type:data rom:0x4EB184 -b_area_isk_part_1_stone_chomp_idleAnimations_80221450 = 0x80221450; // type:data rom:0x4EBB90 -b_area_isk_part_1_stone_chomp_idleAnimations_8022148C = 0x8022148C; // type:data rom:0x4EBBCC -b_area_isk_part_1_stone_chomp_idleAnimations_802214C8 = 0x802214C8; // type:data rom:0x4EBC08 -b_area_isk_part_1_stone_chomp_idleAnimations_80221504 = 0x80221504; // type:data rom:0x4EBC44 -b_area_isk_part_1_stone_chomp_idleAnimations_80221540 = 0x80221540; // type:data rom:0x4EBC80 -b_area_isk_part_1_stone_chomp_defenseTable_8022154C = 0x8022154C; // type:data rom:0x4EBC8C -b_area_isk_part_1_stone_chomp_statusTable_80221558 = 0x80221558; // type:data rom:0x4EBC98 -b_area_isk_part_1_stone_chomp_partsTable_80221604 = 0x80221604; // type:data rom:0x4EBD44 +b_area_isk_part_1_stone_chomp_IdleAnimations_80221450 = 0x80221450; // type:data rom:0x4EBB90 +b_area_isk_part_1_stone_chomp_IdleAnimations_8022148C = 0x8022148C; // type:data rom:0x4EBBCC +b_area_isk_part_1_stone_chomp_IdleAnimations_802214C8 = 0x802214C8; // type:data rom:0x4EBC08 +b_area_isk_part_1_stone_chomp_IdleAnimations_80221504 = 0x80221504; // type:data rom:0x4EBC44 +b_area_isk_part_1_stone_chomp_IdleAnimations_80221540 = 0x80221540; // type:data rom:0x4EBC80 +b_area_isk_part_1_stone_chomp_DefenseTable_8022154C = 0x8022154C; // type:data rom:0x4EBC8C +b_area_isk_part_1_stone_chomp_StatusTable_80221558 = 0x80221558; // type:data rom:0x4EBC98 +b_area_isk_part_1_stone_chomp_PartsTable_80221604 = 0x80221604; // type:data rom:0x4EBD44 b_area_isk_part_1_stone_chomp = 0x8022176C; // type:data rom:0x4EBEAC b_area_isk_part_1_stone_chomp_80221794 = 0x80221794; // type:data rom:0x4EBED4 b_area_isk_part_1_stone_chomp_8022181C = 0x8022181C; // type:data rom:0x4EBF5C @@ -11248,14 +11248,14 @@ func_80218A60_4EFF00 = 0x80218A60; // type:func rom:0x4EFF00 func_80218AA8_4EFF48 = 0x80218AA8; // type:func rom:0x4EFF48 func_80218AD0_4EFF70 = 0x80218AD0; // type:func rom:0x4EFF70 func_80218B18_4EFFB8 = 0x80218B18; // type:func rom:0x4EFFB8 -b_area_isk_part_2_chain_chomp_idleAnimations_80218B40 = 0x80218B40; // type:data rom:0x4EFFE0 -b_area_isk_part_2_chain_chomp_idleAnimations_80218B84 = 0x80218B84; // type:data rom:0x4F0024 -b_area_isk_part_2_chain_chomp_idleAnimations_80218BC8 = 0x80218BC8; // type:data rom:0x4F0068 -b_area_isk_part_2_chain_chomp_idleAnimations_80218C0C = 0x80218C0C; // type:data rom:0x4F00AC -b_area_isk_part_2_chain_chomp_idleAnimations_80218C50 = 0x80218C50; // type:data rom:0x4F00F0 -b_area_isk_part_2_chain_chomp_defenseTable_80218C5C = 0x80218C5C; // type:data rom:0x4F00FC -b_area_isk_part_2_chain_chomp_statusTable_80218C88 = 0x80218C88; // type:data rom:0x4F0128 -b_area_isk_part_2_chain_chomp_partsTable_80218D34 = 0x80218D34; // type:data rom:0x4F01D4 +b_area_isk_part_2_chain_chomp_IdleAnimations_80218B40 = 0x80218B40; // type:data rom:0x4EFFE0 +b_area_isk_part_2_chain_chomp_IdleAnimations_80218B84 = 0x80218B84; // type:data rom:0x4F0024 +b_area_isk_part_2_chain_chomp_IdleAnimations_80218BC8 = 0x80218BC8; // type:data rom:0x4F0068 +b_area_isk_part_2_chain_chomp_IdleAnimations_80218C0C = 0x80218C0C; // type:data rom:0x4F00AC +b_area_isk_part_2_chain_chomp_IdleAnimations_80218C50 = 0x80218C50; // type:data rom:0x4F00F0 +b_area_isk_part_2_chain_chomp_DefenseTable_80218C5C = 0x80218C5C; // type:data rom:0x4F00FC +b_area_isk_part_2_chain_chomp_StatusTable_80218C88 = 0x80218C88; // type:data rom:0x4F0128 +b_area_isk_part_2_chain_chomp_PartsTable_80218D34 = 0x80218D34; // type:data rom:0x4F01D4 b_area_isk_part_2_chain_chomp = 0x80218E9C; // type:data rom:0x4F033C b_area_isk_part_2_chain_chomp_init_80218EC4 = 0x80218EC4; // type:data rom:0x4F0364 b_area_isk_part_2_chain_chomp_80218FCC = 0x80218FCC; // type:data rom:0x4F046C @@ -11266,14 +11266,14 @@ b_area_isk_part_2_chain_chomp_8021A200 = 0x8021A200; // type:data rom:0x4F16A0 b_area_isk_part_2_chain_chomp_takeTurn_8021A7C4 = 0x8021A7C4; // type:data rom:0x4F1C64 b_area_isk_part_2_chain_chomp_8021B41C = 0x8021B41C; // type:data rom:0x4F28BC b_area_isk_part_2_chain_chomp_8021B50C = 0x8021B50C; // type:data rom:0x4F29AC -b_area_isk_part_2_tutankoopa_idleAnimations_8021B960 = 0x8021B960; // type:data rom:0x4F2E00 -b_area_isk_part_2_tutankoopa_idleAnimations_8021B9AC = 0x8021B9AC; // type:data rom:0x4F2E4C -b_area_isk_part_2_tutankoopa_idleAnimations_8021B9F8 = 0x8021B9F8; // type:data rom:0x4F2E98 -b_area_isk_part_2_tutankoopa_idleAnimations_8021BA04 = 0x8021BA04; // type:data rom:0x4F2EA4 -b_area_isk_part_2_tutankoopa_idleAnimations_8021BA10 = 0x8021BA10; // type:data rom:0x4F2EB0 -b_area_isk_part_2_tutankoopa_defenseTable_8021BA1C = 0x8021BA1C; // type:data rom:0x4F2EBC -b_area_isk_part_2_tutankoopa_statusTable_8021BA28 = 0x8021BA28; // type:data rom:0x4F2EC8 -b_area_isk_part_2_tutankoopa_partsTable_8021BAD4 = 0x8021BAD4; // type:data rom:0x4F2F74 +b_area_isk_part_2_tutankoopa_IdleAnimations_8021B960 = 0x8021B960; // type:data rom:0x4F2E00 +b_area_isk_part_2_tutankoopa_IdleAnimations_8021B9AC = 0x8021B9AC; // type:data rom:0x4F2E4C +b_area_isk_part_2_tutankoopa_IdleAnimations_8021B9F8 = 0x8021B9F8; // type:data rom:0x4F2E98 +b_area_isk_part_2_tutankoopa_IdleAnimations_8021BA04 = 0x8021BA04; // type:data rom:0x4F2EA4 +b_area_isk_part_2_tutankoopa_IdleAnimations_8021BA10 = 0x8021BA10; // type:data rom:0x4F2EB0 +b_area_isk_part_2_tutankoopa_DefenseTable_8021BA1C = 0x8021BA1C; // type:data rom:0x4F2EBC +b_area_isk_part_2_tutankoopa_StatusTable_8021BA28 = 0x8021BA28; // type:data rom:0x4F2EC8 +b_area_isk_part_2_tutankoopa_PartsTable_8021BAD4 = 0x8021BAD4; // type:data rom:0x4F2F74 b_area_isk_part_2_tutankoopa = 0x8021BBF4; // type:data rom:0x4F3094 b_area_isk_part_2_tutankoopa_init_8021BC1C = 0x8021BC1C; // type:data rom:0x4F30BC b_area_isk_part_2_tutankoopa_idle_8021BE28 = 0x8021BE28; // type:data rom:0x4F32C8 @@ -11338,22 +11338,22 @@ b_area_isk_part_2_Formation_00 = 0x8022042C; // type:data rom:0x4F78CC b_area_isk_part_2_Formations = 0x80220448; // type:data rom:0x4F78E8 b_area_isk_part_2_Stages = 0x80220470; // type:data rom:0x4F7910 D_802204E0_4F7980 = 0x802204E0; // type:data rom:0x4F7980 -b_area_mim_forest_fuzzy_UnkBattleFunc2 = 0x80220740; // type:data rom:0x4F7BE0 +b_area_mim_forest_fuzzy_SpawnDrainHealthStartFX = 0x80220740; // type:data rom:0x4F7BE0 D_80220744 = 0x80220744; // type:data rom:0x4F7BE4 D_80220750 = 0x80220750; // type:data rom:0x4F7BF0 D_80220754 = 0x80220754; // type:data rom:0x4F7BF4 D_80220760 = 0x80220760; // type:data rom:0x4F7C00 D_80220770 = 0x80220770; // type:data rom:0x4F7C10 D_80220780 = 0x80220780; // type:data rom:0x4F7C20 -b_area_mim_forest_fuzzy_UnkBattleFunc2_2 = 0x802180B4; // type:func rom:0x4F7C94 +b_area_mim_forest_fuzzy_SpawnDrainHealthContinueFX = 0x802180B4; // type:func rom:0x4F7C94 b_area_mim_bzzap_UnkBattleFunc1 = 0x80218170; // type:func rom:0x4F7D50 b_area_mim_bzzap_UnkFloatFunc4 = 0x8021823C; // type:func rom:0x4F7E1C b_area_mim_mim_01_UnkFogFunc2 = 0x80218360; // type:func rom:0x4F7F40 -b_area_mim_forest_fuzzy_defenseTable_802183C0 = 0x802183C0; // type:data rom:0x4F7FA0 -b_area_mim_forest_fuzzy_statusTable_802183CC = 0x802183CC; // type:data rom:0x4F7FAC -b_area_mim_forest_fuzzy_partsTable_80218478 = 0x80218478; // type:data rom:0x4F8058 +b_area_mim_forest_fuzzy_DefenseTable_802183C0 = 0x802183C0; // type:data rom:0x4F7FA0 +b_area_mim_forest_fuzzy_StatusTable_802183CC = 0x802183CC; // type:data rom:0x4F7FAC +b_area_mim_forest_fuzzy_PartsTable_80218478 = 0x80218478; // type:data rom:0x4F8058 b_area_mim_forest_fuzzy = 0x8021849C; // type:data rom:0x4F807C -b_area_mim_forest_fuzzy_idleAnimations_802184C4 = 0x802184C4; // type:data rom:0x4F80A4 +b_area_mim_forest_fuzzy_IdleAnimations_802184C4 = 0x802184C4; // type:data rom:0x4F80A4 b_area_mim_forest_fuzzy_init_80218510 = 0x80218510; // type:data rom:0x4F80F0 b_area_mim_forest_fuzzy_idle_80218574 = 0x80218574; // type:data rom:0x4F8154 b_area_mim_forest_fuzzy_handleEvent_80218584 = 0x80218584; // type:data rom:0x4F8164 @@ -11364,10 +11364,10 @@ b_area_mim_forest_fuzzy_8021A45C = 0x8021A45C; // type:data rom:0x4FA03C b_area_mim_forest_fuzzy_takeTurn_8021A61C = 0x8021A61C; // type:data rom:0x4FA1FC b_area_mim_forest_fuzzy_vector3D_8021A7F4 = 0x8021A7F4; // type:data rom:0x4FA3D4 b_area_mim_forest_fuzzy_specialFormation_8021A800 = 0x8021A800; // type:data rom:0x4FA3E0 -b_area_mim_bzzap_idleAnimations_8021A820 = 0x8021A820; // type:data rom:0x4FA400 -b_area_mim_bzzap_defenseTable_8021A86C = 0x8021A86C; // type:data rom:0x4FA44C -b_area_mim_bzzap_statusTable_8021A878 = 0x8021A878; // type:data rom:0x4FA458 -b_area_mim_bzzap_partsTable_8021A924 = 0x8021A924; // type:data rom:0x4FA504 +b_area_mim_bzzap_IdleAnimations_8021A820 = 0x8021A820; // type:data rom:0x4FA400 +b_area_mim_bzzap_DefenseTable_8021A86C = 0x8021A86C; // type:data rom:0x4FA44C +b_area_mim_bzzap_StatusTable_8021A878 = 0x8021A878; // type:data rom:0x4FA458 +b_area_mim_bzzap_PartsTable_8021A924 = 0x8021A924; // type:data rom:0x4FA504 b_area_mim_bzzap = 0x8021A9FC; // type:data rom:0x4FA5DC b_area_mim_bzzap_init_8021AA24 = 0x8021AA24; // type:data rom:0x4FA604 b_area_mim_bzzap_idle_8021AB10 = 0x8021AB10; // type:data rom:0x4FA6F0 @@ -11377,12 +11377,12 @@ b_area_mim_bzzap_8021B28C = 0x8021B28C; // type:data rom:0x4FAE6C b_area_mim_bzzap_8021B77C = 0x8021B77C; // type:data rom:0x4FB35C b_area_mim_bzzap_8021BC74 = 0x8021BC74; // type:data rom:0x4FB854 b_area_mim_bzzap_takeTurn_8021D28C = 0x8021D28C; // type:data rom:0x4FCE6C -b_area_mim_piranha_plant_idleAnimations_8021D330 = 0x8021D330; // type:data rom:0x4FCF10 +b_area_mim_piranha_plant_IdleAnimations_8021D330 = 0x8021D330; // type:data rom:0x4FCF10 b_area_mim_piranha_plant_unk_missing_8021D37C = 0x8021D37C; // type:data rom:0x4FCF5C b_area_mim_piranha_plant_unk_missing_8021D388 = 0x8021D388; // type:data rom:0x4FCF68 -b_area_mim_piranha_plant_defenseTable_8021D394 = 0x8021D394; // type:data rom:0x4FCF74 -b_area_mim_piranha_plant_statusTable_8021D3A0 = 0x8021D3A0; // type:data rom:0x4FCF80 -b_area_mim_piranha_plant_partsTable_8021D44C = 0x8021D44C; // type:data rom:0x4FD02C +b_area_mim_piranha_plant_DefenseTable_8021D394 = 0x8021D394; // type:data rom:0x4FCF74 +b_area_mim_piranha_plant_StatusTable_8021D3A0 = 0x8021D3A0; // type:data rom:0x4FCF80 +b_area_mim_piranha_plant_PartsTable_8021D44C = 0x8021D44C; // type:data rom:0x4FD02C b_area_mim_piranha_plant = 0x8021D470; // type:data rom:0x4FD050 b_area_mim_piranha_plant_init_8021D498 = 0x8021D498; // type:data rom:0x4FD078 b_area_mim_piranha_plant_idle_8021D4E4 = 0x8021D4E4; // type:data rom:0x4FD0C4 @@ -11421,68 +11421,68 @@ b_area_arn_hyper_paragoomba_CalculateRotationZ = 0x802184C4; // type:func rom:0x b_area_arn_hyper_cleft_StartRumbleWithParams = 0x802185C0; // type:func rom:0x4FF010 b_area_arn_hyper_cleft_SetSpinSmashable = 0x80218618; // type:func rom:0x4FF068 b_area_arn_tubbas_heart_func_80218680_4FF0D0 = 0x80218680; // type:func rom:0x4FF0D0 -b_area_arn_hypergoomba_defenseTable_80218770 = 0x80218770; // type:data rom:0x4FF1C0 -b_area_arn_hypergoomba_statusTable_8021877C = 0x8021877C; // type:data rom:0x4FF1CC -b_area_arn_hypergoomba_partsTable_80218828 = 0x80218828; // type:data rom:0x4FF278 +b_area_arn_hypergoomba_DefenseTable_80218770 = 0x80218770; // type:data rom:0x4FF1C0 +b_area_arn_hypergoomba_StatusTable_8021877C = 0x8021877C; // type:data rom:0x4FF1CC +b_area_arn_hypergoomba_PartsTable_80218828 = 0x80218828; // type:data rom:0x4FF278 b_area_arn_hypergoomba = 0x8021884C; // type:data rom:0x4FF29C -b_area_arn_hypergoomba_idleAnimations_80218874 = 0x80218874; // type:data rom:0x4FF2C4 +b_area_arn_hypergoomba_IdleAnimations_80218874 = 0x80218874; // type:data rom:0x4FF2C4 b_area_arn_hypergoomba_init_802188C0 = 0x802188C0; // type:data rom:0x4FF310 b_area_arn_hypergoomba_nextTurn_80218950 = 0x80218950; // type:data rom:0x4FF3A0 b_area_arn_hypergoomba_802189D4 = 0x802189D4; // type:data rom:0x4FF424 b_area_arn_hypergoomba_takeTurn_802195F0 = 0x802195F0; // type:data rom:0x500040 -b_area_arn_hypergoomba_idleAnimations_80219818 = 0x80219818; // type:data rom:0x500268 -b_area_arn_hypergoomba_idleAnimations_80219864 = 0x80219864; // type:data rom:0x5002B4 +b_area_arn_hypergoomba_IdleAnimations_80219818 = 0x80219818; // type:data rom:0x500268 +b_area_arn_hypergoomba_IdleAnimations_80219864 = 0x80219864; // type:data rom:0x5002B4 b_area_arn_hypergoomba_802198B0 = 0x802198B0; // type:data rom:0x500300 b_area_arn_hypergoomba_idle_802198FC = 0x802198FC; // type:data rom:0x50034C b_area_arn_hypergoomba_handleEvent_80219BD8 = 0x80219BD8; // type:data rom:0x500628 b_area_arn_hypergoomba_sinTable = 0x8021A4BC; // type:data rom:0x500F0C b_area_arn_hypergoomba_takeTurn_8021A628 = 0x8021A628; // type:data rom:0x501078 -b_area_arn_hyper_paragoomba_defenseTable_8021B2F0 = 0x8021B2F0; // type:data rom:0x501D40 -b_area_arn_hyper_paragoomba_defenseTable_8021B2FC = 0x8021B2FC; // type:data rom:0x501D4C -b_area_arn_hyper_paragoomba_statusTable_8021B308 = 0x8021B308; // type:data rom:0x501D58 -b_area_arn_hyper_paragoomba_statusTable_8021B3B4 = 0x8021B3B4; // type:data rom:0x501E04 -b_area_arn_hyper_paragoomba_partsTable_8021B460 = 0x8021B460; // type:data rom:0x501EB0 +b_area_arn_hyper_paragoomba_DefenseTable_8021B2F0 = 0x8021B2F0; // type:data rom:0x501D40 +b_area_arn_hyper_paragoomba_DefenseTable_8021B2FC = 0x8021B2FC; // type:data rom:0x501D4C +b_area_arn_hyper_paragoomba_StatusTable_8021B308 = 0x8021B308; // type:data rom:0x501D58 +b_area_arn_hyper_paragoomba_StatusTable_8021B3B4 = 0x8021B3B4; // type:data rom:0x501E04 +b_area_arn_hyper_paragoomba_PartsTable_8021B460 = 0x8021B460; // type:data rom:0x501EB0 b_area_arn_hyper_paragoomba = 0x8021B4F0; // type:data rom:0x501F40 -b_area_arn_hyper_paragoomba_idleAnimations_8021B518 = 0x8021B518; // type:data rom:0x501F68 +b_area_arn_hyper_paragoomba_IdleAnimations_8021B518 = 0x8021B518; // type:data rom:0x501F68 b_area_arn_hyper_paragoomba_init_8021B564 = 0x8021B564; // type:data rom:0x501FB4 b_area_arn_hyper_paragoomba_nextTurn_8021B5F4 = 0x8021B5F4; // type:data rom:0x502044 b_area_arn_hyper_paragoomba_8021B678 = 0x8021B678; // type:data rom:0x5020C8 b_area_arn_hyper_paragoomba_takeTurn_8021C36C = 0x8021C36C; // type:data rom:0x502DBC -b_area_arn_hyper_paragoomba_idleAnimations_8021C594 = 0x8021C594; // type:data rom:0x502FE4 -b_area_arn_hyper_paragoomba_idleAnimations_8021C5E0 = 0x8021C5E0; // type:data rom:0x503030 -b_area_arn_hyper_paragoomba_idleAnimations_8021C62C = 0x8021C62C; // type:data rom:0x50307C -b_area_arn_hyper_paragoomba_idleAnimations_8021C638 = 0x8021C638; // type:data rom:0x503088 +b_area_arn_hyper_paragoomba_IdleAnimations_8021C594 = 0x8021C594; // type:data rom:0x502FE4 +b_area_arn_hyper_paragoomba_IdleAnimations_8021C5E0 = 0x8021C5E0; // type:data rom:0x503030 +b_area_arn_hyper_paragoomba_IdleAnimations_8021C62C = 0x8021C62C; // type:data rom:0x50307C +b_area_arn_hyper_paragoomba_IdleAnimations_8021C638 = 0x8021C638; // type:data rom:0x503088 b_area_arn_hyper_paragoomba_8021C644 = 0x8021C644; // type:data rom:0x503094 b_area_arn_hyper_paragoomba_idle_8021C690 = 0x8021C690; // type:data rom:0x5030E0 b_area_arn_hyper_paragoomba_8021C94C = 0x8021C94C; // type:data rom:0x50339C b_area_arn_hyper_paragoomba_handleEvent_8021C9C4 = 0x8021C9C4; // type:data rom:0x503414 b_area_arn_hyper_paragoomba_takeTurn_8021D1DC = 0x8021D1DC; // type:data rom:0x503C2C b_area_arn_hyper_paragoomba_8021D9F4 = 0x8021D9F4; // type:data rom:0x504444 -b_area_arn_hyper_paragoomba_idleAnimations_8021DF7C = 0x8021DF7C; // type:data rom:0x5049CC +b_area_arn_hyper_paragoomba_IdleAnimations_8021DF7C = 0x8021DF7C; // type:data rom:0x5049CC b_area_arn_hyper_paragoomba_8021DFC8 = 0x8021DFC8; // type:data rom:0x504A18 b_area_arn_hyper_paragoomba_8021E058 = 0x8021E058; // type:data rom:0x504AA8 b_area_arn_hyper_paragoomba_nextTurn_8021E194 = 0x8021E194; // type:data rom:0x504BE4 b_area_arn_hyper_paragoomba_8021E218 = 0x8021E218; // type:data rom:0x504C68 b_area_arn_hyper_paragoomba_takeTurn_8021EE34 = 0x8021EE34; // type:data rom:0x505884 -b_area_arn_hyper_paragoomba_idleAnimations_8021F05C = 0x8021F05C; // type:data rom:0x505AAC -b_area_arn_hyper_paragoomba_idleAnimations_8021F0A8 = 0x8021F0A8; // type:data rom:0x505AF8 +b_area_arn_hyper_paragoomba_IdleAnimations_8021F05C = 0x8021F05C; // type:data rom:0x505AAC +b_area_arn_hyper_paragoomba_IdleAnimations_8021F0A8 = 0x8021F0A8; // type:data rom:0x505AF8 b_area_arn_hyper_paragoomba_8021F0F4 = 0x8021F0F4; // type:data rom:0x505B44 b_area_arn_hyper_paragoomba_idle_8021F140 = 0x8021F140; // type:data rom:0x505B90 b_area_arn_hyper_paragoomba_handleEvent_8021F41C = 0x8021F41C; // type:data rom:0x505E6C b_area_arn_hyper_paragoomba_sinTable = 0x8021FD00; // type:data rom:0x506750 b_area_arn_hyper_paragoomba_takeTurn_8021FE6C = 0x8021FE6C; // type:data rom:0x5068BC -b_area_arn_hyper_cleft_defenseTable_80220B40 = 0x80220B40; // type:data rom:0x507590 -b_area_arn_hyper_cleft_defenseTable_80220B54 = 0x80220B54; // type:data rom:0x5075A4 -b_area_arn_hyper_cleft_statusTable_80220B68 = 0x80220B68; // type:data rom:0x5075B8 -b_area_arn_hyper_cleft_partsTable_80220C14 = 0x80220C14; // type:data rom:0x507664 +b_area_arn_hyper_cleft_DefenseTable_80220B40 = 0x80220B40; // type:data rom:0x507590 +b_area_arn_hyper_cleft_DefenseTable_80220B54 = 0x80220B54; // type:data rom:0x5075A4 +b_area_arn_hyper_cleft_StatusTable_80220B68 = 0x80220B68; // type:data rom:0x5075B8 +b_area_arn_hyper_cleft_PartsTable_80220C14 = 0x80220C14; // type:data rom:0x507664 b_area_arn_hyper_cleft = 0x80220C38; // type:data rom:0x507688 -b_area_arn_hyper_cleft_idleAnimations_80220C60 = 0x80220C60; // type:data rom:0x5076B0 +b_area_arn_hyper_cleft_IdleAnimations_80220C60 = 0x80220C60; // type:data rom:0x5076B0 b_area_arn_hyper_cleft_init_80220CAC = 0x80220CAC; // type:data rom:0x5076FC b_area_arn_hyper_cleft_nextTurn_80220D3C = 0x80220D3C; // type:data rom:0x50778C b_area_arn_hyper_cleft_80220DC0 = 0x80220DC0; // type:data rom:0x507810 b_area_arn_hyper_cleft_takeTurn_80221A58 = 0x80221A58; // type:data rom:0x5084A8 -b_area_arn_hyper_cleft_idleAnimations_80221CD4 = 0x80221CD4; // type:data rom:0x508724 -b_area_arn_hyper_cleft_idleAnimations_80221D20 = 0x80221D20; // type:data rom:0x508770 +b_area_arn_hyper_cleft_IdleAnimations_80221CD4 = 0x80221CD4; // type:data rom:0x508724 +b_area_arn_hyper_cleft_IdleAnimations_80221D20 = 0x80221D20; // type:data rom:0x508770 b_area_arn_hyper_cleft_80221D6C = 0x80221D6C; // type:data rom:0x5087BC b_area_arn_hyper_cleft_idle_80221DD0 = 0x80221DD0; // type:data rom:0x508820 b_area_arn_hyper_cleft_80221DE0 = 0x80221DE0; // type:data rom:0x508830 @@ -11490,11 +11490,11 @@ b_area_arn_hyper_cleft_handleEvent_80222140 = 0x80222140; // type:data rom:0x508 b_area_arn_hyper_cleft_80222F1C = 0x80222F1C; // type:data rom:0x50996C b_area_arn_hyper_cleft_80223310 = 0x80223310; // type:data rom:0x509D60 b_area_arn_hyper_cleft_takeTurn_80223B5C = 0x80223B5C; // type:data rom:0x50A5AC -b_area_arn_tubbas_heart_idleAnimations_80223BC0 = 0x80223BC0; // type:data rom:0x50A610 -b_area_arn_tubbas_heart_idleAnimations_80223C1C = 0x80223C1C; // type:data rom:0x50A66C -b_area_arn_tubbas_heart_defenseTable_80223C78 = 0x80223C78; // type:data rom:0x50A6C8 -b_area_arn_tubbas_heart_statusTable_80223C84 = 0x80223C84; // type:data rom:0x50A6D4 -b_area_arn_tubbas_heart_partsTable_80223D30 = 0x80223D30; // type:data rom:0x50A780 +b_area_arn_tubbas_heart_IdleAnimations_80223BC0 = 0x80223BC0; // type:data rom:0x50A610 +b_area_arn_tubbas_heart_IdleAnimations_80223C1C = 0x80223C1C; // type:data rom:0x50A66C +b_area_arn_tubbas_heart_DefenseTable_80223C78 = 0x80223C78; // type:data rom:0x50A6C8 +b_area_arn_tubbas_heart_StatusTable_80223C84 = 0x80223C84; // type:data rom:0x50A6D4 +b_area_arn_tubbas_heart_PartsTable_80223D30 = 0x80223D30; // type:data rom:0x50A780 b_area_arn_tubbas_heart = 0x80223D78; // type:data rom:0x50A7C8 b_area_arn_tubbas_heart_init_80223DA0 = 0x80223DA0; // type:data rom:0x50A7F0 b_area_arn_tubbas_heart_idle_80223E98 = 0x80223E98; // type:data rom:0x50A8E8 @@ -11506,10 +11506,10 @@ b_area_arn_tubbas_heart_takeTurn_802245C8 = 0x802245C8; // type:data rom:0x50B01 b_area_arn_tubbas_heart_80224B3C = 0x80224B3C; // type:data rom:0x50B58C b_area_arn_tubbas_heart_80225258 = 0x80225258; // type:data rom:0x50BCA8 b_area_arn_tubbas_heart_802255D8 = 0x802255D8; // type:data rom:0x50C028 -b_area_arn_tubba_blubba_idleAnimations_80225C40 = 0x80225C40; // type:data rom:0x50C690 -b_area_arn_tubba_blubba_defenseTable_80225C94 = 0x80225C94; // type:data rom:0x50C6E4 -b_area_arn_tubba_blubba_statusTable_80225CA0 = 0x80225CA0; // type:data rom:0x50C6F0 -b_area_arn_tubba_blubba_partsTable_80225D4C = 0x80225D4C; // type:data rom:0x50C79C +b_area_arn_tubba_blubba_IdleAnimations_80225C40 = 0x80225C40; // type:data rom:0x50C690 +b_area_arn_tubba_blubba_DefenseTable_80225C94 = 0x80225C94; // type:data rom:0x50C6E4 +b_area_arn_tubba_blubba_StatusTable_80225CA0 = 0x80225CA0; // type:data rom:0x50C6F0 +b_area_arn_tubba_blubba_PartsTable_80225D4C = 0x80225D4C; // type:data rom:0x50C79C b_area_arn_tubba_blubba = 0x80225D70; // type:data rom:0x50C7C0 b_area_arn_tubba_blubba_init_80225D98 = 0x80225D98; // type:data rom:0x50C7E8 b_area_arn_tubba_blubba_80225E08 = 0x80225E08; // type:data rom:0x50C858 @@ -11567,19 +11567,19 @@ b_area_arn_vector3D_802280E8 = 0x802280E8; // type:data rom:0x50EB38 b_area_arn_Formation_10 = 0x802280F4; // type:data rom:0x50EB44 b_area_arn_Formations = 0x80228110; // type:data rom:0x50EB60 b_area_arn_Stages = 0x80228278; // type:data rom:0x50ECC8 -b_area_dgb_clubba_idleAnimations_80218000 = 0x80218000; // type:data rom:0x50F020 -b_area_dgb_clubba_defenseTable_8021804C = 0x8021804C; // type:data rom:0x50F06C -b_area_dgb_clubba_statusTable_80218058 = 0x80218058; // type:data rom:0x50F078 -b_area_dgb_clubba_partsTable_80218104 = 0x80218104; // type:data rom:0x50F124 +b_area_dgb_clubba_IdleAnimations_80218000 = 0x80218000; // type:data rom:0x50F020 +b_area_dgb_clubba_DefenseTable_8021804C = 0x8021804C; // type:data rom:0x50F06C +b_area_dgb_clubba_StatusTable_80218058 = 0x80218058; // type:data rom:0x50F078 +b_area_dgb_clubba_PartsTable_80218104 = 0x80218104; // type:data rom:0x50F124 b_area_dgb_clubba = 0x80218128; // type:data rom:0x50F148 b_area_dgb_clubba_init_80218150 = 0x80218150; // type:data rom:0x50F170 b_area_dgb_clubba_idle_8021819C = 0x8021819C; // type:data rom:0x50F1BC b_area_dgb_clubba_handleEvent_802181AC = 0x802181AC; // type:data rom:0x50F1CC b_area_dgb_clubba_takeTurn_802186BC = 0x802186BC; // type:data rom:0x50F6DC -b_area_dgb_tubba_blubba_idleAnimations_80218C10 = 0x80218C10; // type:data rom:0x50FC30 -b_area_dgb_tubba_blubba_defenseTable_80218C6C = 0x80218C6C; // type:data rom:0x50FC8C -b_area_dgb_tubba_blubba_statusTable_80218C78 = 0x80218C78; // type:data rom:0x50FC98 -b_area_dgb_tubba_blubba_partsTable_80218D24 = 0x80218D24; // type:data rom:0x50FD44 +b_area_dgb_tubba_blubba_IdleAnimations_80218C10 = 0x80218C10; // type:data rom:0x50FC30 +b_area_dgb_tubba_blubba_DefenseTable_80218C6C = 0x80218C6C; // type:data rom:0x50FC8C +b_area_dgb_tubba_blubba_StatusTable_80218C78 = 0x80218C78; // type:data rom:0x50FC98 +b_area_dgb_tubba_blubba_PartsTable_80218D24 = 0x80218D24; // type:data rom:0x50FD44 b_area_dgb_tubba_blubba = 0x80218D48; // type:data rom:0x50FD68 b_area_dgb_tubba_blubba_init_80218D70 = 0x80218D70; // type:data rom:0x50FD90 b_area_dgb_tubba_blubba_80218E60 = 0x80218E60; // type:data rom:0x50FE80 @@ -11637,11 +11637,11 @@ b_area_omo_pyro_guy_UnkBattleFunc1 = 0x80218EE0; // type:func rom:0x5134B0 func_80218FB0_513580 = 0x80218FB0; // type:func rom:0x513580 b_area_omo_omo_04_IsGameStatusUnkAA_1 = 0x802191C0; // type:func rom:0x513790 b_area_omo_omo_04_Add1Coin = 0x802191E8; // type:func rom:0x5137B8 -b_area_omo_red_shy_guy_defenseTable_80219210 = 0x80219210; // type:data rom:0x5137E0 -b_area_omo_red_shy_guy_statusTable_80219224 = 0x80219224; // type:data rom:0x5137F4 -b_area_omo_red_shy_guy_partsTable_802192D0 = 0x802192D0; // type:data rom:0x5138A0 +b_area_omo_red_shy_guy_DefenseTable_80219210 = 0x80219210; // type:data rom:0x5137E0 +b_area_omo_red_shy_guy_StatusTable_80219224 = 0x80219224; // type:data rom:0x5137F4 +b_area_omo_red_shy_guy_PartsTable_802192D0 = 0x802192D0; // type:data rom:0x5138A0 b_area_omo_red_shy_guy = 0x802192F4; // type:data rom:0x5138C4 -b_area_omo_red_shy_guy_idleAnimations_8021931C = 0x8021931C; // type:data rom:0x5138EC +b_area_omo_red_shy_guy_IdleAnimations_8021931C = 0x8021931C; // type:data rom:0x5138EC b_area_omo_red_shy_guy_init_80219368 = 0x80219368; // type:data rom:0x513938 b_area_omo_red_shy_guy_idle_802193B4 = 0x802193B4; // type:data rom:0x513984 b_area_omo_red_shy_guy_802194C4 = 0x802194C4; // type:data rom:0x513A94 @@ -11649,11 +11649,11 @@ b_area_omo_red_shy_guy_handleEvent_80219528 = 0x80219528; // type:data rom:0x513 b_area_omo_red_shy_guy_80219A04 = 0x80219A04; // type:data rom:0x513FD4 b_area_omo_red_shy_guy_8021A12C = 0x8021A12C; // type:data rom:0x5146FC b_area_omo_red_shy_guy_takeTurn_8021ACB4 = 0x8021ACB4; // type:data rom:0x515284 -b_area_omo_blue_shy_guy_defenseTable_8021AD10 = 0x8021AD10; // type:data rom:0x5152E0 -b_area_omo_blue_shy_guy_statusTable_8021AD24 = 0x8021AD24; // type:data rom:0x5152F4 -b_area_omo_blue_shy_guy_partsTable_8021ADD0 = 0x8021ADD0; // type:data rom:0x5153A0 +b_area_omo_blue_shy_guy_DefenseTable_8021AD10 = 0x8021AD10; // type:data rom:0x5152E0 +b_area_omo_blue_shy_guy_StatusTable_8021AD24 = 0x8021AD24; // type:data rom:0x5152F4 +b_area_omo_blue_shy_guy_PartsTable_8021ADD0 = 0x8021ADD0; // type:data rom:0x5153A0 b_area_omo_blue_shy_guy = 0x8021ADF4; // type:data rom:0x5153C4 -b_area_omo_blue_shy_guy_idleAnimations_8021AE1C = 0x8021AE1C; // type:data rom:0x5153EC +b_area_omo_blue_shy_guy_IdleAnimations_8021AE1C = 0x8021AE1C; // type:data rom:0x5153EC b_area_omo_blue_shy_guy_init_8021AE68 = 0x8021AE68; // type:data rom:0x515438 b_area_omo_blue_shy_guy_idle_8021AEB4 = 0x8021AEB4; // type:data rom:0x515484 b_area_omo_blue_shy_guy_8021AFC4 = 0x8021AFC4; // type:data rom:0x515594 @@ -11661,11 +11661,11 @@ b_area_omo_blue_shy_guy_handleEvent_8021B028 = 0x8021B028; // type:data rom:0x51 b_area_omo_blue_shy_guy_8021B504 = 0x8021B504; // type:data rom:0x515AD4 b_area_omo_blue_shy_guy_8021BC2C = 0x8021BC2C; // type:data rom:0x5161FC b_area_omo_blue_shy_guy_takeTurn_8021C7B4 = 0x8021C7B4; // type:data rom:0x516D84 -b_area_omo_yellow_shy_guy_defenseTable_8021C810 = 0x8021C810; // type:data rom:0x516DE0 -b_area_omo_yellow_shy_guy_statusTable_8021C824 = 0x8021C824; // type:data rom:0x516DF4 -b_area_omo_yellow_shy_guy_partsTable_8021C8D0 = 0x8021C8D0; // type:data rom:0x516EA0 +b_area_omo_yellow_shy_guy_DefenseTable_8021C810 = 0x8021C810; // type:data rom:0x516DE0 +b_area_omo_yellow_shy_guy_StatusTable_8021C824 = 0x8021C824; // type:data rom:0x516DF4 +b_area_omo_yellow_shy_guy_PartsTable_8021C8D0 = 0x8021C8D0; // type:data rom:0x516EA0 b_area_omo_yellow_shy_guy = 0x8021C8F4; // type:data rom:0x516EC4 -b_area_omo_yellow_shy_guy_idleAnimations_8021C91C = 0x8021C91C; // type:data rom:0x516EEC +b_area_omo_yellow_shy_guy_IdleAnimations_8021C91C = 0x8021C91C; // type:data rom:0x516EEC b_area_omo_yellow_shy_guy_init_8021C968 = 0x8021C968; // type:data rom:0x516F38 b_area_omo_yellow_shy_guy_idle_8021C9B4 = 0x8021C9B4; // type:data rom:0x516F84 b_area_omo_yellow_shy_guy_8021CAC4 = 0x8021CAC4; // type:data rom:0x517094 @@ -11673,11 +11673,11 @@ b_area_omo_yellow_shy_guy_handleEvent_8021CB28 = 0x8021CB28; // type:data rom:0x b_area_omo_yellow_shy_guy_8021D004 = 0x8021D004; // type:data rom:0x5175D4 b_area_omo_yellow_shy_guy_8021D72C = 0x8021D72C; // type:data rom:0x517CFC b_area_omo_yellow_shy_guy_takeTurn_8021E2B4 = 0x8021E2B4; // type:data rom:0x518884 -b_area_omo_pink_shy_guy_defenseTable_8021E310 = 0x8021E310; // type:data rom:0x5188E0 -b_area_omo_pink_shy_guy_statusTable_8021E324 = 0x8021E324; // type:data rom:0x5188F4 -b_area_omo_pink_shy_guy_partsTable_8021E3D0 = 0x8021E3D0; // type:data rom:0x5189A0 +b_area_omo_pink_shy_guy_DefenseTable_8021E310 = 0x8021E310; // type:data rom:0x5188E0 +b_area_omo_pink_shy_guy_StatusTable_8021E324 = 0x8021E324; // type:data rom:0x5188F4 +b_area_omo_pink_shy_guy_PartsTable_8021E3D0 = 0x8021E3D0; // type:data rom:0x5189A0 b_area_omo_pink_shy_guy = 0x8021E3F4; // type:data rom:0x5189C4 -b_area_omo_pink_shy_guy_idleAnimations_8021E41C = 0x8021E41C; // type:data rom:0x5189EC +b_area_omo_pink_shy_guy_IdleAnimations_8021E41C = 0x8021E41C; // type:data rom:0x5189EC b_area_omo_pink_shy_guy_init_8021E468 = 0x8021E468; // type:data rom:0x518A38 b_area_omo_pink_shy_guy_idle_8021E4B4 = 0x8021E4B4; // type:data rom:0x518A84 b_area_omo_pink_shy_guy_8021E5C4 = 0x8021E5C4; // type:data rom:0x518B94 @@ -11685,11 +11685,11 @@ b_area_omo_pink_shy_guy_handleEvent_8021E628 = 0x8021E628; // type:data rom:0x51 b_area_omo_pink_shy_guy_8021EB04 = 0x8021EB04; // type:data rom:0x5190D4 b_area_omo_pink_shy_guy_8021F22C = 0x8021F22C; // type:data rom:0x5197FC b_area_omo_pink_shy_guy_takeTurn_8021FDB4 = 0x8021FDB4; // type:data rom:0x51A384 -b_area_omo_green_shy_guy_defenseTable_8021FE10 = 0x8021FE10; // type:data rom:0x51A3E0 -b_area_omo_green_shy_guy_statusTable_8021FE24 = 0x8021FE24; // type:data rom:0x51A3F4 -b_area_omo_green_shy_guy_partsTable_8021FED0 = 0x8021FED0; // type:data rom:0x51A4A0 +b_area_omo_green_shy_guy_DefenseTable_8021FE10 = 0x8021FE10; // type:data rom:0x51A3E0 +b_area_omo_green_shy_guy_StatusTable_8021FE24 = 0x8021FE24; // type:data rom:0x51A3F4 +b_area_omo_green_shy_guy_PartsTable_8021FED0 = 0x8021FED0; // type:data rom:0x51A4A0 b_area_omo_green_shy_guy = 0x8021FEF4; // type:data rom:0x51A4C4 -b_area_omo_green_shy_guy_idleAnimations_8021FF1C = 0x8021FF1C; // type:data rom:0x51A4EC +b_area_omo_green_shy_guy_IdleAnimations_8021FF1C = 0x8021FF1C; // type:data rom:0x51A4EC b_area_omo_green_shy_guy_init_8021FF68 = 0x8021FF68; // type:data rom:0x51A538 b_area_omo_green_shy_guy_idle_8021FFB4 = 0x8021FFB4; // type:data rom:0x51A584 b_area_omo_green_shy_guy_802200C4 = 0x802200C4; // type:data rom:0x51A694 @@ -11697,11 +11697,11 @@ b_area_omo_green_shy_guy_handleEvent_80220128 = 0x80220128; // type:data rom:0x5 b_area_omo_green_shy_guy_80220604 = 0x80220604; // type:data rom:0x51ABD4 b_area_omo_green_shy_guy_80220D2C = 0x80220D2C; // type:data rom:0x51B2FC b_area_omo_green_shy_guy_takeTurn_802218B4 = 0x802218B4; // type:data rom:0x51BE84 -b_area_omo_anti_guy_defenseTable_80221910 = 0x80221910; // type:data rom:0x51BEE0 -b_area_omo_anti_guy_statusTable_8022191C = 0x8022191C; // type:data rom:0x51BEEC -b_area_omo_anti_guy_partsTable_802219C8 = 0x802219C8; // type:data rom:0x51BF98 +b_area_omo_anti_guy_DefenseTable_80221910 = 0x80221910; // type:data rom:0x51BEE0 +b_area_omo_anti_guy_StatusTable_8022191C = 0x8022191C; // type:data rom:0x51BEEC +b_area_omo_anti_guy_PartsTable_802219C8 = 0x802219C8; // type:data rom:0x51BF98 b_area_omo_anti_guy = 0x802219EC; // type:data rom:0x51BFBC -b_area_omo_anti_guy_idleAnimations_80221A14 = 0x80221A14; // type:data rom:0x51BFE4 +b_area_omo_anti_guy_IdleAnimations_80221A14 = 0x80221A14; // type:data rom:0x51BFE4 b_area_omo_anti_guy_init_80221A60 = 0x80221A60; // type:data rom:0x51C030 b_area_omo_anti_guy_idle_80221AAC = 0x80221AAC; // type:data rom:0x51C07C b_area_omo_anti_guy_80221BBC = 0x80221BBC; // type:data rom:0x51C18C @@ -11709,10 +11709,10 @@ b_area_omo_anti_guy_handleEvent_80221C20 = 0x80221C20; // type:data rom:0x51C1F0 b_area_omo_anti_guy_802220FC = 0x802220FC; // type:data rom:0x51C6CC b_area_omo_anti_guy_80222824 = 0x80222824; // type:data rom:0x51CDF4 b_area_omo_anti_guy_takeTurn_802233AC = 0x802233AC; // type:data rom:0x51D97C -b_area_omo_medi_guy_idleAnimations_8021F890 = 0x80223410; // type:data rom:0x51D9E0 -b_area_omo_medi_guy_defenseTable_8021F8DC = 0x8022345C; // type:data rom:0x51DA2C -b_area_omo_medi_guy_statusTable_8021F8F0 = 0x80223470; // type:data rom:0x51DA40 -b_area_omo_medi_guy_partsTable_8021F99C = 0x8022351C; // type:data rom:0x51DAEC +b_area_omo_medi_guy_IdleAnimations_8021F890 = 0x80223410; // type:data rom:0x51D9E0 +b_area_omo_medi_guy_DefenseTable_8021F8DC = 0x8022345C; // type:data rom:0x51DA2C +b_area_omo_medi_guy_StatusTable_8021F8F0 = 0x80223470; // type:data rom:0x51DA40 +b_area_omo_medi_guy_PartsTable_8021F99C = 0x8022351C; // type:data rom:0x51DAEC b_area_omo_medi_guy = 0x80223540; // type:data rom:0x51DB10 b_area_omo_medi_guy_init_8021F9E8 = 0x80223568; // type:data rom:0x51DB38 b_area_omo_medi_guy_idle_8021FA8C = 0x8022360C; // type:data rom:0x51DBDC @@ -11722,10 +11722,10 @@ b_area_omo_medi_guy_flyingAttack = 0x80223D90; // type:data rom:0x51E360 b_area_omo_medi_guy_healOneAlly = 0x80224578; // type:data rom:0x51EB48 b_area_omo_medi_guy_80220CEC = 0x8022486C; // type:data rom:0x51EE3C b_area_omo_medi_guy_takeTurn_80220DCC = 0x8022494C; // type:data rom:0x51EF1C -b_area_omo_groove_guy_idleAnimations_802249E0 = 0x802249E0; // type:data rom:0x51EFB0 -b_area_omo_groove_guy_defenseTable_80224A2C = 0x80224A2C; // type:data rom:0x51EFFC -b_area_omo_groove_guy_statusTable_80224A40 = 0x80224A40; // type:data rom:0x51F010 -b_area_omo_groove_guy_partsTable_80224AEC = 0x80224AEC; // type:data rom:0x51F0BC +b_area_omo_groove_guy_IdleAnimations_802249E0 = 0x802249E0; // type:data rom:0x51EFB0 +b_area_omo_groove_guy_DefenseTable_80224A2C = 0x80224A2C; // type:data rom:0x51EFFC +b_area_omo_groove_guy_StatusTable_80224A40 = 0x80224A40; // type:data rom:0x51F010 +b_area_omo_groove_guy_PartsTable_80224AEC = 0x80224AEC; // type:data rom:0x51F0BC b_area_omo_groove_guy = 0x80224B10; // type:data rom:0x51F0E0 b_area_omo_groove_guy_init_80224B38 = 0x80224B38; // type:data rom:0x51F108 b_area_omo_groove_guy_idle_80224B9C = 0x80224B9C; // type:data rom:0x51F16C @@ -11745,12 +11745,12 @@ b_area_omo_groove_guy_vector3D_8022739C = 0x8022739C; // type:data rom:0x52196C b_area_omo_groove_guy_specialFormation_802273A8 = 0x802273A8; // type:data rom:0x521978 b_area_omo_groove_guy_specialFormation_802273C4 = 0x802273C4; // type:data rom:0x521994 b_area_omo_groove_guy_specialFormation_802273E0 = 0x802273E0; // type:data rom:0x5219B0 -b_area_omo_spy_guy_idleAnimations_80227400 = 0x80227400; // type:data rom:0x5219D0 -b_area_omo_spy_guy_idleAnimations_8022744C = 0x8022744C; // type:data rom:0x521A1C -b_area_omo_spy_guy_idleAnimations_80227498 = 0x80227498; // type:data rom:0x521A68 -b_area_omo_spy_guy_defenseTable_802274A4 = 0x802274A4; // type:data rom:0x521A74 -b_area_omo_spy_guy_statusTable_802274B8 = 0x802274B8; // type:data rom:0x521A88 -b_area_omo_spy_guy_partsTable_80227564 = 0x80227564; // type:data rom:0x521B34 +b_area_omo_spy_guy_IdleAnimations_80227400 = 0x80227400; // type:data rom:0x5219D0 +b_area_omo_spy_guy_IdleAnimations_8022744C = 0x8022744C; // type:data rom:0x521A1C +b_area_omo_spy_guy_IdleAnimations_80227498 = 0x80227498; // type:data rom:0x521A68 +b_area_omo_spy_guy_DefenseTable_802274A4 = 0x802274A4; // type:data rom:0x521A74 +b_area_omo_spy_guy_StatusTable_802274B8 = 0x802274B8; // type:data rom:0x521A88 +b_area_omo_spy_guy_PartsTable_80227564 = 0x80227564; // type:data rom:0x521B34 b_area_omo_spy_guy = 0x802275AC; // type:data rom:0x521B7C b_area_omo_spy_guy_init_802275D4 = 0x802275D4; // type:data rom:0x521BA4 b_area_omo_spy_guy_idle_802276C4 = 0x802276C4; // type:data rom:0x521C94 @@ -11764,16 +11764,16 @@ b_area_omo_spy_guy_jump_text = 0x8022876C; // type:data rom:0x522D3C b_area_omo_spy_guy_80228778 = 0x80228778; // type:data rom:0x522D48 b_area_omo_spy_guy_hammerAttack = 0x802289B4; // type:data rom:0x522F84 b_area_omo_spy_guy_takeTurn_802293DC = 0x802293DC; // type:data rom:0x5239AC -b_area_omo_sky_guy_idleAnimations_802294C0 = 0x802294C0; // type:data rom:0x523A90 -b_area_omo_sky_guy_idleAnimations_8022950C = 0x8022950C; // type:data rom:0x523ADC -b_area_omo_sky_guy_idleAnimations_80229558 = 0x80229558; // type:data rom:0x523B28 -b_area_omo_sky_guy_idleAnimations_802295A4 = 0x802295A4; // type:data rom:0x523B74 -b_area_omo_sky_guy_idleAnimations_802295F0 = 0x802295F0; // type:data rom:0x523BC0 -b_area_omo_sky_guy_defenseTable_802295FC = 0x802295FC; // type:data rom:0x523BCC -b_area_omo_sky_guy_defenseTable_80229610 = 0x80229610; // type:data rom:0x523BE0 -b_area_omo_sky_guy_statusTable_80229624 = 0x80229624; // type:data rom:0x523BF4 -b_area_omo_sky_guy_statusTable_802296D0 = 0x802296D0; // type:data rom:0x523CA0 -b_area_omo_sky_guy_partsTable_8022977C = 0x8022977C; // type:data rom:0x523D4C +b_area_omo_sky_guy_IdleAnimations_802294C0 = 0x802294C0; // type:data rom:0x523A90 +b_area_omo_sky_guy_IdleAnimations_8022950C = 0x8022950C; // type:data rom:0x523ADC +b_area_omo_sky_guy_IdleAnimations_80229558 = 0x80229558; // type:data rom:0x523B28 +b_area_omo_sky_guy_IdleAnimations_802295A4 = 0x802295A4; // type:data rom:0x523B74 +b_area_omo_sky_guy_IdleAnimations_802295F0 = 0x802295F0; // type:data rom:0x523BC0 +b_area_omo_sky_guy_DefenseTable_802295FC = 0x802295FC; // type:data rom:0x523BCC +b_area_omo_sky_guy_DefenseTable_80229610 = 0x80229610; // type:data rom:0x523BE0 +b_area_omo_sky_guy_StatusTable_80229624 = 0x80229624; // type:data rom:0x523BF4 +b_area_omo_sky_guy_StatusTable_802296D0 = 0x802296D0; // type:data rom:0x523CA0 +b_area_omo_sky_guy_PartsTable_8022977C = 0x8022977C; // type:data rom:0x523D4C b_area_omo_sky_guy = 0x80229854; // type:data rom:0x523E24 b_area_omo_sky_guy_init_8022987C = 0x8022987C; // type:data rom:0x523E4C b_area_omo_sky_guy_idle_80229A24 = 0x80229A24; // type:data rom:0x523FF4 @@ -11783,7 +11783,7 @@ b_area_omo_sky_guy_80229CB0 = 0x80229CB0; // type:data rom:0x524280 b_area_omo_sky_guy_80229F08 = 0x80229F08; // type:data rom:0x5244D8 b_area_omo_sky_guy_handleEvent_8022A398 = 0x8022A398; // type:data rom:0x524968 b_area_omo_sky_guy_takeTurn_8022A9D0 = 0x8022A9D0; // type:data rom:0x524FA0 -b_area_omo_sky_guy_idleAnimations_8022B104 = 0x8022B104; // type:data rom:0x5256D4 +b_area_omo_sky_guy_IdleAnimations_8022B104 = 0x8022B104; // type:data rom:0x5256D4 b_area_omo_sky_guy_8022B150 = 0x8022B150; // type:data rom:0x525720 b_area_omo_sky_guy_idle_8022B19C = 0x8022B19C; // type:data rom:0x52576C b_area_omo_sky_guy_8022B2AC = 0x8022B2AC; // type:data rom:0x52587C @@ -11791,10 +11791,10 @@ b_area_omo_sky_guy_handleEvent_8022B310 = 0x8022B310; // type:data rom:0x5258E0 b_area_omo_sky_guy_8022B7EC = 0x8022B7EC; // type:data rom:0x525DBC b_area_omo_sky_guy_8022BF14 = 0x8022BF14; // type:data rom:0x5264E4 b_area_omo_sky_guy_takeTurn_8022CA9C = 0x8022CA9C; // type:data rom:0x52706C -b_area_omo_pyro_guy_idleAnimations_8022CB00 = 0x8022CB00; // type:data rom:0x5270D0 -b_area_omo_pyro_guy_defenseTable_8022CB4C = 0x8022CB4C; // type:data rom:0x52711C -b_area_omo_pyro_guy_statusTable_8022CB88 = 0x8022CB88; // type:data rom:0x527158 -b_area_omo_pyro_guy_partsTable_8022CC34 = 0x8022CC34; // type:data rom:0x527204 +b_area_omo_pyro_guy_IdleAnimations_8022CB00 = 0x8022CB00; // type:data rom:0x5270D0 +b_area_omo_pyro_guy_DefenseTable_8022CB4C = 0x8022CB4C; // type:data rom:0x52711C +b_area_omo_pyro_guy_StatusTable_8022CB88 = 0x8022CB88; // type:data rom:0x527158 +b_area_omo_pyro_guy_PartsTable_8022CC34 = 0x8022CC34; // type:data rom:0x527204 b_area_omo_pyro_guy = 0x8022CC58; // type:data rom:0x527228 b_area_omo_pyro_guy_init_8022CC80 = 0x8022CC80; // type:data rom:0x527250 b_area_omo_pyro_guy_idle_8022CCCC = 0x8022CCCC; // type:data rom:0x52729C @@ -11827,9 +11827,9 @@ b_area_omo_omo_04_specialFormation_8022DE64 = 0x8022DE64; // type:data rom:0x528 b_area_omo_omo_04_intTable_8022DED4 = 0x8022DED4; // type:data rom:0x5284A4 b_area_omo_omo_04_intTable_8022DEF4 = 0x8022DEF4; // type:data rom:0x5284C4 b_area_omo_omo_04_intTable_8022DF14 = 0x8022DF14; // type:data rom:0x5284E4 -b_area_omo_omo_04_defenseTable_8022DF34 = 0x8022DF34; // type:data rom:0x528504 -b_area_omo_omo_04_statusTable_8022DF40 = 0x8022DF40; // type:data rom:0x528510 -b_area_omo_omo_04_partsTable_8022DFEC = 0x8022DFEC; // type:data rom:0x5285BC +b_area_omo_omo_04_DefenseTable_8022DF34 = 0x8022DF34; // type:data rom:0x528504 +b_area_omo_omo_04_StatusTable_8022DF40 = 0x8022DF40; // type:data rom:0x528510 +b_area_omo_omo_04_PartsTable_8022DFEC = 0x8022DFEC; // type:data rom:0x5285BC b_area_omo_omo_04_slot_machine_stop = 0x8022E010; // type:data rom:0x5285E0 b_area_omo_omo_04_slot_machine_start = 0x8022E038; // type:data rom:0x528608 b_area_omo_omo_04_init_8022E060 = 0x8022E060; // type:data rom:0x528630 @@ -11905,13 +11905,13 @@ b_area_omo2_general_guy_UnfadeBackgroundToBlack = 0x80218098; // type:func rom:0 b_area_omo2_toy_tank_UpdateBulbGlow = 0x80218120; // type:func rom:0x52B7C0 func_802181F4_52B894 = 0x802181F4; // type:func rom:0x52B894 func_80218250_52B8F0 = 0x80218250; // type:func rom:0x52B8F0 -b_area_omo2_general_guy_defenseTable = 0x80218330; // type:data rom:0x52B9D0 -b_area_omo2_general_guy_statusTable = 0x8021833C; // type:data rom:0x52B9DC +b_area_omo2_general_guy_DefenseTable = 0x80218330; // type:data rom:0x52B9D0 +b_area_omo2_general_guy_StatusTable = 0x8021833C; // type:data rom:0x52B9DC b_area_omo2_general_guy_parts = 0x802183E8; // type:data rom:0x52BA88 b_area_omo2_general_guy = 0x80218430; // type:data rom:0x52BAD0 -b_area_omo2_general_guy_idleAnimations = 0x80218458; // type:data rom:0x52BAF8 -b_area_omo2_general_guy_idleAnimations_bomb = 0x802184B4; // type:data rom:0x52BB54 -b_area_omo2_general_guy_idleAnimations3 = 0x802184C0; // type:data rom:0x52BB60 +b_area_omo2_general_guy_IdleAnimations = 0x80218458; // type:data rom:0x52BAF8 +b_area_omo2_general_guy_IdleAnimations_bomb = 0x802184B4; // type:data rom:0x52BB54 +b_area_omo2_general_guy_IdleAnimations3 = 0x802184C0; // type:data rom:0x52BB60 b_area_omo2_general_guy_nextTurn = 0x802184FC; // type:data rom:0x52BB9C b_area_omo2_general_guy_init = 0x8021858C; // type:data rom:0x52BC2C b_area_omo2_general_guy_idle = 0x802186B8; // type:data rom:0x52BD58 @@ -11954,8 +11954,8 @@ toy_tank_as_5 = 0x80221384; // type:data rom:0x534A24 toy_tank_as_move_forward = 0x80222A98; // type:data rom:0x536138 toy_tank_as_7 = 0x8022AE48; // type:data rom:0x53E4E8 toy_tank_as_idle = 0x8022C55C; // type:data rom:0x53FBFC -b_area_omo2_toy_tank_defenseTable = 0x8022C838; // type:data rom:0x53FED8 -b_area_omo2_toy_tank_statusTable = 0x8022C844; // type:data rom:0x53FEE4 +b_area_omo2_toy_tank_DefenseTable = 0x8022C838; // type:data rom:0x53FED8 +b_area_omo2_toy_tank_StatusTable = 0x8022C844; // type:data rom:0x53FEE4 b_area_omo2_toy_tank_parts = 0x8022C8F0; // type:data rom:0x53FF90 b_area_omo2_toy_tank = 0x8022C95C; // type:data rom:0x53FFFC b_area_omo2_toy_tank_init = 0x8022C984; // type:data rom:0x540024 @@ -11982,8 +11982,8 @@ b_area_omo2_toy_tank_formation_stilt_guy_2 = 0x8022F58C; // type:data rom:0x542C b_area_omo2_toy_tank_formation_shy_stack_1 = 0x8022F5A8; // type:data rom:0x542C48 b_area_omo2_toy_tank_formation_shy_stack_2 = 0x8022F5C4; // type:data rom:0x542C64 b_area_omo2_toy_tank_formation_shy_squad_dup = 0x8022F5E0; // type:data rom:0x542C80 -b_area_omo2_light_bulb_defenseTable = 0x8022F600; // type:data rom:0x542CA0 -b_area_omo2_light_bulb_statusTable = 0x8022F614; // type:data rom:0x542CB4 +b_area_omo2_light_bulb_DefenseTable = 0x8022F600; // type:data rom:0x542CA0 +b_area_omo2_light_bulb_StatusTable = 0x8022F614; // type:data rom:0x542CB4 b_area_omo2_light_bulb_parts = 0x8022F6C0; // type:data rom:0x542D60 b_area_omo2_light_bulb = 0x8022F6E4; // type:data rom:0x542D84 b_area_omo2_light_bulb_init = 0x8022F70C; // type:data rom:0x542DAC @@ -12000,11 +12000,11 @@ b_area_omo2_Formation_01 = 0x8022FBA0; // type:data rom:0x543240 b_area_omo2_Formations = 0x8022FBF4; // type:data rom:0x543294 b_area_omo2_Stages = 0x8022FC1C; // type:data rom:0x5432BC b_area_omo2_1_shy_squad_GetActorPartSize = 0x80231000; // type:func rom:0x543570 -b_area_omo2_1_shy_squad_defenseTable = 0x802310B0; // type:data rom:0x543620 -b_area_omo2_1_shy_squad_statusTable = 0x802310BC; // type:data rom:0x54362C +b_area_omo2_1_shy_squad_DefenseTable = 0x802310B0; // type:data rom:0x543620 +b_area_omo2_1_shy_squad_StatusTable = 0x802310BC; // type:data rom:0x54362C b_area_omo2_1_shy_squad_parts = 0x80231168; // type:data rom:0x5436D8 b_area_omo2_1_shy_squad = 0x802313A8; // type:data rom:0x543918 -b_area_omo2_1_shy_squad_idleAnimations = 0x802313D0; // type:data rom:0x543940 +b_area_omo2_1_shy_squad_IdleAnimations = 0x802313D0; // type:data rom:0x543940 b_area_omo2_1_shy_squad_init = 0x8023142C; // type:data rom:0x54399C b_area_omo2_1_shy_squad_nextTurn = 0x80232058; // type:data rom:0x5445C8 b_area_omo2_1_shy_squad_idle = 0x80232454; // type:data rom:0x5449C4 @@ -12027,11 +12027,11 @@ b_area_omo2_1_shy_squad_updateActorSize = 0x80235D9C; // type:data rom:0x54830C b_area_omo2_2_stilt_guy_GetSelectedMoveID = 0x80231000; // type:func rom:0x5483E0 SetActorLevelToZero = 0x8023102C; // type:func rom:0x54840C b_area_omo2_2_stilt_guy_UnkBattleFunc1 = 0x80231054; // type:func rom:0x548434 -b_area_omo2_2_stilt_guy_idleAnimations2 = 0x80231120; // type:data rom:0x548500 -b_area_omo2_2_stilt_guy_idleAnimations3 = 0x80231174; // type:data rom:0x548554 +b_area_omo2_2_stilt_guy_IdleAnimations2 = 0x80231120; // type:data rom:0x548500 +b_area_omo2_2_stilt_guy_IdleAnimations3 = 0x80231174; // type:data rom:0x548554 b_area_omo2_2_stilt_guy_defenseTable2 = 0x80231180; // type:data rom:0x548560 -b_area_omo2_2_stilt_guy_defenseTable = 0x8023118C; // type:data rom:0x54856C -b_area_omo2_2_stilt_guy_statusTable = 0x802311A0; // type:data rom:0x548580 +b_area_omo2_2_stilt_guy_DefenseTable = 0x8023118C; // type:data rom:0x54856C +b_area_omo2_2_stilt_guy_StatusTable = 0x802311A0; // type:data rom:0x548580 b_area_omo2_2_stilt_guy_statusTable2 = 0x8023124C; // type:data rom:0x54862C b_area_omo2_2_stilt_guy_parts = 0x802312F8; // type:data rom:0x5486D8 b_area_omo2_2_stilt_guy = 0x80231418; // type:data rom:0x5487F8 @@ -12047,7 +12047,7 @@ b_area_omo2_2_stilt_guy_fallOff = 0x802333A4; // type:data rom:0x54A784 b_area_omo2_2_stilt_guy_onDeath = 0x8023379C; // type:data rom:0x54AB7C b_area_omo2_2_stilt_guy_shy_guy_rotate = 0x80233888; // type:data rom:0x54AC68 b_area_omo2_2_stilt_guy_shy_guy_on_spin_smash = 0x80233918; // type:data rom:0x54ACF8 -b_area_omo2_2_stilt_guy_idleAnimations = 0x80233E98; // type:data rom:0x54B278 +b_area_omo2_2_stilt_guy_IdleAnimations = 0x80233E98; // type:data rom:0x54B278 b_area_omo2_2_stilt_guy_shy_guy_init = 0x80233EE4; // type:data rom:0x54B2C4 b_area_omo2_2_stilt_guy_shy_guy_idle = 0x80233F30; // type:data rom:0x54B310 b_area_omo2_2_stilt_guy_shy_guy_return_home = 0x80234040; // type:data rom:0x54B420 @@ -12056,17 +12056,17 @@ b_area_omo2_2_stilt_guy_shy_guy_attack1 = 0x80234580; // type:data rom:0x54B960 b_area_omo2_2_stilt_guy_shy_guy_attack2 = 0x80234CA8; // type:data rom:0x54C088 b_area_omo2_2_stilt_guy_shy_guy_takeTurn = 0x80235830; // type:data rom:0x54CC10 func_80231000_54CC70 = 0x80231000; // type:func rom:0x54CC70 -b_area_omo2_3_shy_stack_defenseTable = 0x80231030; // type:data rom:0x54CCA0 -b_area_omo2_3_shy_stack_statusTable = 0x8023103C; // type:data rom:0x54CCAC +b_area_omo2_3_shy_stack_DefenseTable = 0x80231030; // type:data rom:0x54CCA0 +b_area_omo2_3_shy_stack_StatusTable = 0x8023103C; // type:data rom:0x54CCAC b_area_omo2_3_shy_stack_parts = 0x802310E8; // type:data rom:0x54CD58 b_area_omo2_3_shy_stack = 0x802312E0; // type:data rom:0x54CF50 -b_area_omo2_3_shy_stack_idleAnimations = 0x80231308; // type:data rom:0x54CF78 -b_area_omo2_3_shy_stack_idleAnimations2 = 0x80231364; // type:data rom:0x54CFD4 -b_area_omo2_3_shy_stack_idleAnimations3 = 0x802313C0; // type:data rom:0x54D030 -b_area_omo2_3_shy_stack_idleAnimations4 = 0x8023141C; // type:data rom:0x54D08C -b_area_omo2_3_shy_stack_idleAnimations_rock = 0x80231478; // type:data rom:0x54D0E8 -b_area_omo2_3_shy_stack_idleAnimations_damage = 0x80231484; // type:data rom:0x54D0F4 -b_area_omo2_3_shy_stack_idleAnimations_shy_guy = 0x80231490; // type:data rom:0x54D100 +b_area_omo2_3_shy_stack_IdleAnimations = 0x80231308; // type:data rom:0x54CF78 +b_area_omo2_3_shy_stack_IdleAnimations2 = 0x80231364; // type:data rom:0x54CFD4 +b_area_omo2_3_shy_stack_IdleAnimations3 = 0x802313C0; // type:data rom:0x54D030 +b_area_omo2_3_shy_stack_IdleAnimations4 = 0x8023141C; // type:data rom:0x54D08C +b_area_omo2_3_shy_stack_IdleAnimations_rock = 0x80231478; // type:data rom:0x54D0E8 +b_area_omo2_3_shy_stack_IdleAnimations_damage = 0x80231484; // type:data rom:0x54D0F4 +b_area_omo2_3_shy_stack_IdleAnimations_shy_guy = 0x80231490; // type:data rom:0x54D100 b_area_omo2_3_shy_stack_init = 0x8023149C; // type:data rom:0x54D10C b_area_omo2_3_shy_stack_idle = 0x80232FA0; // type:data rom:0x54EC10 b_area_omo2_3_shy_stack_handleEvent = 0x80232FD4; // type:data rom:0x54EC44 @@ -12081,21 +12081,21 @@ b_area_omo2_3_shy_stack_takeTurn = 0x802357B4; // type:data rom:0x551424 b_area_omo2_3_shy_stack_launch_rock = 0x80235D60; // type:data rom:0x5519D0 b_area_omo2_3_shy_stack_onDeath = 0x80236468; // type:data rom:0x5520D8 b_area_omo2_3_shy_stack_onSpinSmashLaunchDeath = 0x80236518; // type:data rom:0x552188 -b_area_omo2_4_signal_guy_defenseTable = 0x80231000; // type:data rom:0x552440 -b_area_omo2_4_signal_guy_statusTable = 0x8023100C; // type:data rom:0x55244C +b_area_omo2_4_signal_guy_DefenseTable = 0x80231000; // type:data rom:0x552440 +b_area_omo2_4_signal_guy_StatusTable = 0x8023100C; // type:data rom:0x55244C b_area_omo2_4_signal_guy_parts = 0x802310B8; // type:data rom:0x5524F8 b_area_omo2_4_signal_guy = 0x802310DC; // type:data rom:0x55251C -b_area_omo2_4_signal_guy_idleAnimations = 0x80231104; // type:data rom:0x552544 +b_area_omo2_4_signal_guy_IdleAnimations = 0x80231104; // type:data rom:0x552544 b_area_omo2_4_signal_guy_init = 0x80231110; // type:data rom:0x552550 b_area_omo2_4_signal_guy_idle = 0x8023129C; // type:data rom:0x5526DC b_area_omo2_4_signal_guy_handleEvent = 0x802312D0; // type:data rom:0x552710 b_area_omo2_4_signal_guy_takeTurn = 0x80231754; // type:data rom:0x552B94 -b_area_omo2_5_shy_squad_dup_defenseTable = 0x80231000; // type:data rom:0x552BB0 -b_area_omo2_5_shy_squad_dup_statusTable = 0x8023100C; // type:data rom:0x552BBC +b_area_omo2_5_shy_squad_dup_DefenseTable = 0x80231000; // type:data rom:0x552BB0 +b_area_omo2_5_shy_squad_dup_StatusTable = 0x8023100C; // type:data rom:0x552BBC b_area_omo2_5_shy_squad_dup_parts = 0x802310B8; // type:data rom:0x552C68 b_area_omo2_5_shy_squad_dup = 0x802312F8; // type:data rom:0x552EA8 -b_area_omo2_5_shy_squad_dup_idleAnimations = 0x80231320; // type:data rom:0x552ED0 -b_area_omo2_5_shy_squad_dup_idleAnimations_watt = 0x80231334; // type:data rom:0x552EE4 +b_area_omo2_5_shy_squad_dup_IdleAnimations = 0x80231320; // type:data rom:0x552ED0 +b_area_omo2_5_shy_squad_dup_IdleAnimations_watt = 0x80231334; // type:data rom:0x552EE4 b_area_omo2_5_shy_squad_dup_init = 0x80231348; // type:data rom:0x552EF8 b_area_omo2_5_shy_squad_dup_nextTurn = 0x80231FC8; // type:data rom:0x553B78 b_area_omo2_5_shy_squad_dup_idle = 0x80231FD8; // type:data rom:0x553B88 @@ -12114,11 +12114,11 @@ b_area_omo2_5_shy_squad_dup_next_phase = 0x80234370; // type:data rom:0x555F20 b_area_omo2_5_shy_squad_dup_run_away = 0x802343A8; // type:data rom:0x555F58 b_area_omo2_5_shy_squad_dup_attack = 0x80234624; // type:data rom:0x5561D4 b_area_omo2_5_shy_squad_dup_run_squad_to_pos = 0x80234EC4; // type:data rom:0x556A74 -b_area_omo2_6_shy_guy_dup_defenseTable = 0x80231000; // type:data rom:0x556C90 -b_area_omo2_6_shy_guy_dup_statusTable = 0x8023100C; // type:data rom:0x556C9C +b_area_omo2_6_shy_guy_dup_DefenseTable = 0x80231000; // type:data rom:0x556C90 +b_area_omo2_6_shy_guy_dup_StatusTable = 0x8023100C; // type:data rom:0x556C9C b_area_omo2_6_shy_guy_dup_parts = 0x802310B8; // type:data rom:0x556D48 b_area_omo2_6_shy_guy_dup = 0x802311FC; // type:data rom:0x556E8C -b_area_omo2_6_shy_guy_dup_idleAnimations = 0x80231224; // type:data rom:0x556EB4 +b_area_omo2_6_shy_guy_dup_IdleAnimations = 0x80231224; // type:data rom:0x556EB4 b_area_omo2_6_shy_guy_dup_init = 0x80231280; // type:data rom:0x556F10 b_area_omo2_6_shy_guy_dup_idle = 0x802315EC; // type:data rom:0x55727C b_area_omo2_6_shy_guy_dup_run_to_pos = 0x80231620; // type:data rom:0x5572B0 @@ -12132,8 +12132,8 @@ b_area_omo3_IsGameStatusUnkAA_1 = 0x802186A0; // type:func rom:0x557A80 b_area_omo3_Add1Coin = 0x802186C8; // type:func rom:0x557AA8 b_area_omo3_ArcsinDeg = 0x802186F0; // type:func rom:0x557AD0 b_area_omo3_CalculateRotationZ = 0x8021887C; // type:func rom:0x557C5C -b_area_omo3_UnkBattleFunc2 = 0x80218970; // type:func rom:0x557D50 -b_area_omo3_UnkBattleFunc2_2 = 0x80218A24; // type:func rom:0x557E04 +b_area_omo3_SpawnDrainHealthStartFX = 0x80218970; // type:func rom:0x557D50 +b_area_omo3_SpawnDrainHealthContinueFX = 0x80218A24; // type:func rom:0x557E04 b_area_omo3_UnkBattleFunc1 = 0x80218AE0; // type:func rom:0x557EC0 dup_b_area_omo3_UnkBattleFunc1 = 0x80218BB0; // type:func rom:0x557F90 b_area_omo3_StartRumbleWithParams = 0x80218C7C; // type:func rom:0x55805C @@ -12144,11 +12144,11 @@ b_area_kgr_fuzzipede_DisableRandomAbility = 0x802182E4; // type:func rom:0x56E58 b_area_kgr_fuzzipede_StartRumbleWithParams = 0x802184A0; // type:func rom:0x56E740 b_area_kgr_fuzzipede_SpyGuyActionFunc = 0x802184F8; // type:func rom:0x56E798 func_80218560_56E800 = 0x80218560; // type:func rom:0x56E800 -b_area_kgr_fuzzipede_idleAnimations_802189B0 = 0x802189B0; // type:data rom:0x56EC50 -b_area_kgr_fuzzipede_idleAnimations_802189FC = 0x802189FC; // type:data rom:0x56EC9C -b_area_kgr_fuzzipede_defenseTable_80218A48 = 0x80218A48; // type:data rom:0x56ECE8 -b_area_kgr_fuzzipede_statusTable_80218A54 = 0x80218A54; // type:data rom:0x56ECF4 -b_area_kgr_fuzzipede_partsTable_80218B00 = 0x80218B00; // type:data rom:0x56EDA0 +b_area_kgr_fuzzipede_IdleAnimations_802189B0 = 0x802189B0; // type:data rom:0x56EC50 +b_area_kgr_fuzzipede_IdleAnimations_802189FC = 0x802189FC; // type:data rom:0x56EC9C +b_area_kgr_fuzzipede_DefenseTable_80218A48 = 0x80218A48; // type:data rom:0x56ECE8 +b_area_kgr_fuzzipede_StatusTable_80218A54 = 0x80218A54; // type:data rom:0x56ECF4 +b_area_kgr_fuzzipede_PartsTable_80218B00 = 0x80218B00; // type:data rom:0x56EDA0 b_area_kgr_fuzzipede = 0x80218B48; // type:data rom:0x56EDE8 b_area_kgr_fuzzipede_init_80218B70 = 0x80218B70; // type:data rom:0x56EE10 b_area_kgr_fuzzipede_nextTurn_80218C58 = 0x80218C58; // type:data rom:0x56EEF8 @@ -12184,20 +12184,20 @@ b_area_kgr_Formations = 0x8021D5FC; // type:data rom:0x57389C b_area_kgr_Stages = 0x8021D624; // type:data rom:0x5738C4 b_area_jan_spear_guy_UnkBattleFunc1 = 0x80218000; // type:func rom:0x573920 b_area_jan_hurt_plant_UnkBattleFunc1 = 0x802180D0; // type:func rom:0x5739F0 -b_area_jan_jungle_fuzzy_UnkBattleFunc2 = 0x802181A0; // type:func rom:0x573AC0 -b_area_jan_jungle_fuzzy_UnkBattleFunc2_2 = 0x80218254; // type:func rom:0x573B74 +b_area_jan_jungle_fuzzy_SpawnDrainHealthStartFX = 0x802181A0; // type:func rom:0x573AC0 +b_area_jan_jungle_fuzzy_SpawnDrainHealthContinueFX = 0x80218254; // type:func rom:0x573B74 b_area_jan_medi_guy_UnkBattleFunc1 = 0x80218310; // type:func rom:0x573C30 b_area_jan_medi_guy_MediGuySpriteRotationFunc = 0x802183DC; // type:func rom:0x573CFC b_area_jan_spike_top_UnkBattleFunc1 = 0x802184F0; // type:func rom:0x573E10 -b_area_jan_spear_guy_idleAnimations_802185C0 = 0x802185C0; // type:data rom:0x573EE0 -b_area_jan_spear_guy_idleAnimations_8021860C = 0x8021860C; // type:data rom:0x573F2C -b_area_jan_spear_guy_idleAnimations_80218658 = 0x80218658; // type:data rom:0x573F78 -b_area_jan_spear_guy_idleAnimations_80218664 = 0x80218664; // type:data rom:0x573F84 -b_area_jan_spear_guy_defenseTable_80218670 = 0x80218670; // type:data rom:0x573F90 -b_area_jan_spear_guy_defenseTable_80218684 = 0x80218684; // type:data rom:0x573FA4 -b_area_jan_spear_guy_statusTable_80218698 = 0x80218698; // type:data rom:0x573FB8 -b_area_jan_spear_guy_statusTable_80218744 = 0x80218744; // type:data rom:0x574064 -b_area_jan_spear_guy_partsTable_802187F0 = 0x802187F0; // type:data rom:0x574110 +b_area_jan_spear_guy_IdleAnimations_802185C0 = 0x802185C0; // type:data rom:0x573EE0 +b_area_jan_spear_guy_IdleAnimations_8021860C = 0x8021860C; // type:data rom:0x573F2C +b_area_jan_spear_guy_IdleAnimations_80218658 = 0x80218658; // type:data rom:0x573F78 +b_area_jan_spear_guy_IdleAnimations_80218664 = 0x80218664; // type:data rom:0x573F84 +b_area_jan_spear_guy_DefenseTable_80218670 = 0x80218670; // type:data rom:0x573F90 +b_area_jan_spear_guy_DefenseTable_80218684 = 0x80218684; // type:data rom:0x573FA4 +b_area_jan_spear_guy_StatusTable_80218698 = 0x80218698; // type:data rom:0x573FB8 +b_area_jan_spear_guy_StatusTable_80218744 = 0x80218744; // type:data rom:0x574064 +b_area_jan_spear_guy_PartsTable_802187F0 = 0x802187F0; // type:data rom:0x574110 b_area_jan_spear_guy = 0x80218880; // type:data rom:0x5741A0 b_area_jan_spear_guy_setSpearStance = 0x802188A8; // type:data rom:0x5741C8 b_area_jan_spear_guy_init_80218980 = 0x80218980; // type:data rom:0x5742A0 @@ -12217,7 +12217,7 @@ b_area_jan_spear_guy_8021B770 = 0x8021B770; // type:data rom:0x577090 b_area_jan_spear_guy_8021B96C = 0x8021B96C; // type:data rom:0x57728C b_area_jan_spear_guy_8021BB18 = 0x8021BB18; // type:data rom:0x577438 b_area_jan_spear_guy_takeTurn_8021BCB4 = 0x8021BCB4; // type:data rom:0x5775D4 -b_area_jan_spear_guy_idleAnimations_8021BF40 = 0x8021BF40; // type:data rom:0x577860 +b_area_jan_spear_guy_IdleAnimations_8021BF40 = 0x8021BF40; // type:data rom:0x577860 b_area_jan_spear_guy_8021BF8C = 0x8021BF8C; // type:data rom:0x5778AC b_area_jan_spear_guy_idle_8021BFD8 = 0x8021BFD8; // type:data rom:0x5778F8 b_area_jan_spear_guy_8021C0E8 = 0x8021C0E8; // type:data rom:0x577A08 @@ -12225,21 +12225,21 @@ b_area_jan_spear_guy_handleEvent_8021C14C = 0x8021C14C; // type:data rom:0x577A6 b_area_jan_spear_guy_8021C628 = 0x8021C628; // type:data rom:0x577F48 b_area_jan_spear_guy_8021CD50 = 0x8021CD50; // type:data rom:0x578670 b_area_jan_spear_guy_takeTurn_8021D8D8 = 0x8021D8D8; // type:data rom:0x5791F8 -b_area_jan_hurt_plant_idleAnimations_8021D940 = 0x8021D940; // type:data rom:0x579260 -b_area_jan_hurt_plant_defenseTable_8021D98C = 0x8021D98C; // type:data rom:0x5792AC -b_area_jan_hurt_plant_statusTable_8021D9A0 = 0x8021D9A0; // type:data rom:0x5792C0 -b_area_jan_hurt_plant_partsTable_8021DA4C = 0x8021DA4C; // type:data rom:0x57936C +b_area_jan_hurt_plant_IdleAnimations_8021D940 = 0x8021D940; // type:data rom:0x579260 +b_area_jan_hurt_plant_DefenseTable_8021D98C = 0x8021D98C; // type:data rom:0x5792AC +b_area_jan_hurt_plant_StatusTable_8021D9A0 = 0x8021D9A0; // type:data rom:0x5792C0 +b_area_jan_hurt_plant_PartsTable_8021DA4C = 0x8021DA4C; // type:data rom:0x57936C b_area_jan_hurt_plant = 0x8021DA70; // type:data rom:0x579390 b_area_jan_hurt_plant_init_8021DA98 = 0x8021DA98; // type:data rom:0x5793B8 b_area_jan_hurt_plant_idle_8021DAE4 = 0x8021DAE4; // type:data rom:0x579404 b_area_jan_hurt_plant_8021DBFC = 0x8021DBFC; // type:data rom:0x57951C b_area_jan_hurt_plant_handleEvent_8021DCF4 = 0x8021DCF4; // type:data rom:0x579614 b_area_jan_hurt_plant_takeTurn_8021E33C = 0x8021E33C; // type:data rom:0x579C5C -b_area_jan_jungle_fuzzy_defenseTable_8021E9D0 = 0x8021E9D0; // type:data rom:0x57A2F0 -b_area_jan_jungle_fuzzy_statusTable_8021E9E4 = 0x8021E9E4; // type:data rom:0x57A304 -b_area_jan_jungle_fuzzy_partsTable_8021EA90 = 0x8021EA90; // type:data rom:0x57A3B0 +b_area_jan_jungle_fuzzy_DefenseTable_8021E9D0 = 0x8021E9D0; // type:data rom:0x57A2F0 +b_area_jan_jungle_fuzzy_StatusTable_8021E9E4 = 0x8021E9E4; // type:data rom:0x57A304 +b_area_jan_jungle_fuzzy_PartsTable_8021EA90 = 0x8021EA90; // type:data rom:0x57A3B0 b_area_jan_jungle_fuzzy = 0x8021EAB4; // type:data rom:0x57A3D4 -b_area_jan_jungle_fuzzy_idleAnimations_8021EADC = 0x8021EADC; // type:data rom:0x57A3FC +b_area_jan_jungle_fuzzy_IdleAnimations_8021EADC = 0x8021EADC; // type:data rom:0x57A3FC b_area_jan_jungle_fuzzy_init_8021EB28 = 0x8021EB28; // type:data rom:0x57A448 b_area_jan_jungle_fuzzy_idle_8021EB8C = 0x8021EB8C; // type:data rom:0x57A4AC b_area_jan_jungle_fuzzy_handleEvent_8021EB9C = 0x8021EB9C; // type:data rom:0x57A4BC @@ -12250,20 +12250,20 @@ b_area_jan_jungle_fuzzy_80221468 = 0x80221468; // type:data rom:0x57CD88 b_area_jan_jungle_fuzzy_takeTurn_80221628 = 0x80221628; // type:data rom:0x57CF48 b_area_jan_jungle_fuzzy_vector3D_80221800 = 0x80221800; // type:data rom:0x57D120 b_area_jan_jungle_fuzzy_specialFormation_8022180C = 0x8022180C; // type:data rom:0x57D12C -b_area_jan_m_bush_idleAnimations_80221830 = 0x80221830; // type:data rom:0x57D150 -b_area_jan_m_bush_defenseTable_8022187C = 0x8022187C; // type:data rom:0x57D19C -b_area_jan_m_bush_statusTable_80221890 = 0x80221890; // type:data rom:0x57D1B0 -b_area_jan_m_bush_partsTable_8022193C = 0x8022193C; // type:data rom:0x57D25C +b_area_jan_m_bush_IdleAnimations_80221830 = 0x80221830; // type:data rom:0x57D150 +b_area_jan_m_bush_DefenseTable_8022187C = 0x8022187C; // type:data rom:0x57D19C +b_area_jan_m_bush_StatusTable_80221890 = 0x80221890; // type:data rom:0x57D1B0 +b_area_jan_m_bush_PartsTable_8022193C = 0x8022193C; // type:data rom:0x57D25C b_area_jan_m_bush = 0x80221960; // type:data rom:0x57D280 b_area_jan_m_bush_init_80221988 = 0x80221988; // type:data rom:0x57D2A8 b_area_jan_m_bush_idle_802219D4 = 0x802219D4; // type:data rom:0x57D2F4 b_area_jan_m_bush_802219E4 = 0x802219E4; // type:data rom:0x57D304 b_area_jan_m_bush_handleEvent_80221A74 = 0x80221A74; // type:data rom:0x57D394 b_area_jan_m_bush_takeTurn_80221F78 = 0x80221F78; // type:data rom:0x57D898 -b_area_jan_medi_guy_idleAnimations_8021F890 = 0x80222550; // type:data rom:0x57DE70 -b_area_jan_medi_guy_defenseTable_8021F8DC = 0x8022259C; // type:data rom:0x57DEBC -b_area_jan_medi_guy_statusTable_8021F8F0 = 0x802225B0; // type:data rom:0x57DED0 -b_area_jan_medi_guy_partsTable_8021F99C = 0x8022265C; // type:data rom:0x57DF7C +b_area_jan_medi_guy_IdleAnimations_8021F890 = 0x80222550; // type:data rom:0x57DE70 +b_area_jan_medi_guy_DefenseTable_8021F8DC = 0x8022259C; // type:data rom:0x57DEBC +b_area_jan_medi_guy_StatusTable_8021F8F0 = 0x802225B0; // type:data rom:0x57DED0 +b_area_jan_medi_guy_PartsTable_8021F99C = 0x8022265C; // type:data rom:0x57DF7C b_area_jan_medi_guy = 0x80222680; // type:data rom:0x57DFA0 b_area_jan_medi_guy_init_8021F9E8 = 0x802226A8; // type:data rom:0x57DFC8 b_area_jan_medi_guy_idle_8021FA8C = 0x8022274C; // type:data rom:0x57E06C @@ -12273,14 +12273,14 @@ b_area_jan_medi_guy_flyingAttack = 0x80222ED0; // type:data rom:0x57E7F0 b_area_jan_medi_guy_healOneAlly = 0x802236B8; // type:data rom:0x57EFD8 b_area_jan_medi_guy_80220CEC = 0x802239AC; // type:data rom:0x57F2CC b_area_jan_medi_guy_takeTurn_80220DCC = 0x80223A8C; // type:data rom:0x57F3AC -b_area_jan_spike_top_defenseTable_8021C8B0 = 0x80223B20; // type:data rom:0x57F440 -b_area_jan_spike_top_defenseTable_8021C8CC = 0x80223B3C; // type:data rom:0x57F45C -b_area_jan_spike_top_statusTable_8021C8D8 = 0x80223B48; // type:data rom:0x57F468 -b_area_jan_spike_top_partsTable_8021C984 = 0x80223BF4; // type:data rom:0x57F514 +b_area_jan_spike_top_DefenseTable_8021C8B0 = 0x80223B20; // type:data rom:0x57F440 +b_area_jan_spike_top_DefenseTable_8021C8CC = 0x80223B3C; // type:data rom:0x57F45C +b_area_jan_spike_top_StatusTable_8021C8D8 = 0x80223B48; // type:data rom:0x57F468 +b_area_jan_spike_top_PartsTable_8021C984 = 0x80223BF4; // type:data rom:0x57F514 b_area_jan_spike_top = 0x80223C18; // type:data rom:0x57F538 -b_area_jan_spike_top_idleAnimations_8021C9D0 = 0x80223C40; // type:data rom:0x57F560 -b_area_jan_spike_top_idleAnimations_8021CA1C = 0x80223C8C; // type:data rom:0x57F5AC -b_area_jan_spike_top_idleAnimations_8021CA68 = 0x80223CD8; // type:data rom:0x57F5F8 +b_area_jan_spike_top_IdleAnimations_8021C9D0 = 0x80223C40; // type:data rom:0x57F560 +b_area_jan_spike_top_IdleAnimations_8021CA1C = 0x80223C8C; // type:data rom:0x57F5AC +b_area_jan_spike_top_IdleAnimations_8021CA68 = 0x80223CD8; // type:data rom:0x57F5F8 b_area_jan_spike_top_init_8021CAAC = 0x80223D1C; // type:data rom:0x57F63C b_area_jan_spike_top_idle_8021CC7C = 0x80223EEC; // type:data rom:0x57F80C b_area_jan_spike_top_spikeTop_FallDown = 0x80223EFC; // type:data rom:0x57F81C @@ -12355,10 +12355,10 @@ b_area_jan2_white_magikoopa_StartRumbleWithParams = 0x802184A0; // type:func rom b_area_jan2_white_magikoopa_UnkFunc52 = 0x802184F8; // type:func rom:0x584E38 b_area_jan2_white_magikoopa_GetBootsHammerLevel = 0x802185BC; // type:func rom:0x584EFC b_area_jan2_white_magikoopa_UnkBattleFunc5 = 0x8021861C; // type:func rom:0x584F5C -b_area_jan2_putrid_piranha_idleAnimations_8021B0A0 = 0x802186C0; // type:data rom:0x585000 -b_area_jan2_putrid_piranha_defenseTable_8021B0EC = 0x8021870C; // type:data rom:0x58504C -b_area_jan2_putrid_piranha_statusTable_8021B100 = 0x80218720; // type:data rom:0x585060 -b_area_jan2_putrid_piranha_partsTable_8021B1AC = 0x802187CC; // type:data rom:0x58510C +b_area_jan2_putrid_piranha_IdleAnimations_8021B0A0 = 0x802186C0; // type:data rom:0x585000 +b_area_jan2_putrid_piranha_DefenseTable_8021B0EC = 0x8021870C; // type:data rom:0x58504C +b_area_jan2_putrid_piranha_StatusTable_8021B100 = 0x80218720; // type:data rom:0x585060 +b_area_jan2_putrid_piranha_PartsTable_8021B1AC = 0x802187CC; // type:data rom:0x58510C b_area_jan2_putrid_piranha = 0x802187F0; // type:data rom:0x585130 b_area_jan2_putrid_piranha_init_8021B1F8 = 0x80218818; // type:data rom:0x585158 b_area_jan2_putrid_piranha_idle_8021B244 = 0x80218864; // type:data rom:0x5851A4 @@ -12367,17 +12367,17 @@ b_area_jan2_putrid_piranha_handleEvent_8021B3D0 = 0x802189F0; // type:data rom:0 b_area_jan2_putrid_piranha_takeTurn_8021B8A8 = 0x80218EC8; // type:data rom:0x585808 b_area_jan2_putrid_piranha_bite = 0x80218F60; // type:data rom:0x5858A0 b_area_jan2_putrid_piranha_breath = 0x80219908; // type:data rom:0x586248 -b_area_jan2_white_magikoopa_defenseTable_80223B20 = 0x80219ED0; // type:data rom:0x586810 -b_area_jan2_white_magikoopa_defenseTable_80223B2C = 0x80219EDC; // type:data rom:0x58681C -b_area_jan2_white_magikoopa_statusTable_80223B38 = 0x80219EE8; // type:data rom:0x586828 -b_area_jan2_white_magikoopa_statusTable_80223BE4 = 0x80219F94; // type:data rom:0x5868D4 -b_area_jan2_white_magikoopa_partsTable_80223C90 = 0x8021A040; // type:data rom:0x586980 -b_area_jan2_white_magikoopa_partsTable_80223CB4 = 0x8021A064; // type:data rom:0x5869A4 +b_area_jan2_white_magikoopa_DefenseTable_80223B20 = 0x80219ED0; // type:data rom:0x586810 +b_area_jan2_white_magikoopa_DefenseTable_80223B2C = 0x80219EDC; // type:data rom:0x58681C +b_area_jan2_white_magikoopa_StatusTable_80223B38 = 0x80219EE8; // type:data rom:0x586828 +b_area_jan2_white_magikoopa_StatusTable_80223BE4 = 0x80219F94; // type:data rom:0x5868D4 +b_area_jan2_white_magikoopa_PartsTable_80223C90 = 0x8021A040; // type:data rom:0x586980 +b_area_jan2_white_magikoopa_PartsTable_80223CB4 = 0x8021A064; // type:data rom:0x5869A4 b_area_jan2_white_magikoopa = 0x8021A0D0; // type:data rom:0x586A10 b_area_jan2_white_magikoopa_flying = 0x8021A0F8; // type:data rom:0x586A38 -b_area_jan2_white_magikoopa_idleAnimations_80223D70 = 0x8021A120; // type:data rom:0x586A60 -b_area_jan2_white_magikoopa_idleAnimations_80223DBC = 0x8021A16C; // type:data rom:0x586AAC -b_area_jan2_white_magikoopa_idleAnimations_80223E08 = 0x8021A1B8; // type:data rom:0x586AF8 +b_area_jan2_white_magikoopa_IdleAnimations_80223D70 = 0x8021A120; // type:data rom:0x586A60 +b_area_jan2_white_magikoopa_IdleAnimations_80223DBC = 0x8021A16C; // type:data rom:0x586AAC +b_area_jan2_white_magikoopa_IdleAnimations_80223E08 = 0x8021A1B8; // type:data rom:0x586AF8 b_area_jan2_white_magikoopa_idle_80223E14 = 0x8021A1C4; // type:data rom:0x586B04 b_area_jan2_white_magikoopa_handleEvent_80223E24 = 0x8021A1D4; // type:data rom:0x586B14 b_area_jan2_white_magikoopa_8022433C = 0x8021A6EC; // type:data rom:0x58702C @@ -12452,12 +12452,12 @@ b_area_kzn_white_magikoopa_StartRumbleWithParams = 0x80218BF0; // type:func rom: b_area_kzn_white_magikoopa_UnkFunc52 = 0x80218C48; // type:func rom:0x58CF38 b_area_kzn_white_magikoopa_GetBootsHammerLevel = 0x80218D0C; // type:func rom:0x58CFFC b_area_kzn_white_magikoopa_UnkBattleFunc5 = 0x80218D6C; // type:func rom:0x58D05C -b_area_kzn_lava_bubble_defenseTable_80218E10 = 0x80218E10; // type:data rom:0x58D100 -b_area_kzn_lava_bubble_statusTable_80218E3C = 0x80218E3C; // type:data rom:0x58D12C -b_area_kzn_lava_bubble_partsTable_80218EE8 = 0x80218EE8; // type:data rom:0x58D1D8 +b_area_kzn_lava_bubble_DefenseTable_80218E10 = 0x80218E10; // type:data rom:0x58D100 +b_area_kzn_lava_bubble_StatusTable_80218E3C = 0x80218E3C; // type:data rom:0x58D12C +b_area_kzn_lava_bubble_PartsTable_80218EE8 = 0x80218EE8; // type:data rom:0x58D1D8 b_area_kzn_lava_bubble = 0x80218F9C; // type:data rom:0x58D28C -b_area_kzn_lava_bubble_idleAnimations_80218FC4 = 0x80218FC4; // type:data rom:0x58D2B4 -b_area_kzn_lava_bubble_idleAnimations_80219010 = 0x80219010; // type:data rom:0x58D300 +b_area_kzn_lava_bubble_IdleAnimations_80218FC4 = 0x80218FC4; // type:data rom:0x58D2B4 +b_area_kzn_lava_bubble_IdleAnimations_80219010 = 0x80219010; // type:data rom:0x58D300 b_area_kzn_lava_bubble_init_8021901C = 0x8021901C; // type:data rom:0x58D30C b_area_kzn_lava_bubble_idle_802191E4 = 0x802191E4; // type:data rom:0x58D4D4 b_area_kzn_lava_bubble_80219464 = 0x80219464; // type:data rom:0x58D754 @@ -12468,10 +12468,10 @@ b_area_kzn_lava_bubble_8021A218 = 0x8021A218; // type:data rom:0x58E508 b_area_kzn_lava_bubble_fireballs_Partner = 0x8021A274; // type:data rom:0x58E564 b_area_kzn_lava_bubble_fireballs_Player = 0x8021A7E8; // type:data rom:0x58EAD8 b_area_kzn_lava_bubble_takeTurn_8021AEA4 = 0x8021AEA4; // type:data rom:0x58F194 -b_area_kzn_putrid_piranha_idleAnimations_8021B0A0 = 0x8021B0A0; // type:data rom:0x58F390 -b_area_kzn_putrid_piranha_defenseTable_8021B0EC = 0x8021B0EC; // type:data rom:0x58F3DC -b_area_kzn_putrid_piranha_statusTable_8021B100 = 0x8021B100; // type:data rom:0x58F3F0 -b_area_kzn_putrid_piranha_partsTable_8021B1AC = 0x8021B1AC; // type:data rom:0x58F49C +b_area_kzn_putrid_piranha_IdleAnimations_8021B0A0 = 0x8021B0A0; // type:data rom:0x58F390 +b_area_kzn_putrid_piranha_DefenseTable_8021B0EC = 0x8021B0EC; // type:data rom:0x58F3DC +b_area_kzn_putrid_piranha_StatusTable_8021B100 = 0x8021B100; // type:data rom:0x58F3F0 +b_area_kzn_putrid_piranha_PartsTable_8021B1AC = 0x8021B1AC; // type:data rom:0x58F49C b_area_kzn_putrid_piranha = 0x8021B1D0; // type:data rom:0x58F4C0 b_area_kzn_putrid_piranha_init_8021B1F8 = 0x8021B1F8; // type:data rom:0x58F4E8 b_area_kzn_putrid_piranha_idle_8021B244 = 0x8021B244; // type:data rom:0x58F534 @@ -12480,14 +12480,14 @@ b_area_kzn_putrid_piranha_handleEvent_8021B3D0 = 0x8021B3D0; // type:data rom:0x b_area_kzn_putrid_piranha_takeTurn_8021B8A8 = 0x8021B8A8; // type:data rom:0x58FB98 b_area_kzn_putrid_piranha_bite = 0x8021B940; // type:data rom:0x58FC30 b_area_kzn_putrid_piranha_breath = 0x8021C2E8; // type:data rom:0x5905D8 -b_area_kzn_spike_top_defenseTable_8021C8B0 = 0x8021C8B0; // type:data rom:0x590BA0 -b_area_kzn_spike_top_defenseTable_8021C8CC = 0x8021C8CC; // type:data rom:0x590BBC -b_area_kzn_spike_top_statusTable_8021C8D8 = 0x8021C8D8; // type:data rom:0x590BC8 -b_area_kzn_spike_top_partsTable_8021C984 = 0x8021C984; // type:data rom:0x590C74 +b_area_kzn_spike_top_DefenseTable_8021C8B0 = 0x8021C8B0; // type:data rom:0x590BA0 +b_area_kzn_spike_top_DefenseTable_8021C8CC = 0x8021C8CC; // type:data rom:0x590BBC +b_area_kzn_spike_top_StatusTable_8021C8D8 = 0x8021C8D8; // type:data rom:0x590BC8 +b_area_kzn_spike_top_PartsTable_8021C984 = 0x8021C984; // type:data rom:0x590C74 b_area_kzn_spike_top = 0x8021C9A8; // type:data rom:0x590C98 -b_area_kzn_spike_top_idleAnimations_8021C9D0 = 0x8021C9D0; // type:data rom:0x590CC0 -b_area_kzn_spike_top_idleAnimations_8021CA1C = 0x8021CA1C; // type:data rom:0x590D0C -b_area_kzn_spike_top_idleAnimations_8021CA68 = 0x8021CA68; // type:data rom:0x590D58 +b_area_kzn_spike_top_IdleAnimations_8021C9D0 = 0x8021C9D0; // type:data rom:0x590CC0 +b_area_kzn_spike_top_IdleAnimations_8021CA1C = 0x8021CA1C; // type:data rom:0x590D0C +b_area_kzn_spike_top_IdleAnimations_8021CA68 = 0x8021CA68; // type:data rom:0x590D58 b_area_kzn_spike_top_init_8021CAAC = 0x8021CAAC; // type:data rom:0x590D9C b_area_kzn_spike_top_idle_8021CC7C = 0x8021CC7C; // type:data rom:0x590F6C b_area_kzn_spike_top_spikeTop_FallDown = 0x8021CC8C; // type:data rom:0x590F7C @@ -12497,10 +12497,10 @@ b_area_kzn_spike_top_intTable_8021D5CC = 0x8021D5CC; // type:data rom:0x5918BC b_area_kzn_spike_top_spikeTop_HandleEvent_Floor = 0x8021D618; // type:data rom:0x591908 b_area_kzn_spike_top_spikeTop_TakeTurn_Ceiling = 0x8021E3B4; // type:data rom:0x5926A4 b_area_kzn_spike_top_spikeTop_TakeTurn_Floor = 0x8021EE6C; // type:data rom:0x59315C -b_area_kzn_medi_guy_idleAnimations_8021F890 = 0x8021F890; // type:data rom:0x593B80 -b_area_kzn_medi_guy_defenseTable_8021F8DC = 0x8021F8DC; // type:data rom:0x593BCC -b_area_kzn_medi_guy_statusTable_8021F8F0 = 0x8021F8F0; // type:data rom:0x593BE0 -b_area_kzn_medi_guy_partsTable_8021F99C = 0x8021F99C; // type:data rom:0x593C8C +b_area_kzn_medi_guy_IdleAnimations_8021F890 = 0x8021F890; // type:data rom:0x593B80 +b_area_kzn_medi_guy_DefenseTable_8021F8DC = 0x8021F8DC; // type:data rom:0x593BCC +b_area_kzn_medi_guy_StatusTable_8021F8F0 = 0x8021F8F0; // type:data rom:0x593BE0 +b_area_kzn_medi_guy_PartsTable_8021F99C = 0x8021F99C; // type:data rom:0x593C8C b_area_kzn_medi_guy = 0x8021F9C0; // type:data rom:0x593CB0 b_area_kzn_medi_guy_init_8021F9E8 = 0x8021F9E8; // type:data rom:0x593CD8 b_area_kzn_medi_guy_idle_8021FA8C = 0x8021FA8C; // type:data rom:0x593D7C @@ -12532,17 +12532,17 @@ b_area_kzn_red_magikoopa_8022E334 = 0x80223074; // type:data rom:0x597364 b_area_kzn_red_magikoopa_8022E558 = 0x80223298; // type:data rom:0x597588 b_area_kzn_red_magikoopa_8022E5FC = 0x8022333C; // type:data rom:0x59762C b_area_kzn_red_magikoopa_8022E6A0 = 0x802233E0; // type:data rom:0x5976D0 -b_area_kzn_white_magikoopa_defenseTable_80223B20 = 0x80223B20; // type:data rom:0x597E10 -b_area_kzn_white_magikoopa_defenseTable_80223B2C = 0x80223B2C; // type:data rom:0x597E1C -b_area_kzn_white_magikoopa_statusTable_80223B38 = 0x80223B38; // type:data rom:0x597E28 -b_area_kzn_white_magikoopa_statusTable_80223BE4 = 0x80223BE4; // type:data rom:0x597ED4 -b_area_kzn_white_magikoopa_partsTable_80223C90 = 0x80223C90; // type:data rom:0x597F80 -b_area_kzn_white_magikoopa_partsTable_80223CB4 = 0x80223CB4; // type:data rom:0x597FA4 +b_area_kzn_white_magikoopa_DefenseTable_80223B20 = 0x80223B20; // type:data rom:0x597E10 +b_area_kzn_white_magikoopa_DefenseTable_80223B2C = 0x80223B2C; // type:data rom:0x597E1C +b_area_kzn_white_magikoopa_StatusTable_80223B38 = 0x80223B38; // type:data rom:0x597E28 +b_area_kzn_white_magikoopa_StatusTable_80223BE4 = 0x80223BE4; // type:data rom:0x597ED4 +b_area_kzn_white_magikoopa_PartsTable_80223C90 = 0x80223C90; // type:data rom:0x597F80 +b_area_kzn_white_magikoopa_PartsTable_80223CB4 = 0x80223CB4; // type:data rom:0x597FA4 b_area_kzn_white_magikoopa = 0x80223D20; // type:data rom:0x598010 b_area_kzn_white_magikoopa_flying = 0x80223D48; // type:data rom:0x598038 -b_area_kzn_white_magikoopa_idleAnimations_80223D70 = 0x80223D70; // type:data rom:0x598060 -b_area_kzn_white_magikoopa_idleAnimations_80223DBC = 0x80223DBC; // type:data rom:0x5980AC -b_area_kzn_white_magikoopa_idleAnimations_80223E08 = 0x80223E08; // type:data rom:0x5980F8 +b_area_kzn_white_magikoopa_IdleAnimations_80223D70 = 0x80223D70; // type:data rom:0x598060 +b_area_kzn_white_magikoopa_IdleAnimations_80223DBC = 0x80223DBC; // type:data rom:0x5980AC +b_area_kzn_white_magikoopa_IdleAnimations_80223E08 = 0x80223E08; // type:data rom:0x5980F8 b_area_kzn_white_magikoopa_idle_80223E14 = 0x80223E14; // type:data rom:0x598104 b_area_kzn_white_magikoopa_handleEvent_80223E24 = 0x80223E24; // type:data rom:0x598114 b_area_kzn_white_magikoopa_8022433C = 0x8022433C; // type:data rom:0x59862C @@ -12736,8 +12736,8 @@ dup_b_area_tik2_FadeBackgroundToBlack = 0x8021876C; // type:func rom:0x60921C dup_b_area_tik2_UnfadeBackgroundToBlack = 0x80218804; // type:func rom:0x6092B4 dup2_b_area_tik2_SpitInk = 0x80218884; // type:func rom:0x609334 dup3_b_area_tik2_StartRumbleWithParams = 0x80218A20; // type:func rom:0x6094D0 -b_area_tik2_UnkBattleFunc2 = 0x80218A78; // type:func rom:0x609528 -b_area_tik2_UnkBattleFunc2_2 = 0x80218B2C; // type:func rom:0x6095DC +b_area_tik2_SpawnDrainHealthStartFX = 0x80218A78; // type:func rom:0x609528 +b_area_tik2_SpawnDrainHealthContinueFX = 0x80218B2C; // type:func rom:0x6095DC b_area_tik2_UnkFunc56 = 0x80218BE0; // type:func rom:0x609690 dup_b_area_tik2_UnkFunc56 = 0x80219080; // type:func rom:0x609B30 dup2_b_area_tik2_UnkFunc56 = 0x80219520; // type:func rom:0x609FD0 @@ -12746,8 +12746,8 @@ b_area_tik2_UpdateTexturePanSmooth = 0x80219E10; // type:func rom:0x60A8C0 b_area_tik2_UpdateTexturePanStepped = 0x80219F34; // type:func rom:0x60A9E4 b_area_tik3_UnkBattleFunc1 = 0x80218000; // type:func rom:0x6186F0 dup_b_area_tik3_UnkBattleFunc1 = 0x802180D0; // type:func rom:0x6187C0 -b_area_tik3_UnkBattleFunc2 = 0x8021819C; // type:func rom:0x61888C -b_area_tik3_UnkBattleFunc2_2 = 0x80218250; // type:func rom:0x618940 +b_area_tik3_SpawnDrainHealthStartFX = 0x8021819C; // type:func rom:0x61888C +b_area_tik3_SpawnDrainHealthContinueFX = 0x80218250; // type:func rom:0x618940 b_area_tik3_UnkFunc56 = 0x80218310; // type:func rom:0x618A00 dup_b_area_tik3_UnkFunc56 = 0x802187B0; // type:func rom:0x618EA0 dup2_b_area_tik3_UnkFunc56 = 0x80218C50; // type:func rom:0x619340 @@ -12798,11 +12798,11 @@ b_area_sam_sam_03_UnkModelStuff_func1 = 0x8021AB50; // type:func rom:0x6266F0 b_area_sam_sam_03_Set80071270_0_16 = 0x8021AD48; // type:func rom:0x6268E8 b_area_sam_sam_03_UnkFloatFunc2 = 0x8021AD6C; // type:func rom:0x62690C func_8021AE70_626A10 = 0x8021AE70; // type:func rom:0x626A10 -b_area_sam_duplighost_idleAnimations = 0x8021AE90; // type:data rom:0x626A30 -b_area_sam_duplighost_idleAnimations2 = 0x8021AEDC; // type:data rom:0x626A7C -b_area_sam_duplighost_idleAnimations3 = 0x8021AEE8; // type:data rom:0x626A88 -b_area_sam_duplighost_defenseTable = 0x8021AEF4; // type:data rom:0x626A94 -b_area_sam_duplighost_statusTable = 0x8021AF00; // type:data rom:0x626AA0 +b_area_sam_duplighost_IdleAnimations = 0x8021AE90; // type:data rom:0x626A30 +b_area_sam_duplighost_IdleAnimations2 = 0x8021AEDC; // type:data rom:0x626A7C +b_area_sam_duplighost_IdleAnimations3 = 0x8021AEE8; // type:data rom:0x626A88 +b_area_sam_duplighost_DefenseTable = 0x8021AEF4; // type:data rom:0x626A94 +b_area_sam_duplighost_StatusTable = 0x8021AF00; // type:data rom:0x626AA0 b_area_sam_duplighost_parts = 0x8021AFAC; // type:data rom:0x626B4C b_area_sam_duplighost = 0x8021AFD0; // type:data rom:0x626B70 b_area_sam_duplighost_init = 0x8021AFF8; // type:data rom:0x626B98 @@ -12816,9 +12816,9 @@ b_area_sam_duplighost_OnHitElectric = 0x8021BC34; // type:data rom:0x6277D4 b_area_sam_duplighost_OnShockHit = 0x8021C0F8; // type:data rom:0x627C98 b_area_sam_duplighost_OnShockDeath = 0x8021C784; // type:data rom:0x628324 b_area_sam_duplighost_pos_summon = 0x8021CAE8; // type:data rom:0x628688 -b_area_sam_duplighost_goombario_idleAnimations = 0x8021CAF4; // type:data rom:0x628694 -b_area_sam_duplighost_goombario_defenseTable = 0x8021CB40; // type:data rom:0x6286E0 -b_area_sam_duplighost_goombario_statusTable = 0x8021CB4C; // type:data rom:0x6286EC +b_area_sam_duplighost_goombario_IdleAnimations = 0x8021CAF4; // type:data rom:0x628694 +b_area_sam_duplighost_goombario_DefenseTable = 0x8021CB40; // type:data rom:0x6286E0 +b_area_sam_duplighost_goombario_StatusTable = 0x8021CB4C; // type:data rom:0x6286EC b_area_sam_duplighost_goombario_parts = 0x8021CBF8; // type:data rom:0x628798 b_area_sam_duplighost_goombario = 0x8021CC1C; // type:data rom:0x6287BC b_area_sam_duplighost_goombario_init = 0x8021CC44; // type:data rom:0x6287E4 @@ -12831,11 +12831,11 @@ b_area_sam_duplighost_goombario_attack = 0x8021D864; // type:data rom:0x629404 b_area_sam_duplighost_goombario_tattle = 0x8021E2F0; // type:data rom:0x629E90 b_area_sam_duplighost_goombario_takeTurn = 0x8021E604; // type:data rom:0x62A1A4 b_area_sam_duplighost_formation_goombario = 0x8021E660; // type:data rom:0x62A200 -b_area_sam_duplighost_kooper_idleAnimations = 0x8021E67C; // type:data rom:0x62A21C -b_area_sam_duplighost_kooper_idleAnimations2 = 0x8021E6C8; // type:data rom:0x62A268 -b_area_sam_duplighost_kooper_defenseTable = 0x8021E714; // type:data rom:0x62A2B4 +b_area_sam_duplighost_kooper_IdleAnimations = 0x8021E67C; // type:data rom:0x62A21C +b_area_sam_duplighost_kooper_IdleAnimations2 = 0x8021E6C8; // type:data rom:0x62A268 +b_area_sam_duplighost_kooper_DefenseTable = 0x8021E714; // type:data rom:0x62A2B4 b_area_sam_duplighost_kooper_defenseTable2 = 0x8021E720; // type:data rom:0x62A2C0 -b_area_sam_duplighost_kooper_statusTable = 0x8021E72C; // type:data rom:0x62A2CC +b_area_sam_duplighost_kooper_StatusTable = 0x8021E72C; // type:data rom:0x62A2CC b_area_sam_duplighost_kooper_parts = 0x8021E7D8; // type:data rom:0x62A378 b_area_sam_duplighost_kooper = 0x8021E7FC; // type:data rom:0x62A39C b_area_sam_duplighost_kooper_init = 0x8021E824; // type:data rom:0x62A3C4 @@ -12844,9 +12844,9 @@ b_area_sam_duplighost_kooper_dispOffsets = 0x8021E9C0; // type:data rom:0x62A560 b_area_sam_duplighost_kooper_handleEvent = 0x8021EA18; // type:data rom:0x62A5B8 b_area_sam_duplighost_kooper_takeTurn = 0x8021F374; // type:data rom:0x62AF14 b_area_sam_duplighost_formation_kooper = 0x80220314; // type:data rom:0x62BEB4 -b_area_sam_duplighost_bombette_idleAnimations = 0x80220330; // type:data rom:0x62BED0 -b_area_sam_duplighost_bombette_defenseTable = 0x8022037C; // type:data rom:0x62BF1C -b_area_sam_duplighost_bombette_statusTable = 0x80220388; // type:data rom:0x62BF28 +b_area_sam_duplighost_bombette_IdleAnimations = 0x80220330; // type:data rom:0x62BED0 +b_area_sam_duplighost_bombette_DefenseTable = 0x8022037C; // type:data rom:0x62BF1C +b_area_sam_duplighost_bombette_StatusTable = 0x80220388; // type:data rom:0x62BF28 b_area_sam_duplighost_bombette_parts = 0x80220434; // type:data rom:0x62BFD4 b_area_sam_duplighost_bombette = 0x80220458; // type:data rom:0x62BFF8 b_area_sam_duplighost_bombette_init = 0x80220480; // type:data rom:0x62C020 @@ -12855,9 +12855,9 @@ b_area_sam_duplighost_bombette_playEffects = 0x802204DC; // type:data rom:0x62C0 b_area_sam_duplighost_bombette_handleEvent = 0x80220654; // type:data rom:0x62C1F4 b_area_sam_duplighost_bombette_takeTurn = 0x80220CA0; // type:data rom:0x62C840 b_area_sam_duplighost_formation_bombette = 0x80221574; // type:data rom:0x62D114 -b_area_sam_duplighost_parakarry_idleAnimations = 0x80221590; // type:data rom:0x62D130 -b_area_sam_duplighost_parakarry_defenseTable = 0x802215DC; // type:data rom:0x62D17C -b_area_sam_duplighost_parakarry_statusTable = 0x802215E8; // type:data rom:0x62D188 +b_area_sam_duplighost_parakarry_IdleAnimations = 0x80221590; // type:data rom:0x62D130 +b_area_sam_duplighost_parakarry_DefenseTable = 0x802215DC; // type:data rom:0x62D17C +b_area_sam_duplighost_parakarry_StatusTable = 0x802215E8; // type:data rom:0x62D188 b_area_sam_duplighost_parakarry_parts = 0x80221694; // type:data rom:0x62D234 b_area_sam_duplighost_parakarry = 0x802216DC; // type:data rom:0x62D27C b_area_sam_duplighost_parakarry_init = 0x80221704; // type:data rom:0x62D2A4 @@ -12866,9 +12866,9 @@ b_area_sam_duplighost_parakarry_handleEvent = 0x80221760; // type:data rom:0x62D b_area_sam_duplighost_parakarry_doTakeTurn = 0x80221D54; // type:data rom:0x62D8F4 b_area_sam_duplighost_parakarry_takeTurn = 0x802224E4; // type:data rom:0x62E084 b_area_sam_duplighost_formation_parakarry = 0x80222500; // type:data rom:0x62E0A0 -b_area_sam_duplighost_bow_idleAnimations = 0x8022251C; // type:data rom:0x62E0BC -b_area_sam_duplighost_bow_defenseTable = 0x80222568; // type:data rom:0x62E108 -b_area_sam_duplighost_bow_statusTable = 0x80222574; // type:data rom:0x62E114 +b_area_sam_duplighost_bow_IdleAnimations = 0x8022251C; // type:data rom:0x62E0BC +b_area_sam_duplighost_bow_DefenseTable = 0x80222568; // type:data rom:0x62E108 +b_area_sam_duplighost_bow_StatusTable = 0x80222574; // type:data rom:0x62E114 b_area_sam_duplighost_bow_parts = 0x80222620; // type:data rom:0x62E1C0 b_area_sam_duplighost_bow = 0x80222668; // type:data rom:0x62E208 b_area_sam_duplighost_bow_init = 0x80222690; // type:data rom:0x62E230 @@ -12876,9 +12876,9 @@ b_area_sam_duplighost_bow_idle = 0x802226DC; // type:data rom:0x62E27C b_area_sam_duplighost_bow_handleEvent = 0x802226EC; // type:data rom:0x62E28C b_area_sam_duplighost_bow_takeTurn = 0x80222C7C; // type:data rom:0x62E81C b_area_sam_duplighost_formation_bow = 0x802238D0; // type:data rom:0x62F470 -b_area_sam_duplighost_watt_idleAnimations = 0x802238EC; // type:data rom:0x62F48C -b_area_sam_duplighost_watt_defenseTable = 0x80223938; // type:data rom:0x62F4D8 -b_area_sam_duplighost_watt_statusTable = 0x8022394C; // type:data rom:0x62F4EC +b_area_sam_duplighost_watt_IdleAnimations = 0x802238EC; // type:data rom:0x62F48C +b_area_sam_duplighost_watt_DefenseTable = 0x80223938; // type:data rom:0x62F4D8 +b_area_sam_duplighost_watt_StatusTable = 0x8022394C; // type:data rom:0x62F4EC b_area_sam_duplighost_watt_parts = 0x802239F8; // type:data rom:0x62F598 b_area_sam_duplighost_watt = 0x80223A40; // type:data rom:0x62F5E0 b_area_sam_duplighost_watt_init = 0x80223A68; // type:data rom:0x62F608 @@ -12886,9 +12886,9 @@ b_area_sam_duplighost_watt_idle = 0x80223AB4; // type:data rom:0x62F654 b_area_sam_duplighost_watt_handleEvent = 0x80223ADC; // type:data rom:0x62F67C b_area_sam_duplighost_watt_takeTurn = 0x80223F50; // type:data rom:0x62FAF0 b_area_sam_duplighost_formation_watt = 0x802247CC; // type:data rom:0x63036C -b_area_sam_duplighost_sushie_idleAnimations = 0x802247E8; // type:data rom:0x630388 -b_area_sam_duplighost_sushie_defenseTable = 0x80224834; // type:data rom:0x6303D4 -b_area_sam_duplighost_sushie_statusTable = 0x80224840; // type:data rom:0x6303E0 +b_area_sam_duplighost_sushie_IdleAnimations = 0x802247E8; // type:data rom:0x630388 +b_area_sam_duplighost_sushie_DefenseTable = 0x80224834; // type:data rom:0x6303D4 +b_area_sam_duplighost_sushie_StatusTable = 0x80224840; // type:data rom:0x6303E0 b_area_sam_duplighost_sushie_parts = 0x802248EC; // type:data rom:0x63048C b_area_sam_duplighost_sushie = 0x80224910; // type:data rom:0x6304B0 b_area_sam_duplighost_sushie_init = 0x80224938; // type:data rom:0x6304D8 @@ -12896,10 +12896,10 @@ b_area_sam_duplighost_sushie_idle = 0x80224984; // type:data rom:0x630524 b_area_sam_duplighost_sushie_handleEvent = 0x80224994; // type:data rom:0x630534 b_area_sam_duplighost_sushie_takeTurn = 0x80224F04; // type:data rom:0x630AA4 b_area_sam_duplighost_formation_sushie = 0x80226164; // type:data rom:0x631D04 -b_area_sam_duplighost_lakilester_idleAnimations = 0x80226180; // type:data rom:0x631D20 -b_area_sam_duplighost_lakilester_idleAnimations2 = 0x802261CC; // type:data rom:0x631D6C -b_area_sam_duplighost_lakilester_defenseTable = 0x802261D8; // type:data rom:0x631D78 -b_area_sam_duplighost_lakilester_statusTable = 0x802261E4; // type:data rom:0x631D84 +b_area_sam_duplighost_lakilester_IdleAnimations = 0x80226180; // type:data rom:0x631D20 +b_area_sam_duplighost_lakilester_IdleAnimations2 = 0x802261CC; // type:data rom:0x631D6C +b_area_sam_duplighost_lakilester_DefenseTable = 0x802261D8; // type:data rom:0x631D78 +b_area_sam_duplighost_lakilester_StatusTable = 0x802261E4; // type:data rom:0x631D84 b_area_sam_duplighost_lakilester_parts = 0x80226290; // type:data rom:0x631E30 b_area_sam_duplighost_lakilester = 0x802262D8; // type:data rom:0x631E78 b_area_sam_duplighost_lakilester_init = 0x80226300; // type:data rom:0x631EA0 @@ -12910,10 +12910,10 @@ b_area_sam_duplighost_formation_lakilester = 0x80227404; // type:data rom:0x632F b_area_sam_duplighost_copyPartner = 0x80227420; // type:data rom:0x632FC0 b_area_sam_duplighost_takeTurn = 0x80227C40; // type:data rom:0x6337E0 b_area_sam_gulpit_idleAnimations1 = 0x80227DD0; // type:data rom:0x633970 -b_area_sam_gulpit_idleAnimations2 = 0x80227E1C; // type:data rom:0x6339BC -b_area_sam_gulpit_idleAnimations3 = 0x80227E28; // type:data rom:0x6339C8 -b_area_sam_gulpit_defenseTable = 0x80227E34; // type:data rom:0x6339D4 -b_area_sam_gulpit_statusTable = 0x80227E40; // type:data rom:0x6339E0 +b_area_sam_gulpit_IdleAnimations2 = 0x80227E1C; // type:data rom:0x6339BC +b_area_sam_gulpit_IdleAnimations3 = 0x80227E28; // type:data rom:0x6339C8 +b_area_sam_gulpit_DefenseTable = 0x80227E34; // type:data rom:0x6339D4 +b_area_sam_gulpit_StatusTable = 0x80227E40; // type:data rom:0x6339E0 b_area_sam_gulpit_parts = 0x80227EEC; // type:data rom:0x633A8C b_area_sam_gulpit = 0x80227F58; // type:data rom:0x633AF8 b_area_sam_gulpit_init = 0x80227F80; // type:data rom:0x633B20 @@ -12923,10 +12923,10 @@ b_area_sam_gulpit_handleEvent = 0x80228030; // type:data rom:0x633BD0 b_area_sam_gulpit_attack_lick = 0x80228518; // type:data rom:0x6340B8 b_area_sam_gulpit_attack_rock = 0x8022898C; // type:data rom:0x63452C b_area_sam_gulpit_takeTurn = 0x802291B4; // type:data rom:0x634D54 -b_area_sam_gulpit_rocks_idleAnimations = 0x802294D0; // type:data rom:0x635070 -b_area_sam_gulpit_rocks_idleAnimations2 = 0x802294DC; // type:data rom:0x63507C -b_area_sam_gulpit_rocks_defenseTable = 0x802294E8; // type:data rom:0x635088 -b_area_sam_gulpit_rocks_statusTable = 0x802294F4; // type:data rom:0x635094 +b_area_sam_gulpit_rocks_IdleAnimations = 0x802294D0; // type:data rom:0x635070 +b_area_sam_gulpit_rocks_IdleAnimations2 = 0x802294DC; // type:data rom:0x63507C +b_area_sam_gulpit_rocks_DefenseTable = 0x802294E8; // type:data rom:0x635088 +b_area_sam_gulpit_rocks_StatusTable = 0x802294F4; // type:data rom:0x635094 b_area_sam_gulpit_rocks_parts = 0x802295A0; // type:data rom:0x635140 b_area_sam_gulpit_rocks = 0x802295C4; // type:data rom:0x635164 b_area_sam_gulpit_rocks_init = 0x802295EC; // type:data rom:0x63518C @@ -12934,18 +12934,18 @@ b_area_sam_gulpit_rocks_idle = 0x8022973C; // type:data rom:0x6352DC b_area_sam_gulpit_rocks_setAnim = 0x8022974C; // type:data rom:0x6352EC b_area_sam_gulpit_rocks_handleEvent = 0x802297B0; // type:data rom:0x635350 b_area_sam_gulpit_rocks_takeTurn = 0x80229AAC; // type:data rom:0x63564C -b_area_sam_white_clubba_idleAnimations = 0x80229AC0; // type:data rom:0x635660 -b_area_sam_white_clubba_defenseTable = 0x80229B0C; // type:data rom:0x6356AC -b_area_sam_white_clubba_statusTable = 0x80229B28; // type:data rom:0x6356C8 +b_area_sam_white_clubba_IdleAnimations = 0x80229AC0; // type:data rom:0x635660 +b_area_sam_white_clubba_DefenseTable = 0x80229B0C; // type:data rom:0x6356AC +b_area_sam_white_clubba_StatusTable = 0x80229B28; // type:data rom:0x6356C8 b_area_sam_white_clubba_parts = 0x80229BD4; // type:data rom:0x635774 b_area_sam_white_clubba = 0x80229BF8; // type:data rom:0x635798 b_area_sam_white_clubba_init = 0x80229C20; // type:data rom:0x6357C0 b_area_sam_white_clubba_idle = 0x80229C6C; // type:data rom:0x63580C b_area_sam_white_clubba_handleEvent = 0x80229C7C; // type:data rom:0x63581C b_area_sam_white_clubba_takeTurn = 0x8022A18C; // type:data rom:0x635D2C -b_area_sam_frost_piranha_idleAnimations = 0x8022AAB0; // type:data rom:0x636650 -b_area_sam_frost_piranha_defenseTable = 0x8022AAFC; // type:data rom:0x63669C -b_area_sam_frost_piranha_statusTable = 0x8022AB18; // type:data rom:0x6366B8 +b_area_sam_frost_piranha_IdleAnimations = 0x8022AAB0; // type:data rom:0x636650 +b_area_sam_frost_piranha_DefenseTable = 0x8022AAFC; // type:data rom:0x63669C +b_area_sam_frost_piranha_StatusTable = 0x8022AB18; // type:data rom:0x6366B8 b_area_sam_frost_piranha_parts = 0x8022ABC4; // type:data rom:0x636764 b_area_sam_frost_piranha = 0x8022ABE8; // type:data rom:0x636788 b_area_sam_frost_piranha_init = 0x8022AC10; // type:data rom:0x6367B0 @@ -12955,17 +12955,17 @@ b_area_sam_frost_piranha_handleEvent = 0x8022ADFC; // type:data rom:0x63699C b_area_sam_frost_piranha_takeTurn = 0x8022B2D4; // type:data rom:0x636E74 b_area_sam_frost_piranha_attack_bite = 0x8022B3AC; // type:data rom:0x636F4C b_area_sam_frost_piranha_attack_icy_breath = 0x8022BD44; // type:data rom:0x6378E4 -b_area_sam_gray_magikoopa_defenseTable = 0x8022C310; // type:data rom:0x637EB0 -b_area_sam_gray_magikoopa_defenseTable_flying = 0x8022C31C; // type:data rom:0x637EBC -b_area_sam_gray_magikoopa_statusTable = 0x8022C328; // type:data rom:0x637EC8 -b_area_sam_gray_magikoopa_statusTable_flying = 0x8022C3D4; // type:data rom:0x637F74 +b_area_sam_gray_magikoopa_DefenseTable = 0x8022C310; // type:data rom:0x637EB0 +b_area_sam_gray_magikoopa_DefenseTable_flying = 0x8022C31C; // type:data rom:0x637EBC +b_area_sam_gray_magikoopa_StatusTable = 0x8022C328; // type:data rom:0x637EC8 +b_area_sam_gray_magikoopa_StatusTable_flying = 0x8022C3D4; // type:data rom:0x637F74 b_area_sam_gray_magikoopa_parts = 0x8022C480; // type:data rom:0x638020 b_area_sam_gray_magikoopa_parts_flying = 0x8022C4A4; // type:data rom:0x638044 b_area_sam_gray_magikoopa = 0x8022C510; // type:data rom:0x6380B0 b_area_sam_gray_magikoopa_flying = 0x8022C538; // type:data rom:0x6380D8 b_area_sam_gray_magikoopa_idleAnimations1 = 0x8022C560; // type:data rom:0x638100 -b_area_sam_gray_magikoopa_idleAnimations2 = 0x8022C5AC; // type:data rom:0x63814C -b_area_sam_gray_magikoopa_idleAnimations3 = 0x8022C5F8; // type:data rom:0x638198 +b_area_sam_gray_magikoopa_IdleAnimations2 = 0x8022C5AC; // type:data rom:0x63814C +b_area_sam_gray_magikoopa_IdleAnimations3 = 0x8022C5F8; // type:data rom:0x638198 b_area_sam_gray_magikoopa_idle = 0x8022C604; // type:data rom:0x6381A4 b_area_sam_gray_magikoopa_handleEvent = 0x8022C614; // type:data rom:0x6381B4 b_area_sam_gray_magikoopa_canBeKnockedOff = 0x8022CB2C; // type:data rom:0x6386CC @@ -13132,12 +13132,12 @@ b_area_sam2_sam_03_UnkModelStuff_func1 = 0x80219B20; // type:func rom:0x63ED00 b_area_sam2_sam_03_Set80071270_0_16 = 0x80219D18; // type:func rom:0x63EEF8 b_area_sam2_sam_03_UnkFloatFunc2 = 0x80219D3C; // type:func rom:0x63EF1C func_80219E40_63F020 = 0x80219E40; // type:func rom:0x63F020 -b_area_sam2_monstar_defenseTable = 0x80219E60; // type:data rom:0x63F040 -b_area_sam2_monstar_statusTable = 0x80219E74; // type:data rom:0x63F054 +b_area_sam2_monstar_DefenseTable = 0x80219E60; // type:data rom:0x63F040 +b_area_sam2_monstar_StatusTable = 0x80219E74; // type:data rom:0x63F054 b_area_sam2_monstar_parts = 0x80219F20; // type:data rom:0x63F100 b_area_sam2_monstar = 0x80219F68; // type:data rom:0x63F148 -b_area_sam2_monstar_idleAnimations = 0x80219F90; // type:data rom:0x63F170 -b_area_sam2_monstar_idleAnimations2 = 0x80219FE4; // type:data rom:0x63F1C4 +b_area_sam2_monstar_IdleAnimations = 0x80219F90; // type:data rom:0x63F170 +b_area_sam2_monstar_IdleAnimations2 = 0x80219FE4; // type:data rom:0x63F1C4 b_area_sam2_monstar_init = 0x80219FF0; // type:data rom:0x63F1D0 battle_area_sam2_actor_img_png = 0x8021A098; // type:data rom:0x63F278 battle_area_sam2_actor_img_pal = 0x8021A298; // type:data rom:0x63F478 @@ -13150,40 +13150,40 @@ b_area_sam2_monstar_nextTurn = 0x8021B384; // type:data rom:0x640564 b_area_sam2_monstar_takeTurn = 0x8021B394; // type:data rom:0x640574 b_area_sam2_monstar_OnDeath = 0x8021B55C; // type:data rom:0x64073C b_area_sam2_monstar_OnBurn = 0x8021B898; // type:data rom:0x640A78 -b_area_sam2_paragoomba_defenseTable_8021B110 = 0x8021BE90; // type:data rom:0x641070 -b_area_sam2_paragoomba_defenseTable_8021B11C = 0x8021BE9C; // type:data rom:0x64107C -b_area_sam2_paragoomba_statusTable_8021B128 = 0x8021BEA8; // type:data rom:0x641088 -b_area_sam2_paragoomba_statusTable_8021B1D4 = 0x8021BF54; // type:data rom:0x641134 -b_area_sam2_paragoomba_partsTable_8021B280 = 0x8021C000; // type:data rom:0x6411E0 +b_area_sam2_paragoomba_DefenseTable_8021B110 = 0x8021BE90; // type:data rom:0x641070 +b_area_sam2_paragoomba_DefenseTable_8021B11C = 0x8021BE9C; // type:data rom:0x64107C +b_area_sam2_paragoomba_StatusTable_8021B128 = 0x8021BEA8; // type:data rom:0x641088 +b_area_sam2_paragoomba_StatusTable_8021B1D4 = 0x8021BF54; // type:data rom:0x641134 +b_area_sam2_paragoomba_PartsTable_8021B280 = 0x8021C000; // type:data rom:0x6411E0 b_area_sam2_paragoomba = 0x8021C090; // type:data rom:0x641270 -b_area_sam2_paragoomba_idleAnimations_8021B338 = 0x8021C0B8; // type:data rom:0x641298 -b_area_sam2_paragoomba_idleAnimations_8021B384 = 0x8021C104; // type:data rom:0x6412E4 -b_area_sam2_paragoomba_idleAnimations_8021B3D0 = 0x8021C150; // type:data rom:0x641330 -b_area_sam2_paragoomba_idleAnimations_8021B3DC = 0x8021C15C; // type:data rom:0x64133C +b_area_sam2_paragoomba_IdleAnimations_8021B338 = 0x8021C0B8; // type:data rom:0x641298 +b_area_sam2_paragoomba_IdleAnimations_8021B384 = 0x8021C104; // type:data rom:0x6412E4 +b_area_sam2_paragoomba_IdleAnimations_8021B3D0 = 0x8021C150; // type:data rom:0x641330 +b_area_sam2_paragoomba_IdleAnimations_8021B3DC = 0x8021C15C; // type:data rom:0x64133C b_area_sam2_paragoomba_init_8021B3E8 = 0x8021C168; // type:data rom:0x641348 b_area_sam2_paragoomba_idle_8021B434 = 0x8021C1B4; // type:data rom:0x641394 b_area_sam2_paragoomba_8021B6F0 = 0x8021C470; // type:data rom:0x641650 b_area_sam2_paragoomba_handleEvent_8021B768 = 0x8021C4E8; // type:data rom:0x6416C8 b_area_sam2_paragoomba_takeTurn_8021BD5C = 0x8021CADC; // type:data rom:0x641CBC b_area_sam2_paragoomba_8021C574 = 0x8021D2F4; // type:data rom:0x6424D4 -b_area_sam2_paragoomba_idleAnimations_8021CAFC = 0x8021D87C; // type:data rom:0x642A5C -b_area_sam2_paragoomba_idleAnimations_8021CB48 = 0x8021D8C8; // type:data rom:0x642AA8 +b_area_sam2_paragoomba_IdleAnimations_8021CAFC = 0x8021D87C; // type:data rom:0x642A5C +b_area_sam2_paragoomba_IdleAnimations_8021CB48 = 0x8021D8C8; // type:data rom:0x642AA8 b_area_sam2_paragoomba_8021CB94 = 0x8021D914; // type:data rom:0x642AF4 b_area_sam2_paragoomba_idle_8021CBE0 = 0x8021D960; // type:data rom:0x642B40 b_area_sam2_paragoomba_handleEvent_8021CEBC = 0x8021DC3C; // type:data rom:0x642E1C b_area_sam2_paragoomba_sinTable = 0x8021E2FC; // type:data rom:0x6434DC b_area_sam2_paragoomba_takeTurn_8021D6E8 = 0x8021E468; // type:data rom:0x643648 -b_area_sam2_gray_magikoopa_defenseTable = 0x8021F130; // type:data rom:0x644310 -b_area_sam2_gray_magikoopa_defenseTable_flying = 0x8021F13C; // type:data rom:0x64431C -b_area_sam2_gray_magikoopa_statusTable = 0x8021F148; // type:data rom:0x644328 -b_area_sam2_gray_magikoopa_statusTable_flying = 0x8021F1F4; // type:data rom:0x6443D4 +b_area_sam2_gray_magikoopa_DefenseTable = 0x8021F130; // type:data rom:0x644310 +b_area_sam2_gray_magikoopa_DefenseTable_flying = 0x8021F13C; // type:data rom:0x64431C +b_area_sam2_gray_magikoopa_StatusTable = 0x8021F148; // type:data rom:0x644328 +b_area_sam2_gray_magikoopa_StatusTable_flying = 0x8021F1F4; // type:data rom:0x6443D4 b_area_sam2_gray_magikoopa_parts = 0x8021F2A0; // type:data rom:0x644480 b_area_sam2_gray_magikoopa_parts_flying = 0x8021F2C4; // type:data rom:0x6444A4 b_area_sam2_gray_magikoopa = 0x8021F330; // type:data rom:0x644510 b_area_sam2_gray_magikoopa_flying = 0x8021F358; // type:data rom:0x644538 b_area_sam2_gray_magikoopa_idleAnimations1 = 0x8021F380; // type:data rom:0x644560 -b_area_sam2_gray_magikoopa_idleAnimations2 = 0x8021F3CC; // type:data rom:0x6445AC -b_area_sam2_gray_magikoopa_idleAnimations3 = 0x8021F418; // type:data rom:0x6445F8 +b_area_sam2_gray_magikoopa_IdleAnimations2 = 0x8021F3CC; // type:data rom:0x6445AC +b_area_sam2_gray_magikoopa_IdleAnimations3 = 0x8021F418; // type:data rom:0x6445F8 b_area_sam2_gray_magikoopa_idle = 0x8021F424; // type:data rom:0x644604 b_area_sam2_gray_magikoopa_handleEvent = 0x8021F434; // type:data rom:0x644614 b_area_sam2_gray_magikoopa_canBeKnockedOff = 0x8021F94C; // type:data rom:0x644B2C @@ -13257,8 +13257,8 @@ b_area_sam2_Stages = 0x8022352C; // type:data rom:0x64870C b_area_sam2_monstar_dlist = 0x80223570; // type:data rom:0x648750 monstar_bubbles = 0x80223680; // type:data rom:0x648860 b_area_pra_UnkBattleFunc1 = 0x80218000; // type:func rom:0x648E10 -b_area_pra_UnkBattleFunc2 = 0x802180CC; // type:func rom:0x648EDC -b_area_pra_UnkBattleFunc2_2 = 0x80218180; // type:func rom:0x648F90 +b_area_pra_SpawnDrainHealthStartFX = 0x802180CC; // type:func rom:0x648EDC +b_area_pra_SpawnDrainHealthContinueFX = 0x80218180; // type:func rom:0x648F90 func_80218240_649050 = 0x80218240; // type:func rom:0x649050 b_area_pra_ShrinkActor = 0x80218300; // type:func rom:0x649110 dup3_b_area_pra_GetSelectedMoveID = 0x80218458; // type:func rom:0x649268 @@ -13300,9 +13300,9 @@ b_area_pra2_sam_04_UnkModelStuff_func1 = 0x802186C0; // type:func rom:0x660E10 b_area_pra2_sam_04_Set80071270_0_16 = 0x802188B8; // type:func rom:0x661008 b_area_pra2_sam_04_UnkFloatFunc2 = 0x802188DC; // type:func rom:0x66102C func_802189E0_661130 = 0x802189E0; // type:func rom:0x661130 -b_area_pra2_crystal_king_idleAnimations = 0x80218A00; // type:data rom:0x661150 -b_area_pra2_crystal_king_defenseTable = 0x80218A2C; // type:data rom:0x66117C -b_area_pra2_crystal_king_statusTable = 0x80218A48; // type:data rom:0x661198 +b_area_pra2_crystal_king_IdleAnimations = 0x80218A00; // type:data rom:0x661150 +b_area_pra2_crystal_king_DefenseTable = 0x80218A2C; // type:data rom:0x66117C +b_area_pra2_crystal_king_StatusTable = 0x80218A48; // type:data rom:0x661198 b_area_pra2_crystal_king_parts = 0x80218AF4; // type:data rom:0x661244 b_area_pra2_crystal_king = 0x80218B18; // type:data rom:0x661268 b_area_pra2_crystal_king_init = 0x80218B40; // type:data rom:0x661290 @@ -13315,7 +13315,7 @@ b_area_pra2_crystal_king_handleEvent = 0x80219F30; // type:data rom:0x662680 b_area_pra2_crystal_king_takeTurn = 0x8021AEEC; // type:data rom:0x66363C b_area_pra2_crystal_king_AttackIcyBreath = 0x8021B670; // type:data rom:0x663DC0 b_area_pra2_crystal_king_AttackIceBolt = 0x8021BDBC; // type:data rom:0x66450C -b_area_pra2_crystal_king_clone_statusTable = 0x8021C6DC; // type:data rom:0x664E2C +b_area_pra2_crystal_king_clone_StatusTable = 0x8021C6DC; // type:data rom:0x664E2C b_area_pra2_crystal_king_clone_script = 0x8021C788; // type:data rom:0x664ED8 b_area_pra2_crystal_king_clone_init = 0x8021C798; // type:data rom:0x664EE8 b_area_pra2_crystal_king_clone = 0x8021C7E4; // type:data rom:0x664F34 @@ -13336,11 +13336,11 @@ b_area_pra2_crystal_king_RemoveCrystalBit = 0x8021F150; // type:data rom:0x6678A b_area_pra2_crystal_king_AttackWithCrystalBit = 0x8021F3A4; // type:data rom:0x667AF4 b_area_pra2_crystal_king_NormalAttack = 0x8021F6B0; // type:data rom:0x667E00 b_area_pra2_crystal_king_Heal = 0x8021FE90; // type:data rom:0x6685E0 -b_area_pra2_crystal_bit_idleAnimations_1 = 0x80220480; // type:data rom:0x668BD0 -b_area_pra2_crystal_bit_idleAnimations_2 = 0x8022048C; // type:data rom:0x668BDC -b_area_pra2_crystal_bit_idleAnimations_3 = 0x80220498; // type:data rom:0x668BE8 -b_area_pra2_crystal_bit_defenseTable = 0x802204A4; // type:data rom:0x668BF4 -b_area_pra2_crystal_bit_statusTable = 0x802204C0; // type:data rom:0x668C10 +b_area_pra2_crystal_bit_IdleAnimations_1 = 0x80220480; // type:data rom:0x668BD0 +b_area_pra2_crystal_bit_IdleAnimations_2 = 0x8022048C; // type:data rom:0x668BDC +b_area_pra2_crystal_bit_IdleAnimations_3 = 0x80220498; // type:data rom:0x668BE8 +b_area_pra2_crystal_bit_DefenseTable = 0x802204A4; // type:data rom:0x668BF4 +b_area_pra2_crystal_bit_StatusTable = 0x802204C0; // type:data rom:0x668C10 b_area_pra2_crystal_bit_parts_1 = 0x8022056C; // type:data rom:0x668CBC b_area_pra2_crystal_bit_parts_2 = 0x802205B4; // type:data rom:0x668D04 b_area_pra2_crystal_bit_parts_3 = 0x802205FC; // type:data rom:0x668D4C @@ -13386,8 +13386,8 @@ b_area_pra3_duplighost_SetBackgroundAlpha = 0x80219480; // type:func rom:0x66B20 b_area_pra3_duplighost_GetPartnerAndLevel = 0x802194B8; // type:func rom:0x66B238 b_area_pra3_duplighost_CopyPriority = 0x80219524; // type:func rom:0x66B2A4 b_area_pra3_swoopula_UnkBattleFunc1 = 0x802195F0; // type:func rom:0x66B370 -b_area_pra3_swoopula_UnkBattleFunc2 = 0x802196BC; // type:func rom:0x66B43C -b_area_pra3_swoopula_UnkBattleFunc2_2 = 0x80219770; // type:func rom:0x66B4F0 +b_area_pra3_swoopula_SpawnDrainHealthStartFX = 0x802196BC; // type:func rom:0x66B43C +b_area_pra3_swoopula_SpawnDrainHealthContinueFX = 0x80219770; // type:func rom:0x66B4F0 b_area_pra3_red_magikoopa_ShrinkActor = 0x80219830; // type:func rom:0x66B5B0 b_area_pra3_red_magikoopa_GetSelectedMoveID = 0x80219988; // type:func rom:0x66B708 b_area_pra3_red_magikoopa_UnkBattleFunc1 = 0x802199B4; // type:func rom:0x66B734 @@ -13398,11 +13398,11 @@ b_area_pra3_gray_magikoopa_GetSelectedMoveID = 0x80219CF8; // type:func rom:0x66 b_area_pra3_gray_magikoopa_UnkBattleFunc1 = 0x80219D24; // type:func rom:0x66BAA4 b_area_pra3_gray_magikoopa_StartRumbleWithParams = 0x80219DF0; // type:func rom:0x66BB70 b_area_pra3_gray_magikoopa_UnkFunc52 = 0x80219E48; // type:func rom:0x66BBC8 -b_area_pra3_duplighost_idleAnimations = 0x80219F10; // type:data rom:0x66BC90 -b_area_pra3_duplighost_idleAnimations2 = 0x80219F5C; // type:data rom:0x66BCDC -b_area_pra3_duplighost_idleAnimations3 = 0x80219F68; // type:data rom:0x66BCE8 -b_area_pra3_duplighost_defenseTable = 0x80219F74; // type:data rom:0x66BCF4 -b_area_pra3_duplighost_statusTable = 0x80219F80; // type:data rom:0x66BD00 +b_area_pra3_duplighost_IdleAnimations = 0x80219F10; // type:data rom:0x66BC90 +b_area_pra3_duplighost_IdleAnimations2 = 0x80219F5C; // type:data rom:0x66BCDC +b_area_pra3_duplighost_IdleAnimations3 = 0x80219F68; // type:data rom:0x66BCE8 +b_area_pra3_duplighost_DefenseTable = 0x80219F74; // type:data rom:0x66BCF4 +b_area_pra3_duplighost_StatusTable = 0x80219F80; // type:data rom:0x66BD00 b_area_pra3_duplighost_parts = 0x8021A02C; // type:data rom:0x66BDAC b_area_pra3_duplighost = 0x8021A050; // type:data rom:0x66BDD0 b_area_pra3_duplighost_init = 0x8021A078; // type:data rom:0x66BDF8 @@ -13416,9 +13416,9 @@ b_area_pra3_duplighost_OnHitElectric = 0x8021ACB4; // type:data rom:0x66CA34 b_area_pra3_duplighost_OnShockHit = 0x8021B178; // type:data rom:0x66CEF8 b_area_pra3_duplighost_OnShockDeath = 0x8021B804; // type:data rom:0x66D584 b_area_pra3_duplighost_pos_summon = 0x8021BB68; // type:data rom:0x66D8E8 -b_area_pra3_duplighost_goombario_idleAnimations = 0x8021BB74; // type:data rom:0x66D8F4 -b_area_pra3_duplighost_goombario_defenseTable = 0x8021BBC0; // type:data rom:0x66D940 -b_area_pra3_duplighost_goombario_statusTable = 0x8021BBCC; // type:data rom:0x66D94C +b_area_pra3_duplighost_goombario_IdleAnimations = 0x8021BB74; // type:data rom:0x66D8F4 +b_area_pra3_duplighost_goombario_DefenseTable = 0x8021BBC0; // type:data rom:0x66D940 +b_area_pra3_duplighost_goombario_StatusTable = 0x8021BBCC; // type:data rom:0x66D94C b_area_pra3_duplighost_goombario_parts = 0x8021BC78; // type:data rom:0x66D9F8 b_area_pra3_duplighost_goombario = 0x8021BC9C; // type:data rom:0x66DA1C b_area_pra3_duplighost_goombario_init = 0x8021BCC4; // type:data rom:0x66DA44 @@ -13431,11 +13431,11 @@ b_area_pra3_duplighost_goombario_attack = 0x8021C8E4; // type:data rom:0x66E664 b_area_pra3_duplighost_goombario_tattle = 0x8021D370; // type:data rom:0x66F0F0 b_area_pra3_duplighost_goombario_takeTurn = 0x8021D684; // type:data rom:0x66F404 b_area_pra3_duplighost_formation_goombario = 0x8021D6E0; // type:data rom:0x66F460 -b_area_pra3_duplighost_kooper_idleAnimations = 0x8021D6FC; // type:data rom:0x66F47C -b_area_pra3_duplighost_kooper_idleAnimations2 = 0x8021D748; // type:data rom:0x66F4C8 -b_area_pra3_duplighost_kooper_defenseTable = 0x8021D794; // type:data rom:0x66F514 +b_area_pra3_duplighost_kooper_IdleAnimations = 0x8021D6FC; // type:data rom:0x66F47C +b_area_pra3_duplighost_kooper_IdleAnimations2 = 0x8021D748; // type:data rom:0x66F4C8 +b_area_pra3_duplighost_kooper_DefenseTable = 0x8021D794; // type:data rom:0x66F514 b_area_pra3_duplighost_kooper_defenseTable2 = 0x8021D7A0; // type:data rom:0x66F520 -b_area_pra3_duplighost_kooper_statusTable = 0x8021D7AC; // type:data rom:0x66F52C +b_area_pra3_duplighost_kooper_StatusTable = 0x8021D7AC; // type:data rom:0x66F52C b_area_pra3_duplighost_kooper_parts = 0x8021D858; // type:data rom:0x66F5D8 b_area_pra3_duplighost_kooper = 0x8021D87C; // type:data rom:0x66F5FC b_area_pra3_duplighost_kooper_init = 0x8021D8A4; // type:data rom:0x66F624 @@ -13444,9 +13444,9 @@ b_area_pra3_duplighost_kooper_dispOffsets = 0x8021DA40; // type:data rom:0x66F7C b_area_pra3_duplighost_kooper_handleEvent = 0x8021DA98; // type:data rom:0x66F818 b_area_pra3_duplighost_kooper_takeTurn = 0x8021E3F4; // type:data rom:0x670174 b_area_pra3_duplighost_formation_kooper = 0x8021F394; // type:data rom:0x671114 -b_area_pra3_duplighost_bombette_idleAnimations = 0x8021F3B0; // type:data rom:0x671130 -b_area_pra3_duplighost_bombette_defenseTable = 0x8021F3FC; // type:data rom:0x67117C -b_area_pra3_duplighost_bombette_statusTable = 0x8021F408; // type:data rom:0x671188 +b_area_pra3_duplighost_bombette_IdleAnimations = 0x8021F3B0; // type:data rom:0x671130 +b_area_pra3_duplighost_bombette_DefenseTable = 0x8021F3FC; // type:data rom:0x67117C +b_area_pra3_duplighost_bombette_StatusTable = 0x8021F408; // type:data rom:0x671188 b_area_pra3_duplighost_bombette_parts = 0x8021F4B4; // type:data rom:0x671234 b_area_pra3_duplighost_bombette = 0x8021F4D8; // type:data rom:0x671258 b_area_pra3_duplighost_bombette_init = 0x8021F500; // type:data rom:0x671280 @@ -13455,9 +13455,9 @@ b_area_pra3_duplighost_bombette_playEffects = 0x8021F55C; // type:data rom:0x671 b_area_pra3_duplighost_bombette_handleEvent = 0x8021F6D4; // type:data rom:0x671454 b_area_pra3_duplighost_bombette_takeTurn = 0x8021FD20; // type:data rom:0x671AA0 b_area_pra3_duplighost_formation_bombette = 0x802205F4; // type:data rom:0x672374 -b_area_pra3_duplighost_parakarry_idleAnimations = 0x80220610; // type:data rom:0x672390 -b_area_pra3_duplighost_parakarry_defenseTable = 0x8022065C; // type:data rom:0x6723DC -b_area_pra3_duplighost_parakarry_statusTable = 0x80220668; // type:data rom:0x6723E8 +b_area_pra3_duplighost_parakarry_IdleAnimations = 0x80220610; // type:data rom:0x672390 +b_area_pra3_duplighost_parakarry_DefenseTable = 0x8022065C; // type:data rom:0x6723DC +b_area_pra3_duplighost_parakarry_StatusTable = 0x80220668; // type:data rom:0x6723E8 b_area_pra3_duplighost_parakarry_parts = 0x80220714; // type:data rom:0x672494 b_area_pra3_duplighost_parakarry = 0x8022075C; // type:data rom:0x6724DC b_area_pra3_duplighost_parakarry_init = 0x80220784; // type:data rom:0x672504 @@ -13466,9 +13466,9 @@ b_area_pra3_duplighost_parakarry_handleEvent = 0x802207E0; // type:data rom:0x67 b_area_pra3_duplighost_parakarry_doTakeTurn = 0x80220DD4; // type:data rom:0x672B54 b_area_pra3_duplighost_parakarry_takeTurn = 0x80221564; // type:data rom:0x6732E4 b_area_pra3_duplighost_formation_parakarry = 0x80221580; // type:data rom:0x673300 -b_area_pra3_duplighost_bow_idleAnimations = 0x8022159C; // type:data rom:0x67331C -b_area_pra3_duplighost_bow_defenseTable = 0x802215E8; // type:data rom:0x673368 -b_area_pra3_duplighost_bow_statusTable = 0x802215F4; // type:data rom:0x673374 +b_area_pra3_duplighost_bow_IdleAnimations = 0x8022159C; // type:data rom:0x67331C +b_area_pra3_duplighost_bow_DefenseTable = 0x802215E8; // type:data rom:0x673368 +b_area_pra3_duplighost_bow_StatusTable = 0x802215F4; // type:data rom:0x673374 b_area_pra3_duplighost_bow_parts = 0x802216A0; // type:data rom:0x673420 b_area_pra3_duplighost_bow = 0x802216E8; // type:data rom:0x673468 b_area_pra3_duplighost_bow_init = 0x80221710; // type:data rom:0x673490 @@ -13476,9 +13476,9 @@ b_area_pra3_duplighost_bow_idle = 0x8022175C; // type:data rom:0x6734DC b_area_pra3_duplighost_bow_handleEvent = 0x8022176C; // type:data rom:0x6734EC b_area_pra3_duplighost_bow_takeTurn = 0x80221CFC; // type:data rom:0x673A7C b_area_pra3_duplighost_formation_bow = 0x80222950; // type:data rom:0x6746D0 -b_area_pra3_duplighost_watt_idleAnimations = 0x8022296C; // type:data rom:0x6746EC -b_area_pra3_duplighost_watt_defenseTable = 0x802229B8; // type:data rom:0x674738 -b_area_pra3_duplighost_watt_statusTable = 0x802229CC; // type:data rom:0x67474C +b_area_pra3_duplighost_watt_IdleAnimations = 0x8022296C; // type:data rom:0x6746EC +b_area_pra3_duplighost_watt_DefenseTable = 0x802229B8; // type:data rom:0x674738 +b_area_pra3_duplighost_watt_StatusTable = 0x802229CC; // type:data rom:0x67474C b_area_pra3_duplighost_watt_parts = 0x80222A78; // type:data rom:0x6747F8 b_area_pra3_duplighost_watt = 0x80222AC0; // type:data rom:0x674840 b_area_pra3_duplighost_watt_init = 0x80222AE8; // type:data rom:0x674868 @@ -13486,9 +13486,9 @@ b_area_pra3_duplighost_watt_idle = 0x80222B34; // type:data rom:0x6748B4 b_area_pra3_duplighost_watt_handleEvent = 0x80222B5C; // type:data rom:0x6748DC b_area_pra3_duplighost_watt_takeTurn = 0x80222FD0; // type:data rom:0x674D50 b_area_pra3_duplighost_formation_watt = 0x8022384C; // type:data rom:0x6755CC -b_area_pra3_duplighost_sushie_idleAnimations = 0x80223868; // type:data rom:0x6755E8 -b_area_pra3_duplighost_sushie_defenseTable = 0x802238B4; // type:data rom:0x675634 -b_area_pra3_duplighost_sushie_statusTable = 0x802238C0; // type:data rom:0x675640 +b_area_pra3_duplighost_sushie_IdleAnimations = 0x80223868; // type:data rom:0x6755E8 +b_area_pra3_duplighost_sushie_DefenseTable = 0x802238B4; // type:data rom:0x675634 +b_area_pra3_duplighost_sushie_StatusTable = 0x802238C0; // type:data rom:0x675640 b_area_pra3_duplighost_sushie_parts = 0x8022396C; // type:data rom:0x6756EC b_area_pra3_duplighost_sushie = 0x80223990; // type:data rom:0x675710 b_area_pra3_duplighost_sushie_init = 0x802239B8; // type:data rom:0x675738 @@ -13496,10 +13496,10 @@ b_area_pra3_duplighost_sushie_idle = 0x80223A04; // type:data rom:0x675784 b_area_pra3_duplighost_sushie_handleEvent = 0x80223A14; // type:data rom:0x675794 b_area_pra3_duplighost_sushie_takeTurn = 0x80223F84; // type:data rom:0x675D04 b_area_pra3_duplighost_formation_sushie = 0x802251E4; // type:data rom:0x676F64 -b_area_pra3_duplighost_lakilester_idleAnimations = 0x80225200; // type:data rom:0x676F80 -b_area_pra3_duplighost_lakilester_idleAnimations2 = 0x8022524C; // type:data rom:0x676FCC -b_area_pra3_duplighost_lakilester_defenseTable = 0x80225258; // type:data rom:0x676FD8 -b_area_pra3_duplighost_lakilester_statusTable = 0x80225264; // type:data rom:0x676FE4 +b_area_pra3_duplighost_lakilester_IdleAnimations = 0x80225200; // type:data rom:0x676F80 +b_area_pra3_duplighost_lakilester_IdleAnimations2 = 0x8022524C; // type:data rom:0x676FCC +b_area_pra3_duplighost_lakilester_DefenseTable = 0x80225258; // type:data rom:0x676FD8 +b_area_pra3_duplighost_lakilester_StatusTable = 0x80225264; // type:data rom:0x676FE4 b_area_pra3_duplighost_lakilester_parts = 0x80225310; // type:data rom:0x677090 b_area_pra3_duplighost_lakilester = 0x80225358; // type:data rom:0x6770D8 b_area_pra3_duplighost_lakilester_init = 0x80225380; // type:data rom:0x677100 @@ -13509,12 +13509,12 @@ b_area_pra3_duplighost_lakilester_takeTurn = 0x802259A4; // type:data rom:0x6777 b_area_pra3_duplighost_formation_lakilester = 0x80226484; // type:data rom:0x678204 b_area_pra3_duplighost_copyPartner = 0x802264A0; // type:data rom:0x678220 b_area_pra3_duplighost_takeTurn = 0x80226CC0; // type:data rom:0x678A40 -b_area_pra3_swoopula_defenseTable = 0x80226E50; // type:data rom:0x678BD0 -b_area_pra3_swoopula_statusTable = 0x80226E5C; // type:data rom:0x678BDC +b_area_pra3_swoopula_DefenseTable = 0x80226E50; // type:data rom:0x678BD0 +b_area_pra3_swoopula_StatusTable = 0x80226E5C; // type:data rom:0x678BDC b_area_pra3_swoopula_parts = 0x80226F08; // type:data rom:0x678C88 b_area_pra3_swoopula = 0x80226F2C; // type:data rom:0x678CAC -b_area_pra3_swoopula_idleAnimations = 0x80226F54; // type:data rom:0x678CD4 -b_area_pra3_swoopula_idleAnimations_flying = 0x80226FA0; // type:data rom:0x678D20 +b_area_pra3_swoopula_IdleAnimations = 0x80226F54; // type:data rom:0x678CD4 +b_area_pra3_swoopula_IdleAnimations_flying = 0x80226FA0; // type:data rom:0x678D20 b_area_pra3_swoopula_init = 0x80226FEC; // type:data rom:0x678D6C b_area_pra3_swoopula_idle = 0x80227050; // type:data rom:0x678DD0 b_area_pra3_swoopula_returnHome = 0x80227060; // type:data rom:0x678DE0 @@ -13523,9 +13523,9 @@ b_area_pra3_swoopula_knockDown = 0x802276A4; // type:data rom:0x679424 b_area_pra3_swoopula_handleEvent = 0x80227A04; // type:data rom:0x679784 b_area_pra3_swoopula_takeTurn_flying = 0x80228184; // type:data rom:0x679F04 b_area_pra3_swoopula_takeTurn = 0x80229DA4; // type:data rom:0x67BB24 -b_area_pra3_white_clubba_idleAnimations = 0x8022B130; // type:data rom:0x67CEB0 -b_area_pra3_white_clubba_defenseTable = 0x8022B17C; // type:data rom:0x67CEFC -b_area_pra3_white_clubba_statusTable = 0x8022B198; // type:data rom:0x67CF18 +b_area_pra3_white_clubba_IdleAnimations = 0x8022B130; // type:data rom:0x67CEB0 +b_area_pra3_white_clubba_DefenseTable = 0x8022B17C; // type:data rom:0x67CEFC +b_area_pra3_white_clubba_StatusTable = 0x8022B198; // type:data rom:0x67CF18 b_area_pra3_white_clubba_parts = 0x8022B244; // type:data rom:0x67CFC4 b_area_pra3_white_clubba = 0x8022B268; // type:data rom:0x67CFE8 b_area_pra3_white_clubba_init = 0x8022B290; // type:data rom:0x67D010 @@ -13554,17 +13554,17 @@ b_area_pra3_red_magikoopa_8022E334 = 0x8022E334; // type:data rom:0x6800B4 b_area_pra3_red_magikoopa_8022E558 = 0x8022E558; // type:data rom:0x6802D8 b_area_pra3_red_magikoopa_8022E5FC = 0x8022E5FC; // type:data rom:0x68037C b_area_pra3_red_magikoopa_8022E6A0 = 0x8022E6A0; // type:data rom:0x680420 -b_area_pra3_gray_magikoopa_defenseTable = 0x8022EDE0; // type:data rom:0x680B60 -b_area_pra3_gray_magikoopa_defenseTable_flying = 0x8022EDEC; // type:data rom:0x680B6C -b_area_pra3_gray_magikoopa_statusTable = 0x8022EDF8; // type:data rom:0x680B78 -b_area_pra3_gray_magikoopa_statusTable_flying = 0x8022EEA4; // type:data rom:0x680C24 +b_area_pra3_gray_magikoopa_DefenseTable = 0x8022EDE0; // type:data rom:0x680B60 +b_area_pra3_gray_magikoopa_DefenseTable_flying = 0x8022EDEC; // type:data rom:0x680B6C +b_area_pra3_gray_magikoopa_StatusTable = 0x8022EDF8; // type:data rom:0x680B78 +b_area_pra3_gray_magikoopa_StatusTable_flying = 0x8022EEA4; // type:data rom:0x680C24 b_area_pra3_gray_magikoopa_parts = 0x8022EF50; // type:data rom:0x680CD0 b_area_pra3_gray_magikoopa_parts_flying = 0x8022EF74; // type:data rom:0x680CF4 b_area_pra3_gray_magikoopa = 0x8022EFE0; // type:data rom:0x680D60 b_area_pra3_gray_magikoopa_flying = 0x8022F008; // type:data rom:0x680D88 b_area_pra3_gray_magikoopa_idleAnimations1 = 0x8022F030; // type:data rom:0x680DB0 -b_area_pra3_gray_magikoopa_idleAnimations2 = 0x8022F07C; // type:data rom:0x680DFC -b_area_pra3_gray_magikoopa_idleAnimations3 = 0x8022F0C8; // type:data rom:0x680E48 +b_area_pra3_gray_magikoopa_IdleAnimations2 = 0x8022F07C; // type:data rom:0x680DFC +b_area_pra3_gray_magikoopa_IdleAnimations3 = 0x8022F0C8; // type:data rom:0x680E48 b_area_pra3_gray_magikoopa_idle = 0x8022F0D4; // type:data rom:0x680E54 b_area_pra3_gray_magikoopa_handleEvent = 0x8022F0E4; // type:data rom:0x680E64 b_area_pra3_gray_magikoopa_canBeKnockedOff = 0x8022F5FC; // type:data rom:0x68137C @@ -13827,8 +13827,8 @@ func_802183EC_6DC18C = 0x802183EC; // type:func rom:0x6DC18C func_8021849C_6DC23C = 0x8021849C; // type:func rom:0x6DC23C b_area_kkj_SetLightningBoltPurple = 0x80218550; // type:func rom:0x6DC2F0 b_area_dig_UnkBattleFunc1 = 0x80218000; // type:func rom:0x6DDDC0 -b_area_dig_UnkBattleFunc2 = 0x802180D0; // type:func rom:0x6DDE90 -b_area_dig_UnkBattleFunc2_2 = 0x80218184; // type:func rom:0x6DDF44 +b_area_dig_SpawnDrainHealthStartFX = 0x802180D0; // type:func rom:0x6DDE90 +b_area_dig_SpawnDrainHealthContinueFX = 0x80218184; // type:func rom:0x6DDF44 dup_b_area_dig_UnkBattleFunc1 = 0x80218240; // type:func rom:0x6DE000 dup2_b_area_dig_UnkBattleFunc1 = 0x80218310; // type:func rom:0x6DE0D0 b_area_dig_IsSaveVar123 = 0x802183E0; // type:func rom:0x6DE1A0 @@ -13842,10 +13842,10 @@ func_802186E0_6DE4A0 = 0x802186E0; // type:func rom:0x6DE4A0 func_80218770_6DE530 = 0x80218770; // type:func rom:0x6DE530 func_802187F0_6DE5B0 = 0x802187F0; // type:func rom:0x6DE5B0 dup_b_area_dig_SetDemoBattleBeginDelay = 0x80218890; // type:func rom:0x6DE650 -battle_partner_goombario_idleAnimations_80238000 = 0x80238000; // type:data rom:0x6F0B30 -battle_partner_goombario_defenseTable_8023800C = 0x8023800C; // type:data rom:0x6F0B3C -battle_partner_goombario_statusTable_80238018 = 0x80238018; // type:data rom:0x6F0B48 -battle_partner_goombario_partsTable_802380C4 = 0x802380C4; // type:data rom:0x6F0BF4 +battle_partner_goombario_IdleAnimations_80238000 = 0x80238000; // type:data rom:0x6F0B30 +battle_partner_goombario_DefenseTable_8023800C = 0x8023800C; // type:data rom:0x6F0B3C +battle_partner_goombario_StatusTable_80238018 = 0x80238018; // type:data rom:0x6F0B48 +battle_partner_goombario_PartsTable_802380C4 = 0x802380C4; // type:data rom:0x6F0BF4 battle_partner_goombario = 0x802380E8; // type:data rom:0x6F0C18 battle_partner_goombario_init_80238110 = 0x80238110; // type:data rom:0x6F0C40 battle_partner_goombario_idle_8023818C = 0x8023818C; // type:data rom:0x6F0CBC @@ -13870,10 +13870,10 @@ battle_partner_goombario_StopChargeAndGet = 0x80239068; // type:func rom:0x6F214 battle_partner_goombario_GetChargeAmount = 0x802390B0; // type:func rom:0x6F2190 battle_partner_goombario_PlayChargeFX = 0x802390C8; // type:func rom:0x6F21A8 battle_partner_goombario_GetChargeMessage = 0x80239190; // type:func rom:0x6F2270 -battle_partner_goombario_idleAnimations_802391B0 = 0x802391B0; // type:data rom:0x6F2290 -battle_partner_goombario_defenseTable_802391EC = 0x802391EC; // type:data rom:0x6F22CC -battle_partner_goombario_statusTable_802391F8 = 0x802391F8; // type:data rom:0x6F22D8 -battle_partner_goombario_partsTable_802392A4 = 0x802392A4; // type:data rom:0x6F2384 +battle_partner_goombario_IdleAnimations_802391B0 = 0x802391B0; // type:data rom:0x6F2290 +battle_partner_goombario_DefenseTable_802391EC = 0x802391EC; // type:data rom:0x6F22CC +battle_partner_goombario_StatusTable_802391F8 = 0x802391F8; // type:data rom:0x6F22D8 +battle_partner_goombario_PartsTable_802392A4 = 0x802392A4; // type:data rom:0x6F2384 battle_partner_goombario_goombario = 0x802392C8; // type:data rom:0x6F23A8 battle_partner_goombario_init_802392F0 = 0x802392F0; // type:data rom:0x6F23D0 battle_partner_goombario_idle_80239350 = 0x80239350; // type:data rom:0x6F2430 @@ -13910,10 +13910,10 @@ func_80238000_6F5E80 = 0x80238000; // type:func rom:0x6F5E80 func_80238114_6F5F94 = 0x80238114; // type:func rom:0x6F5F94 battle_partner_kooper_AverageTargetDizzyChance = 0x80238298; // type:func rom:0x6F6118 func_802383C0_6F6240 = 0x802383C0; // type:func rom:0x6F6240 -battle_partner_kooper_idleAnimations_80238430 = 0x80238430; // type:data rom:0x6F62B0 -battle_partner_kooper_defenseTable_8023846C = 0x8023846C; // type:data rom:0x6F62EC -battle_partner_kooper_statusTable_80238478 = 0x80238478; // type:data rom:0x6F62F8 -battle_partner_kooper_partsTable_80238524 = 0x80238524; // type:data rom:0x6F63A4 +battle_partner_kooper_IdleAnimations_80238430 = 0x80238430; // type:data rom:0x6F62B0 +battle_partner_kooper_DefenseTable_8023846C = 0x8023846C; // type:data rom:0x6F62EC +battle_partner_kooper_StatusTable_80238478 = 0x80238478; // type:data rom:0x6F62F8 +battle_partner_kooper_PartsTable_80238524 = 0x80238524; // type:data rom:0x6F63A4 battle_partner_kooper = 0x80238548; // type:data rom:0x6F63C8 battle_partner_kooper_init_80238570 = 0x80238570; // type:data rom:0x6F63F0 battle_partner_kooper_idle_802385D0 = 0x802385D0; // type:data rom:0x6F6450 @@ -13938,10 +13938,10 @@ func_80238244_6FAF54 = 0x80238244; // type:func rom:0x6FAF54 func_80238358_6FB068 = 0x80238358; // type:func rom:0x6FB068 func_8023849C_6FB1AC = 0x8023849C; // type:func rom:0x6FB1AC func_80238590_6FB2A0 = 0x80238590; // type:func rom:0x6FB2A0 -battle_partner_bombette_idleAnimations_80238640 = 0x80238640; // type:data rom:0x6FB350 -battle_partner_bombette_defenseTable_8023867C = 0x8023867C; // type:data rom:0x6FB38C -battle_partner_bombette_statusTable_80238688 = 0x80238688; // type:data rom:0x6FB398 -battle_partner_bombette_partsTable_80238734 = 0x80238734; // type:data rom:0x6FB444 +battle_partner_bombette_IdleAnimations_80238640 = 0x80238640; // type:data rom:0x6FB350 +battle_partner_bombette_DefenseTable_8023867C = 0x8023867C; // type:data rom:0x6FB38C +battle_partner_bombette_StatusTable_80238688 = 0x80238688; // type:data rom:0x6FB398 +battle_partner_bombette_PartsTable_80238734 = 0x80238734; // type:data rom:0x6FB444 battle_partner_bombette = 0x80238758; // type:data rom:0x6FB468 battle_partner_bombette_init_80238780 = 0x80238780; // type:data rom:0x6FB490 battle_partner_bombette_idle_802387E0 = 0x802387E0; // type:data rom:0x6FB4F0