kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'mr-origin-86'

Browse Source
This commit is contained in:
banjo.decomp
2024-10-08 01:58:19 -05:00
parent 06204d3b68 7f41a49ef8
commit 680cf7a950
34 changed files with 568 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

169
src/TTC/ch/nipper.c
View File

@@ -2,33 +2,40 @@
#include "functions.h"
#include "variables.h"
void func_80388434(Actor *this);
Actor *func_80387EB0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
static void __chNipper_updateFunc(Actor *this);
static Actor *__chNipper_animFunc(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
enum ch_nipper_states_e {
CH_NIPPER_STATE_1_UNKNOWN = 1, // L80388578
CH_NIPPER_STATE_2_UNKNOWN, // L8038872C
CH_NIPPER_STATE_3_UNKNOWN, // L803887B4
CH_NIPPER_STATE_4_DIEING, // L80388910
CH_NIPPER_STATE_5_SPAWNED, // L80388938
CH_NIPPER_STATE_6_DEAD, // L803889A8
CH_NIPPER_STATE_7_UNKNOWN // already dead? L80388A20
};
/* .data */
ActorAnimationInfo D_8038C540[] = {
{0x00, 0.0f},
ActorAnimationInfo gChNipperAnimations[8] = {
{NULL, NULL},
{ASSET_C0_ANIM_NIPPER_IDLE, 2.0f},
{ASSET_BD_ANIM_NIPPER_VULNERABLE, 1.5f},
{ASSET_BF_ANIM_NIPPER_ATTACK, 1.2f},
{ASSET_BE_ANIM_NIPPER_OW, 1.3f},
{ASSET_C0_ANIM_NIPPER_IDLE, 2.0f},
{ASSET_133_ANIM_NIPPER_DIE, 3.0f},
{0x00, 0.0f}
{NULL, NULL}
};
ActorInfo D_8038C580 = {
ActorInfo gChNipper = {
MARKER_A5_NIPPER, ACTOR_117_NIPPER, ASSET_3D5_MODEL_NIPPER,
0x1, D_8038C540,
func_80388434, actor_update_func_80326224, func_80387EB0,
0x1, gChNipperAnimations,
__chNipper_updateFunc, actor_update_func_80326224, __chNipper_animFunc,
0, 0x299, 10.0f, 0
};
/* .code */
void func_80387DC0(f32 *position, s32 count) {
static void __chNipper_drawParticlesAtPosition(f32 *position, s32 count) {
static s32 D_8038C5A4[3] = {180, 180, 180};
static ParticleScaleAndLifetimeRanges D_8038C5B0 = {
{0.1f, 0.5f},
@@ -57,7 +64,7 @@ void func_80387DC0(f32 *position, s32 count) {
particleEmitter_emitN(pCtrl, count);
}
Actor *func_80387EB0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
static Actor *__chNipper_animFunc(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
Actor *this;
this = marker_getActor(marker);
@@ -65,43 +72,45 @@ Actor *func_80387EB0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
return actor_draw(marker, gfx, mtx, vtx);
}
void TTC_func_80387F18(Actor *this) {
subaddie_set_state_looped(this, 3);
static void __chNipper_setAnimationDuration(Actor *this) {
subaddie_set_state_looped(this, CH_NIPPER_STATE_3_UNKNOWN);
this->unk1C[0] = 0.0f;
switch((s32)this->lifetime_value){
case 0x78:
case 120:
animctrl_setDuration(this->animctrl, 1.2f);
break;
case 0x50:
case 80:
animctrl_setDuration(this->animctrl, 1.05f);
break;
case 0x28:
case 40:
animctrl_setDuration(this->animctrl, 0.9f);
break;
}
}
void TTC_func_80387FB0(ActorMarker *caller, enum asset_e text_id, s32 arg2){
static void __chNipper_spawnedShowTextCallback(ActorMarker *caller, enum asset_e text_id, s32 arg2){
Actor *this;
this = marker_getActor(caller);
TTC_func_80387F18(this);
__chNipper_setAnimationDuration(this);
ncStaticCamera_exit();
comusic_8025AB44(COMUSIC_12_TTC_NIPPER, -1, 300);
}
void TTC_func_80387FF4(Actor *this) {
static void __chNipper_playDeathAnimation(Actor *this) {
s32 i;
subaddie_set_state_with_direction(this, 4, 0.01f, 1);
subaddie_set_state_with_direction(this, CH_NIPPER_STATE_4_DIEING, 0.01f, 1);
actor_playAnimationOnce(this);
for(i = 0; i < 3; i ++){
FUNC_8030E8B4(SFX_79_TICKER_DEATH, 0.5f, 17000, this->position, 1500, 3000);
};
}
bool func_80388088(Actor *this){
// if player too far away -> false
// otherwise return whether sp2C is within -35 and 35?
static bool __func_80388088(Actor *this){
f32 sp2C;
f32 sp20[3];
bool out;
@@ -115,11 +124,11 @@ bool func_80388088(Actor *this){
return BOOL(-35.0f < sp2C && sp2C < 35.0f);
}
bool func_8038812C(Actor *this){
return BOOL(func_80329530(this, 1300) && func_80388088(this));
static bool __chNipper_shouldShowActor(Actor *this){
return BOOL(func_80329530(this, 1300) && __func_80388088(this));
}
void func_80388178(ActorMarker *this_marker, ActorMarker *other_marker) {
static void __chNipper_dieFunc(ActorMarker *this_marker, ActorMarker *other_marker) {
Actor *this;
s32 i;
@@ -127,33 +136,33 @@ void func_80388178(ActorMarker *this_marker, ActorMarker *other_marker) {
func_8032B4DC(this, other_marker, 7);
if (this->lifetime_value == 40.0f) {
subaddie_set_state_with_direction(this, 6, 0.01f, 1);
subaddie_set_state_with_direction(this, CH_NIPPER_STATE_6_DEAD, 0.01f, 1);
actor_playAnimationOnce(this);
for(i = 0; i < 3; i++){
FUNC_8030E8B4(SFX_78_EAGLECRY, 0.7f, 20000, this->position, 1500, 3000);
};
comusic_8025AB44(COMUSIC_12_TTC_NIPPER, 0, 300);
func_8025AABC(0x12);
func_8025AABC(COMUSIC_12_TTC_NIPPER);
func_8032BB88(this, -1, 300);
func_802BAFE4(0x1C);
return;
}
if (this->lifetime_value == 80.0f) {
TTC_func_80387FF4(this);
__chNipper_playDeathAnimation(this);
this->lifetime_value = 40.0f;
return;
}
TTC_func_80387FF4(this);
__chNipper_playDeathAnimation(this);
this->lifetime_value = 80.0f;
gcdialog_showText(0xA10, 4, NULL, NULL, NULL, NULL);
gcdialog_showText(ASSET_A10_TEXT_TTC_NIPPER_HURT, 4, NULL, NULL, NULL, NULL);
return;
}
bool func_803882E4(ActorMarker * this_marker, ActorMarker * other_marker){
static bool __chNipper_determineMarkerId(ActorMarker * this_marker, ActorMarker * other_marker){
if(this_marker->unk40_31 == 1){
this_marker->id = 0x16C;
this_marker->id = MARKER_16C_NIPPER;
}
else{
this_marker->id = MARKER_A5_NIPPER;
@@ -161,21 +170,21 @@ bool func_803882E4(ActorMarker * this_marker, ActorMarker * other_marker){
return TRUE;
}
void func_80388344(ActorMarker * this_marker, ActorMarker *other_marker){
static void __chNipper_ow2Func(ActorMarker * this_marker, ActorMarker *other_marker){
Actor *this;
if(other_marker->id == 1){
this = marker_getActor(this_marker);
if( !mapSpecificFlags_get(7)
if( !mapSpecificFlags_get(TTC_SPECIFIC_FLAG_7_NIPPER_FIRST_MEET_TEXT_SHOWN)
&& this->has_met_before
&& gcdialog_showText(0xa0f, 0, NULL, NULL, NULL, NULL)
){
mapSpecificFlags_set(7, TRUE);
mapSpecificFlags_set(TTC_SPECIFIC_FLAG_7_NIPPER_FIRST_MEET_TEXT_SHOWN, TRUE);
}
}
}
void func_803883C8(ActorMarker * this_marker, ActorMarker *other_marker){
static void __chNipper_owFunc(ActorMarker * this_marker, ActorMarker *other_marker){
Actor *this = marker_getActor(this_marker);
if( !this->unk138_23
&& this->has_met_before
@@ -185,68 +194,67 @@ void func_803883C8(ActorMarker * this_marker, ActorMarker *other_marker){
}
}
void func_80388434(Actor *this){
f32 sp4C[3];
static void __chNipper_updateFunc(Actor *this){
f32 particlePosition[3];
s32 sp48;
s32 sp44;
f32 sp38[3];
s32 xVelocity;
f32 playerPosition[3];
s32 temp_v0;
player_getPosition(sp38);
sp44 = func_80309D58(sp38, 1);
player_getPosition(playerPosition);
xVelocity = func_80309D58(playerPosition, 1);
if(!this->volatile_initialized){
this->volatile_initialized = TRUE;
this->velocity_x = sp44;
this->velocity_x = xVelocity;
func_8032BC18(this);
}
if(this->state != 7){
// sp30 = sp44;
if(0.0f == this->velocity_x && sp44){
if(this->state != CH_NIPPER_STATE_7_UNKNOWN){
if(0.0f == this->velocity_x && xVelocity){
comusic_8025AB44(COMUSIC_12_TTC_NIPPER, -1, 5000);
func_8032BB88(this, 0, 4000);
func_8024BD08(0);
}
else if(!sp44 && 0.0f != this->velocity_x){
else if(!xVelocity && 0.0f != this->velocity_x){
comusic_8025AB44(COMUSIC_12_TTC_NIPPER, 0, 300);
func_8025AABC(COMUSIC_12_TTC_NIPPER);
func_8032BB88(this, -1, 300);
func_8024BD08(1);
}
this->velocity_x = sp44;
}//L80388554
this->velocity_x = xVelocity;
}
switch(this->state){
case 1:// L80388578
case CH_NIPPER_STATE_1_UNKNOWN:
if(!this->initialized){
animctrl_setTransitionDuration(this->animctrl, 0.35f);
subaddie_set_state_with_direction(this, 1, 0.01f, 1);
subaddie_set_state_with_direction(this, CH_NIPPER_STATE_1_UNKNOWN, 0.01f, 1);
this->lifetime_value = 120.0f;
this->marker->propPtr->unk8_3 = TRUE;
marker_setCollisionScripts(this->marker, func_803883C8, func_80388344, func_80388178);
func_803300C0(this->marker, func_803882E4);
marker_setCollisionScripts(this->marker, __chNipper_owFunc, __chNipper_ow2Func, __chNipper_dieFunc);
func_803300C0(this->marker, __chNipper_determineMarkerId);
this->initialized = TRUE;
}//L8038860C
if(func_8038812C(this)){
}
if(__chNipper_shouldShowActor(this)){
temp_v0 = func_8028ECAC();
if( !this->has_met_before
&& temp_v0 != 1
&& temp_v0 != 10
){
subaddie_set_state_with_direction(this, 5, 0.01f, 1);
if(gcdialog_showText(0xa0e, 0xf, this->position, this->marker, TTC_func_80387FB0, NULL)){
subaddie_set_state_with_direction(this, CH_NIPPER_STATE_5_SPAWNED, 0.01f, 1);
if(gcdialog_showText(ASSET_A0E_TEXT_NIPPER_SPAWNED, 0xf, this->position, this->marker, __chNipper_spawnedShowTextCallback, NULL)){
this->has_met_before = TRUE;
}
comusic_8025AB44(COMUSIC_12_TTC_NIPPER, 5000, 300);
ncStaticCamera_setToNode(11);
}
else{//L803886B0
TTC_func_80387F18(this);
else{
__chNipper_setAnimationDuration(this);
}
break;
}
//L803886C0
if( actor_animationIsAt(this, 0.2f)
|| actor_animationIsAt(this, 0.2f)
|| actor_animationIsAt(this, 0.6f)
@@ -256,35 +264,35 @@ void func_80388434(Actor *this){
}
break;
case 2:// L8038872C
if(!func_8038812C(this)){
subaddie_set_state_looped(this, 1);
case CH_NIPPER_STATE_2_UNKNOWN:
if(!__chNipper_shouldShowActor(this)){
subaddie_set_state_looped(this, CH_NIPPER_STATE_1_UNKNOWN);
break;
}
if(this->lifetime_value <= this->unk38_31){
TTC_func_80387F18(this);
__chNipper_setAnimationDuration(this);
break;
}
this->unk38_31++;
break;
case 3:// L803887B4
case CH_NIPPER_STATE_3_UNKNOWN:
if(actor_animationIsAt(this, 0.5f) && this->marker->unk14_21){
func_8034A174(this->marker->unk44, 6, sp4C);
func_80387DC0(sp4C, 2);
func_8034A174(this->marker->unk44, 6, particlePosition);
__chNipper_drawParticlesAtPosition(particlePosition, 2);
}
else if(actor_animationIsAt(this, 0.95f) && this->marker->unk14_21){//L80388800
func_8034A174(this->marker->unk44, 5, sp4C);
func_80387DC0(sp4C, 2);
}//L80388848
func_8034A174(this->marker->unk44, 5, particlePosition);
__chNipper_drawParticlesAtPosition(particlePosition, 2);
}
if(actor_animationIsAt(this, 0.99f)){
this->unk1C[0] += 1.0f;
}
if(2.0f <= this->unk1C[0]){
subaddie_set_state_looped(this, 2);
subaddie_set_state_looped(this, CH_NIPPER_STATE_2_UNKNOWN);
this->unk38_31 = 0;
break;
}
@@ -298,13 +306,13 @@ void func_80388434(Actor *this){
}
break;
case 4:// L80388910
case CH_NIPPER_STATE_4_DIEING:
if(actor_animationIsAt(this, 0.99f)){
TTC_func_80387F18(this);
__chNipper_setAnimationDuration(this);
}
break;
case 5:// L80388938
case CH_NIPPER_STATE_5_SPAWNED:
if( actor_animationIsAt(this, 0.2f)
|| actor_animationIsAt(this, 0.2f)
|| actor_animationIsAt(this, 0.6f)
@@ -314,7 +322,7 @@ void func_80388434(Actor *this){
}
break;
case 6:// L803889A8
case CH_NIPPER_STATE_6_DEAD:
this->marker->collidable = FALSE;
if(actor_animationIsAt(this, 0.6f)){
FUNC_8030E8B4(SFX_7C_CHEBOOF, 0.9f, 20000, this->position, 1500, 3000);
@@ -322,18 +330,17 @@ void func_80388434(Actor *this){
}
if(actor_animationIsAt(this, 0.99f)){
subaddie_set_state_with_direction(this, 7, 0.01f, 1);
subaddie_set_state_with_direction(this, CH_NIPPER_STATE_7_UNKNOWN, 0.01f, 1);
}
break;
case 7:// L80388A20
case CH_NIPPER_STATE_7_UNKNOWN:
this->marker->collidable = FALSE;
break;
}//L80388A30
}
}
bool func_80388A44(s16 arg0[3]){
bool chNipper_isInState7(s16 arg0[3]){
f32 sp1C[3];
Actor *nipper;
@@ -342,5 +349,5 @@ bool func_80388A44(s16 arg0[3]){
sp1C[2] = (f32) arg0[2];
nipper = actorArray_findClosestActorFromActorId(sp1C, ACTOR_117_NIPPER, -1, NULL);
return nipper->state == 7;
return nipper->state == CH_NIPPER_STATE_7_UNKNOWN;
}