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

12
src/FP/code_0.c
View File

@@ -5,22 +5,22 @@
void func_803867BC(Actor *this);
/* .data */
ActorAnimationInfo D_803919F0[] ={
ActorAnimationInfo FP_D_803919F0[] ={
{ASSET_1A1_ANIM_SLED, 1.0f},
{ASSET_1A1_ANIM_SLED, 1.0f},
{ASSET_1A1_ANIM_SLED, 1.0f},
{ASSET_1A1_ANIM_SLED, 1.0f}
};
ActorInfo D_80391A10 = {
ActorInfo FP_D_80391A10 = {
MARKER_3B_SCARF_SLED, ACTOR_181_SCARF_SLED, ASSET_352_MODEL_SLED,
0, D_803919F0,
0, FP_D_803919F0,
NULL, func_803867BC, func_80325888,
1000, 0, 0.0f, 0
};
/* .code */
void func_803863F0(Actor *this, s32 next_state){
void FP_func_803863F0(Actor *this, s32 next_state){
func_80328A84(this, next_state);
if(next_state == 2){
@@ -47,7 +47,7 @@ void func_803864F4(ActorMarker *this_marker, ActorMarker *other_marker){
if(player_getTransformation() != TRANSFORM_1_BANJO) return;
if(func_8028F68C(BS_INTR_27_BANJO_SLED, this->marker))
func_803863F0(this, 2);
FP_func_803863F0(this, 2);
}
void func_8038655C(Actor *this){
@@ -128,7 +128,7 @@ void func_803867BC(Actor *this){
this->marker->propPtr->unk8_3 = TRUE;
this->unk10_12 = 0;
ml_vec3f_clear(this->velocity);
func_803863F0(this, 1);
FP_func_803863F0(this, 1);
}
if(!this->unk16C_4){

2
src/FP/code_19E0.c
View File

@@ -143,7 +143,7 @@ void func_803881AC(Actor *this){
if( 1.0f == this->velocity_x && func_80387EE4(this)){
func_8025A6EC(COMUSIC_2B_DING_B, 28000);
func_8038BA88(this->unkF4_8);
FP_func_8038BA88(this->unkF4_8);
}
if(func_80388000(this)){

20
src/FP/code_2350.c
View File

@@ -25,7 +25,7 @@ typedef struct {
Actor *func_80388740(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
void func_80388D70(ActorMarker *caller, enum asset_e text_id, s32 arg2);
void func_80388EE8(ParticleEmitter *pCtrl);
void func_80388F4C(Actor *this);
void FP_func_80388F4C(Actor *this);
void func_803896FC(Actor *this);
/* .data */
@@ -47,7 +47,7 @@ ActorAnimationInfo D_80391C80[] = {
ActorInfo D_80391CE8 = { 0x97, ACTOR_C8_BOGGY_2, ASSET_38A_MODEL_BOGGY_1,
0x1, D_80391C80,
func_80388F4C, func_803896FC, func_80388740,
FP_func_80388F4C, func_803896FC, func_80388740,
0, 0, 1.4f, 0
};
f32 D_80391D0C[3] = {1842.0f, 658.0f, 5758.0f};
@@ -67,7 +67,7 @@ struct42s D_80391D58 = {
};
f32 D_80391D88[3] = { 1592.0f, 673.0f, 5895.0f};
f32 D_80391D94[3] = {0.0f, 0.0f, 0.0f};
f32 FP_D_80391D94[3] = {0.0f, 0.0f, 0.0f};
s32 D_80391DA0[3] = {0x5F5, 0x292, 0x1539};
s32 D_80391DAC[3] = {-0x11F8, 0x637, -0x1816};
Struct_FP_2350 D_80391DB8[7]={
@@ -117,7 +117,7 @@ Actor *func_80388740(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
return this;
}
void func_803888E4(Actor *this){
void FP_func_803888E4(Actor *this){
func_80328B8C(this, 0xC, 0.0001f, 1);
if(!jiggyscore_isSpawned(JIGGY_30_FP_BOGGY_2)){
if(mapSpecificFlags_get(5)){
@@ -200,7 +200,7 @@ void func_80388C88(Actor *this){
local->unk18 = 1;
}
bool func_80388CA0(Actor *this){
bool FP_func_80388CA0(Actor *this){
ActorLocal_FP_2350 *local = (ActorLocal_FP_2350 *)&this->local;
u32 sp20;
@@ -241,7 +241,7 @@ void func_80388D70(ActorMarker *caller, enum asset_e text_id, s32 arg2){
default://L80388E78
switch(arg2){
case 1:
func_803888E4(this);
FP_func_803888E4(this);
mapSpecificFlags_set(6, TRUE);
break;
case 0:
@@ -263,10 +263,10 @@ void func_80388EE8(ParticleEmitter *pCtrl){
func_802F0D54(pCtrl);
}
void func_80388F4C(Actor *this){}
void FP_func_80388F4C(Actor *this){}
void func_80388F54(ActorMarker *marker){
Actor *other = func_80328230(ACTOR_C8_BOGGY_2, D_80391D88, D_80391D94);
Actor *other = func_80328230(ACTOR_C8_BOGGY_2, D_80391D88, FP_D_80391D94);
func_80343DEC(other);
}
@@ -463,11 +463,11 @@ void func_803896FC(Actor *this){
switch(this->state){
case 1:// L803899B8
if(func_80388CA0(this)){
if(FP_func_80388CA0(this)){
func_80388B18(this, local->unk19);
}//L803899DC
else if(!jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2) && func_8028ECAC() == BSGROUP_C_WALRUS_SLED){
func_803888E4(this);
FP_func_803888E4(this);
}
else if( func_80329530(this, 0x1C2)
&& func_8028ECAC() == 0

6
src/FP/code_3E00.c
View File

@@ -27,7 +27,7 @@ ActorInfo D_80391E08 = { MARKER_1FA_POLAR_BEAR_CUB_BLUE, ACTOR_1EA_POLAR_BEAR_CU
2500, 0, 1.2f, 0
};
ActorInfo D_80391E2C = { MARKER_1FB_POLAR_BEAR_CUB_GREEN, ACTOR_1EB_POLAR_BEAR_CUB_GREEN, ASSET_44D_MODEL_POLAR_BEAR_CUB_GREEN,
ActorInfo FP_D_80391E2C = { MARKER_1FB_POLAR_BEAR_CUB_GREEN, ACTOR_1EB_POLAR_BEAR_CUB_GREEN, ASSET_44D_MODEL_POLAR_BEAR_CUB_GREEN,
0x1, D_80391DF0,
func_8038A384, func_80326224, func_80325888,
2500, 0, 1.2f, 0
@@ -39,7 +39,7 @@ ActorInfo D_80391E50 = { MARKER_1FC_POLAR_BEAR_CUB_RED, ACTOR_1EC_POLAR_BEAR_CUB
2500, 0, 1.2f, 0
};
f32 D_80391E74[3] = {-5.0f, 180.0f, 1.0f};
f32 FP_D_80391E74[3] = {-5.0f, 180.0f, 1.0f};
Struct_FP_3E00 D_80391E80[] ={
{0x11, MARKER_1FD_BLUE_PRESENT_COLLECTABLE, ACTOR_1ED_BLUE_PRESENT_COLLECTABLE, 0x1EE},
{0x12, MARKER_1FE_GREEN_PRESENT_COLLECTABLE, ACTOR_1EF_GREEN_PRESENT_COLLECTABLE, 0x1F0},
@@ -72,7 +72,7 @@ void func_8038A274(Actor *this){
void func_8038A318(ActorMarker *caller, enum asset_e text_id, s32 arg1){
if(text_id == 0xc19){
func_802BAFE4(0x25);
jiggySpawn(JIGGY_2E_FP_PRESENTS, D_80391E74);
jiggySpawn(JIGGY_2E_FP_PRESENTS, FP_D_80391E74);
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 32000);
func_8025A6EC(COMUSIC_5B_FP_IGLOO_HAPPY, 25000);
func_8025A58C(0, 4000);

2
src/FP/code_45D0.c
View File

@@ -14,7 +14,7 @@ typedef struct {
extern Struct_FP_45D0_0 D_80392F50;
/* .code */
void func_8038A9C0(void){
void FP_func_8038A9C0(void){
if( map_get() != MAP_27_FP_FREEZEEZY_PEAK
|| jiggyscore_isCollected(JIGGY_2D_FP_SNOWMAN_BUTTONS)
|| jiggyscore_isSpawned(JIGGY_2D_FP_SNOWMAN_BUTTONS)

20
src/FP/code_4770.c
View File

@@ -44,7 +44,7 @@ extern Struct_FP_4770 D_80393280[0x27];
/* .code */
void func_8038AB60(s32 arg0){
void FP_func_8038AB60(s32 arg0){
int i;
func_8028F8F8(0xe, arg0 ^ 1);
@@ -176,7 +176,7 @@ void func_8038B074(s32 indx){
}
}
void func_8038B0B8(void){
void FP_func_8038B0B8(void){
int i;
for(i = 0; i < 5; i++){
func_8038B074(i);
@@ -210,7 +210,7 @@ void func_8038B1C4(void){
void func_8038B1D0(enum jiggy_e jiggy_id){
timed_setCameraToNode(0.0f, 3);
timedFunc_set_0(0.0f, func_8038AEA0);
timedFunc_set_0(0.0f, func_8038B0B8);
timedFunc_set_0(0.0f, FP_func_8038B0B8);
timedFunc_set_1(0.1f, (GenMethod_1) func_8038B130, jiggy_id);
timedFunc_set_0(5.0f, func_8038B190);
timedFunc_set_0(5.0f, func_8038B1C4);
@@ -221,7 +221,7 @@ void func_8038B1D0(enum jiggy_e jiggy_id){
void func_8038B268(void){
func_80324E88(0.0f);
timedFunc_set_0(0.0f, func_8038AEA0);
timedFunc_set_0(0.0f, func_8038B0B8);
timedFunc_set_0(0.0f, FP_func_8038B0B8);
func_8028FA14(map_get(), 0x11);
func_8028F66C(BS_INTR_2A);
}
@@ -264,7 +264,7 @@ void func_8038B39C(void){
}
func_8028F918(1);
func_8025A6EC(COMUSIC_3B_MINIGAME_VICTORY, 28000);
func_8038AB60(0);
FP_func_8038AB60(0);
func_8038ABDC();
timed_setCameraToNode(0.0f, 1);
}
@@ -278,7 +278,7 @@ void func_8038B410(void){
sp2C->unk38_31 = 1;
func_8025A6EC(COMUSIC_3C_MINIGAME_LOSS, 28000);
func_8038AB60(0);
FP_func_8038AB60(0);
func_8038ABDC();
if(!jiggyscore_isCollected(JIGGY_30_FP_BOGGY_2)){
timed_setCameraToNode(0.0f, 1);
@@ -355,7 +355,7 @@ void func_8038B544(void){
void func_8038B7A4(void){
int i;
func_8038AB60(0);
FP_func_8038AB60(0);
if(map_get() != MAP_27_FP_FREEZEEZY_PEAK || jiggyscore_isCollected(JIGGY_2C_FP_BOGGY_3)){
D_803935A8.unk0 = 0;
@@ -442,11 +442,11 @@ void func_8038B9C8(void){
D_803935A8.unk18 = 0;
D_803935A8.unk19 = 0;
D_803935A8.unk1A = 0;
func_8038AB60(1);
FP_func_8038AB60(1);
D_803935A8.unk0 = 2;
}
void func_8038BA88(s32 arg0){
void FP_func_8038BA88(s32 arg0){
D_803935A8.unk8 = --arg0;
func_8038AC20(arg0, 3);
@@ -517,7 +517,7 @@ void func_8038BC0C(s32 arg0){
if(D_803935A8.unk1A)
break;
D_803935A8.unk1A = TRUE;
func_8038AB60(0);
FP_func_8038AB60(0);
if(!func_8028F22C()){
func_8028F918(2);
func_80311480(0xc10, 0x20, NULL, NULL, func_8038B2C8, NULL);

18
src/FP/code_4D0.c
View File

@@ -6,16 +6,16 @@ Actor *func_803868C0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
void func_80386AA4(Actor *this);
/* .data */
ActorAnimationInfo D_80391A40 []= {
ActorAnimationInfo FP_D_80391A40 []= {
{ ASSET_1A1_ANIM_SLED, 1.0f},
{ ASSET_1A1_ANIM_SLED, 1.0f},
{ ASSET_1A1_ANIM_SLED, 1.0f},
{ ASSET_1A1_ANIM_SLED, 1.0f}
};
ActorInfo D_80391A60 = {
ActorInfo FP_D_80391A60 = {
MARKER_3C_RACE_SLED, ACTOR_182_RACE_SLED, ASSET_352_MODEL_SLED,
0x0, D_80391A40,
0x0, FP_D_80391A40,
func_80386AA4, NULL, func_803868C0,
1000, 0, 0.0f, 0
};
@@ -29,7 +29,7 @@ Actor *func_803868C0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
return this;
}
void func_80386920(Actor *this, s32 next_state){
void FP_func_80386920(Actor *this, s32 next_state){
if(this->state != 1 || next_state != 1){
func_80328A84(this, next_state);
switch(next_state){
@@ -60,7 +60,7 @@ void func_803869FC(ActorMarker *this_marker, ActorMarker *other_marker){
&& player_getTransformation() == TRANSFORM_4_WALRUS
&& func_8028F68C(BS_INTR_27_WALRUS_SLED, this->marker)
){
func_80386920(this, 3); //start_race
FP_func_80386920(this, 3); //start_race
}
}
}
@@ -70,23 +70,23 @@ void func_80386AA4(Actor *this){
if(!this->initialized){
this->initialized = TRUE;
marker_setCollisionScripts(this->marker, func_803869FC, NULL, NULL);
func_80386920(this, 1);
FP_func_80386920(this, 1);
}
sp24 = mapSpecificFlags_get(4);
if(sp24 == 0){
func_80386920(this, 1);
FP_func_80386920(this, 1);
}
switch (this->state){
case 1://L80386B38
if(sp24){
func_80386920(this, 2);
FP_func_80386920(this, 2);
}
break;
case 3://L80386B50
if(func_8028ECAC() != BSGROUP_C_WALRUS_SLED){
func_80386920(this, 2);
FP_func_80386920(this, 2);
}
break;
}

6
src/FP/code_6AE0.c
View File

@@ -5,7 +5,7 @@
extern void func_80324CD8(f32);
extern Actor *func_8032813C(enum actor_e, f32[3], s32);
Actor *func_8038CED0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
Actor *FP_func_8038CED0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
void func_8038D6C8(Actor *this);
/* .data */
@@ -19,7 +19,7 @@ ActorAnimationInfo D_803920C0[] ={
ActorInfo D_803920E8 = { 0x204, 0x336, 0x442,
0x1, D_803920C0,
func_8038D6C8, func_80326224, func_8038CED0,
func_8038D6C8, func_80326224, FP_func_8038CED0,
0, 0, 0.0f, 0
};
@@ -115,7 +115,7 @@ enum actor_e D_8039236C[4] = {
f32 D_8039237C[3] = {-3940.0f, 69.0f, 3570.0f};
/* .code */
Actor *func_8038CED0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
Actor *FP_func_8038CED0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
Actor *this = marker_getActor(marker);
if( func_8038BFA0() || func_8031FF1C(BKPROG_13) ){
if(0.0f == this->velocity[1])

16
src/FP/code_790.c
View File

@@ -3,20 +3,20 @@
#include "variables.h"
Actor *func_80386B80(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
void func_80386CF8(Actor *this);
void FP_func_80386CF8(Actor *this);
/* .data */
ActorAnimationInfo D_80391A90[] ={
ActorAnimationInfo FP_D_80391A90[] ={
{0, 0.0},
{ASSET_143_ANIM_SNOWMAN_BUTTON, 800000.0f},
{ASSET_143_ANIM_SNOWMAN_BUTTON, 0.5f},
{ASSET_143_ANIM_SNOWMAN_BUTTON, 800000.0f}
};
ActorInfo D_80391AB0 = {
ActorInfo FP_D_80391AB0 = {
MARKER_B9_FP_SNOWMAN_BUTTON, ACTOR_116_FP_SNOWMAN_BUTTON, ASSET_421_MODEL_FP_SNOWMAN_BUTTON,
0x1, D_80391A90,
func_80386CF8, func_80326224, func_80386B80,
0x1, FP_D_80391A90,
FP_func_80386CF8, func_80326224, func_80386B80,
0, 0x800, 0.0f, 0
};
@@ -45,7 +45,7 @@ Actor *func_80386B80(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
}
void func_80386BEC(Actor *this){
void FP_func_80386BEC(Actor *this){
f32 plyr_pos[3];
ParticleEmitter *pCtrl = partEmitList_pushNew(12);
@@ -67,11 +67,11 @@ void func_80386CB8(ActorMarker *this_marker, ActorMarker *other_marker){
Actor *this = marker_getActor(this_marker);
if(this->state == 1)
func_80386BEC(this);
FP_func_80386BEC(this);
}
void func_80386CF8(Actor *this){
void FP_func_80386CF8(Actor *this){
marker_setCollisionScripts(this->marker, NULL, NULL, func_80386CB8);
this->marker->propPtr->unk8_3 = TRUE;
actor_collisionOn(this);

22
src/FP/code_8E20.c
View File

@@ -11,14 +11,14 @@ typedef struct {
} ActorLocal_Wozza;
Actor *func_8038F210(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
void func_8038F7AC(Actor *this);
void FP_func_8038F7AC(Actor *this);
/* .data */
extern ActorAnimationInfo D_80392520[];
extern ActorInfo D_80392588 = { MARKER_20B_WOZZA, ACTOR_1F3_WOZZA, ASSET_494_MODEL_WOZZA,
0x1, D_80392520,
func_8038F7AC, func_80326224, func_8038F210,
FP_func_8038F7AC, func_80326224, func_8038F210,
0, 0, 1.6f, 0
};
@@ -132,7 +132,7 @@ bool func_8038F5D4(Actor *this, f32 arg1[3], f32 arg2, f32 arg3, s32 arg4){
}
bool func_8038F6C4(Actor *this, f32 arg1[3], f32 arg2){
bool FP_func_8038F6C4(Actor *this, f32 arg1[3], f32 arg2){
s32 dTheta;
func_80328C64(this, func_803297C8(this, arg1));
@@ -144,7 +144,7 @@ bool func_8038F6C4(Actor *this, f32 arg1[3], f32 arg2){
return FALSE;
}
void func_8038F758(ActorMarker *marker){
void FP_func_8038F758(ActorMarker *marker){
Actor *this = marker_getActor(reinterpret_cast(ActorMarker *, marker));
Actor *jiggy = spawn_child_actor(ACTOR_1F4_WOZZAS_JIGGY, &this);
s32 pad;
@@ -155,7 +155,7 @@ void func_8038F758(ActorMarker *marker){
}
void func_8038F7AC(Actor *this){
void FP_func_8038F7AC(Actor *this){
ActorLocal_Wozza * local = (ActorLocal_Wozza *)&this->local;
if(func_803203FC(0xC4)){
@@ -190,7 +190,7 @@ void func_8038F7AC(Actor *this){
this->position[0] = local->unkC[0];\
this->position[1] = local->unkC[1];\
this->position[2] = local->unkC[2];
__spawnqueue_add_1(func_8038F758, this->marker);
__spawnqueue_add_1(FP_func_8038F758, this->marker);
local->unk30 = FALSE;
}
}//L8038F910
@@ -244,7 +244,7 @@ void func_8038F7AC(Actor *this){
break;
case 5: //L8038FB50
func_8038F6C4(this, local->unk18, 1.0f);
FP_func_8038F6C4(this, local->unk18, 1.0f);
if(0.97 < animctrl_getAnimTimer(this->animctrl)){
func_80328B8C(this, 6, 0.02f, 1);
actor_loopAnimation(this);
@@ -252,7 +252,7 @@ void func_8038F7AC(Actor *this){
break;
case 6: //L8038FBA8
func_8038F6C4(this, local->unk18, 1.0f);
FP_func_8038F6C4(this, local->unk18, 1.0f);
if( func_80329530(this, 1700) ) break;
if( func_8028ECAC() == BSGROUP_A_FLYING ) break;
@@ -266,7 +266,7 @@ void func_8038F7AC(Actor *this){
break;
case 7: //L8038FC30
if(!func_8038F6C4(this, local->unkC, 4.5f))
if(!FP_func_8038F6C4(this, local->unkC, 4.5f))
break;
if(func_80329530(this, 1000) || func_8028ECAC() == BSGROUP_A_FLYING){
@@ -294,7 +294,7 @@ void func_8038F7AC(Actor *this){
}//L8038FD40
if(mapSpecificFlags_get(8)){
if(func_8038F6C4(this, D_803925AC, 9.0f)){
if(FP_func_8038F6C4(this, D_803925AC, 9.0f)){
func_80328B8C(this, 9, 0.02f, 1);
actor_playAnimationOnce(this);
}
@@ -315,7 +315,7 @@ void func_8038F7AC(Actor *this){
break;
case 9: //L8038FE14
func_8038F6C4(this, D_803925AC, 9.0f);
FP_func_8038F6C4(this, D_803925AC, 9.0f);
if(0.97 < animctrl_getAnimTimer(this->animctrl)){
func_80328B8C(this, 10, 0.02f, 1);
actor_loopAnimation(this);

34
src/FP/code_A40.c
View File

@@ -2,21 +2,21 @@
#include "functions.h"
#include "variables.h"
Actor *func_80386E30(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
Actor *FP_func_80386E30(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
void chXmasTree_update(Actor *this);
/* .data */
ActorInfo D_80391B50 = {
MARKER_BA_XMAS_TREE, ACTOR_15F_XMAS_TREE, ASSET_488_MODEL_XMAS_TREE,
0x1, NULL,
chXmasTree_update, func_80326224, func_80386E30,
chXmasTree_update, func_80326224, FP_func_80386E30,
0, 0, 0.0f, 0
};
s32 chXmasTree_switch_spawn_position[3] = {-0x1220, 0x6A, 0x1945};
/* .code */
Actor *func_80386E30(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
Actor *FP_func_80386E30(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
Actor *this = marker_getActor(marker);
func_8033A45C(5, this->unk38_31);
func_8033A45C(6, func_8031FF1C(0x13) && !func_8033A0F0(5));
@@ -34,7 +34,7 @@ void func_80386EAC(Actor *this){
}
}
void func_80386EF4(Actor *this, int arg1){
void FP_func_80386EF4(Actor *this, int arg1){
this->unk38_31 = arg1;
mapSpecificFlags_set(0, this->unk38_31);
@@ -49,14 +49,14 @@ void func_80386F3C(void){
void func_80386F84(Actor * this){
func_80328A84(this, 2);
func_80386EF4(this, 0);
FP_func_80386EF4(this, 0);
}
void func_80386FB4(void){
func_8032811C(ACTOR_338_XMAS_TREE_SWITCH, chXmasTree_switch_spawn_position, 350);
}
void func_80386FE0(void *marker){
void FP_func_80386FE0(void *marker){
Actor *this = marker_getActor(reinterpret_cast(ActorMarker *, marker));
Actor *child = spawn_child_actor(0x339, &this);
s32 pad;
@@ -99,7 +99,7 @@ void chXmasTree_update(Actor *this){
sfxsource_setSampleRate(this->unk44_31, 28000);
}
func_802C3BF8(func_80386FB4);
__spawnqueue_add_1(func_80386FE0, this->marker);
__spawnqueue_add_1(FP_func_80386FE0, this->marker);
if(func_8031FF1C(0x13)){
func_80386F84(this);
mapSpecificFlags_set(2, FALSE);
@@ -108,13 +108,13 @@ void chXmasTree_update(Actor *this){
this->unk124_9 = 1;
if(jiggyscore_isCollected(JIGGY_2F_FP_XMAS_TREE) || levelSpecificFlags_get(0x29)){
func_80386EF4(this, 1);
FP_func_80386EF4(this, 1);
return;
}
switch(this->state){
case 1: // L80387268
func_80386EF4(this, 0);
FP_func_80386EF4(this, 0);
if(func_8031FF1C(0x13)){
func_80386F84(this);
}
@@ -133,14 +133,14 @@ void chXmasTree_update(Actor *this){
case 3: // L803872F0
if(0.0 <= this->unk60){
if( 1.8 < this->unk60){
func_80386EF4(this, 0);
FP_func_80386EF4(this, 0);
}
else if(this->unk60 < 0.2){//L80387340
func_80386EF4(this, 1);
FP_func_80386EF4(this, 1);
}
else{
if(randf() < 0.2){
func_80386EF4(this, this->unk38_31 ^ 1);
FP_func_80386EF4(this, this->unk38_31 ^ 1);
func_8038709C(this);
}
}//L803873AC
@@ -149,7 +149,7 @@ void chXmasTree_update(Actor *this){
else{//L803873BC
if(func_802BB270()){
func_80328A84(this, 4);
func_80386EF4(this, 1);
FP_func_80386EF4(this, 1);
item_set(ITEM_0_HOURGLASS_TIMER, 3600 - 1);
item_set(ITEM_6_HOURGLASS, TRUE);
@@ -160,7 +160,7 @@ void chXmasTree_update(Actor *this){
case 4: // L80387400
if(mapSpecificFlags_get(3)){
func_80328A84(this, 6);
func_80386EF4(this, 1);
FP_func_80386EF4(this, 1);
item_set(ITEM_6_HOURGLASS, FALSE);
tmp_a0 = this->unk44_31;
if(tmp_a0){
@@ -189,14 +189,14 @@ void chXmasTree_update(Actor *this){
case 5: // L803874EC
if(0.0 <= this->unk60){
if( 1.8 < this->unk60){
func_80386EF4(this, 1);
FP_func_80386EF4(this, 1);
}
else if(this->unk60 < 0.2){
func_80386EF4(this, 0);
FP_func_80386EF4(this, 0);
}
else{
if(randf() < 0.2){
func_80386EF4(this, this->unk38_31 ^ 1);
FP_func_80386EF4(this, this->unk38_31 ^ 1);
func_8038709C(this);
}
}

6
src/FP/code_A880.c
View File

@@ -7,12 +7,12 @@ extern s32 func_8024DB50(f32[3], f32);
void func_80390EB0(Actor *this);
/* .data */
extern ActorInfo D_80392840 = { MARKER_245_XMAS_TREE_EGG_TOLL, ACTOR_353_XMAS_TREE_EGG_TOLL, ASSET_402_MODEL_EGG_TOLL,
extern ActorInfo FP_D_80392840 = { MARKER_245_XMAS_TREE_EGG_TOLL, ACTOR_353_XMAS_TREE_EGG_TOLL, ASSET_402_MODEL_EGG_TOLL,
0x0, NULL,
func_80390EB0, func_80326224, func_80325340,
2000, 0, 0.0f, 0
};
struct40s D_80392864;
extern struct40s FP_D_80392864;
s32 D_80392894[3];
struct40s D_803928A0;
s32 D_803928D0[3];
@@ -33,7 +33,7 @@ void func_80390C70(f32 position[3]){
0.0f, 40.0f, 0.0f,
0.0f, 90.0f, 0.0f
);
func_802EFC28(pCtrl, &D_80392864);
func_802EFC28(pCtrl, &FP_D_80392864);
}
void func_80390D58(f32 position[3]){

36
src/FP/code_ABD0.c
View File

@@ -7,16 +7,16 @@
extern ActorInfo D_80367FE0;
extern ActorInfo D_80391A10;
extern ActorInfo D_80391A60;
extern ActorInfo D_80391AB0;
extern ActorInfo FP_D_80391A10;
extern ActorInfo FP_D_80391A60;
extern ActorInfo FP_D_80391AB0;
extern ActorInfo D_80391B50;
extern ActorInfo D_80391BB0;
extern ActorInfo D_80391C18;
extern ActorInfo D_80391C58;
extern ActorInfo D_80391CE8;
extern ActorInfo D_80391E08;
extern ActorInfo D_80391E2C;
extern ActorInfo FP_D_80391E2C;
extern ActorInfo D_80391E50;
extern ActorInfo D_80391F88;
extern ActorInfo D_80391FAC;
@@ -35,25 +35,25 @@ extern ActorInfo D_80392690;
extern ActorInfo D_803926C0;
extern ActorInfo D_80392700;
extern ActorInfo D_80392730;
extern ActorInfo D_80392840;
extern ActorInfo FP_D_80392840;
void func_80391040(Actor *this);
void func_80391180(Actor *this);
void func_80391254(Actor *this);
void FP_func_80391254(Actor *this);
void func_803912EC(Actor *this);
void func_8039180C(Actor *this);
void func_80391894(Actor *this);
/* .data */
ActorInfo D_803928E0 = { 0x247, 0x355, 0x4E5, 0x0, NULL, func_80391040, func_80326224, func_80325888, 3000, 0, 0.0f, 0};
ActorInfo FP_D_803928E0 = { 0x247, 0x355, 0x4E5, 0x0, NULL, func_80391040, func_80326224, func_80325888, 3000, 0, 0.0f, 0};
ActorInfo D_80392904 = { 0x248, 0x356, 0x4E6, 0x0, NULL, func_80391040, func_80326224, func_80325888, 3000, 0, 0.0f, 0};
ActorInfo D_80392928 = { 0x249, 0x357, 0x4E7, 0x0, NULL, func_80391040, func_80326224, func_80325888, 3000, 0, 0.0f, 0};
ActorInfo D_8039294C = { 0x24A, 0x358, 0x4E8, 0x0, NULL, func_80391040, func_80326224, func_80325888, 3000, 0, 0.0f, 0};
ActorInfo D_80392970 = { 0x21F, 0x22B, 0x4C4, 0x1, NULL, func_80391180, func_80326224, func_80325E78, 0, 0, 0.0f, 0};
ActorInfo D_80392994 = { 0x220, 0x22C, 0x4C5, 0x1, NULL, func_80391180, func_80326224, func_80325E78, 0, 0, 0.0f, 0};
ActorInfo D_803929B8 = { 0x221, 0x22D, 0x4C6, 0x1, NULL, func_80391254, func_80326224, func_80325E78, 0, 0, 0.0f, 0};
ActorInfo D_803929DC = { 0x222, 0x22E, 0x4C6, 0x1, NULL, func_80391254, func_80326224, func_80325E78, 0, 0, 0.0f, 0};
ActorInfo D_80392A00 = { 0x223, 0x22F, 0x4C6, 0x1, NULL, func_80391254, func_80326224, func_80325E78, 0, 0, 0.0f, 0};
ActorInfo D_803929B8 = { 0x221, 0x22D, 0x4C6, 0x1, NULL, FP_func_80391254, func_80326224, func_80325E78, 0, 0, 0.0f, 0};
ActorInfo D_803929DC = { 0x222, 0x22E, 0x4C6, 0x1, NULL, FP_func_80391254, func_80326224, func_80325E78, 0, 0, 0.0f, 0};
ActorInfo D_80392A00 = { 0x223, 0x22F, 0x4C6, 0x1, NULL, FP_func_80391254, func_80326224, func_80325E78, 0, 0, 0.0f, 0};
ActorInfo D_80392A24 = { 0x24B, 0x35D, 0x4E9, 0x1, NULL, func_803912EC, func_80326224, func_80325E78, 0, 0, 0.0f, 0};
ActorInfo D_80392A48 = { 0x24C, 0x35E, 0x4EC, 0x1, NULL, func_803912EC, func_80326224, func_80325E78, 0, 0, 0.0f, 0};
ActorInfo D_80392A6C = { 0x24D, 0x35F, 0x4EA, 0x1, NULL, func_803912EC, func_80326224, func_80325E78, 0, 0, 0.0f, 0};
@@ -131,7 +131,7 @@ void func_80391180(Actor *this){
}
}
void func_80391254(Actor *this){
void FP_func_80391254(Actor *this){
func_802D3D74(this);
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
@@ -152,15 +152,15 @@ void func_803912EC(Actor *this){
}
void func_80391324(void)
void FP_func_80391324(void)
{
spawnableActorList_add(&D_80391AB0, actor_new, 0X600);
spawnableActorList_add(&FP_D_80391AB0, actor_new, 0X600);
spawnableActorList_add(&D_80391BB0, actor_new, 0X2A);
spawnableActorList_add(&D_80391C18, actor_new, 0X180084);
spawnableActorList_add(&D_80391C58, actor_new, 0X180084);
spawnableActorList_add(&D_80391CE8, actor_new, 0X2002E);
spawnableActorList_add(&D_80391E08, actor_new, 0X100);
spawnableActorList_add(&D_80391E2C, actor_new, 0X100);
spawnableActorList_add(&FP_D_80391E2C, actor_new, 0X100);
spawnableActorList_add(&D_80391E50, actor_new, 0X100);
spawnableActorList_add(&D_80391F88, actor_new, 0X2100C);
spawnableActorList_add(&D_80391FAC, actor_new, 0X2100C);
@@ -174,17 +174,17 @@ void func_80391324(void)
spawnableActorList_add(&D_803924B0, actor_new, 8);
spawnableActorList_add(&D_803924D4, actor_new, 8);
spawnableActorList_add(&D_803924F8, actor_new, 8);
spawnableActorList_add(&D_80391A10, actor_new, 0);
spawnableActorList_add(&D_80391A60, actor_new, 0X20);
spawnableActorList_add(&FP_D_80391A10, actor_new, 0);
spawnableActorList_add(&FP_D_80391A60, actor_new, 0X20);
spawnableActorList_add(&D_80392588, actor_new, 0X80108);
spawnableActorList_add(&D_80392628, actor_new, 0X44);
spawnableActorList_add(&D_80392690, actor_new, 0XA8);
spawnableActorList_add(&D_803926C0, actor_new, 0X8000400);
spawnableActorList_add(&D_80392700, actor_new, 0X108);
spawnableActorList_add(&D_80392840, actor_new, 0);
spawnableActorList_add(&FP_D_80392840, actor_new, 0);
spawnableActorList_add(&D_80392730, actor_new, 0X20000);
spawnableActorList_add(&D_80367FE0, actor_new, 0);
spawnableActorList_add(&D_803928E0, actor_new, 0X40);
spawnableActorList_add(&FP_D_803928E0, actor_new, 0X40);
spawnableActorList_add(&D_80392904, actor_new, 0X40);
spawnableActorList_add(&D_80392928, actor_new, 0X40);
spawnableActorList_add(&D_8039294C, actor_new, 0X40);