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

6
src/RBB/code_0.c
View File

@@ -43,7 +43,7 @@ Struct_RBB_0_1 D_80390074[4] = {
};
/* .code */
void func_803863F0(Actor *actor, s32 arg1){
void RBB_func_803863F0(Actor *actor, s32 arg1){
ActorLocal_RBB_0 * local = (ActorLocal_RBB_0 *) &actor->local;
void *temp_a0;
f32 sp3C[3];
@@ -92,7 +92,7 @@ void func_803865A4(ActorMarker *marker, s32 arg1){
void func_803865D0(ActorMarker *marker){
Actor* actor = marker_getActor(marker);
ActorLocal_RBB_0 * local = (ActorLocal_RBB_0 *) &actor->local;
func_803863F0(actor, 1);
RBB_func_803863F0(actor, 1);
timed_setCameraToNode(0.0f, D_80390074[local->unk4].unk0);
timedFunc_set_2(0.75*D_80390074[local->unk4].unk4, (TFQM2) func_803865A4, actor->marker, 4);
func_80324E88(0.75*D_80390074[local->unk4].unk4);
@@ -158,7 +158,7 @@ void func_803868F0(Actor *this){
local->unk4 = (this->unk78_13 == 0xB)? 3: local->unk4;
func_803866F4(this, 1);
}
func_803863F0(this, 0);
RBB_func_803863F0(this, 0);
}//L803869F4
if(this->state == 2){
if(--local->unkC <= 0){

20
src/RBB/code_1570.c
View File

@@ -7,12 +7,12 @@
/* typedefs and declarations */
void func_803881E8(Actor *this, s32 arg1);
void func_803882F4(Actor *this);
void RBB_func_803882F4(Actor *this);
/* .data */
ActorInfo D_80390270 = {
0x184, 0x174, 0x402, 0x0, NULL,
func_803882F4, NULL, func_80325340,
RBB_func_803882F4, NULL, func_80325340,
0, 0, 0.0f, 0
};
@@ -43,7 +43,7 @@ struct41s D_80390344= {
};
/*.code */
void func_80387960(f32 arg0){
void RBB_func_80387960(f32 arg0){
f32 sp34[3];
void * temp_v0;
f32 sp24[3];
@@ -159,11 +159,11 @@ void func_80387E20(void){
func_802EF3F4(actor, &D_8039032C, &D_80390338, 0x19);
}
void func_80387F18(ActorMarker *marker, s32 arg1){
void RBB_func_80387F18(ActorMarker *marker, s32 arg1){
func_803881E8(marker_getActor(marker), arg1);
}
void func_80387F44(void){
void RBB_func_80387F44(void){
func_80250E94(0.5f, 1.0f, 1.5f, 0.0f, 1.0f, 1.5f);
}
@@ -187,13 +187,13 @@ void func_80387F88(ActorMarker *marker){
timed_playSfx(3.0f, SFX_1A_BIG_THINGS_FALL_OVER, 0.6f, 22000);
func_80324E88(4.0f);
func_80324E38(4.0f, 0);
timedFunc_set_2(4.0f, (TFQM2) func_80387F18, (s32) actor->marker, 3);
timedFunc_set_2(4.0f, (TFQM2) RBB_func_80387F18, (s32) actor->marker, 3);
}
void func_80388154(ActorMarker *marker){
Actor *actor = marker_getActor(marker);
func_803879F0();
timedFunc_set_0(0.0f, (TFQM0) func_80387F44);
timedFunc_set_0(0.0f, (TFQM0) RBB_func_80387F44);
timed_playSfx(0.0f, SFX_7F_HEAVYDOOR_SLAM, 1.0f, 0x7fc6);
timedFunc_set_2(1.2f, (TFQM2) func_80387B8C, 0x19f, 0);
timed_setCameraToNode(1.2f, 8);
@@ -203,7 +203,7 @@ void func_80388154(ActorMarker *marker){
void func_803881E8(Actor *this, s32 arg1){
this->state = arg1;
if(this->state == 2){
func_80387960(0.05f);
RBB_func_80387960(0.05f);
timedFunc_set_2(0.05f, (TFQM2)func_80387BEC, 0x19f, 0x1f4);
timedFunc_set_2(0.1f, (TFQM2)func_8025A6EC, COMUSIC_2B_DING_B, 28000);
func_80324E38(0.2f, 3);
@@ -219,12 +219,12 @@ void func_803882B4(ActorMarker *marker, s32 arg1){
func_803881E8(actor, 2);
}
void func_803882F4(Actor *this){
void RBB_func_803882F4(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = 1;
if(levelSpecificFlags_get(0x2d)){
func_80387AC0();
func_80387960(0.0f);
RBB_func_80387960(0.0f);
func_80387B24();
func_803881E8(this, 3);
}else{

4
src/RBB/code_1FC0.c
View File

@@ -36,7 +36,7 @@ void func_803883B0(Actor *this, s32 arg1){
this->state = arg1;
}
void func_80388430(ActorMarker * marker, ActorMarker *other_marker){
void RBB_func_80388430(ActorMarker * marker, ActorMarker *other_marker){
Actor * actor = marker_getActor(marker);
ActorLocal_RBB_1FC0 *local = (ActorLocal_RBB_1FC0 *) &actor->local;
func_8030E6D4(SFX_111_WHIPCRACK_DEATH);
@@ -97,7 +97,7 @@ void func_80388620(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = 1;
this->marker->propPtr->unk8_3 = 1;
marker_setCollisionScripts(this->marker, func_80388430, NULL, NULL);
marker_setCollisionScripts(this->marker, RBB_func_80388430, NULL, NULL);
local->unk4 = 0;
local->unk0 = 0.0f;
local->unk8 = 0.0f;

10
src/RBB/code_34B0.c
View File

@@ -2,17 +2,17 @@
#include "functions.h"
#include "variables.h"
void func_803899C0(Actor *this);
void RBB_func_803899C0(Actor *this);
/* .data */
ActorInfo D_803906B0 = {
0x194, 0x1BE, 0x412, 0x0, NULL,
func_803899C0, NULL, func_80325888,
RBB_func_803899C0, NULL, func_80325888,
0, 0, 0.0f, 0
};
/* .code */
void func_803898A0(void){
void RBB_func_803898A0(void){
mapSpecificFlags_set(0, 1);
}
@@ -23,7 +23,7 @@ void func_803898C4(Actor * this, s32 arg1){
this->position_y -= 35.0f;
func_80324E38(1.0f, 3);
timed_setCameraToNode(1.0f, 0);
timedFunc_set_0(1.0f, func_803898A0);
timedFunc_set_0(1.0f, RBB_func_803898A0);
func_80324E88(5.0f);
func_80324E38(5.0f, 0);
}
@@ -36,7 +36,7 @@ void func_80389980(ActorMarker *marker, s32 arg1){
}
}
void func_803899C0(Actor *this){
void RBB_func_803899C0(Actor *this){
if(!this->unk16C_4){
this->marker->propPtr->unk8_3 = 1;
this->unk16C_4 = 1;

10
src/RBB/code_3CB0.c
View File

@@ -35,7 +35,7 @@ ActorInfo D_80390738 = {
};
/* .code */
void func_8038A0A0(Actor *this, s32 arg1){
void RBB_func_8038A0A0(Actor *this, s32 arg1){
ActorLocal_RBB_3CB0 *local = (ActorLocal_RBB_3CB0 *)&this->local;
if(arg1 == 1)
@@ -62,7 +62,7 @@ void func_8038A0A0(Actor *this, s32 arg1){
void func_8038A1C8(ActorMarker *marker, s32 arg1){
Actor *actor = marker_getActor(marker);
if(actor->state == 1){
func_8038A0A0(actor, 2);
RBB_func_8038A0A0(actor, 2);
}
else if(actor->state == 2){
func_8038FF40();
@@ -109,16 +109,16 @@ void func_8038A324(Actor *this){
this->position_y = (f32)local->unk0->unk0[1];
this->position_z = (f32)local->unk0->unk0[2];
if(levelSpecificFlags_get(local->unk0->unkA))
func_8038A0A0(this, 2);
RBB_func_8038A0A0(this, 2);
else
func_8038A0A0(this, 1);
RBB_func_8038A0A0(this, 1);
}//L8038A47C
if(this->state == 2){
if( !levelSpecificFlags_get(local->unk0->unkA)
&& !levelSpecificFlags_get(3)
&& !levelSpecificFlags_get(4)
){
func_8038A0A0(this, 1);
RBB_func_8038A0A0(this, 1);
}
}
}

4
src/RBB/code_47D0.c
View File

@@ -53,7 +53,7 @@ s32 D_8039092C[3] = { 0, 0xFF, 0};
s32 D_80390938[3] = { 0xFF, 0, 0};
/* .code */
Struct_RBB_47D0 *func_8038ABC0(Actor *arg0){
Struct_RBB_47D0 *RBB_func_8038ABC0(Actor *arg0){
Struct_RBB_47D0 *iPtr = D_80390870;
while(iPtr->unk0 != 0){
if(iPtr->unk0 == arg0->modelCacheIndex)
@@ -134,7 +134,7 @@ void func_8038AEB8(Actor *this){
this->marker->propPtr->unk8_3 = 1;
this->marker->unk30 = func_8038AD7C;
marker_setCollisionScripts(this->marker, NULL, func_8038AD3C, NULL);
local->unk4 = func_8038ABC0(this);
local->unk4 = RBB_func_8038ABC0(this);
mapSpecificFlags_set(local->unk4->unk10, FALSE);
this->position_x = local->unk4->unk4[0];
this->position_y = local->unk4->unk4[1];

10
src/RBB/code_4C70.c
View File

@@ -40,7 +40,7 @@ ActorInfo D_803909D4 = {
0, 0, 0.0f, 0
};
ActorInfo D_803909F8 = {
ActorInfo RBB_D_803909F8 = {
0x2C, 0x1C4, 0x416, 0x0, NULL,
func_8038B340, NULL, func_8038B230,
0, 0, 0.0f, 0
@@ -65,7 +65,7 @@ Struct_RBB_4C70 *func_8038B060(Actor *this){
return NULL;
}
void func_8038B0B8(Actor *this, s32 arg1){
void RBB_func_8038B0B8(Actor *this, s32 arg1){
ActorLocal_RBB_4C70 *local = (ActorLocal_RBB_4C70 *)&this->local;
ParticleEmitter *other;
@@ -137,16 +137,16 @@ void func_8038B340(Actor * this){
this->yaw = -90.0f;
this->scale = 0.25f;
func_8038B0B8(this, 1);
RBB_func_8038B0B8(this, 1);
}//L8038B3E4
if(this->state == 1){
if(mapSpecificFlags_get(local->unk0->unk10))
func_8038B0B8(this, 2);
RBB_func_8038B0B8(this, 2);
}
if(this->state == 2){
if( func_80335794(this->unk148) > 0 )
func_8038B0B8(this, 1);
RBB_func_8038B0B8(this, 1);
}
}

2
src/RBB/code_5490.c
View File

@@ -8,7 +8,7 @@ extern s32 func_802EDD8C(f32 (*)[3], f32, f32);
void func_8038B900(Actor *this);
/* .data */
ActorInfo D_80390AB0 = {
ActorInfo RBB_D_80390AB0 = {
0x30, 0x1C8, 0x41C, 0x0, NULL,
NULL, func_8038B900, func_80325888,
0, 0, 0.0f, 0

8
src/RBB/code_5AB0.c
View File

@@ -5,14 +5,14 @@
void func_8038BF28(Actor *this);
/* .data */
ActorInfo D_80390AE0 = {
ActorInfo RBB_D_80390AE0 = {
0x31, 0x1C9, 0x41D, 0x0, NULL,
func_8038BF28, NULL, func_80325888,
0, 0, 0.0f, 0
};
/* .code */
void func_8038BEA0(Actor *this, s32 arg1){
void RBB_func_8038BEA0(Actor *this, s32 arg1){
if(arg1 == 1)
func_80335924(this->unk148, ASSET_141_ANIM_ANCHOR_LOWERED, 0.0f, 5.5f);
@@ -31,14 +31,14 @@ void func_8038BF28(Actor *this){
this->position_z = 1460.0f;
this->marker->propPtr->unk8_3 = 1;
this->yaw = 0.0f;
func_8038BEA0(this, 1);
RBB_func_8038BEA0(this, 1);
if(jiggyscore_isSpawned(JIGGY_53_RBB_SNORKEL)){
marker_despawn(this->marker);
}
}
else{
if(this->state == 1 && mapSpecificFlags_get(8)){
func_8038BEA0(this, 2);
RBB_func_8038BEA0(this, 2);
}
}
}

2
src/RBB/code_5C10.c
View File

@@ -8,7 +8,7 @@ void func_8038C0FC(Actor *this, s32 new_state);
void func_8038C204(Actor *this);
/* .data */
ActorInfo D_80390B10 = {
ActorInfo RBB_D_80390B10 = {
0x199, 0x1CB, 0x0, 0x0, NULL,
func_8038C204, NULL, func_80325340,
0, 0, 0.0f, 0

56
src/RBB/code_5F80.c
View File

@@ -34,7 +34,7 @@ typedef struct{
f32 unk28;
} ActorLocal_RBB_5F80;
void func_8038CC9C(Actor *this, s32 new_state);
void RBB_func_8038CC9C(Actor *this, s32 new_state);
void func_8038D7E8(ActorMarker *marker, s32 arg1);
Actor *func_8038D638(ActorMarker *marker, Gfx **gdl, Mtx ** mptr, s32 arg3);
void func_8038D8BC(Actor *this);
@@ -47,7 +47,7 @@ Struct_RBB_5F80 D_80390B70[4] = {
{ACTOR_284_BOSS_BOOM_BOX_SMALL, 0.25f, 2.0f, 0x5, 0x02, 0x2, 1.5f, 1.1f},
};
ActorInfo D_80390BD0 = {
ActorInfo RBB_D_80390BD0 = {
MARKER_1A1_BOSS_BOOM_BOX_LARGEST, ACTOR_281_BOSS_BOOM_BOX_LARGEST, ASSET_428_MODEL_BOSS_BOOM_BOX, 0x0, NULL,
func_8038D8BC, NULL, func_8038D638,
0, 0, 0.0f, 0
@@ -65,7 +65,7 @@ ActorInfo D_80390C18 = {
0, 0, 0.0f, 0
};
ActorInfo D_80390C3C = {
ActorInfo RBB_D_80390C3C = {
MARKER_1A4_BOSS_BOOM_BOX_SMALL, ACTOR_284_BOSS_BOOM_BOX_SMALL, ASSET_428_MODEL_BOSS_BOOM_BOX, 0x0, NULL,
func_8038D8BC, NULL, func_8038D638,
0, 0, 0.0f, 0
@@ -93,9 +93,9 @@ s32 pad_80391284;
f32 D_80391288[3];
/* .code */
void func_8038C370(ActorMarker *marker, s32 arg1){
void RBB_func_8038C370(ActorMarker *marker, s32 arg1){
Actor *actor = marker_getActor(marker);
func_8038CC9C(actor, arg1);
RBB_func_8038CC9C(actor, arg1);
}
void func_8038C39C(Actor *this){
@@ -120,7 +120,7 @@ void func_8038C39C(Actor *this){
particleEmitter_emitN(other, local->unk0->unkE);
}
void func_8038C538(Actor *this){
void RBB_func_8038C538(Actor *this){
ActorLocal_RBB_5F80 *local = (ActorLocal_RBB_5F80 *) &this->local;
ParticleEmitter *other = partEmitList_pushNew(3*local->unk0->unkE);
particleEmitter_setSprite(other, ASSET_70E_SPRITE_SMOKE_2);
@@ -144,7 +144,7 @@ void func_8038C538(Actor *this){
}
void func_8038C70C(Actor *this){
void RBB_func_8038C70C(Actor *this){
ActorLocal_RBB_5F80 *local = (ActorLocal_RBB_5F80 *) &this->local;
ParticleEmitter *other = partEmitList_pushNew(0xa);
@@ -230,7 +230,7 @@ void func_8038CB68(ActorMarker *marker, s32 arg1, s32 arg2){
Actor *actor = marker_getActor(marker);
func_80324E88(0.0f);
func_80324E38(0.0f, 0);
timedFunc_set_2(0.0f, (TFQM2)func_8038C370, actor->marker, 3);
timedFunc_set_2(0.0f, (TFQM2)RBB_func_8038C370, actor->marker, 3);
}
void func_8038CBC0(void){
@@ -239,7 +239,7 @@ void func_8038CBC0(void){
func_802C8090(actor);
}
int func_8038CBF0(Actor *this){
int RBB_func_8038CBF0(Actor *this){
f32 sp2C[3];
f32 sp20[3];
ActorLocal_RBB_5F80 *local = (ActorLocal_RBB_5F80 *) &this->local;
@@ -258,7 +258,7 @@ int func_8038CBF0(Actor *this){
}
void func_8038CC9C(Actor *this, s32 new_state){
void RBB_func_8038CC9C(Actor *this, s32 new_state){
f32 sp8C[3];
f32 sp80[3];
ActorLocal_RBB_5F80 *local = (ActorLocal_RBB_5F80 *) &this->local;
@@ -320,7 +320,7 @@ void func_8038CC9C(Actor *this, s32 new_state){
item_set(ITEM_0_HOURGLASS_TIMER, 0x1067);
func_80324E88(2.4f);
func_80324E38(2.4f, 0);
timedFunc_set_2(2.4f, (TFQM2)func_8038C370, (s32)this->marker, 3);
timedFunc_set_2(2.4f, (TFQM2)RBB_func_8038C370, (s32)this->marker, 3);
}
else{//L8038CEFC
timedFunc_set_3(2.4f, (TFQM3)comusic_8025AB44, COMUSIC_62_RBB_BOOMBOX, 0x1f40, 0x12C);
@@ -351,8 +351,8 @@ void func_8038CC9C(Actor *this, s32 new_state){
local->unk14[2] = sp80[2] + this->position_z;
local->unk14[1] = 0.0f;
func_8038CA70(this, &local->unk14);
func_8038C70C(this);
func_8038C538(this);
RBB_func_8038C70C(this);
RBB_func_8038C538(this);
}//L8038D17C
if(this->state == 6){
@@ -398,11 +398,11 @@ void func_8038CC9C(Actor *this, s32 new_state){
local->unk14[0] = this->position_x;
local->unk14[1] = this->position_y;
local->unk14[2] = this->position_z;
local->unk20 = func_8038CBF0(this);
local->unk20 = RBB_func_8038CBF0(this);
}//L8038D3FC
if(this->state == 3 || this->state == 4 || this->state == 5){
local->unk20 = func_8038CBF0(this);
local->unk20 = RBB_func_8038CBF0(this);
if( local->unk20 == 0){
sp64 = local->unk0->unk4*300.0f;
for(i = 0; i < 10; i++){
@@ -410,7 +410,7 @@ void func_8038CC9C(Actor *this, s32 new_state){
local->unk14[1] = local->unk14[1];
local->unk14[2] = local->unk8[2] + randf2(-sp64, sp64);
func_8038CA70(this, &local->unk14);
local->unk20 = func_8038CBF0(this);
local->unk20 = RBB_func_8038CBF0(this);
if(local->unk20)
break;
}
@@ -434,7 +434,7 @@ void func_8038CC9C(Actor *this, s32 new_state){
void func_8038D590(ActorMarker *marker, s32 arg1){
Actor *actor = marker_getActor(marker);
func_8038CC9C(actor, 4);
RBB_func_8038CC9C(actor, 4);
}
void func_8038D5BC(ActorMarker *marker, s32 arg1){
@@ -442,7 +442,7 @@ void func_8038D5BC(ActorMarker *marker, s32 arg1){
ActorLocal_RBB_5F80 *local = (ActorLocal_RBB_5F80 *) &actor->local;
func_8030E6A4(0x3f5, local->unk0->unk10, 0x4e20);
func_8038CC9C(actor, 4);
RBB_func_8038CC9C(actor, 4);
func_8038C8A8(actor);
}
@@ -480,9 +480,9 @@ void func_8038D7E8(ActorMarker *marker, s32 arg1){
func_8030E6A4(SFX_D7_GRABBA_DEATH, local->unk0->unk10, 0x7530);
local->unk4 += (arg1) ? 1 : 5;
if(local->unk4 >= local->unk0->unkC)
func_8038CC9C(actor, 5);
RBB_func_8038CC9C(actor, 5);
else{
func_8038CC9C(actor, 4);
RBB_func_8038CC9C(actor, 4);
}
if(!arg1)
@@ -518,11 +518,11 @@ void func_8038D8BC(Actor *this){
marker_setCollisionScripts(this->marker, func_8038D590, func_8038D5BC, func_8038D608);
func_803300D8(this->marker, func_8038D8B4);
if(local->unk0->unk0 == ACTOR_281_BOSS_BOOM_BOX_LARGEST){
func_8038CC9C(this, 1);
RBB_func_8038CC9C(this, 1);
D_80391280 = 0;
}
else{
func_8038CC9C(this, 7);
RBB_func_8038CC9C(this, 7);
}
if(jiggyscore_isSpawned(JIGGY_56_RBB_BOSS_BOOM_BOX) && !func_803203FC(2))
@@ -544,12 +544,12 @@ void func_8038D8BC(Actor *this){
if(this->state == 1){
if(func_803203FC(2)){
if(func_803203FC(3)){
func_8038CC9C(this, 2);
RBB_func_8038CC9C(this, 2);
}
}
else{//L8038DAA8
if(ml_vec3f_distance(&this->position, &sp64) < 1200.0f){
func_8038CC9C(this, 2);
RBB_func_8038CC9C(this, 2);
}
}
}//L8038DAD8
@@ -578,7 +578,7 @@ void func_8038D8BC(Actor *this){
if(item_empty(ITEM_0_HOURGLASS_TIMER)){
func_803204E4(3, 0);
func_803204E4(5, 0);
func_8038CC9C(this, 8);
RBB_func_8038CC9C(this, 8);
}
}
func_8033568C(this->unk148, &sp54, &sp50);
@@ -589,13 +589,13 @@ void func_8038D8BC(Actor *this){
}
if(func_80335794(this->unk148) > 0)
func_8038CC9C(this, 3);
RBB_func_8038CC9C(this, 3);
}//L8038DD64
if(this->state == 5){
if(func_80335794(this->unk148) > 0){
func_8038CC9C(this, 6);
RBB_func_8038CC9C(this, 6);
}else{
tmp_f2 = func_80335684(this->unk148);
if(tmp_f2 <= 0.3)
@@ -608,6 +608,6 @@ void func_8038D8BC(Actor *this){
if(this->state == 7){
if(func_80335794(this->unk148) > 0)
func_8038CC9C(this, 3);
RBB_func_8038CC9C(this, 3);
}
}

34
src/RBB/code_640.c
View File

@@ -30,22 +30,22 @@ extern ActorInfo D_803908E4;
extern ActorInfo D_80390908;
extern ActorInfo D_803909B0;
extern ActorInfo D_803909D4;
extern ActorInfo D_803909F8;
extern ActorInfo RBB_D_803909F8;
extern ActorInfo D_80390A50;
extern ActorInfo D_80390380;
extern ActorInfo D_80390A80; //anchorswitch
extern ActorInfo D_80390AB0; //dolphin
extern ActorInfo D_80390AE0; //anchor
extern ActorInfo D_80390B10;
extern ActorInfo RBB_D_80390AB0; //dolphin
extern ActorInfo RBB_D_80390AE0; //anchor
extern ActorInfo RBB_D_80390B10;
extern ActorInfo D_80390B40; //rarewareflag
extern ActorInfo D_80390BD0;
extern ActorInfo RBB_D_80390BD0;
extern ActorInfo D_80390BF4;
extern ActorInfo D_80390C18;
extern ActorInfo D_80390C3C;
extern ActorInfo D_80390CF0;
extern ActorInfo RBB_D_80390C3C;
extern ActorInfo RBB_D_80390CF0;
extern ActorInfo D_80390D88;
extern ActorInfo D_80390DAC; //TNTpart_IDStruct;
extern ActorInfo D_80390E00;
extern ActorInfo RBB_D_80390E00;
extern ActorInfo D_80390E34;
extern ActorInfo D_80390E58;
extern ActorInfo D_803900E0;
@@ -168,7 +168,7 @@ void func_80386BF8(Actor *arg0){
func_802D4A9C(arg0, 0);
}
void rbb_func_80386C48(void){
void RBB_func_80386C48(void){
spawnableActorList_add(&D_80390D20, actor_new, 0x4880);
spawnableActorList_add(&D_80390050, actor_new, 0);
spawnableActorList_add(&D_80390200, actor_new, 0x80);
@@ -195,22 +195,22 @@ void rbb_func_80386C48(void){
spawnableActorList_add(&D_80390908, actor_new, 0x80);
spawnableActorList_add(&D_803909B0, actor_new, 0x880);
spawnableActorList_add(&D_803909D4, actor_new, 0x880);
spawnableActorList_add(&D_803909F8, actor_new, 0x880);
spawnableActorList_add(&RBB_D_803909F8, actor_new, 0x880);
spawnableActorList_add(&D_80390A50, actor_new, 0x80);
spawnableActorList_add(&D_80390380, actor_new, 0x9aa);
spawnableActorList_add(&D_80390A80, actor_new, 0x80); //anchorswitch
spawnableActorList_add(&D_80390AB0, actor_new, 0x8C8); //dolphin
spawnableActorList_add(&D_80390AE0, actor_new, 0xC80); //anchor
spawnableActorList_add(&D_80390B10, actor_new, 0x80);
spawnableActorList_add(&RBB_D_80390AB0, actor_new, 0x8C8); //dolphin
spawnableActorList_add(&RBB_D_80390AE0, actor_new, 0xC80); //anchor
spawnableActorList_add(&RBB_D_80390B10, actor_new, 0x80);
spawnableActorList_add(&D_80390B40, actor_new, 0x880); //rarewareflag
spawnableActorList_add(&D_80390BD0, actor_new, 0xc2c);
spawnableActorList_add(&RBB_D_80390BD0, actor_new, 0xc2c);
spawnableActorList_add(&D_80390BF4, actor_new, 0xc2c);
spawnableActorList_add(&D_80390C18, actor_new, 0xc2c);
spawnableActorList_add(&D_80390C3C, actor_new, 0xc2c);
spawnableActorList_add(&D_80390CF0, actor_new, 0x80);
spawnableActorList_add(&RBB_D_80390C3C, actor_new, 0xc2c);
spawnableActorList_add(&RBB_D_80390CF0, actor_new, 0x80);
spawnableActorList_add(&D_80390D88, actor_new, 0x2000889);
spawnableActorList_add(&D_80390DAC, actor_new, 0x2000889);
spawnableActorList_add(&D_80390E00, actor_new, 0x80);
spawnableActorList_add(&RBB_D_80390E00, actor_new, 0x80);
spawnableActorList_add(&D_80390E34, actor_new, 0x80);
spawnableActorList_add(&D_80390E58, actor_new, 0x80);
spawnableActorList_add(&D_803900E0, actor_new, 0);

2
src/RBB/code_7A60.c
View File

@@ -6,7 +6,7 @@
void func_8038DE68(Actor *this);
/* .data */
ActorInfo D_80390CF0 = {
ActorInfo RBB_D_80390CF0 = {
0x1C0, 0x2AD, 0x0, 0x0, NULL,
func_8038DE68, NULL, func_80325340,
0, 0, 0.0f, 0

4
src/RBB/code_8520.c
View File

@@ -41,7 +41,7 @@ ActorInfo D_80390DAC = {
0, 0, 0.0f, 0
};
s32 D_80390DD0[3] = {0xDE, 0xA7, 0x71};
s32 RBB_D_80390DD0[3] = {0xDE, 0xA7, 0x71};
s32 D_80390DDC[4] = {0xFF, 0xFF, 0xFF, 0xFF};
s32 D_80390DEC[4] = {0,0,0,0};
@@ -116,7 +116,7 @@ void func_8038EC14(Actor *this){
func_802EFB84(other, 2.0f, 3.0f);
particleEmitter_setParticleSpawnPositionRange(other, -75.0f, 25.0f, -75.0f, 75.0f, 75.0f, 75.0f);
particleEmitter_setParticleVelocityRange(other, -70.0f, 50.0f, -70.0f, 70.0f, 100.0f, 70.0f);
func_802EFFA8(other, &D_80390DD0);
func_802EFFA8(other, &RBB_D_80390DD0);
func_802EFEC0(other, 3.0f, 4.0f);
particleEmitter_emitN(other, 6);
}

12
src/RBB/code_9670.c
View File

@@ -4,12 +4,12 @@
extern
void func_8038FB84(Actor *this);
void RBB_func_8038FB84(Actor *this);
/* .data */
ActorInfo D_80390E00 = {
ActorInfo RBB_D_80390E00 = {
0x1B8, 0x2A5, 0x0, 0x0, NULL,
func_8038FB84, NULL, func_80325340,
RBB_func_8038FB84, NULL, func_80325340,
0, 0, 0.0f, 0
};
@@ -17,7 +17,7 @@ ActorInfo D_80390E00 = {
u8 D_803912B0;
/* .code */
void func_8038FA60(ActorMarker *marker){
void RBB_func_8038FA60(ActorMarker *marker){
Actor *actor = marker_getActor(marker);
func_802C8F70(actor->yaw);
func_802C937C(6, &actor->position);
@@ -28,7 +28,7 @@ void func_8038FA9C(Actor *this, s32 arg1){
func_80324E38(0.0f, 3);
timedFunc_set_2(1.0f, (TFQM2)func_8025A6EC, COMUSIC_2B_DING_B, 28000);
timed_setCameraToNode(1.8f, 1);
timedFunc_set_1(2.0f, (GenMethod_1) func_8038FA60, (s32)this->marker);
timedFunc_set_1(2.0f, (GenMethod_1) RBB_func_8038FA60, (s32)this->marker);
func_80324E88(5.0f);
func_80324E38(5.0f, 0);
}
@@ -43,7 +43,7 @@ void func_8038FB6C(void){
D_803912B0--;
}
void func_8038FB84(Actor *this){
void RBB_func_8038FB84(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = 1;
D_803912B0 = 0;

4
src/RBB/code_9840.c
View File

@@ -12,7 +12,7 @@ typedef struct {
}ActorLocal_RBB_9840;
/* .data */
s16 D_80390E30[2] = {0x177, 0x17F};
s16 RBB_D_80390E30[2] = {0x177, 0x17F};
ActorInfo D_80390E34 = {
0x1D2, 0x31B, 0x0, 0x0, NULL,
func_8038FC48, NULL, func_80325340,
@@ -38,7 +38,7 @@ void func_8038FC48(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = 1;
actor_collisionOff(this);
local->unk4 = D_80390E30 + (this->marker->unk14_20 - 0x1d2);
local->unk4 = RBB_D_80390E30 + (this->marker->unk14_20 - 0x1d2);
local->unk8 = NULL;
local->unk0 = func_802F9AA8(0x400);