pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-18 08:52:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

clean up

Browse Source
This commit is contained in:
Alex Bates 2020-12-30 09:33:40 +00:00
parent 3ddb184ab9
commit 87e2e13eed
No known key found for this signature in database
GPG Key ID: 5E11C2DB78877706
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/battle/actor/goomba.c
View File

@ -54,7 +54,7 @@ ActorPartDesc goomba_parts[] = {
.flags = 0x00800000, .flags = 0x00800000,
.index = 1, .index = 1,
.posOffset = { 0, 0, 0 }, .posOffset = { 0, 0, 0 },
.targetOffset = { 0, 0x14 }, .targetOffset = { 0, 20 },
.opacity = 0xFF, .opacity = 0xFF,
.idleAnimations = goomba_anims, .idleAnimations = goomba_anims,
.defenseTable = goomba_defense_table, .defenseTable = goomba_defense_table,
@ -176,45 +176,45 @@ Script goomba_dispatch = SCRIPT({
GetLastEvent(ActorID_SELF, SI_VAR(0)); GetLastEvent(ActorID_SELF, SI_VAR(0));
match SI_VAR(0) { match SI_VAR(0) {
Event_HIT_COMBO, Event_HIT { Event_HIT_COMBO, Event_HIT {
SI_VAR(0) = c 0x1; SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, pain); SI_VAR(1) = c NPC_ANIM(goomba, normal, pain);
await DoNormalHit; await DoNormalHit;
} }
== Event_BURN_HIT { == Event_BURN_HIT {
SI_VAR(0) = c 0x1; SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, burn_pain); SI_VAR(1) = c NPC_ANIM(goomba, normal, burn_pain);
SI_VAR(2) = c NPC_ANIM(goomba, normal, burn_dead); SI_VAR(2) = c NPC_ANIM(goomba, normal, burn_dead);
await DoBurnHit; await DoBurnHit;
} }
== Event_BURN_DEATH { == Event_BURN_DEATH {
SI_VAR(0) = c 0x1; SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, burn_pain); SI_VAR(1) = c NPC_ANIM(goomba, normal, burn_pain);
SI_VAR(2) = c NPC_ANIM(goomba, normal, burn_dead); SI_VAR(2) = c NPC_ANIM(goomba, normal, burn_dead);
await DoBurnHit; await DoBurnHit;
SI_VAR(0) = c 0x1; SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, burn_dead); SI_VAR(1) = c NPC_ANIM(goomba, normal, burn_dead);
await DoDeath; await DoDeath;
return; return;
} }
== Event_SPIN_SMASH_HIT { == Event_SPIN_SMASH_HIT {
SI_VAR(0) = c 0x1; SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, pain); SI_VAR(1) = c NPC_ANIM(goomba, normal, pain);
await DoSpinSmashHit; await DoSpinSmashHit;
} }
== Event_SPIN_SMASH_DEATH { == Event_SPIN_SMASH_DEATH {
SI_VAR(0) = c 0x1; SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, pain); SI_VAR(1) = c NPC_ANIM(goomba, normal, pain);
await DoSpinSmashHit; await DoSpinSmashHit;
SI_VAR(0) = c 0x1; SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, dead); SI_VAR(1) = c NPC_ANIM(goomba, normal, dead);
await DoDeath; await DoDeath;
return; return;
} }
== Event_SHOCK_HIT { == Event_SHOCK_HIT {
SI_VAR(0) = c 0x1; SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, electrocute); SI_VAR(1) = c NPC_ANIM(goomba, normal, electrocute);
await DoShockHit; await DoShockHit;
SI_VAR(0) = c 0x1; SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, pain); SI_VAR(1) = c NPC_ANIM(goomba, normal, pain);
await DoJumpBack; await DoJumpBack;
JumpToGoal(ActorID_SELF, 5, 0, 1, 0); JumpToGoal(ActorID_SELF, 5, 0, 1, 0);
@ -230,25 +230,25 @@ Script goomba_dispatch = SCRIPT({
JumpToGoal(ActorID_SELF, 5, 0, 1, 0); JumpToGoal(ActorID_SELF, 5, 0, 1, 0);
} }
== Event_SHOCK_DEATH { == Event_SHOCK_DEATH {
SI_VAR(0) = c 0x1; SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, electrocute); SI_VAR(1) = c NPC_ANIM(goomba, normal, electrocute);
await DoShockHit; await DoShockHit;
SI_VAR(0) = c 0x1; SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, dead); SI_VAR(1) = c NPC_ANIM(goomba, normal, dead);
await DoDeath; await DoDeath;
return; return;
} }
== Event_STAR_BEAM, 23, Event_IMMUNE, Event_AIR_LIFT_FAILED { == Event_STAR_BEAM, 23, Event_IMMUNE, Event_AIR_LIFT_FAILED {
SI_VAR(0) = c 0x1; SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, idle); SI_VAR(1) = c NPC_ANIM(goomba, normal, idle);
await DoImmune; await DoImmune;
} }
== Event_DEATH { == Event_DEATH {
SI_VAR(0) = c 0x1; SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, pain); SI_VAR(1) = c NPC_ANIM(goomba, normal, pain);
await DoNormalHit; await DoNormalHit;
sleep 10; sleep 10;
SI_VAR(0) = c 0x1; SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, dead); SI_VAR(1) = c NPC_ANIM(goomba, normal, dead);
await DoDeath; await DoDeath;
return; return;
@ -263,24 +263,24 @@ Script goomba_dispatch = SCRIPT({
HPBarToHome(ActorID_SELF); HPBarToHome(ActorID_SELF);
} }
== Event_RECOVER_STATUS { == Event_RECOVER_STATUS {
SI_VAR(0) = c 0x1; SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, idle); SI_VAR(1) = c NPC_ANIM(goomba, normal, idle);
await DoRecover; await DoRecover;
} }
== Event_SCARE_AWAY { == Event_SCARE_AWAY {
SI_VAR(0) = c 0x1; SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, run); SI_VAR(1) = c NPC_ANIM(goomba, normal, run);
SI_VAR(2) = c NPC_ANIM(goomba, normal, pain); SI_VAR(2) = c NPC_ANIM(goomba, normal, pain);
await DoScareAway; await DoScareAway;
return; return;
} }
== Event_BEGIN_AIR_LIFT { == Event_BEGIN_AIR_LIFT {
SI_VAR(0) = c 0x1; SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, run); SI_VAR(1) = c NPC_ANIM(goomba, normal, run);
await DoAirLift; await DoAirLift;
} }
== Event_BLOW_AWAY { == Event_BLOW_AWAY {
SI_VAR(0) = c 0x1; SI_VAR(0) = c 1;
SI_VAR(1) = c NPC_ANIM(goomba, normal, pain); SI_VAR(1) = c NPC_ANIM(goomba, normal, pain);
await DoBlowAway; await DoBlowAway;
return; return;