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

Created inital yaml for decompressed rom, edited makefile to build it and fixed all undefined symbol/multiple definition errors

Browse Source
This commit is contained in:
Mr-Wiseguy
2022-10-28 02:46:26 -04:00
parent cc8a6ffc78
commit e1bf4549e3
174 changed files with 3648 additions and 1282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/CC/ch/sawblade.c
View File

@@ -119,7 +119,7 @@ void func_80389520(ActorMarker *marker, ActorMarker *otherMarker){
FUNC_8030E624(SFX_65_METALLIC_SCRATCH, 1.0f, 30000);
}
void func_8038954C(ActorMarker *marker, ActorMarker *otherMarker){
void CC_func_8038954C(ActorMarker *marker, ActorMarker *otherMarker){
Actor *actor = marker_getActor(marker);
ActorLocal_CC_3130 *local = (ActorLocal_CC_3130 *) &actor->local;
@@ -138,7 +138,7 @@ void chSawblade_update(Actor *this){
this->unk16C_4 = TRUE;
this->roll = this->yaw;
this->yaw = 0.0f;
marker_setCollisionScripts(this->marker, func_80389520, NULL, func_8038954C);
marker_setCollisionScripts(this->marker, func_80389520, NULL, CC_func_8038954C);
local->unk0 = &D_80389C30[(this->modelCacheIndex < 0x43) ? this->modelCacheIndex - 0x3D : this->modelCacheIndex - 0x28A];
local->unk4 = 0;
func_80256C60(this->position, 100);

14
src/CC/code_0.c
View File

@@ -20,7 +20,7 @@ ActorInfo D_80389AA0 = {
};
/* .code */
void func_803863F0(Actor *this, s32 next_state){
void CC_func_803863F0(Actor *this, s32 next_state){
ActorLocal_CC_0 * local = (ActorLocal_CC_0 *)this->local;
if(this->state == 4){
func_80388ED4(0);
@@ -55,7 +55,7 @@ void func_803864D4(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = 1;
marker->propPtr->unk8_3 = 1;
func_803863F0(this, 1);
CC_func_803863F0(this, 1);
}//L80386530
func_80388B4C(&sp4C);
@@ -65,27 +65,27 @@ void func_803864D4(Actor *this){
sp30[0] = sp4C[0] - sp40[0];
sp30[1] = 0.0f;
sp30[2] = sp4C[2] - sp40[2];
if(!func_80388CA0()){
if(!CC_func_80388CA0()){
local->unk4 = 2.0f;
}
else if(60.0f < gu_sqrtf(sp30[0]*sp30[0] + sp30[1]*sp30[1] + sp30[2]*sp30[2])){
local->unk4 = 0.05f;
}
else{
func_803863F0(this, 2);
CC_func_803863F0(this, 2);
}
}//L80386634
if(func_8025773C(&local->unk0, sp3C)){
func_803863F0(this, 4);
CC_func_803863F0(this, 4);
}
if((this->state == 2) && (1.0 <= local->unk8)){
func_803863F0(this, 3);
CC_func_803863F0(this, 3);
}//L803866B4
if((this->state == 4) && (1.0 <= local->unk8)){
func_803863F0(this, 1);
CC_func_803863F0(this, 1);
}//L80386714
if(this->state == 1){

12
src/CC/code_13C0.c
View File

@@ -66,7 +66,7 @@ void func_80387940(Struct_CC_13C0_1 *arg0, Struct68s *arg1) {
func_803878F0(arg0, arg1, 1);
}
void func_80387960(Struct_CC_13C0_1 *arg0, Struct68s *arg1) {
void CC_func_80387960(Struct_CC_13C0_1 *arg0, Struct68s *arg1) {
func_803878F0(arg0, arg1, 2);
}
@@ -82,19 +82,19 @@ void func_803879C0(Struct_CC_13C0_1 *arg0, Struct68s *arg1) {
func_803878F0(arg0, arg1, 5);
}
void func_803879E0(Struct_CC_13C0_1 *arg0, Struct68s *arg1) {
void CC_func_803879E0(Struct_CC_13C0_1 *arg0, Struct68s *arg1) {
func_803878F0(arg0, arg1, 6);
}
void func_80387A00(Struct_CC_13C0_1 *arg0, Struct68s *arg1) {
void CC_func_80387A00(Struct_CC_13C0_1 *arg0, Struct68s *arg1) {
func_803878F0(arg0, arg1, 7);
}
void func_80387A20(Struct_CC_13C0_1 *arg0, Struct68s *arg1) {
void CC_func_80387A20(Struct_CC_13C0_1 *arg0, Struct68s *arg1) {
func_803878F0(arg0, arg1, 8);
}
void func_80387A40(Struct_CC_13C0_1* arg0, Struct68s* arg1, f32 arg2) {
void CC_func_80387A40(Struct_CC_13C0_1* arg0, Struct68s* arg1, f32 arg2) {
s32 temp_v0;
f32 sp50[3];
f32 sp44[3];
@@ -160,7 +160,7 @@ void func_80387CC0(void){
}
void func_80387D4C(void){
void CC_func_80387D4C(void){
u32 sp1C;
u32 tmp_v0;
osPiReadIo(0x504, &sp1C);

2
src/CC/code_19B0.c
View File

@@ -25,7 +25,7 @@ extern ActorInfo D_80389E68;
extern ActorInfo D_80389E8C;
/* .code */
void func_80387DA0(void)
void CC_func_80387DA0(void)
{
spawnableActorList_add(&D_80389AA0, actor_new, 0X4080);
spawnableActorList_add(&D_80389E44, actor_new, 0X10080);

4
src/CC/code_1B90.c
View File

@@ -20,7 +20,7 @@ void func_80387F80(void){
func_8034E71C(func_8034C5AC(0x131), 0x190, 0.0f);
}
void func_80387FB0(void){
void CC_func_80387FB0(void){
item_set(ITEM_0_HOURGLASS_TIMER, 48*60 - 1);
item_set(ITEM_6_HOURGLASS, 1);
D_80389F90.unk1 = 1;
@@ -41,7 +41,7 @@ s32 func_80388010(void){
void func_8038803C(s32 arg0){
if(arg0 == D_80389F90.unk0){
if(arg0 == 1){
func_80387FB0();
CC_func_80387FB0();
}
D_80389F90.unk0++;
if(D_80389F90.unk0 >= 9){

12
src/CC/code_1F70.c
View File

@@ -112,7 +112,7 @@ void func_80388664(void) {
jiggySpawn(JIGGY_17_CC_CLANKER_RAISED, D_80389C00);
}
void func_8038868C(void) {
void CC_func_8038868C(void) {
func_80324E38(0, 3);
timed_setCameraToNode(0, 0);
timed_setCameraToNode(5.5f, 1);
@@ -128,7 +128,7 @@ void func_8038868C(void) {
}
void func_80388760(Gfx **gfx, Mtx **mtx, Vtx **vtx){
void CC_func_80388760(Gfx **gfx, Mtx **mtx, Vtx **vtx){
BKVertexList *tmp_v0;
s32 s1;
f32 spA4[3];
@@ -237,11 +237,11 @@ void func_80388C50(s32 arg0, s32 arg1){
func_8031CD20(arg0, 0xb, 1);
}
void func_80388C78(s32 arg0, s32 arg1){
void CC_func_80388C78(s32 arg0, s32 arg1){
func_8031CD20(arg0, 0xb, 2);
}
int func_80388CA0(void){
int CC_func_80388CA0(void){
return D_80389FA0.unk21 == 3;
}
@@ -317,7 +317,7 @@ void func_80388ED4(s32 arg0){
D_80389FA0.unk8 = 1.0f;
}
void func_80388F4C(void){
void CC_func_80388F4C(void){
f32 sp6C[3];
f32 sp68 = time_getDelta();
f32 sp64;
@@ -327,7 +327,7 @@ void func_80388F4C(void){
BKCollisionTri *tmp_v0;
f32 pad[3];
func_80387D4C();
CC_func_80387D4C();
if(D_80389FA0.unk21 != 0 && func_80334904() == 2){
player_getPosition(sp6C);
D_80389FA0.unk20 = (ml_vec3f_distance(sp6C, D_80389FA0.unkC) < 200.0f);

20
src/CC/code_530.c
View File

@@ -30,7 +30,7 @@ ActorInfo D_80389AD0 = {
f32 D_80389AF4[3] = {6200.0f, -2600.0f, 0.0f};
/* .code */
void func_80386920(Actor *this, s32 next_state){
void CC_func_80386920(Actor *this, s32 next_state){
ActorLocal_CC_530 *local = (ActorLocal_CC_530 *)&this->local;
f32 sp28[3];
s16 sp20[3];
@@ -57,7 +57,7 @@ void func_80386920(Actor *this, s32 next_state){
}
if(next_state == 4){
func_8038868C();
CC_func_8038868C();
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7FFF);
}
@@ -76,7 +76,7 @@ void func_80386AD0(ActorMarker *arg0, s32 arg1) {
void func_80386AF8(Actor *arg0) {
ActorLocal_CC_530 *local = (ActorLocal_CC_530 *)&arg0->local;
func_80386920(arg0, 0);
CC_func_80386920(arg0, 0);
func_8030DA44(local->unk0);
}
@@ -107,10 +107,10 @@ void func_80386B28(Actor *this){
this->position_y = -2620.0f;
this->position_z = -20.0f;
if(jiggyscore_isSpawned(JIGGY_17_CC_CLANKER_RAISED)){
func_80386920(this, 5);
CC_func_80386920(this, 5);
}
else{
func_80386920(this, 1);
CC_func_80386920(this, 1);
}
}
else{//L80386C40
@@ -159,10 +159,10 @@ void func_80386B28(Actor *this){
local->unk4[2] = sp58[2];
if(this->state == 0x1 && local->unk2 == 1){
if(--local->unk3 == 0){
func_80386920(this, 4);
CC_func_80386920(this, 4);
}
else{
func_80386920(this, 2);
CC_func_80386920(this, 2);
}
}//L80386E4C
@@ -172,7 +172,7 @@ void func_80386B28(Actor *this){
}
this->pitch = (f32)local->unk10 + 30.0f*local->unk14;
if(1.0f <= local->unk14){
func_80386920(this, 3);
CC_func_80386920(this, 3);
}
}//L80386EC0
@@ -182,7 +182,7 @@ void func_80386B28(Actor *this){
}
this->pitch = (f32)local->unk10 + 30.0f*(1.0f - local->unk14);
if(1.0f <= local->unk14){
func_80386920(this, 1);
CC_func_80386920(this, 1);
}
}//L80386F44
@@ -192,7 +192,7 @@ void func_80386B28(Actor *this){
}
this->pitch = (f32)local->unk10 + 180.0f*(local->unk14/5.0f);
if(5.0f <= local->unk14){
func_80386920(this, 5);
CC_func_80386920(this, 5);
func_80388EA4();
}
}//L80386FC0

12
src/CC/code_BF0.c
View File

@@ -29,7 +29,7 @@ extern ActorInfo D_80389B24 = {
u8 D_80389F80;
/* .code */
void func_80386FE0(Actor *this, s32 next_state){
void CC_func_80386FE0(Actor *this, s32 next_state){
ActorLocal_CC_BF0 *local = (ActorLocal_CC_BF0 *)&this->local;
s32 prev_state = this->state;
this->state = next_state;
@@ -54,7 +54,7 @@ void func_80386FE0(Actor *this, s32 next_state){
}
}
void func_803870E0(void) {
void CC_func_803870E0(void) {
D_80389F80 = 0;
}
@@ -82,9 +82,9 @@ void func_803870F8(Actor *this){
this->roll = 0.0f;
local->unk0 = (marker->modelId == 0x309) ? 1 : 2;
local->egg_count = 0;
func_80386FE0(this, 1);
CC_func_80386FE0(this, 1);
if(levelSpecificFlags_get((local->unk0 == 1)? LEVEL_FLAG_0_CC_TOKEN_TOOTH_OPEN: LEVEL_FLAG_1_CC_JIGGY_TOOTH_OPEN)){
func_80386FE0(this, 3);
CC_func_80386FE0(this, 3);
}
}//L803871D8
player_getPosition(&sp70);
@@ -119,7 +119,7 @@ void func_803870F8(Actor *this){
D_80389F80 = 0;
local->egg_count++;
if(local->egg_count == 3){
func_80386FE0(this, 2);
CC_func_80386FE0(this, 2);
}else{
func_8025A6EC(COMUSIC_2B_DING_B, 28000);
}
@@ -131,7 +131,7 @@ void func_803870F8(Actor *this){
((flagCnt == 0)? 0xd30 : 0xd31) :
((flagCnt == 0)? 0xd2e : 0xd2f), 4, NULL, NULL, NULL, NULL);
}
func_80386FE0(this, 3);
CC_func_80386FE0(this, 3);
}//L80387474
if(this->state == 3){