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;
}
}

16
src/BGS/code_3030.c
View File

@@ -10,15 +10,15 @@ typedef struct{
}ActorLocal_BGS_3030;
void func_80389668(Actor *this);
Actor *func_80389610(ActorMarker *marker, Gfx **, Mtx **, Vtx**);
Actor *BGS_func_80389610(ActorMarker *marker, Gfx **, Mtx **, Vtx**);
/* .data */
ActorInfo D_80390880 = { MARKER_19B_CHOIR_TURTLE_YELLOW, ACTOR_27B_CHOIR_TURTLE_YELLOW, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, func_80389668, NULL, func_80389610, 0, 0, 1.5f, 0};
ActorInfo D_803908A4 = { MARKER_19C_CHOIR_TURTLE_CYAN, ACTOR_27C_CHOIR_TURTLE_CYAN, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, func_80389668, NULL, func_80389610, 0, 0, 1.5f, 0};
ActorInfo D_803908C8 = { MARKER_19D_CHOIR_TURTLE_BLUE, ACTOR_27D_CHOIR_TURTLE_BLUE, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, func_80389668, NULL, func_80389610, 0, 0, 1.5f, 0};
ActorInfo D_803908EC = { MARKER_19E_CHOIR_TURTLE_RED, ACTOR_27E_CHOIR_TURTLE_RED, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, func_80389668, NULL, func_80389610, 0, 0, 1.5f, 0};
ActorInfo D_80390910 = { MARKER_19F_CHOIR_TURTLE_PINK, ACTOR_27F_CHOIR_TURTLE_PINK, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, func_80389668, NULL, func_80389610, 0, 0, 1.5f, 0};
ActorInfo D_80390934 = { MARKER_1A0_CHOIR_TURTLE_PURPLE, ACTOR_280_CHOIR_TURTLE_PURPLE, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, func_80389668, NULL, func_80389610, 0, 0, 1.5f, 0};
ActorInfo D_80390880 = { MARKER_19B_CHOIR_TURTLE_YELLOW, ACTOR_27B_CHOIR_TURTLE_YELLOW, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, func_80389668, NULL, BGS_func_80389610, 0, 0, 1.5f, 0};
ActorInfo D_803908A4 = { MARKER_19C_CHOIR_TURTLE_CYAN, ACTOR_27C_CHOIR_TURTLE_CYAN, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, func_80389668, NULL, BGS_func_80389610, 0, 0, 1.5f, 0};
ActorInfo D_803908C8 = { MARKER_19D_CHOIR_TURTLE_BLUE, ACTOR_27D_CHOIR_TURTLE_BLUE, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, func_80389668, NULL, BGS_func_80389610, 0, 0, 1.5f, 0};
ActorInfo D_803908EC = { MARKER_19E_CHOIR_TURTLE_RED, ACTOR_27E_CHOIR_TURTLE_RED, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, func_80389668, NULL, BGS_func_80389610, 0, 0, 1.5f, 0};
ActorInfo D_80390910 = { MARKER_19F_CHOIR_TURTLE_PINK, ACTOR_27F_CHOIR_TURTLE_PINK, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, func_80389668, NULL, BGS_func_80389610, 0, 0, 1.5f, 0};
ActorInfo D_80390934 = { MARKER_1A0_CHOIR_TURTLE_PURPLE, ACTOR_280_CHOIR_TURTLE_PURPLE, ASSET_3F9_MODEL_CHOIR_TURTLE, 0, NULL, func_80389668, NULL, BGS_func_80389610, 0, 0, 1.5f, 0};
/* .code */
void func_80389420(ActorMarker *marker) {
@@ -60,7 +60,7 @@ void func_803895D0(ActorMarker *marker, ActorMarker *other_marker){
}
}
Actor *func_80389610(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
Actor *BGS_func_80389610(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
func_8033A45C(4, marker->unk14_20 - 0x19A);
return func_80325888(marker, gfx, mtx, vtx);
}

30
src/BGS/code_3420.c
View File

@@ -41,11 +41,11 @@ enum asset_e D_80390984[] = { 0, 0xC66, 0xC68, 0xC6A, 0xC92, 0xC93, 0xC94,
enum asset_e D_803909A4[] = { 0, 0xC67, 0xC69, 0, 0xC95, 0xC96, 0xC97};
enum asset_e D_803909C0[] = { 0, 0xC6E, 0xC6F, 0, 0xC95, 0xC96, 0xC97};
enum asset_e D_803909DC[] = {0xC65, 0xC65, 0xC65, 0xC8F, 0, 0, 0};
enum asset_e D_803909F8[] = {0xC64, 0, 0, 0xC8E, 0, 0, 0, 0};
enum asset_e BGS_D_803909F8[] = {0xC64, 0, 0, 0xC8E, 0, 0, 0, 0};
enum asset_e D_80390A18[] = {0xC6D, 0xC70, 0xC71, 0xC8E, 0, 0, 0, 0};
/* .code */
bool func_80389810(f32 arg0[3]) {
bool BGS_func_80389810(f32 arg0[3]) {
if (func_8028ECAC() != BSGROUP_7_CROC_ATTACK) {
return FALSE;
}
@@ -53,7 +53,7 @@ bool func_80389810(f32 arg0[3]) {
return TRUE;
}
void func_80389850(Actor *this, s32 arg1) {
void BGS_func_80389850(Actor *this, s32 arg1) {
ActorLocal_BGS_3420 *local;
Actor *vile;
f32 sp94[3];
@@ -158,11 +158,11 @@ void func_80389C58(ActorMarker *marker) {
this = marker_getActor(marker);
local = (ActorLocal_BGS_3420 *)&this->local;
func_80389850(this, 0);
BGS_func_80389850(this, 0);
func_80311480(D_80390984[local->unkC], 0xF, func_8038C284(local->vile_marker), this->marker, func_80389BF8, NULL);
}
void func_80389CD8(ActorMarker *marker, enum asset_e text_id, s32 arg2){
void BGS_func_80389CD8(ActorMarker *marker, enum asset_e text_id, s32 arg2){
Actor *this;
this = marker_getActor(marker);
@@ -177,11 +177,11 @@ void func_80389D20(ActorMarker *marker) {
this = marker_getActor(marker);
local = (ActorLocal_BGS_3420 *)&this->local;
func_80389850(this, 0);
BGS_func_80389850(this, 0);
if (local->unkC == local->unkD) {
func_80311480(D_803909A4[local->unkC], 0xF, func_8038C284(local->vile_marker), this->marker, func_80389CD8, NULL);
func_80311480(D_803909A4[local->unkC], 0xF, func_8038C284(local->vile_marker), this->marker, BGS_func_80389CD8, NULL);
} else {
func_80311480(D_803909C0[local->unkC], 0xF, func_8038C284(local->vile_marker), this->marker, func_80389CD8, NULL);
func_80311480(D_803909C0[local->unkC], 0xF, func_8038C284(local->vile_marker), this->marker, BGS_func_80389CD8, NULL);
}
func_80347A14(0);
}
@@ -202,7 +202,7 @@ void func_80389E40(ActorMarker *marker) {
this = marker_getActor(marker);
local = (ActorLocal_BGS_3420 *)&this->local;
func_80389850(this, 1);
BGS_func_80389850(this, 1);
func_80311480(0xC6B, 0xF, func_8038C284(local->vile_marker), this->marker, func_80389DF8, NULL);
}
@@ -227,7 +227,7 @@ void func_80389F08(ActorMarker *marker) {
this = marker_getActor(marker);
local = (ActorLocal_BGS_3420 *)&this->local;
func_80389850(this, 0);
BGS_func_80389850(this, 0);
var_s2 = func_80326F58(0x49);
vile = marker_getActor(local->vile_marker);
if (var_s2 > 0) {
@@ -278,7 +278,7 @@ void func_8038A068(Actor *this, s32 next_state) {
}
if (next_state == 4) {
if (local->unkC == local->unkD) {
func_80311480(D_803909F8[local->unkC], 0xE | ((D_803909F8[local->unkC] == 0xC8E) ? 1 : 0) | 0xE, func_8038C284(local->vile_marker), this->marker, func_80389BC8, NULL);
func_80311480(BGS_D_803909F8[local->unkC], 0xE | ((BGS_D_803909F8[local->unkC] == 0xC8E) ? 1 : 0) | 0xE, func_8038C284(local->vile_marker), this->marker, func_80389BC8, NULL);
} else {
func_80311480(D_80390A18[local->unkC], 0xF , func_8038C284(local->vile_marker), this->marker, func_80389BC8, NULL);
}
@@ -290,7 +290,7 @@ void func_8038A068(Actor *this, s32 next_state) {
local->unkD = local->unkC;
}
if (local->unkC == 7) {
func_8038C434(local->vile_marker);
BGS_func_8038C434(local->vile_marker);
} else {
local->current_type = YUMBLIE;
local->player_score = 0;
@@ -315,7 +315,7 @@ void func_8038A068(Actor *this, s32 next_state) {
func_8038A044();
}
}
func_8038C460(local->vile_marker);
BGS_func_8038C460(local->vile_marker);
func_80347A14(1);
}
if (next_state == 6) {
@@ -363,7 +363,7 @@ void chvilegame_player_consume_piece(Actor *this) {
begin = (struct vilegame_piece *)vector_getBegin(local->game_pieces);
end = (struct vilegame_piece *) vector_getEnd(local->game_pieces);
if ((end != begin) && func_80389810(sp44)){
if ((end != begin) && BGS_func_80389810(sp44)){
sp44[1] = 0.0f;
for(i_ptr = begin; i_ptr < end; i_ptr++){
if ((ml_vec3f_distance(i_ptr->position, sp44) < 65.25) && chyumblie_is_edible(i_ptr->marker)) {
@@ -640,7 +640,7 @@ void chvilegame_update(Actor *this) {
}
}
}
if ((this->state == 7) && (func_8038C338(local->vile_marker) != 0)) {
if ((this->state == 7) && (BGS_func_8038C338(local->vile_marker) != 0)) {
func_8038A068(this, 1);
}
}

12
src/BGS/code_9750.c
View File

@@ -22,25 +22,25 @@ ActorInfo D_80390C88 = {MARKER_6D_TANKTUP_LEG, ACTOR_E9_TANKTUP_LEG_FL, ASSET_3E
};
u8 pad_80390CCC[4] = {0};
ActorAnimationInfo D_80390CB0[3] = {
ActorAnimationInfo BGS_D_80390CB0[3] = {
{0, 0.0f},
{0x104, 8000000.0f},
{0x104, 0.75f}
};
ActorInfo D_80390CC8 = {MARKER_6D_TANKTUP_LEG, ACTOR_EA_TANKTUP_LEG_BL, ASSET_3F0_MODEL_TANKTUP_LEG_BL, 0x01, D_80390CB0,
ActorInfo D_80390CC8 = {MARKER_6D_TANKTUP_LEG, ACTOR_EA_TANKTUP_LEG_BL, ASSET_3F0_MODEL_TANKTUP_LEG_BL, 0x01, BGS_D_80390CB0,
func_8038FBF8, func_80326224, func_80325888,
0, 0x166, 0.0f, 0
};
u8 pad_80390CEC[4] = {0};
ActorAnimationInfo D_80390CF0[3] = {
ActorAnimationInfo BGS_D_80390CF0[3] = {
{0, 0.0f},
{0x105, 8000000.0f},
{0x105, 0.75f}
};
ActorInfo D_80390D08 = {MARKER_6D_TANKTUP_LEG, ACTOR_EB_TANKTUP_LEG_FR, ASSET_3F1_MODEL_TANKTUP_LEG_FR, 0x01, D_80390CF0,
ActorInfo D_80390D08 = {MARKER_6D_TANKTUP_LEG, ACTOR_EB_TANKTUP_LEG_FR, ASSET_3F1_MODEL_TANKTUP_LEG_FR, 0x01, BGS_D_80390CF0,
func_8038FBF8, func_80326224, func_80325888,
0, 0x166, 0.0f, 0
};
@@ -67,7 +67,7 @@ void func_8038FB40(ActorMarker *this, s32 arg1){
FUNC_8030E624(SFX_A_BANJO_LANDING_05, 0.8f, 32750);
}
void func_8038FB84(ActorMarker *this, ActorMarker *other_marker){
void BGS_func_8038FB84(ActorMarker *this, ActorMarker *other_marker){
Actor *thisActor;
thisActor = marker_getActor(this);
@@ -81,7 +81,7 @@ void func_8038FBF8(Actor *this){
if(!this->initialized){
this->initialized = 1;
this->marker->propPtr->unk8_3 = 1;
marker_setCollisionScripts(this->marker, NULL, NULL, func_8038FB84);
marker_setCollisionScripts(this->marker, NULL, NULL, BGS_func_8038FB84);
}
if(this->state == 2){
if(animctrl_isAt(this->animctrl, 0.65f)){

34
src/BGS/done/ch/code_2270.c
View File

@@ -3,7 +3,7 @@
#include "variables.h"
void func_80324E88(f32);
void func_803888E4(Actor *this, s32 arg1);
void BGS_func_803888E4(Actor *this, s32 arg1);
typedef struct{
u32 unk0;
@@ -33,11 +33,11 @@ s16 D_8039085C[] = {0, 0xC77, 0xC79, 0xC7B}; //success texts
u8 D_80390864[] = {3, 3, 5, 7}; //chchoirgame_sequence_length
f32 D_80390868[3] = {0.0f, 100.0f, -1020.0f}; //chchoirgame_jiggy_position
void func_80388660(ActorMarker *this){
func_803888E4(marker_getActor(this), 6);
void BGS_func_80388660(ActorMarker *this){
BGS_func_803888E4(marker_getActor(this), 6);
}
void func_8038868C(void){
void BGS_func_8038868C(void){
jiggySpawn(JIGGY_27_BGS_TIPTUP, D_80390868);
}
@@ -61,14 +61,14 @@ void func_803886F4(ActorMarker *this){
thisActor = marker_getActor(this);
item_set(ITEM_6_HOURGLASS, 1);
item_set(ITEM_0_HOURGLASS_TIMER, 30*60-1);
func_803888E4(thisActor, 5);
BGS_func_803888E4(thisActor, 5);
}
void func_8038873C(void){
func_8025A6EC(COMUSIC_2B_DING_B, 28000);
}
void func_80388760(void){
void BGS_func_80388760(void){
func_8025A6EC(COMUSIC_2C_BUZZER, 28000);
}
@@ -79,20 +79,20 @@ void func_80388784(ActorMarker *this, s32 arg1, s32 arg2){
switch(arg1){
case 0xc72:
case 0xc74:
func_803888E4(thisActor, 3);
BGS_func_803888E4(thisActor, 3);
break;
case 0xc78:
case 0xc7a:
case 0xc7c:
func_803888E4(thisActor, 4);
BGS_func_803888E4(thisActor, 4);
break;
case 0xc77:
case 0xc79:
func_80324E38(0.0f, 0);
func_803888E4(thisActor, 3);
BGS_func_803888E4(thisActor, 3);
break;
case 0xc7b:
timedFunc_set_0(0.0f, func_8038868C);
timedFunc_set_0(0.0f, BGS_func_8038868C);
func_80324E88(2.5f);
func_80324E38(2.5f, 0);
break;
@@ -117,11 +117,11 @@ void func_80388848(ActorMarker *this){
func_803204E4(5,1);
}
else{
func_80388660(thisActor->marker);
BGS_func_80388660(thisActor->marker);
}
}
void func_803888E4(Actor *this, s32 arg1){
void BGS_func_803888E4(Actor *this, s32 arg1){
ActorLocal_BGS_2270 *unqPtr;
f32 sp54;
@@ -242,7 +242,7 @@ void func_80388E94(ActorMarker *this, s32 arg1){
}
else{
func_8028F55C(1, thisActor->marker);
timedFunc_set_0(0.5f, func_80388760);
timedFunc_set_0(0.5f, BGS_func_80388760);
if(!mapSpecificFlags_get(1) && !func_803203FC(2) && func_80311480(0xc75, 0, NULL, NULL, NULL, NULL))
mapSpecificFlags_set(1,TRUE);
}
@@ -296,7 +296,7 @@ void func_80389080(Actor *this){
unqPtr->unkA = 3;
this->position_y = this->position_y - 300.0f;
}
func_803888E4(this, 1);
BGS_func_803888E4(this, 1);
if(jiggyscore_isSpawned(JIGGY_27_BGS_TIPTUP) && !func_803203FC(2) && !func_803203FC(1))
marker_despawn(this->marker);
}
@@ -315,12 +315,12 @@ void func_80389080(Actor *this){
if(func_803203FC(2)){
if(func_803203FC(3)){
func_80324E38(0.0f,0);
func_803888E4(this, 3);
BGS_func_803888E4(this, 3);
}
}
else{
if(ml_vec3f_distance(this->position, &sp44) < 300.0f && player_getTransformation() == TRANSFORM_1_BANJO && !jiggyscore_isSpawned(JIGGY_27_BGS_TIPTUP)){
func_803888E4(this, 2);
BGS_func_803888E4(this, 2);
}
}
}
@@ -334,7 +334,7 @@ void func_80389080(Actor *this){
} //L80389370
else{
if(ml_vec3f_distance(this->position, &sp44) >= 300.0f)
func_803888E4(this, 1);
BGS_func_803888E4(this, 1);
}
}//L803893A0
if(this->state == 6){

8
src/BGS/done/ch/code_6730.c
View File

@@ -9,7 +9,7 @@ void func_8025A58C(u32, u32);
void func_80324E88(f32);
ActorInfo D_80390AB0 = {MARKER_C4_YELLOW_FLIBBIT_CTRL, ACTOR_136_YELLOW_FLIBBIT_CONTROLLER, 0x00, 0x00, NULL,
ActorInfo BGS_D_80390AB0 = {MARKER_C4_YELLOW_FLIBBIT_CTRL, ACTOR_136_YELLOW_FLIBBIT_CONTROLLER, 0x00, 0x00, NULL,
func_8038CEE8, NULL, func_80325340,
0, 0, 0.0f, 0
};
@@ -20,7 +20,7 @@ f32 D_80390AD4[3] = {1985.0f, 200.0f, -1386.0f};
u8 D_80391240[4];
/* .code */
void func_8038CB20(void){
void BGS_func_8038CB20(void){
jiggySpawn(JIGGY_24_BGS_FLIBBITS, D_80390AD4);
}
@@ -97,7 +97,7 @@ void func_8038CC08(Actor * arg0, u32 arg1){
if(arg1 == 5){
func_80324E38(0.0f, 3);
timed_setCameraToNode(0.0f, 0x27);
timedFunc_set_0(0.2f, func_8038CB20);
timedFunc_set_0(0.2f, BGS_func_8038CB20);
func_80324E88(3.0f);
func_80324E38(3.0f, 0);
arg1 = 6;
@@ -121,7 +121,7 @@ void func_8038CEB8(void){
D_80391240[2]++;
}
void func_8038CED0(void){
void BGS_func_8038CED0(void){
D_80391240[3]++;
}

10
src/BGS/done/code_8DF0.c
View File

@@ -16,8 +16,8 @@ extern ActorInfo D_80390C88;
extern ActorInfo D_80390CC8;
extern ActorInfo D_80390D08;
extern ActorInfo D_80390D48;
extern ActorInfo D_80390AB0;
extern ActorInfo D_80390AE0;
extern ActorInfo BGS_D_80390AB0;
extern ActorInfo BGS_D_80390AE0;
extern ActorInfo D_80390960;
extern ActorInfo D_80390A40;
extern ActorInfo D_80390A70;
@@ -33,7 +33,7 @@ extern ActorInfo D_80390D70;
extern ActorInfo D_80390BD8;
extern ActorInfo D_80390BFC;
void bgs_func_8038F1E0(void){//bgs_updateSpawnableActors
void BGS_func_8038F1E0(void){//bgs_updateSpawnableActors
spawnableActorList_add(&D_80390804, actor_new, 0x00000088);//croctus
spawnableActorList_add(&D_80390690, actor_new, 0x020108A1); //flibbit
spawnableActorList_add(&D_803906F8, actor_new, 0x400); //pink_egg_largest
@@ -47,8 +47,8 @@ void bgs_func_8038F1E0(void){//bgs_updateSpawnableActors
spawnableActorList_add(&D_80390CC8, actor_new, 0x400042c);//tanktup_leg
spawnableActorList_add(&D_80390D08, actor_new, 0x400042c);//tanktup_leg
spawnableActorList_add(&D_80390D48, actor_new, 0x400042c);//tanktup_leg
spawnableActorList_add(&D_80390AB0, actor_new, 0x81);
spawnableActorList_add(&D_80390AE0, actor_new, 0x20108a1); //yellow_flibbit
spawnableActorList_add(&BGS_D_80390AB0, actor_new, 0x81);
spawnableActorList_add(&BGS_D_80390AE0, actor_new, 0x20108a1); //yellow_flibbit
spawnableActorList_add(&D_80390960, actor_new, 0);
spawnableActorList_add(&D_80390A40, actor_new, 0x880); //yumblie
spawnableActorList_add(&D_80390A70, actor_new, 0x9a2); //mr. vile