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

2
src/BGS/ch/croctus.c
View File

@@ -218,7 +218,7 @@ void func_80387FD4(Actor *this){
}
}
void bgs_func_803885DC(void){
void BGS_func_803885DC(void){
s32 i;
for(i = 0; i<5; i++)
bgs_D_803907B8[i] = 0;

12
src/BGS/ch/flibbit.c
View File

@@ -33,7 +33,7 @@ ActorInfo D_80390690 = {
f32 D_803906B4[3] = {0.0f, 0.0f, 0.0f};
/* .code */
bool func_803863F0(Actor *this, f32 arg1[3], s32 arg2){
bool BGS_func_803863F0(Actor *this, f32 arg1[3], s32 arg2){
ActorLocal_Flibbit *local = (ActorLocal_Flibbit *)&this->local;
@@ -73,7 +73,7 @@ bool func_80386564(Actor *this){
sp30[1] = sp3C[1] + this->position_y;
sp30[2] = sp3C[2] + this->position_z;
if(func_80329210(this, sp30))
return func_803863F0(this, sp30, 1);
return BGS_func_803863F0(this, sp30, 1);
}
}
return 0;
@@ -109,7 +109,7 @@ s32 func_803866A4(Actor *this) {
sp3C[2] = (f32) local->unkE[2];
}
if (func_80329210(this, sp3C) != 0) {
return func_803863F0(this, sp3C, 0);
return BGS_func_803863F0(this, sp3C, 0);
}
}
return 0;
@@ -143,7 +143,7 @@ bool func_8038686C(Actor *this) {
sp68[1] += this->position[1];
sp68[2] += this->position[2];
if (func_80329210(this, sp68)) {
return func_803863F0(this, sp68, 0);
return BGS_func_803863F0(this, sp68, 0);
}
}
return FALSE;
@@ -242,7 +242,7 @@ void func_80386AEC(Actor *this, s32 next_state) {
}
void func_80386E30(ActorMarker *this, ActorMarker *other){
void BGS_func_80386E30(ActorMarker *this, ActorMarker *other){
Actor *thisActor = marker_getActor(this);
if(thisActor->state < 6){
func_80386AEC(thisActor, 4);
@@ -325,7 +325,7 @@ void chflibbit_update(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
marker_setCollisionScripts(this->marker, func_80386E30, func_80386E70, func_80386EB0);
marker_setCollisionScripts(this->marker, BGS_func_80386E30, func_80386E70, func_80386EB0);
local->unk1C[0] = randf2(-2.0f, -1.0f);
local->unk1C[1] = randf2(-2.0f, -1.0f);

34
src/BGS/ch/mrvile.c
View File

@@ -89,7 +89,7 @@ void func_8038BB40(ActorMarker * arg0){
}
}
void func_8038BBA0(Actor *this, s32 arg1){
void BGS_func_8038BBA0(Actor *this, s32 arg1){
ActorLocal_MrVile *local;
local = (ActorLocal_MrVile *)&this->local;
@@ -138,7 +138,7 @@ void func_8038BD84(Actor *this){
local->unk28[0] = 0.0f;
local->unk28[1] = 0.0f;
local->unk28[2] = 0.0f;
func_8038BBA0(this, 101);
BGS_func_8038BBA0(this, 101);
}
void func_8038BDD4(Actor *this) {
@@ -200,26 +200,26 @@ void func_8038C0C8(Actor * this, s32 next_state){
local = (ActorLocal_MrVile *)&this->local;
if(next_state == 1)
func_8038BBA0(this, 101);
BGS_func_8038BBA0(this, 101);
if(next_state == 2)
func_8038BBA0(this, 101);
BGS_func_8038BBA0(this, 101);
if(next_state == 3)
func_8038BBA0(this, 102);
BGS_func_8038BBA0(this, 102);
if(next_state == 4)
func_8038BBA0(this, 102);
BGS_func_8038BBA0(this, 102);
if(next_state == 5){
local->target_position[0] = local->target_position[1] = local->target_position[2] = 0.0f;
func_8038BBA0(this, 102);
BGS_func_8038BBA0(this, 102);
}
if(next_state == 6){
local->target_position[0] = local->target_position[1] = local->target_position[2] = 0.0f;
local->unk24 = 300.0f;
func_8038BBA0(this, 102);
BGS_func_8038BBA0(this, 102);
}
this->state = next_state;
@@ -269,7 +269,7 @@ bool func_8038C2A8(ActorMarker *marker) {
}
bool func_8038C338(ActorMarker *marker){
bool BGS_func_8038C338(ActorMarker *marker){
Actor *this;
this = marker_getActor(marker);
@@ -312,14 +312,14 @@ void func_8038C408(ActorMarker *marker){
func_8038C0C8(this, 5);
}
void func_8038C434(ActorMarker *marker){
void BGS_func_8038C434(ActorMarker *marker){
Actor *this;
this = marker_getActor(marker);
func_8038C0C8(this, 6);
}
void func_8038C460(ActorMarker *arg0){
void BGS_func_8038C460(ActorMarker *arg0){
func_8038C0C8(marker_getActor(arg0), 1);
}
@@ -394,22 +394,22 @@ void chvile_update(Actor *this) {
func_80258A4C(this->position, this->yaw - 90.0f, local->target_position, &sp70, &sp6C, &sp68);
if (local->unkC == 102) {
if ((-0.8 < sp68) && (sp68 < 0.8) && (sp70 <= 150.0f) && var_v1) {
func_8038BBA0(this, 103);
BGS_func_8038BBA0(this, 103);
}
}
if (local->unkC == 103) {
if (sp70 <= 50.0f) {
if (chvilegame_cpu_consume_piece(local->game_marker, local->target_position)) {
func_8038BBA0(this, 104);
BGS_func_8038BBA0(this, 104);
} else {
func_8038BBA0(this, 102);
BGS_func_8038BBA0(this, 102);
}
} else if (func_80335794(this->unk148) >= 3) {
func_8038BBA0(this, 102);
BGS_func_8038BBA0(this, 102);
}
}
if ((local->unkC == 104) && (func_80335794(this->unk148) >= 3)) {
func_8038BBA0(this, 102);
BGS_func_8038BBA0(this, 102);
}
}
}
@@ -417,7 +417,7 @@ void chvile_update(Actor *this) {
player_getPosition(local->target_position);
local->unk10 = 500.0f;
if ((local->unkC == 102) && (ml_vec3f_distance(this->position, local->target_position) < 200.0f)) {
func_8038BBA0(this, 103);
BGS_func_8038BBA0(this, 103);
}
if ((local->unkC == 103) && (func_80335794(this->unk148) >= 2)) {
func_8038C0C8(this, 1);

4
src/BGS/ch/tanktup.c
View File

@@ -21,14 +21,14 @@ enum chtanktup_leg_e {
TANKTUP_LEG_BACK_RIGHT,
};
ActorAnimationInfo D_80390C20[] = {
ActorAnimationInfo BGS_D_80390C20[] = {
{0, 0.0f},
{0x101, 7.5f},
{0x102, 1.75f},
{0x107, 1.75f}
};
ActorInfo D_80390C40 = {MARKER_6C_TANKTUP, ACTOR_E8_TANKTUP, ASSET_3EE_TANKTUP, 0x01, D_80390C20,
ActorInfo D_80390C40 = {MARKER_6C_TANKTUP, ACTOR_E8_TANKTUP, ASSET_3EE_TANKTUP, 0x01, BGS_D_80390C20,
func_8038F6A4, func_80326224, func_80325888,
0, 0x80, 0.0f, 0
};

14
src/BGS/ch/yellowflibbit.c
View File

@@ -18,17 +18,17 @@ typedef struct {
}ActorLocal_Yellow_Flibbit;
Actor *func_8038DE5C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx** vtx);
void func_8038E034(Actor *this);
void BGS_func_8038E034(Actor *this);
/* .data */
ActorInfo D_80390AE0 = {
ActorInfo BGS_D_80390AE0 = {
MARKER_C5_FLIBBIT_YELLOW, ACTOR_137_FLIBBIT_YELLOW, ASSET_385_MODEL_FLIBBIT_YELLOW,
0, NULL,
func_8038E034, NULL, func_8038DE5C,
BGS_func_8038E034, NULL, func_8038DE5C,
0, 0, 1.0f, 0
};
s32 D_80390B04[3] = {0xFF, 0xB3, 0};
f32 D_80390B10[3] = {0.0f, 0.0f, 0.0f};
f32 BGS_D_80390B10[3] = {0.0f, 0.0f, 0.0f};
/* .code */
void func_8038D1E0(Actor *this) {
@@ -325,7 +325,7 @@ Actor *func_8038DE5C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
return this;
}
void func_8038E034(Actor *this) {
void BGS_func_8038E034(Actor *this) {
f32 spB4[3];
f32 spA8[3];
f32 spA4;
@@ -365,7 +365,7 @@ void func_8038E034(Actor *this) {
}
if (!local->unk2) {
local->unk2 = TRUE;
func_8038CED0();
BGS_func_8038CED0();
}
player_getPosition(spB4);
spA8[0] = spB4[0] - this->position[0];
@@ -446,7 +446,7 @@ void func_8038E034(Actor *this) {
sp60[0] = (f32) (local->unkA[0] - local->unk4[0]);
sp60[1] = (f32) (local->unkA[1] - local->unk4[1]);
sp60[2] = (f32) (local->unkA[2] - local->unk4[2]);
func_80258A4C(D_80390B10, this->yaw - 90.0f, sp60, &sp74, &sp70, &sp6C);
func_80258A4C(BGS_D_80390B10, this->yaw - 90.0f, sp60, &sp74, &sp70, &sp6C);
this->yaw += sp6C * 220.0f * sp9C;
}
}