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

8
src/SM/ch/attacktutorial.c
View File

@@ -38,7 +38,7 @@ void __chAttackTutorial_spawnEnemy(ActorMarker *marker, s32 enemy_id){
if(marker);
}
s32 func_803871FC(Actor *this, s32 arg1){
s32 SM_func_803871FC(Actor *this, s32 arg1){
volatile s32 sp1C;
s32 tmp_v0;
@@ -82,7 +82,7 @@ void chAttackTutorial_setState(Actor * this, s32 arg1){
case 2://L803873E0
this->unk38_31 = 0;
func_803871FC(this, ++this->unk10_12);
SM_func_803871FC(this, ++this->unk10_12);
break;
case 3://L8038742C
mapSpecificFlags_set(5,1);
@@ -94,7 +94,7 @@ void chAttackTutorial_setState(Actor * this, s32 arg1){
if(!honeycombscore_get(HONEYCOMB_17_SM_COLIWOBBLE)){
this->unk10_12 = 3;
this->unk38_31 = 1;
func_803871FC(this, this->unk10_12);
SM_func_803871FC(this, this->unk10_12);
}
break;
}//L803874A8
@@ -155,7 +155,7 @@ void func_80387690(ActorMarker *marker, enum asset_e text_id, s32 arg2){
case 0xE14:
case 0xE16:
case 0xE18:
func_803871FC(actor, actor->unk10_12);
SM_func_803871FC(actor, actor->unk10_12);
break;
case 0xE15:
ability_unlock(ABILITY_C_ROLL);

8
src/SM/code_0.c
View File

@@ -13,11 +13,11 @@ typedef struct {
}Struct_SM_0;
/* .code */
void func_803863F0(Actor *this, s32 arg1) {
void SM_func_803863F0(Actor *this, s32 arg1) {
func_80288F78(this, 0.20f, 0xF280FA);
}
void func_80386420(Actor *arg0, s32 arg1) {
void SM_func_80386420(Actor *arg0, s32 arg1) {
func_80288F78(arg0, 0.20f, 0x3ED803E);
func_80288F78(arg0, 0.35f, 0x3ED8C3E);
func_80288F78(arg0, 0.71f, 0x21F336);
@@ -28,6 +28,6 @@ void func_80386420(Actor *arg0, s32 arg1) {
/* .data */
Struct_SM_0 D_8038AAC0[2] = {
{0x20A, func_803863F0, 0, 0},
{0x208, func_80386420, 0, 0},
{0x20A, SM_func_803863F0, 0, 0},
{0x208, SM_func_80386420, 0, 0},
};

10
src/SM/code_2990.c
View File

@@ -20,7 +20,7 @@ typedef struct sm_2900_struct{
//public
void func_803899B0(Actor * this);
void func_80389610(Actor * this);
void SM_func_80389610(Actor * this);
/* .data */
ActorAnimationInfo D_8038AF60[6] = {
@@ -141,7 +141,7 @@ void func_80388FA0(Actor *this, s32 arg1){
case 5:
func_80388F24(this);
func_8028F94C(2,this->position);
func_80389610(this);
SM_func_80389610(this);
break;
case 3:
actor_loopAnimation(this);
@@ -256,7 +256,7 @@ void func_80389494(Actor * this, s32* arg1, s32 *arg2){
}
}
void func_80389610(Actor * this){
void SM_func_80389610(Actor * this){
s32 sp2C;
s32 sp28;
@@ -476,7 +476,7 @@ void func_803899B0(Actor * this){
}//L80389EA0
if(actor_animationIsAt(this, 0.9999f)){
if(!mapSpecificFlags_get(1)){
func_80389610(this);
SM_func_80389610(this);
}
func_80388FA0(this, 3);
}//L80389EE0
@@ -489,7 +489,7 @@ void func_803899B0(Actor * this){
}else if(actor_animationIsAt(this, 0.35f)){//L80389F78
if(mapSpecificFlags_get(1)){
func_80389610(this);
SM_func_80389610(this);
}
}
break;

6
src/SM/code_4070.c
View File

@@ -7,12 +7,12 @@ Actor *func_802D94B4(ActorMarker *, Gfx **, Mtx **, Vtx**);
void func_80324E88(f32);
//public
void func_8038A5D8(Actor *this);
void SM_func_8038A5D8(Actor *this);
void func_8038A4DC(Actor *this, s32 arg1);
/* .data */
ActorInfo D_8038B0B0 = { 0x1ED, 0x3B9, 0, 1, NULL,
func_8038A5D8, func_80326224, func_80325340,
SM_func_8038A5D8, func_80326224, func_80325340,
0, 0, 0.0f, 0
};
@@ -55,7 +55,7 @@ void func_8038A4DC(Actor *this, s32 arg1){
func_80328A84(this, arg1);
}
void func_8038A5D8(Actor *this){
void SM_func_8038A5D8(Actor *this){
f32 sp5C[3];
s32 sp44[6];
f32 sp40;

16
src/SM/code_5B0.c
View File

@@ -6,8 +6,8 @@
void func_803869A0(Actor*, f32, f32);
void func_802C4218(s32, f32, f32, f32);
void func_80386EF4(Actor *this);
void func_80386A00(Actor *this);
void SM_func_80386EF4(Actor *this);
void SM_func_80386A00(Actor *this);
/*.data */
ActorAnimationInfo D_8038AAF0[] = {
@@ -18,14 +18,14 @@ ActorAnimationInfo D_8038AAF0[] = {
ActorInfo D_8038AB00 = {
MARKER_135_QUARRIE, ACTOR_16F_QUARRIE, ASSET_42D_MODEL_QUARRIE,
1, NULL,
func_80386EF4, func_80326224, func_80325E78,
SM_func_80386EF4, func_80326224, func_80325E78,
2000, 0, 5.0f, 0
};
ActorInfo D_8038AB24 = {
MARKER_29D_ROCK_TRAPPING_GRUNTY, ACTOR_3CA_ROCK_TRAPPING_GRUNTY, ASSET_47B_MODEL_ROCK,
1, D_8038AAF0,
func_80386A00, func_80326224, func_80325E78,
SM_func_80386A00, func_80326224, func_80325E78,
0, 0, 0.0f, 0
};
@@ -50,7 +50,7 @@ void func_803869A0(Actor *this, f32 arg1, f32 arg2) {
}
}
void func_80386A00(Actor *this) {
void SM_func_80386A00(Actor *this) {
if (this->unk16C_4 <= 0) {
if (func_8031FF1C(BKPROG_FC_DEFEAT_GRUNTY) == 0) {
marker_despawn(this->marker);
@@ -99,7 +99,7 @@ void func_80386C2C(ParticleEmitter *p_ctrl, f32 *arg1, s32 arg2, f32 arg3) {
particleEmitter_emitN(p_ctrl, arg2);
}
void func_80386D68(Actor *this){
void SM_func_80386D68(Actor *this){
FUNC_8030E8B4(SFX_9B_BOULDER_BREAKING_1, 1.0f, 32000, this->position, 1000, 2000);
this->unk44_31 = func_8030D90C();
@@ -122,11 +122,11 @@ void func_80386EB4(ActorMarker *marker, ActorMarker *other_marker) {
Actor *this;
this = marker_getActor(marker);
if ((this->state ) == 2) {
func_80386D68(this);
SM_func_80386D68(this);
}
}
void func_80386EF4(Actor *this) {
void SM_func_80386EF4(Actor *this) {
u32 temp_t3;
Actor *other;
if ((this->unk16C_4) <= 0) {

6
src/SM/code_BF0.c
View File

@@ -2,18 +2,18 @@
#include "functions.h"
#include "variables.h"
void func_80386FE0(Actor *this);
void SM_func_80386FE0(Actor *this);
/* .data */
ActorInfo D_8038ABF0 = {
0x134, 0x16E, 0,
1, NULL,
func_80386FE0, func_80326224, func_80325340,
SM_func_80386FE0, func_80326224, func_80325340,
2000, 0, 0.0f, 0
};
/* .code */
void func_80386FE0(Actor *this){
void SM_func_80386FE0(Actor *this){
if(!this->unk16C_4){
this->unk10_12 = 0;
this->unk38_31 = this->unk10_12;

2
src/SM/code_F0.c
View File

@@ -140,7 +140,7 @@ bool SM_CRCs_are_valid(void){
return FALSE;
}
void func_80386810(void)
void SM_func_80386810(void)
{
spawnableActorList_add(&D_8038AB00, actor_new, 0X2000180);
spawnableActorList_add(&D_8038ABF0, actor_new, 0X80);