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

Merge branch 'mr-origin-96'

Browse Source
This commit is contained in:
banjo.decomp
2024-10-19 23:10:46 -05:00
parent 9443a276c5 0ba0a22549
commit a59e1abddf
291 changed files with 2238 additions and 2204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/GV/ch/ancientone.c
View File

@@ -2,7 +2,7 @@
#include "functions.h"
#include "variables.h"
extern void func_80244BB0(s32, s32, s32, f32);
extern void core1_7090_initSfxSource(s32, s32, s32, f32);
typedef struct {
f32 unk0[3];
@@ -75,13 +75,13 @@ void func_80386620(Actor *this){
}
void func_8038678C(void){
func_80244BB0(3, 0x85, 0x7ff8, 1.0f);
func_80244BB0(4, 0x85, 0x7ff8, 1.0f);
core1_7090_initSfxSource(3, 0x85, 0x7ff8, 1.0f);
core1_7090_initSfxSource(4, 0x85, 0x7ff8, 1.0f);
}
void func_803867CC(void){
func_80244C78(3);
func_80244C78(4);
core1_7090_freeSfxSource(3);
core1_7090_freeSfxSource(4);
}
void func_803867F4(void){
@@ -167,7 +167,7 @@ void chAncientOne_update(Actor *this){
if(this->unkF4_8 < 5){
D_80390C28[this->unkF4_8]->propPtr->unk8_4 = TRUE;
func_802BAFE4(GV_D_80390C20[this->unkF4_8 - 1]);
func_80244BB0(2, 0x86, 0x7ff8, 0.3f);
core1_7090_initSfxSource(2, 0x86, 0x7ff8, 0.3f);
timedFunc_set_0(0.45f, func_8038678C);
}//L80386DB0
@@ -190,7 +190,7 @@ void chAncientOne_update(Actor *this){
}//L80386D80
}
if(LOCAL_CH_ANCIENT_ONE(this)->unk1C <= this->position_y){
func_80244C78(2);
core1_7090_freeSfxSource(2);
timedFunc_set_0(0.5f, func_803867CC);
}
}//L80386DB0

2
src/GV/code_3BB0.c
View File

@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "core1/core1.h"
#include "functions.h"
#include "variables.h"
#include <core1/viewport.h>
void GV_func_8038A084(Actor *this);

1
src/GV/code_4740.c
View File

@@ -2,7 +2,6 @@
#include "functions.h"
#include "variables.h"
f32 func_80257204(f32, f32, f32, f32);
void func_8038B124(Actor *this);
/* .data */

2
src/GV/code_7060.c
View File

@@ -72,7 +72,7 @@ void func_8038D47C(Actor *this){
if(!mapSpecificFlags_get(0x14)){
player_getPosition(sp3C);
if(func_8028ECAC() == 0){
if( ml_distance_vec3f(sp3C, this->unk1C) < 100.0f || ml_distance_vec3f(sp3C, this->velocity) < 100.0f){
if( ml_vec3f_distance(sp3C, this->unk1C) < 100.0f || ml_vec3f_distance(sp3C, this->velocity) < 100.0f){
if(gcdialog_showText(ASSET_A7B_TEXT_JINXY_MEET, 0, NULL, NULL, NULL, NULL)){
mapSpecificFlags_set(0x14, 1);
}

24
src/GV/code_7FF0.c
View File

@@ -1,10 +1,10 @@
#include <ultra64.h>
#include "core1/core1.h"
#include "functions.h"
#include "variables.h"
#include "SnS.h"
#include "actor.h"
extern void func_80244BB0(s32, s32, s32, f32);
extern void core1_7090_initSfxSource(s32, s32, s32, f32);
extern void func_802D3D54(Actor *this);
extern void func_802D3D74(Actor *this);
extern Actor *func_80325F2C(ActorMarker *this_marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
@@ -231,7 +231,7 @@ void func_8038E648(Actor *this){
func_802BAFE4(2);
subaddie_set_state(this, 6);
this->unk38_31 = 600;
func_80244BB0(0, 0x6A, 0x7ff8, 0.3f);
core1_7090_initSfxSource(0, 0x6A, 0x7ff8, 0.3f);
func_802D68F0(25);
item_set(ITEM_6_HOURGLASS, 1);
}
@@ -243,7 +243,7 @@ void func_8038E648(Actor *this){
subaddie_set_state(this, 7);
this->pitch = 90.0f;
func_8030E540(SFX_7F_HEAVYDOOR_SLAM);
func_80244C78(0);
core1_7090_freeSfxSource(0);
}
break;
@@ -251,7 +251,7 @@ void func_8038E648(Actor *this){
this->unk38_31 -= time_getDelta();
if(this->unk38_31 == 0){
subaddie_set_state(this, 8);
func_80244BB0(0, 0x6A, 0x7ff8, 0.3f);
core1_7090_initSfxSource(0, 0x6A, 0x7ff8, 0.3f);
}
break;
@@ -262,7 +262,7 @@ void func_8038E648(Actor *this){
this->pitch = 0.0f;
func_8030E540(SFX_7F_HEAVYDOOR_SLAM);
mapSpecificFlags_set(5, FALSE);
func_80244C78(0);
core1_7090_freeSfxSource(0);
volatileFlag_setAndTriggerDialog_0(VOLATILE_FLAG_AC_GV_TRAPDOOR_MISSED);
}
break;
@@ -296,7 +296,7 @@ void func_8038E97C(Actor *this){
this->position_y += 130.0;
this->unk38_31 = 30;
subaddie_set_state(this, 8);
func_80244BB0(1, 0x6A, 0x7ff8, 0.3f);
core1_7090_initSfxSource(1, 0x6A, 0x7ff8, 0.3f);
}
}//L8038EA6C
@@ -314,7 +314,7 @@ void func_8038E97C(Actor *this){
this->unk38_31 -= 1;
if(this->unk38_31 == 0){
subaddie_set_state(this, 1);
func_80244C78(1);
core1_7090_freeSfxSource(1);
func_8030E540(SFX_7F_HEAVYDOOR_SLAM);
}
@@ -330,7 +330,7 @@ void chKazooieDoor_update(Actor *this){
func_8025A6EC(COMUSIC_2B_DING_B, -1);
func_802BAFE4(3);
subaddie_set_state(this, 6);
func_80244BB0(1, 0x6a, 0x7ff8, 0.3f);
core1_7090_initSfxSource(1, 0x6a, 0x7ff8, 0.3f);
this->unk1C[1] = this->position_y + 210.0f;
this->unk1C[0] = this->position_y;
}
@@ -342,7 +342,7 @@ void chKazooieDoor_update(Actor *this){
if(this->unk1C[1] <= this->position_y){
subaddie_set_state(this, 7);
func_8030E540(SFX_7F_HEAVYDOOR_SLAM);
func_80244C78(1);
core1_7090_freeSfxSource(1);
this->unk38_31 = 450;
}
break;
@@ -351,7 +351,7 @@ void chKazooieDoor_update(Actor *this){
this->unk38_31--;
if(this->unk38_31 == 0){
subaddie_set_state(this, 8);
func_80244BB0(1, 0x6a, 0x7ff8, 0.3f);
core1_7090_initSfxSource(1, 0x6a, 0x7ff8, 0.3f);
}
break;
@@ -362,7 +362,7 @@ void chKazooieDoor_update(Actor *this){
this->position_y = this->unk1C[0];
subaddie_set_state(this, 1);
func_8030E540(SFX_7F_HEAVYDOOR_SLAM);
func_80244C78(1);
core1_7090_freeSfxSource(1);
mapSpecificFlags_set(6, FALSE);
}
break;