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

Documenting Mumbo Mountain

Browse Source
This commit is contained in:
Adrien Bonnin
2024-09-05 13:18:58 +02:00
committed by Adrien Bonnin
parent fd6a60a4b4
commit 9d2e6efbda
10 changed files with 237 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/MM/ch/orange.c
View File

@@ -7,6 +7,14 @@
#define MIN(s,t) ((s < t)?(s):(t))
#endif
#ifndef ORANGE_FALLING_STATE
#define ORANGE_FALLING_STATE 1
#endif
#ifndef ORANGE_LANDED_STATE
#define ORANGE_LANDED_STATE 2
#endif
/* extern functions */
f32 func_80309724(f32*);
@@ -15,7 +23,7 @@ void MM_func_80387FF4(Actor *this);
Actor* func_80388188(ActorMarker *, Gfx **, Mtx**, Vtx**);
/* .data */
ActorInfo chorangeInfo = { MARKER_C_ORANGE_PROJECTILE, ACTOR_14_ORANGE_PROJECTILE, ASSET_2D2_MODEL_ORANGE,
ActorInfo chorangeInfo = { MARKER_C_ORANGE_PROJECTILE, ACTOR_14_ORANGE_PROJECTILE, ASSET_2D2_MODEL_ORANGE,
1, NULL,
MM_func_80387FF4, func_80326224, func_80388188,
0, 0, 0.6f, 0
@@ -25,7 +33,7 @@ f32 D_803899F4[3] = {0.0f,-8.0f, 0.0f};
f32 D_80389A00[3] = {0.0f, 0.0f, 0.0f};
void func_80387F90(ActorMarker *arg0, ActorMarker *other_marker){
if( !func_8028F22C(arg0)
if( !func_8028F22C(arg0)
&& !mapSpecificFlags_get(mapflag_mm_main_hit_with_orange)
&& func_80311480(ASSET_B3A_TEXT_CONGA_HITS_PLAYER, 0, 0, 0, NULL, NULL)
){
@@ -36,34 +44,34 @@ void func_80387F90(ActorMarker *arg0, ActorMarker *other_marker){
}
void MM_func_80387FF4(Actor * this){
f32 temp_f2;
f32 temp_f0;
f32 ground_position_y;
f32 velocity_y;
if(!this->initialized){
this->marker->unk2C_1 = 1;
marker_setCollisionScripts(this->marker, NULL, func_80387F90, NULL);
}
switch(this->state){
case 1://L80388060
case ORANGE_FALLING_STATE:
this->position_x += this->velocity_x;
temp_f0 = this->velocity_y - 5.0;
this->velocity_y = temp_f0;
this->position_y += temp_f0;
velocity_y = this->velocity_y - 5.0;
this->velocity_y = velocity_y;
this->position_y += velocity_y;
this->position_z += this->velocity_z;
temp_f2 = func_80309724(this->position);
if(this->position_y < temp_f2){
this->position_y = temp_f2;
this->unk1C_y = temp_f2;
ground_position_y = func_80309724(this->position);
if(this->position_y < ground_position_y){
this->position_y = ground_position_y;
this->unk1C_y = ground_position_y;
func_8030E6D4(SFX_2F_ORANGE_SPLAT);
this->unk28 = 1.0f;
this->unk60 = 340.0f;
this->state = 2;
}
break;
case 2://L8038810C
case ORANGE_LANDED_STATE:
if(this->unk60 < 324.0){
this->marker->collidable = 0;
}
@@ -78,16 +86,16 @@ void MM_func_80387FF4(Actor * this){
Actor *func_80388188(ActorMarker *this, Gfx **dl, Mtx **mptr, Vtx **vtx){
Actor* actorPtr = actor_drawFullDepth(this, dl, mptr, vtx);
f32 sp60[3] = D_803899F4;
f32 sp54[3] = D_80389A00;
f32 sp48[3];
f32 rotation[3] = D_80389A00;
f32 position[3];
if(actorPtr->state == 2){
sp48[0] = actorPtr->position_x;
sp48[1] = actorPtr->unk1C_y + 3.0f;
sp48[2] = actorPtr->position_z;
position[0] = actorPtr->position_x;
position[1] = actorPtr->unk1C_y + 3.0f;
position[2] = actorPtr->position_z;
modelRender_setAlpha( (s32) MIN(255.0f, actorPtr->unk60) );
modelRender_setDepthMode(MODEL_RENDER_DEPTH_FULL);
modelRender_draw(dl, mptr, sp48, sp54, actorPtr->unk28, sp60, func_8030A428(0x18));
modelRender_draw(dl, mptr, position, rotation, actorPtr->unk28, sp60, func_8030A428(0x18));
actorPtr->position_y -= 1.9;
if(actorPtr->unk28 < 2.428){
actorPtr->unk28 += 0.1;