Skip to content

Commit

Permalink
lee done
Browse files Browse the repository at this point in the history
  • Loading branch information
HailSanta authored and HailSanta committed Aug 20, 2023
1 parent 3523c12 commit 9d58830
Show file tree
Hide file tree
Showing 19 changed files with 546 additions and 531 deletions.
10 changes: 5 additions & 5 deletions include/effects.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2604,11 +2604,11 @@ typedef struct EffectInstance {

// composite struct for watt effects -- NOT the same as StaticStatusFXData
typedef struct WattEffectData {
/* 0x00 */ s32 flags;
/* 0x04 */ s32 unk_04;
/* 0x08 */ s32 angle;
/* 0x0C */ s32 unk_0C;
/* 0x10 */ s32 unk_10;
/* 0x00 */ s32 initialized;
/* 0x04 */ s32 isBouncing;
/* 0x08 */ s32 bouncePhase;
/* 0x0C */ s32 isActive;
/* 0x10 */ s32 currentEffectIndex;
/* 0x14 */ EffectInstance* effect1;
/* 0x18 */ EffectInstance* effect2;
/* 0x1C */ s32 debuff;
Expand Down
2 changes: 1 addition & 1 deletion include/enums.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2105,7 +2105,7 @@ enum Events {
EVENT_FALL_TRIGGER = 0x0000000C,
EVENT_FLIP_TRIGGER = 0x0000000D,
EVENT_BURN_HIT = 0x0000000E,
EVENT_15 = 0x0000000F,
EVENT_15 = 0x0000000F, // FLAME_HIT?
EVENT_SPIN_SMASH_LAUNCH_HIT = 0x00000011,
EVENT_SHELL_CRACK_HIT = 0x00000012,
EVENT_STAR_BEAM = 0x00000013,
Expand Down
2 changes: 1 addition & 1 deletion src/80850_len_3060.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ void clear_player_data(void) {

for (i = 0; i < ARRAY_COUNT(playerData->partners); i++) {
playerData->partners[i].enabled = FALSE;
playerData->partners[i].level = 0;
playerData->partners[i].level = PARTNER_RANK_NORMAL;
playerData->partners[i].unk_02[0] = 0;
playerData->partners[i].unk_02[1] = 0;
playerData->partners[i].unk_02[2] = 0;
Expand Down
72 changes: 36 additions & 36 deletions src/battle/area/hos/actor/magikoopa.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -486,27 +486,27 @@ EvtScript N(handleEvent_8021E6D8) = {
EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_MAIN, 255)
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0)
EVT_CASE_EQ(9)
EVT_CASE_EQ(EVENT_HIT_COMBO)
EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Unk_0, LVar0)
EVT_BITWISE_OR_CONST(LVar0, 1)
EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Unk_0, LVar0)
EVT_SET_CONST(LVar0, PRT_MAIN)
EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim04)
EVT_EXEC_WAIT(EVS_Enemy_Hit)
EVT_CASE_OR_EQ(10)
EVT_CASE_OR_EQ(61)
EVT_CASE_OR_EQ(EVENT_HIT)
EVT_CASE_OR_EQ(EVENT_UP_AND_AWAY)
EVT_SET_CONST(LVar0, PRT_MAIN)
EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim04)
EVT_EXEC_WAIT(EVS_Enemy_Hit)
EVT_EXEC_WAIT(N(8021E46C))
EVT_END_CASE_GROUP
EVT_CASE_EQ(14)
EVT_CASE_EQ(EVENT_BURN_HIT)
EVT_SET_CONST(LVar0, PRT_MAIN)
EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim05)
EVT_SET_CONST(LVar2, ANIM_Magikoopa_Anim06)
EVT_EXEC_WAIT(EVS_Enemy_BurnHit)
EVT_EXEC_WAIT(N(8021E46C))
EVT_CASE_EQ(36)
EVT_CASE_EQ(EVENT_BURN_DEATH)
EVT_SET_CONST(LVar0, PRT_MAIN)
EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim05)
EVT_SET_CONST(LVar2, ANIM_Magikoopa_Anim06)
Expand All @@ -516,12 +516,12 @@ EvtScript N(handleEvent_8021E6D8) = {
EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim06)
EVT_EXEC_WAIT(EVS_Enemy_Death)
EVT_RETURN
EVT_CASE_EQ(11)
EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT)
EVT_SET_CONST(LVar0, PRT_MAIN)
EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim04)
EVT_EXEC_WAIT(EVS_Enemy_SpinSmashHit)
EVT_EXEC_WAIT(N(8021E46C))
EVT_CASE_EQ(33)
EVT_CASE_EQ(EVENT_SPIN_SMASH_DEATH)
EVT_SET_CONST(LVar0, PRT_MAIN)
EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim04)
EVT_EXEC_WAIT(EVS_Enemy_SpinSmashHit)
Expand All @@ -530,11 +530,11 @@ EvtScript N(handleEvent_8021E6D8) = {
EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim04)
EVT_EXEC_WAIT(EVS_Enemy_Death)
EVT_RETURN
EVT_CASE_EQ(23)
EVT_CASE_EQ(EVENT_ZERO_DAMAGE)
EVT_SET_CONST(LVar0, PRT_MAIN)
EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim01)
EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit)
EVT_CASE_EQ(25)
EVT_CASE_EQ(EVENT_IMMUNE)
EVT_SET_CONST(LVar0, PRT_MAIN)
EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim01)
EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit)
Expand All @@ -547,7 +547,7 @@ EvtScript N(handleEvent_8021E6D8) = {
EVT_IF_NE(LVar0, 0)
EVT_EXEC_WAIT(N(8021E46C))
EVT_END_IF
EVT_CASE_EQ(32)
EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, PRT_MAIN)
EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim04)
EVT_EXEC_WAIT(EVS_Enemy_Hit)
Expand All @@ -557,11 +557,11 @@ EvtScript N(handleEvent_8021E6D8) = {
EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim04)
EVT_EXEC_WAIT(EVS_Enemy_Death)
EVT_RETURN
EVT_CASE_EQ(49)
EVT_CASE_EQ(EVENT_RECOVER_STATUS)
EVT_SET_CONST(LVar0, PRT_MAIN)
EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim01)
EVT_EXEC_WAIT(EVS_Enemy_Recover)
EVT_CASE_EQ(57)
EVT_CASE_EQ(EVENT_SCARE_AWAY)
EVT_EXEC_WAIT(N(8021E46C))
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Magikoopa_Anim04)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.5))
Expand All @@ -572,11 +572,11 @@ EvtScript N(handleEvent_8021E6D8) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Magikoopa_Anim02)
EVT_EXEC_WAIT(N(runAway))
EVT_RETURN
EVT_CASE_EQ(58)
EVT_CASE_EQ(EVENT_BEGIN_AIR_LIFT)
EVT_SET_CONST(LVar0, PRT_MAIN)
EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim02)
EVT_EXEC_WAIT(EVS_Enemy_AirLift)
EVT_CASE_EQ(22)
EVT_CASE_EQ(EVENT_BLOW_AWAY)
EVT_EXEC_WAIT(N(8021E46C))
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0)
EVT_IF_NOT_FLAG(LVar0, STATUS_FLAGS_IMMOBILIZED)
Expand All @@ -590,11 +590,11 @@ EvtScript N(handleEvent_8021E6D8) = {
EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim04)
EVT_EXEC_WAIT(EVS_Enemy_BlowAway)
EVT_RETURN
EVT_CASE_EQ(31)
EVT_CASE_EQ(EVENT_AIR_LIFT_FAILED)
EVT_SET_CONST(LVar0, PRT_MAIN)
EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim01)
EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit)
EVT_CASE_EQ(19)
EVT_CASE_EQ(EVENT_STAR_BEAM)
EVT_SET_CONST(LVar0, PRT_MAIN)
EVT_SET_CONST(LVar1, ANIM_Magikoopa_Anim04)
EVT_EXEC_WAIT(EVS_Enemy_Hit)
Expand All @@ -613,30 +613,30 @@ EvtScript N(handleEvent_8021EDF0) = {
EVT_CALL(SetPartAlpha, ACTOR_SELF, PRT_2, 255)
EVT_CALL(GetLastEvent, ACTOR_SELF, LVar0)
EVT_SWITCH(LVar0)
EVT_CASE_EQ(9)
EVT_CASE_EQ(EVENT_HIT_COMBO)
EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_Unk_0, LVar0)
EVT_BITWISE_OR_CONST(LVar0, 1)
EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_Unk_0, LVar0)
EVT_EXEC_WAIT(N(8021D784))
EVT_SET_CONST(LVar0, PRT_2)
EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim04)
EVT_EXEC_WAIT(EVS_Enemy_Hit)
EVT_CASE_OR_EQ(10)
EVT_CASE_OR_EQ(12)
EVT_CASE_OR_EQ(EVENT_HIT)
EVT_CASE_OR_EQ(EVENT_FALL_TRIGGER)
EVT_EXEC_WAIT(N(8021D784))
EVT_SET_CONST(LVar0, PRT_2)
EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim04)
EVT_EXEC_WAIT(EVS_Enemy_Hit)
EVT_EXEC_WAIT(N(8021E46C))
EVT_EXEC_WAIT(N(8021D890))
EVT_END_CASE_GROUP
EVT_CASE_EQ(61)
EVT_CASE_EQ(EVENT_UP_AND_AWAY)
EVT_SET_CONST(LVar0, PRT_2)
EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim04)
EVT_EXEC_WAIT(EVS_Enemy_Hit)
EVT_EXEC_WAIT(N(8021E46C))
EVT_CASE_OR_EQ(14)
EVT_CASE_OR_EQ(15)
EVT_CASE_OR_EQ(EVENT_BURN_HIT)
EVT_CASE_OR_EQ(EVENT_15)
EVT_EXEC_WAIT(N(8021D784))
EVT_SET_CONST(LVar0, PRT_2)
EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim05)
Expand All @@ -645,7 +645,7 @@ EvtScript N(handleEvent_8021EDF0) = {
EVT_EXEC_WAIT(N(8021E46C))
EVT_EXEC_WAIT(N(8021D890))
EVT_END_CASE_GROUP
EVT_CASE_EQ(36)
EVT_CASE_EQ(EVENT_BURN_DEATH)
EVT_SET_CONST(LVar0, PRT_2)
EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim05)
EVT_SET_CONST(LVar2, ANIM_FlyingMagikoopa_Anim06)
Expand All @@ -655,12 +655,12 @@ EvtScript N(handleEvent_8021EDF0) = {
EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim06)
EVT_EXEC_WAIT(EVS_Enemy_Death)
EVT_RETURN
EVT_CASE_EQ(11)
EVT_CASE_EQ(EVENT_SPIN_SMASH_HIT)
EVT_SET_CONST(LVar0, PRT_2)
EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim04)
EVT_EXEC_WAIT(EVS_Enemy_SpinSmashHit)
EVT_EXEC_WAIT(N(8021E46C))
EVT_CASE_EQ(33)
EVT_CASE_EQ(EVENT_SPIN_SMASH_DEATH)
EVT_SET_CONST(LVar0, PRT_2)
EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim04)
EVT_EXEC_WAIT(EVS_Enemy_SpinSmashHit)
Expand All @@ -669,11 +669,11 @@ EvtScript N(handleEvent_8021EDF0) = {
EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim04)
EVT_EXEC_WAIT(EVS_Enemy_Death)
EVT_RETURN
EVT_CASE_EQ(23)
EVT_CASE_EQ(EVENT_ZERO_DAMAGE)
EVT_SET_CONST(LVar0, PRT_2)
EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim01)
EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit)
EVT_CASE_EQ(25)
EVT_CASE_EQ(EVENT_IMMUNE)
EVT_SET_CONST(LVar0, PRT_2)
EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim01)
EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit)
Expand All @@ -686,7 +686,7 @@ EvtScript N(handleEvent_8021EDF0) = {
EVT_IF_NE(LVar0, 0)
EVT_EXEC_WAIT(N(8021E46C))
EVT_END_IF
EVT_CASE_EQ(32)
EVT_CASE_EQ(EVENT_DEATH)
EVT_SET_CONST(LVar0, PRT_2)
EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim04)
EVT_EXEC_WAIT(EVS_Enemy_Hit)
Expand All @@ -696,21 +696,21 @@ EvtScript N(handleEvent_8021EDF0) = {
EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim04)
EVT_EXEC_WAIT(EVS_Enemy_Death)
EVT_RETURN
EVT_CASE_EQ(56)
EVT_CASE_EQ(EVENT_BEGIN_FIRST_STRIKE)
EVT_CALL(SetActorPos, ACTOR_SELF, 20, 0, 0)
EVT_CALL(HPBarToCurrent, ACTOR_SELF)
EVT_CASE_EQ(53)
EVT_CASE_EQ(EVENT_END_FIRST_STRIKE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_FlyingMagikoopa_Anim01)
EVT_CALL(SetGoalToHome, ACTOR_SELF)
EVT_CALL(SetActorSpeed, ACTOR_SELF, EVT_FLOAT(4.0))
EVT_CALL(FlyToGoal, ACTOR_SELF, 0, 1, EASING_LINEAR)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_FlyingMagikoopa_Anim01)
EVT_CALL(HPBarToHome, ACTOR_SELF)
EVT_CASE_EQ(49)
EVT_CASE_EQ(EVENT_RECOVER_STATUS)
EVT_SET_CONST(LVar0, PRT_2)
EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim01)
EVT_EXEC_WAIT(EVS_Enemy_Recover)
EVT_CASE_EQ(57)
EVT_CASE_EQ(EVENT_SCARE_AWAY)
EVT_EXEC_WAIT(N(8021E46C))
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_FlyingMagikoopa_Anim04)
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.5))
Expand All @@ -721,11 +721,11 @@ EvtScript N(handleEvent_8021EDF0) = {
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_2, ANIM_FlyingMagikoopa_Anim02)
EVT_EXEC_WAIT(N(runAway))
EVT_RETURN
EVT_CASE_EQ(58)
EVT_CASE_EQ(EVENT_BEGIN_AIR_LIFT)
EVT_SET_CONST(LVar0, PRT_2)
EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim02)
EVT_EXEC_WAIT(EVS_Enemy_AirLift)
EVT_CASE_EQ(22)
EVT_CASE_EQ(EVENT_BLOW_AWAY)
EVT_EXEC_WAIT(N(8021E46C))
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar0)
EVT_IF_NOT_FLAG(LVar0, STATUS_FLAGS_IMMOBILIZED)
Expand All @@ -739,11 +739,11 @@ EvtScript N(handleEvent_8021EDF0) = {
EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim04)
EVT_EXEC_WAIT(EVS_Enemy_BlowAway)
EVT_RETURN
EVT_CASE_EQ(31)
EVT_CASE_EQ(EVENT_AIR_LIFT_FAILED)
EVT_SET_CONST(LVar0, PRT_2)
EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim01)
EVT_EXEC_WAIT(EVS_Enemy_NoDamageHit)
EVT_CASE_EQ(19)
EVT_CASE_EQ(EVENT_STAR_BEAM)
EVT_SET_CONST(LVar0, PRT_2)
EVT_SET_CONST(LVar1, ANIM_FlyingMagikoopa_Anim04)
EVT_EXEC_WAIT(EVS_Enemy_Hit)
Expand Down
4 changes: 2 additions & 2 deletions src/battle/area/kmr_part_2/actor/goomba_king.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ EvtScript N(EVS_Idle) = {
EVT_END
};

EvtScript N(EVS_ShockKnockback) = {
EvtScript A(EVS_Lee_ShockKnockback) = {
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(SetAnimation, ACTOR_SELF, LVar0, LVar1)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Expand Down Expand Up @@ -280,7 +280,7 @@ EvtScript N(EVS_HandleEvent) = {
EVT_EXEC_WAIT(EVS_Enemy_ShockHit)
EVT_SET_CONST(LVar0, PRT_MAIN)
EVT_SET_CONST(LVar1, ANIM_GoombaKing_Dead)
EVT_EXEC_WAIT(N(EVS_ShockKnockback))
EVT_EXEC_WAIT(A(EVS_Lee_ShockKnockback))
EVT_SET_CONST(LVar0, PRT_MAIN)
EVT_SET_CONST(LVar1, ANIM_GoombaKing_Run)
EVT_EXEC_WAIT(EVS_Enemy_ReturnHome)
Expand Down
Loading

0 comments on commit 9d58830

Please sign in to comment.