Skip to content

Angry Penguin #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Mode8fx wants to merge 1 commit into
base: nightly
Choose a base branch
from
Open

Angry Penguin #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 27 additions & 2 deletions src/game/behaviors/tuxie.inc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,22 @@
// tuxie.c.inc

struct Object *sp2CAngry;

/**
* Hitbox for Tuxie's mother (used only when she is furious).
*/
static struct ObjectHitbox sTuxiesMotherHitbox = {
/* interactType: */ INTERACT_DAMAGE,
/* downOffset: */ 0,
/* damageOrCoinValue: */ 16,
/* health: */ 0,
/* numLootCoins: */ 0,
/* radius: */ 48,
/* height: */ 52,
/* hurtboxRadius: */ 0,
/* hurtboxHeight: */ 0,
};

void play_penguin_walking_sound(s32 walk) {
s32 sound;
if (o->oSoundStateID == 0) {
Expand All @@ -16,7 +33,14 @@ void tuxies_mother_act_2(void) {
UNUSED s32 unused;
struct Object *sp1C = cur_obj_find_nearest_object_with_behavior(bhvSmallPenguin, &sp24);

if (cur_obj_find_nearby_held_actor(bhvUnused20E0, 1000.0f) != NULL) {
if (o->oSubAction == 7) {
cur_obj_init_animation_with_sound(0);
o->oForwardVel = 30.0f;
cur_obj_rotate_yaw_toward(o->oAngleToMario, 0x1000);
} else if (sp2CAngry != NULL && sp2CAngry->oPosY < -4850) {
o->oSubAction = 7;
obj_set_hitbox(o, &sTuxiesMotherHitbox);
} else if (cur_obj_find_nearby_held_actor(bhvUnused20E0, 1000.0f) != NULL) {
if (o->oSubAction == 0) {
cur_obj_init_animation_with_sound(0);
o->oForwardVel = 10.0f;
Expand All @@ -29,12 +53,13 @@ void tuxies_mother_act_2(void) {
if (cur_obj_lateral_dist_from_mario_to_home() < 700.0f)
o->oSubAction = 0;
}
sp2CAngry = cur_obj_find_nearby_held_actor(bhvUnused20E0, 1000.0f);
} else {
o->oForwardVel = 0.0f;
cur_obj_init_animation_with_sound(3);
}
if (sp1C != NULL && sp24 < 300.0f && sp1C->oHeldState != HELD_FREE) {
o->oAction = 1;
// o->oAction = 1;
sp1C->oSmallPenguinUnk88 = 1;
o->prevObj = sp1C;
}
Expand Down