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/TTC/ch/lockup.c
View File

@@ -55,7 +55,7 @@ Actor *func_803894C0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
}
void func_80389530(Actor *this){
void TTC_func_80389530(Actor *this){
func_80328B8C(this, 1, 0.2f, 1);
this->marker->collidable = FALSE;
this->unk38_31 = 0;
@@ -142,7 +142,7 @@ void func_80389600(Actor *this){
case 4: //L803898F4
case 5: //L803898F4
if(this->marker->unk14_21 && actor_animationIsAt(this, 0.99f)){
func_80389530(this);
TTC_func_80389530(this);
for(i = 5; i < 0xe; i++){
func_8034A174(this->marker->unk44, i, this->unk1C);
func_802EE6CC(this->unk1C, D_8038C80C, D_8038C7FC, 1, 0.4f, 50.0f, 0xb4, 0xa0, 0);

30
src/TTC/code_0.c
View File

@@ -25,7 +25,7 @@ ActorInfo D_8038C3D0 = {
/* .code */
void func_803863F0(enum sfx_e sfx_id, f32 arg1, s32 arg2, f32 position[3], f32 arg4, f32 arg5){
void TTC_func_803863F0(enum sfx_e sfx_id, f32 arg1, s32 arg2, f32 position[3], f32 arg4, f32 arg5){
if(func_803114B0()){
arg2 -= 10000;
if(arg2 < 0)
@@ -40,7 +40,7 @@ void func_80386454(Actor *this){
animctrl_setDuration(this->animctrl, randf2(1.9f, 2.1f));
}
bool func_803864B0(Actor *this, f32 arg1) {
bool TTC_func_803864B0(Actor *this, f32 arg1) {
f32 sp5C;
f32 sp58;
f32 pad;
@@ -88,7 +88,7 @@ bool func_803864B0(Actor *this, f32 arg1) {
if ((func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) ? 0 : 0x11) < this->unk28) {
this->unk28 = (func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) != 0) ? 0.0f : 17.0f;
} else if (sp38 == 0) {
func_803863F0(SFX_AE_YUMYUM_TALKING, randf2(0.9f, 1.0f), 22000, this->position, 500.0f, 2000.0f);
TTC_func_803863F0(SFX_AE_YUMYUM_TALKING, randf2(0.9f, 1.0f), 22000, this->position, 500.0f, 2000.0f);
}
return 1;
@@ -104,7 +104,7 @@ bool func_80386760(Actor *this, s32 arg1) {
animctrl_setDuration(this->animctrl, 1.0f);
sp2C = (s32) ((f64) (60.0f / (f32) func_8033DD90()) * 0.5);
if ((this->unk1C[0] != 0.0f) || !func_803864B0(this, sp2C)) {
if ((this->unk1C[0] != 0.0f) || !TTC_func_803864B0(this, sp2C)) {
if (((f64) animctrl_getAnimTimer(this->animctrl) < 0.1) && ((f64) randf() < 0.5)) {
if (this->unk1C[0] != 0.0f) {
arg1 *= 2;
@@ -148,7 +148,7 @@ void func_80386A9C(ParticleEmitter *pCtrl, f32 position[3]){
func_802EFA70(pCtrl, 2);
}
void func_80386B54(f32 position[3], s32 count){
void TTC_func_80386B54(f32 position[3], s32 count){
static struct41s D_8038C3F4 = {
{{-50.0f, 750.0f, -50.0f}, {120.0f, 900.0f, 120.0f}},
{{ 0.0f, -1800.0f, 0.0f}, { 0.0f, -1800.0f, 0.0f}}
@@ -196,7 +196,7 @@ void func_80386CBC(f32 position[3], s32 count){
particleEmitter_emitN(pCtrl, count);
}
void func_80386D68(f32 position[3], enum asset_e sprite_id, s32 count){
void TTC_func_80386D68(f32 position[3], enum asset_e sprite_id, s32 count){
static struct31s D_8038C484 = {
{0.2f, 0.35f},
{0.0f, 0.0f},
@@ -227,9 +227,9 @@ void func_80386DF4(ActorMarker *this_marker, ActorMarker *other_marker){
this = marker_getActor(this_marker);
this->marker->collidable = FALSE;
this->unk138_27 = TRUE;
func_803863F0(SFX_1D_HITTING_AN_ENEMY_1, 1.0f, 26000, this->position, 1500.0f, 2000.0f);
func_803863F0(SFX_115_BUZZBOMB_DEATH, 1.2f, 26000, this->position, 1500.0f, 2000.0f);
func_80386B54(this->position, 2);
TTC_func_803863F0(SFX_1D_HITTING_AN_ENEMY_1, 1.0f, 26000, this->position, 1500.0f, 2000.0f);
TTC_func_803863F0(SFX_115_BUZZBOMB_DEATH, 1.2f, 26000, this->position, 1500.0f, 2000.0f);
TTC_func_80386B54(this->position, 2);
func_80386C08(this->position, 2);
func_80386CBC(this->position, 0xC);
func_803115C4(0xa14);
@@ -301,7 +301,7 @@ void func_80386FDC(Actor *this){
func_80328B8C(this, 2, 0.01f, 1);
actor_playAnimationOnce(this);
animctrl_setDuration(this->animctrl, 1.0f);
func_803863F0(SFX_3F2_UNKNOWN, randf2(1.0f, 1.1f), 22000, this->position, 1500.0f, 2000.0f);
TTC_func_803863F0(SFX_3F2_UNKNOWN, randf2(1.0f, 1.1f), 22000, this->position, 1500.0f, 2000.0f);
}
else{
animctrl_setDuration(this->animctrl, 2.0f);
@@ -312,7 +312,7 @@ void func_80386FDC(Actor *this){
this->position_y += this->velocity_y;
this->velocity_y += -5.0f;
if(actor_animationIsAt(this, 0.63f)){
func_803863F0(SFX_80_YUMYUM_CLACK, 1.0f, 20000, this->position, 1500.0f, 2000.0f);
TTC_func_803863F0(SFX_80_YUMYUM_CLACK, 1.0f, 20000, this->position, 1500.0f, 2000.0f);
}
if(this->position_y <= sp48){
@@ -339,7 +339,7 @@ void func_80386FDC(Actor *this){
}
if(actor_animationIsAt(this, 0.8f) && 2.0f == this->velocity_x){
func_803863F0(SFX_4B_GULPING, randf2(0.8f, 0.9f), 22000, this->position, 700.0f, 2000.0f);
TTC_func_803863F0(SFX_4B_GULPING, randf2(0.8f, 0.9f), 22000, this->position, 700.0f, 2000.0f);
break;
}//L803873C4
@@ -347,15 +347,15 @@ void func_80386FDC(Actor *this){
if(!this->marker->unk14_21) break;
func_803863F0(SFX_4C_LIP_SMACK, 1.0f, 20000, this->position, 500.0f, 2000.0f);
TTC_func_803863F0(SFX_4C_LIP_SMACK, 1.0f, 20000, this->position, 500.0f, 2000.0f);
func_8034A174(this->marker->unk44, 5, sp38);
switch(this->unk38_31){
case 0x60:
func_80386D68(sp38, ASSET_718_SPRITE_SPARKLE_WHITE_2, 8);
TTC_func_80386D68(sp38, ASSET_718_SPRITE_SPARKLE_WHITE_2, 8);
break;
case 0xb5:
func_80386D68(sp38, ASSET_715_SPRITE_SPARKLE_RED, 8);
TTC_func_80386D68(sp38, ASSET_715_SPRITE_SPARKLE_RED, 8);
break;
}
break;

8
src/TTC/code_10A0.c
View File

@@ -16,7 +16,7 @@ typedef struct {
}ActorLocal_Blubber;
void func_803878CC(Actor *this);
void func_80387CF4(Actor *this);
void TTC_func_80387CF4(Actor *this);
Actor *func_80387D6C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
/* .data */
@@ -29,10 +29,10 @@ ActorAnimationInfo D_8038C4E0[] = {
{0xB8, 0.8f}
};
ActorInfo D_8038C510 = {
ActorInfo TTC_D_8038C510 = {
MARKER_A3_BLUBBER, ACTOR_115_BLUBBER, ASSET_370_MODEL_BLUBBER,
0x1, D_8038C4E0,
func_803878CC, func_80387CF4, func_80387D6C,
func_803878CC, TTC_func_80387CF4, func_80387D6C,
0, 0x399, 1.8f, 0
};
@@ -237,7 +237,7 @@ void func_803878CC(Actor * this){
}
}
void func_80387CF4(Actor *this){
void TTC_func_80387CF4(Actor *this){
func_80343DEC(this);
if(0.99 <= this->unk48){
func_8028F918(0);

20
src/TTC/code_19D0.c
View File

@@ -65,7 +65,7 @@ Actor *func_80387EB0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
return func_80325888(marker, gfx, mtx, vtx);
}
void func_80387F18(Actor *this) {
void TTC_func_80387F18(Actor *this) {
func_80328AEC(this, 3);
this->unk1C[0] = 0.0f;
switch((s32)this->unk60){
@@ -83,15 +83,15 @@ void func_80387F18(Actor *this) {
}
}
void func_80387FB0(ActorMarker *caller, enum asset_e text_id, s32 arg2){
void TTC_func_80387FB0(ActorMarker *caller, enum asset_e text_id, s32 arg2){
Actor *this;
this = marker_getActor(caller);
func_80387F18(this);
TTC_func_80387F18(this);
func_802BAE4C();
comusic_8025AB44(COMUSIC_12_TTC_NIPPER, -1, 300);
}
void func_80387FF4(Actor *this) {
void TTC_func_80387FF4(Actor *this) {
s32 i;
func_80328B8C(this, 4, 0.01f, 1);
@@ -140,12 +140,12 @@ void func_80388178(ActorMarker *this_marker, ActorMarker *other_marker) {
}
if (this->unk60 == 80.0f) {
func_80387FF4(this);
TTC_func_80387FF4(this);
this->unk60 = 40.0f;
return;
}
func_80387FF4(this);
TTC_func_80387FF4(this);
this->unk60 = 80.0f;
func_80311480(0xA10, 4, NULL, NULL, NULL, NULL);
return;
@@ -234,14 +234,14 @@ void func_80388434(Actor *this){
&& temp_v0 != 10
){
func_80328B8C(this, 5, 0.01f, 1);
if(func_80311480(0xa0e, 0xf, this->position, this->marker, func_80387FB0, NULL)){
if(func_80311480(0xa0e, 0xf, this->position, this->marker, TTC_func_80387FB0, NULL)){
this->unk138_24 = TRUE;
}
comusic_8025AB44(COMUSIC_12_TTC_NIPPER, 5000, 300);
set_camera_to_node(11);
}
else{//L803886B0
func_80387F18(this);
TTC_func_80387F18(this);
}
break;
}
@@ -263,7 +263,7 @@ void func_80388434(Actor *this){
}
if(this->unk60 <= this->unk38_31){
func_80387F18(this);
TTC_func_80387F18(this);
break;
}
this->unk38_31++;
@@ -300,7 +300,7 @@ void func_80388434(Actor *this){
case 4:// L80388910
if(actor_animationIsAt(this, 0.99f)){
func_80387F18(this);
TTC_func_80387F18(this);
}
break;

18
src/TTC/code_26D0.c
View File

@@ -5,7 +5,7 @@
#include "SnS.h"
extern ActorInfo D_8038C3D0;
extern ActorInfo D_8038C510;
extern ActorInfo TTC_D_8038C510;
extern ActorInfo D_8038C580;
extern ActorInfo D_8038C5E0;
extern ActorInfo D_8038C604;
@@ -24,7 +24,7 @@ extern ActorInfo D_8038C8D4;
extern ActorInfo D_8038C8F8;
extern ActorInfo gChTreasureInfo;
void func_80388C78(Actor *this);
void TTC_func_80388C78(Actor *this);
void func_80388CB8(Actor *this);
void func_80388D34(Actor *this);
void func_802D3D54(Actor *this);
@@ -62,21 +62,21 @@ ActorInfo D_8038C64C = {
ActorInfo D_8038C670 = {
0x26A, 0x2DF, 0x3BE,
0x1, NULL,
func_80388C78, func_80326224, func_80325E78,
TTC_func_80388C78, func_80326224, func_80325E78,
0, 0, 0.0f, 0
};
ActorInfo D_8038C694 = {
0x268, 0x2E0, 0x3B6,
0x1, NULL,
func_80388C78, func_80326224, func_80325E78,
TTC_func_80388C78, func_80326224, func_80325E78,
0, 0, 0.0f, 0
};
ActorInfo D_8038C6B8 = {
0x269, 0x2E1, 0x3B7,
0x1, NULL,
func_80388C78, func_80326224, func_80325E78,
TTC_func_80388C78, func_80326224, func_80325E78,
0, 0, 0.0f, 0
};
@@ -88,12 +88,12 @@ ActorInfo D_8038C6DC = {
};
/* .code */
void func_80388AC0(void)
void TTC_func_80388AC0(void)
{
spawnableActorList_add(&D_8038C5E0, actor_new, 0);
spawnableActorList_add(&D_8038C604, actor_new, 0);
spawnableActorList_add(&D_8038C580, actor_new, 0X4100168);
spawnableActorList_add(&D_8038C510, actor_new, 0X4000101);
spawnableActorList_add(&TTC_D_8038C510, actor_new, 0X4000101);
spawnableActorList_add(&D_8038C718, actor_new, 0X188);
spawnableActorList_add(&D_8038C790, actor_new, 0X148);
spawnableActorList_add(&D_8038C7B4, actor_new, 0X148);
@@ -111,7 +111,7 @@ void func_80388AC0(void)
spawnableActorList_add(&D_8038C3D0, actor_new, 0X2000041);
}
void func_80388C78(Actor *this){
void TTC_func_80388C78(Actor *this){
if(!this->initialized){
func_802D3D74(this);
this->initialized = TRUE;
@@ -133,7 +133,7 @@ void func_80388D04(s32 arg0){
}
void func_80388D34(Actor *this){
func_80388C78(this);
TTC_func_80388C78(this);
if(!this->unk16C_4){
__spawnqueue_add_1((GenMethod_1)func_80388D04, (s32)this->marker);
this->unk16C_4 = TRUE;

4
src/TTC/code_2B80.c
View File

@@ -23,13 +23,13 @@ ActorInfo D_8038C718 = {
};
/* .code */
bool func_80388F70(Actor *this){
bool TTC_func_80388F70(Actor *this){
return this->modelCacheIndex == 0x56;
}
void func_80388F88(void){
static f32 D_8038C73C[3] = {2500.0f, 250.0f, 4600.0f};
func_803272D0(D_8038C73C, 2000.0f, 2, func_80388F70);
func_803272D0(D_8038C73C, 2000.0f, 2, TTC_func_80388F70);
}
void func_80388FBC(Actor *this) {

18
src/TTC/code_35D0.c
View File

@@ -9,7 +9,7 @@ typedef struct {
s32 unk0;
}ActorLocal_TreasureHunt;
void func_80389E90(Actor *this);
void TTC_func_80389E90(Actor *this);
Actor *func_8038A0D0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
extern u32 D_8037DCB4;
@@ -38,21 +38,21 @@ s32 D_8038C898[6] = {
ActorInfo D_8038C8B0 = {
MARKER_62_RED_ARROW, ACTOR_53_RED_ARROW, ASSET_3E9_MODEL_RED_ARROW,
0, NULL,
func_80389E90, func_80326224, func_8038A0D0,
TTC_func_80389E90, func_80326224, func_8038A0D0,
0, 0x400, 0.0f, 0
};
ActorInfo D_8038C8D4 = {
MARKER_63_RED_QUESTION_MARK, ACTOR_54_RED_QUESTION_MARK, ASSET_3EB_MODEL_RED_QUESTION_MARK,
0, NULL,
func_80389E90, func_80326224, func_8038A0D0,
TTC_func_80389E90, func_80326224, func_8038A0D0,
0, 0x400, 0.0f, 0
};
ActorInfo D_8038C8F8 = {
MARKER_64_RED_X, ACTOR_55_RED_X, ASSET_3EA_MODEL_RED_X,
0, NULL,
func_80389E90, func_80326224, func_8038A0D0,
TTC_func_80389E90, func_80326224, func_8038A0D0,
0, 0x400, 0.0f, 0
};
@@ -71,7 +71,7 @@ struct42s D_8038C950 = {
};
/* .code */
bool func_803899C0(void) {
bool TTC_func_803899C0(void) {
enum comusic_e phi_a0;
s32 phi_a1;
@@ -114,7 +114,7 @@ void func_80389A9C(void) {
}
void func_80389B38(s32 arg0){
if(D_8037DCB4 == arg0 && func_803899C0()){
if(D_8037DCB4 == arg0 && TTC_func_803899C0()){
if(arg0 == 0 && !jiggyscore_isCollected(JIGGY_11_TTC_RED_X)){
func_80311480(0xA18, 4, NULL, NULL, NULL, NULL);
}
@@ -128,7 +128,7 @@ void func_80389B38(s32 arg0){
}
}
void func_80389BFC(ActorMarker *this, ActorMarker *arg1){\
void TTC_func_80389BFC(ActorMarker *this, ActorMarker *arg1){\
func_80389B38(0);
}
@@ -152,7 +152,7 @@ void func_80389CC4(s16 arg0[3], s32 arg1){
static ParticleEmitter *D_8038D700;
static f32 D_8038D708[3];
if(D_8037DCB4 == 5 && func_803899C0()){
if(D_8037DCB4 == 5 && TTC_func_803899C0()){
D_8038D708[0] = (f32)arg0[0];
D_8038D708[1] = (f32)arg0[1];
D_8038D708[2] = (f32)arg0[2];
@@ -179,7 +179,7 @@ void func_80389E84(void){
D_8037DCB4 = 0;
}
void func_80389E90(Actor *this){
void TTC_func_80389E90(Actor *this){
f32 tick = time_getDelta();
ActorLocal_TreasureHunt *local = (ActorLocal_TreasureHunt*)&this->local;
f64 tmp_f12;

28
src/TTC/code_3E30.c
View File

@@ -168,7 +168,7 @@ void func_8038A37C(s32 arg0, BKVtxRef *ref, Vtx *dst, s32 arg3) {
}
}
void func_8038A5D8(Struct_TTC_3E30_1 *arg0, s32 arg1) {
void TTC_func_8038A5D8(Struct_TTC_3E30_1 *arg0, s32 arg1) {
s32 temp_v0;
temp_v0 = arg0->unk3;
@@ -301,9 +301,9 @@ void func_8038AC48(Struct_TTC_3E30_1 *arg0) {
} else {
if (i_ptr->unk4 & 0xFFE) {
func_8038A258(2);
func_8038A5D8(arg0, 5);
TTC_func_8038A5D8(arg0, 5);
} else {
func_8038A5D8(arg0, 3);
TTC_func_8038A5D8(arg0, 3);
}
if (i_ptr->unk0[i_ptr->unk6] == 0) {
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 32000);
@@ -355,7 +355,7 @@ void func_8038AC48(Struct_TTC_3E30_1 *arg0) {
}
}
if ((func_8038BF68() == 0) && (phi_s7 == 0) && (D_8038D720.unk8 == 0)) {
func_8038A5D8(arg0, 1);
TTC_func_8038A5D8(arg0, 1);
}
}
@@ -612,7 +612,7 @@ u32 func_8038B600(void) {
return var_a3;
}
void func_8038B6D4(s32 arg0, s32 arg1, s32 arg2, enum bkprog_e prog_id, s32 prog_val, s32 prog_bit_size, enum bkprog_e arg6){
void TTC_func_8038B6D4(s32 arg0, s32 arg1, s32 arg2, enum bkprog_e prog_id, s32 prog_val, s32 prog_bit_size, enum bkprog_e arg6){
if( ((arg2 + 20 == D_8038CAD8[arg1].unk5) && func_803203FC(arg2))
|| arg0 == 3
){
@@ -660,13 +660,13 @@ void func_8038B800(s32 arg0) {
func_803204E4(0x65, 1);
func_803204E4(sp38, 1);
}
func_8038B6D4(0, arg0, 0x6C, 0x60, 5, 3, 0x33);
func_8038B6D4(0, arg0, 0x6D, 0x63, 7, 3, 0x34);
func_8038B6D4(0, arg0, 0x6E, 0x66, 8, 4, 0x35);
func_8038B6D4(0, arg0, 0x6F, 0x6A, 9, 4, 0x36);
func_8038B6D4(0, arg0, 0x70, 0x6E, 0xA, 4, 0x37);
func_8038B6D4(0, arg0, 0x71, 0x72, 0xC, 4, 0x38);
func_8038B6D4(0, arg0, 0x72, 0x76, 0xF, 4, 0x39);
TTC_func_8038B6D4(0, arg0, 0x6C, 0x60, 5, 3, 0x33);
TTC_func_8038B6D4(0, arg0, 0x6D, 0x63, 7, 3, 0x34);
TTC_func_8038B6D4(0, arg0, 0x6E, 0x66, 8, 4, 0x35);
TTC_func_8038B6D4(0, arg0, 0x6F, 0x6A, 9, 4, 0x36);
TTC_func_8038B6D4(0, arg0, 0x70, 0x6E, 0xA, 4, 0x37);
TTC_func_8038B6D4(0, arg0, 0x71, 0x72, 0xC, 4, 0x38);
TTC_func_8038B6D4(0, arg0, 0x72, 0x76, 0xF, 4, 0x39);
func_8038B79C(0, arg0, 0x94, ITEM_15_HEALTH_TOTAL, 0, 8);
func_8038B79C(0, arg0, 0x77, ITEM_14_HEALTH, 0, item_getCount(ITEM_15_HEALTH_TOTAL));
func_8038B79C(0, arg0, 0x95, ITEM_1C_MUMBO_TOKEN, 0, 99);
@@ -690,7 +690,7 @@ void func_8038BB10(ActorMarker *caller, enum asset_e text_id, s32 arg2) {
func_8038B5B4();
}
void func_8038BBA0(s32 arg0) {
void TTC_func_8038BBA0(s32 arg0) {
s32 i;
if ((s32) D_8038CAD8[arg0].unk5 >= 0x14) {
@@ -775,7 +775,7 @@ bool func_8038BD10(Struct_TTC_3E30_1 *arg0) {
func_8038AB44();
if ((D_8038CAD8 + var_s1)->unk0[(D_8038CAD8 + var_s1)->unk4] == '\0') {
if ((D_8038CAD8 + var_s1)->unk5 != 0) {
func_8038BBA0(var_s1);
TTC_func_8038BBA0(var_s1);
}
return 1;
}