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

code_9E370.c progress

Browse Source
This commit is contained in:
Banjo Kazooie
2022-07-27 19:34:05 -05:00
parent f9588fa0c1
commit 19b01cf810
26 changed files with 95 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core2/ch/beehive.c
View File

@@ -53,7 +53,7 @@ void func_802CE8D4(Actor *this){
{
case 1://L802CE9C4
if( !func_8031FF1C(BKPROG_D_BEEHIVE_TEXT)
&& func_803296B8(this, 250, 300)
&& subaddie_playerIsWithinCylinder(this, 250, 300)
){
if(func_8028ECAC() == 0 || func_8028ECAC() == BSGROUP_8_TROT){
if( player_getTransformation() == TRANSFORM_1_BANJO

2
src/core2/ch/code_5AB30.c
View File

@@ -237,7 +237,7 @@ void func_802E20E8(Actor *this){
}
}//L802E223C
if(!actor_playerIsWithinDist(this, 4000))
if(!subaddie_playerIsWithinSphere(this, 4000))
return;
if(!local->unkB && this->marker->unk14_21){

2
src/core2/ch/firefx.c
View File

@@ -74,7 +74,7 @@ void chfirefx_update(Actor *this){
this->unk1C[0] = 0.0f;
}
}//L80359934
if(actor_playerIsWithinDist(this, 2000)){
if(subaddie_playerIsWithinSphere(this, 2000)){
if( func_8024DB50(this->position, 50.0f) && this->unk38_31 ){
if(!(func_8023DB5C() & 3) && randf() < 0.1){
__chfirefx_spawnSmoke(this->position, this->scale);

2
src/core2/ch/icecube.c
View File

@@ -262,7 +262,7 @@ void chicecube_update(Actor *this){
this->unk58_0 = TRUE;
}//L8035AAF4
if(!actor_playerIsWithinDist(this, 3000))
if(!subaddie_playerIsWithinSphere(this, 3000))
return;
func_802D729C(this, 3.4 * this->scale);

6
src/core2/ch/mole.c
View File

@@ -114,7 +114,7 @@ Actor *func_802D94B4(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
}
void func_802D9530(Actor *this){
Actor *other = func_80329980(this);
Actor *other = subaddie_getLinkedActor(this);
if(this->unk100 && other){
if(this->unk100->unk14_20 == 0xB8)
func_80328B8C(other, 3, 0.0001f, 1);
@@ -230,7 +230,7 @@ int func_802D997C(Actor *this){
}
void func_802D9ADC(Actor *this){
Actor *other = func_80329980(this);
Actor *other = subaddie_getLinkedActor(this);
if(this->unk100 && other && this->unk100->unk14_20 == 0xB8){
func_80328B8C(other, 2, 0.0001f, 1);
}
@@ -307,7 +307,7 @@ void func_802D9D60(Actor *this){
other = func_80326D68(this->position, ACTOR_12C_MOLEHILL, -1, &sp4C);
this->unk100 = (other) ? other->marker : NULL;
if(this->unk100){
other = func_80329980(this);
other = subaddie_getLinkedActor(this);
if(other && this->unk100->unk14_20 == 0xB8){
func_80328A84(other, 1);
}