kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fight documentation

Browse Source
This commit is contained in:
Banjo Kazooie
2022-10-08 22:07:56 -05:00
parent c0b005fa3d
commit cd222d498a
106 changed files with 1120 additions and 880 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/core2/ch/bigbutt.c
View File

@@ -66,7 +66,7 @@ void func_802C5F44(Actor *this){
void func_802C5F94(Actor *this){
func_80328A84(this, 2);
func_802C5E80(this);
func_80328CEC(this, (s32)this->yaw_moving, 135, 175);
func_80328CEC(this, (s32)this->yaw_ideal, 135, 175);
this->unk38_31 = 150;
}
@@ -162,13 +162,13 @@ void func_802C6240(Actor *this){
func_80328CEC(this, (s32)this->yaw, 90, 150);
}//L802C64EC
if(!(func_8023DB5C() & 0xf))
func_80328CEC(this, (s32)this->yaw_moving, 10, 20);
func_80328CEC(this, (s32)this->yaw_ideal, 10, 20);
if(!(func_8023DB5C() & 0x7))
func_80328BD4(this, 1, 0.16f, 1, 0.02f);
if( !(func_8023DB5C() & 0xf)
&& func_80329078(this, (s32)this->yaw_moving, 150)
&& func_80329078(this, (s32)this->yaw_ideal, 150)
&& func_80328B38(this, 3, 0.13f)
){
this->unk28 = randf2(7.1f, 8.4f);
@@ -178,7 +178,7 @@ void func_802C6240(Actor *this){
case 0x8: //L802C65D0
func_802C5F44(this);
this->yaw_moving = func_80329784(this);
this->yaw_ideal = func_80329784(this);
func_80328FB0(this, 4.0f);
if(func_80329480(this))
func_80328A84(this, 6);
@@ -198,7 +198,7 @@ void func_802C6240(Actor *this){
case 0x6: //L802C66D0
animctrl_setDuration(this->animctrl, D_80366010[6].duration - (3 - this->unk10_12)*0.1085);
this->yaw_moving = (f32)func_80329784(this);
this->yaw_ideal = (f32)func_80329784(this);
if(!func_803294B4(this, 0x21)){
func_80328A84(this, 8);
}
@@ -224,13 +224,13 @@ void func_802C6240(Actor *this){
if(30.0f < this->unk28)
this->unk28 = 30.0f;
this->yaw_moving = (f32)func_80329784(this);
this->yaw_ideal = (f32)func_80329784(this);
func_80328FB0(this, 9.0f);
if(!func_80329030(this, 0))
func_802C5F94(this);
if(func_80329530(this, 320)){
if(func_80329078(this, (s32)this->yaw_moving,200)){
if(func_80329078(this, (s32)this->yaw_ideal,200)){
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_ONCE);
func_80328A84(this, 4);
this->unk28 += 5.7;
@@ -252,7 +252,7 @@ void func_802C6240(Actor *this){
case 0x4: //L802C6A14
if(animctrl_getAnimTimer(this->animctrl) < 0.99){
this->yaw_moving = (f32)func_80329784(this);
this->yaw_ideal = (f32)func_80329784(this);
func_80328FB0(this, 1.0f);
}
func_80329030(this, 0);

8
src/core2/ch/code_5AB30.c
View File

@@ -141,13 +141,13 @@ void func_802E1DE8(Actor *this){
}
void func_802E1E20(Actor *this, f32 arg1){
this->yaw_moving = func_80329784(this);
this->yaw_ideal = func_80329784(this);
func_80328FB0(this, 6.0f);
}
int func_802E1E5C(Actor *this, s32 arg1){
f32 f0;
f0 = this->yaw - this->yaw_moving;
f0 = this->yaw - this->yaw_ideal;
if((f0 < arg1) && (-arg1 < f0)){
return 1;
}
@@ -183,7 +183,7 @@ void func_802E1FD0(ActorMarker *marker, ActorMarker *other_marker){
FUNC_8030E8B4(SFX_3EA_UNKNOWN, 1.0f, 30000, actor->position, 1500, 4500);
FUNC_8030E8B4(SFX_2F_ORANGE_SPLAT, 1.0f, 30000, actor->position, 1500, 4500);
func_802C3C88((GenMethod_1)func_802E1BD0, (s32)actor->marker);
__spawnqueue_add_1((GenMethod_1)func_802E1BD0, (s32)actor->marker);
if(map_get() == MAP_27_FP_FREEZEEZY_PEAK)
func_8038A978();
func_802E1CB8(actor->position, 0xC);
@@ -309,7 +309,7 @@ void func_802E20E8(Actor *this){
&& local->unkB
){
func_8030E878(SFX_8F_SNOWBALL_FLYING, randf2(0.95f, 1.05f), 30000, this->position, 800.0f, 3050.0f);
func_802C3C88((GenMethod_1)func_802E1B24, (s32)this->marker);
__spawnqueue_add_1((GenMethod_1)func_802E1B24, (s32)this->marker);
local->unk9 = FALSE;
}

2
src/core2/ch/gameSelect.c
View File

@@ -298,7 +298,7 @@ void func_802C4C14(Actor *this){
return;
if(!this->initialized){
func_802C3C88(func_802C4BB4, this->marker);
__spawnqueue_add_1(func_802C4BB4, this->marker);
func_802C7318(this);
this->unk130 = func_802C71F0;
if(sp84 == 0){

8
src/core2/ch/ghost.c
View File

@@ -183,7 +183,7 @@ void func_8035B824(Actor *this){
func_80328B8C(this, 4, 0.01f, 1);
actor_loopAnimation(this);
func_80328CEC(this, (s32)this->yaw_moving, 0xA, 0x1E);
func_80328CEC(this, (s32)this->yaw_ideal, 0xA, 0x1E);
this->unk28 = 4.0f;
local->unk4 = randf2(2.0f, 4.5f);
@@ -193,7 +193,7 @@ void func_8035B824(Actor *this){
void func_8035B8A8(Actor *this){
func_80328B8C(this, 5, 0.01f, 1);
actor_loopAnimation(this);
func_80328CEC(this, (s32)this->yaw_moving, 0xE1, 0x87);
func_80328CEC(this, (s32)this->yaw_ideal, 0xE1, 0x87);
}
void func_8035B900(Actor *this){
@@ -232,7 +232,7 @@ void func_8035B900(Actor *this){
}
break;
case 2: //L8035BA98
this->yaw_moving = func_80329784(this);
this->yaw_ideal = func_80329784(this);
func_8035B444(this, 4.0f);
if(actor_animationIsAt(this, 0.99f)){
func_8035B75C(this);
@@ -243,7 +243,7 @@ void func_8035B900(Actor *this){
if((sp30 & 0x3F) == 7 && randf() < 0.7){
func_8030E878(0x3F4, randf2(1.0f, 1.2f), 32000, this->position, this->scale*400.0f, this->scale*1800.0f);
}//L8035BB6C
this->yaw_moving = func_80329784(this);
this->yaw_ideal = func_80329784(this);
if(!func_8035B3E4(this) || !func_8035B444(this, 5.0f)){
func_8035B674(this);
}

2
src/core2/ch/icecube.c
View File

@@ -224,7 +224,7 @@ void __chicecube_die(ActorMarker *marker, ActorMarker *other_marker){
func_8035A04C(actor->position, 12, ASSET_505_MODEL_ICECUBE_CHUNK, actor->scale);
func_8035A228(actor->position, 6, ASSET_700_SPRITE_DUST, actor->scale);
if(actor->unkF4_8 != 1){
func_802C3C88(__chicecube_spawnHalfCubes, actor->marker);
__spawnqueue_add_1(__chicecube_spawnHalfCubes, actor->marker);
}
marker_despawn(actor->marker);
}

4
src/core2/ch/jiggy.c
View File

@@ -83,7 +83,7 @@ void func_802C7B8C(Actor *this, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5
timedFunc_set_4(0.6f, (TFQM4)func_802C7AF8, (s32)this->position[0], (s32)this->position[1], (s32)this->position[2], arg4);
timedFunc_set_2(0.6f, (TFQM2)func_802C7AB0, (s32)this->marker, arg5);
timedFunc_set_0(1.0f, (TFQM0)func_802BE720);
timedFunc_set_1(3.9f, (TFQM1)func_802C7B6C, arg4);
timedFunc_set_1(3.9f, (GenMethod_1)func_802C7B6C, arg4);
mapSpecificFlags_set(arg1, 1);
}
}
@@ -95,7 +95,7 @@ void func_802C7CA4(Actor *this){
if(360.0f <= this->yaw){
this->yaw -= 360.0f;
}
this->yaw_moving = this->yaw;
this->yaw_ideal = this->yaw;
}
//chjiggy_draw

8
src/core2/ch/mole.c
View File

@@ -324,7 +324,7 @@ void func_802D9D60(Actor *this){
this->unk38_0 = TRUE;
nodeprop_getPosition(other, this->unk1C);
}
func_802C3C88(func_802D9C54, this->marker);
__spawnqueue_add_1(func_802D9C54, this->marker);
this->marker->propPtr->unk8_3 = FALSE;
this->marker->collidable = FALSE;
this->initialized = TRUE;
@@ -345,7 +345,7 @@ void func_802D9D60(Actor *this){
func_8024E55C(0, sp50);//get face buttons press counters
switch(this->state){
case 1://L802D9F70
this->yaw_moving = func_80329784(this);
this->yaw_ideal = func_80329784(this);
func_80328FB0(this, 4.0f);
if(func_8028F20C() && func_8028F0D4() && !func_8028EC04()){
if( this->unkF4_8 == 0x12
@@ -370,7 +370,7 @@ void func_802D9D60(Actor *this){
break;
case 2://L802DA0A0
this->marker->propPtr->unk8_3 = TRUE;
this->yaw_moving = func_80329784(this);
this->yaw_ideal = func_80329784(this);
func_80328FB0(this, 4.0f);
if( 0.0 < animctrl_getAnimTimer(this->animctrl)
&& animctrl_getAnimTimer(this->animctrl) < 0.16
@@ -396,7 +396,7 @@ void func_802D9D60(Actor *this){
}
break;
case 3://L802DA210
this->yaw_moving = func_80329784(this);
this->yaw_ideal = func_80329784(this);
func_80328FB0(this, 4.0f);
if( ( actor_animationIsAt(this, 0.37f)
|| actor_animationIsAt(this, 0.66f)

2
src/core2/code_3BB80.c
View File

@@ -475,7 +475,7 @@ void func_802C3BF8(void (* arg0)(void)){
}
}
void func_802C3C88(GenMethod_1 arg0, s32 arg1){
void __spawnqueue_add_1(GenMethod_1 arg0, s32 arg1){
u32 tmp = (map_get() == MAP_90_GL_BATTLEMENTS)? 0x32: 0xF;
if(tmp != D_80365DC4){
D_80365DC8[D_80365DC4].func0 = (void (*)(void))arg0;

2
src/core2/code_43A40.c
View File

@@ -75,7 +75,7 @@ void func_802CAA44(Actor *this){
if(map_get() == MAP_12_GV_GOBIS_VALLEY){
this->unk6C = 352.0f;
this->pitch = 352.0f;
this->yaw_moving = 90.0f;
this->yaw_ideal = 90.0f;
this->yaw = 90.0f;
}
}

10
src/core2/code_440B0.c
View File

@@ -61,7 +61,7 @@ void func_802CB078(Actor *this) {
void func_802CB140(Actor *this) {
func_80328A84(this, 2U);
func_802CB040(this);
func_80328CEC(this, (s32) this->yaw_moving, 135, 175);
func_80328CEC(this, (s32) this->yaw_ideal, 135, 175);
this->unk38_31 = 150;
}
@@ -254,7 +254,7 @@ void func_802CBAAC(Actor *this) {
marker_despawn(this->marker);
return;
}
this->yaw_moving = (f32) func_80329784(this);
this->yaw_ideal = (f32) func_80329784(this);
func_80328FB0(this, 4.0f);
return;
}
@@ -319,7 +319,7 @@ void func_802CBAAC(Actor *this) {
break;
case 3: //L802CBF44
this->yaw_moving = (f32) func_80329784(this);
this->yaw_ideal = (f32) func_80329784(this);
func_80328FB0(this, 4.0f);
if (func_80329480(this)) {
func_80328A84(this, 4);
@@ -328,7 +328,7 @@ void func_802CBAAC(Actor *this) {
break;
case 8: //L802CBF9C
this->yaw_moving = func_80329784(this) + 90.0;
this->yaw_ideal = func_80329784(this) + 90.0;
func_80328FB0(this, 4.0f);
if (func_80329480(this)) {
func_80328A84(this, 9);
@@ -340,7 +340,7 @@ void func_802CBAAC(Actor *this) {
case 4: //L802CC024
if ((func_8023DB5C() & 0xF) == 9) {
this->yaw_moving = (f32) func_80329784(this);
this->yaw_ideal = (f32) func_80329784(this);
}
func_80328FB0(this, 7.0f);
if (func_8032CA80(this, (this->modelCacheIndex == 0xF2)? 0xD : 0)) {

2
src/core2/code_47C0.c
View File

@@ -166,7 +166,7 @@ void func_8028B9A8(s32 arg0){
}
void func_8028BA00(s32 arg0){
func_802C3C88(func_8028B9A8, arg0);
__spawnqueue_add_1(func_8028B9A8, arg0);
if(arg0);
}

8
src/core2/code_49A70.c
View File

@@ -53,7 +53,7 @@ void func_802D0A38(Actor *this){
void func_802D0AB8(Actor *this) {
func_80328B8C(this, 1, 0.0f, 0);
func_802D0A00(this);
func_80328CEC(this, (s32) this->yaw_moving, 0x87, 0xAF);
func_80328CEC(this, (s32) this->yaw_ideal, 0x87, 0xAF);
this->unk38_31 = 0x1E;
}
@@ -121,7 +121,7 @@ void func_802D0F30(ActorMarker *marker, ActorMarker *other_marker) {
this = marker_getActor(marker);
FUNC_8030E8B4(SFX_1B_EXPLOSION_1, 1.0f, 32736, this->position, 1250, 2500);
func_802C3C88((GenMethod_1)func_802D0B24, reinterpret_cast(s32, this));
__spawnqueue_add_1((GenMethod_1)func_802D0B24, reinterpret_cast(s32, this));
func_802D0B54(this);
func_802D0CB4(this);
func_802D0DDC(this, ASSET_53A_MODEL_SHRAPNAL_PIECE_EYE, 2);
@@ -172,7 +172,7 @@ void chshrapnel_update(Actor *this) {
break;
case 2:
this->yaw_moving = (f32) func_80329784(this);
this->yaw_ideal = (f32) func_80329784(this);
func_80328FB0(this, 4.0f);
if (func_80329480(this)) {
if (250.0 > ABS(player_position[1] - this->unk1C[1])) {
@@ -185,7 +185,7 @@ void chshrapnel_update(Actor *this) {
break;
case 3:
this->yaw_moving = (f32) func_80329784(this);
this->yaw_ideal = (f32) func_80329784(this);
func_80328FB0(this, this->unk28 / 2);
this->unk28 = MIN( 50.0, (this->unk28 + tick));
if ((250.0 <= ABS(player_position[1] - this->unk1C[1])) || !func_80329054(this, 0)) {

2
src/core2/code_4C020.c
View File

@@ -1141,7 +1141,7 @@ void func_802D6264(f32 arg0, enum map_e arg1, s32 arg2, s32 arg3, s32 arg4, enum
D_803676A0 = 0;
if(arg1 != D_80367694){
timedFunc_set_1(arg0, (TFQM1) func_802D61FC, arg1);
timedFunc_set_1(arg0, (GenMethod_1) func_802D61FC, arg1);
}
else{
timedFunc_set_0(arg0, func_802D63D4);

2
src/core2/code_509D0.c
View File

@@ -144,7 +144,7 @@ void func_802D7C24(ActorMarker *marker, ActorMarker *other_marker) {
break;
}
if (var_a3 != 0) {
timedFunc_set_1(0.5f, (TFQM1)func_802D7BE8, var_a3);
timedFunc_set_1(0.5f, (GenMethod_1)func_802D7BE8, var_a3);
}
func_8028F030(this->modelCacheIndex);
marker_despawn(marker);

2
src/core2/code_51950.c
View File

@@ -89,5 +89,5 @@ void func_802D8B20(enum actor_e actor_id){
}
void func_802D8BE4(bool gold_feather){
func_802C3C88(func_802D8B20, (!gold_feather) ? 0x1FF : 0x200);
__spawnqueue_add_1(func_802D8B20, (!gold_feather) ? 0x1FF : 0x200);
}

2
src/core2/code_51C90.c
View File

@@ -79,7 +79,7 @@ void func_802D8C98(Actor *this, s32 arg1) {
//collectItem
bool func_802D8D48(Actor* actor, u32 arg1, enum asset_e dialogId, enum comusic_e sfxId, enum item_e itemId, f32 arg5){
func_8025A6EC(sfxId,32000);
timedFunc_set_1(0.75f, (TFQM1)func_8035644C, arg1);
timedFunc_set_1(0.75f, (GenMethod_1)func_8035644C, arg1);
if(!func_802FADD4(0x1b)){
item_inc(itemId);
} else {

20
src/core2/code_53C10.c
View File

@@ -87,7 +87,7 @@ void func_802DAE40(Actor *this) {
func_80328A84(this, 2);
func_802DAE10(this);
func_80328CEC(this, (s32) this->yaw_moving, (s32) (this->yaw + 160.0f) % 360, (s32) (this->yaw + 200.0f) % 360);
func_80328CEC(this, (s32) this->yaw_ideal, (s32) (this->yaw + 160.0f) % 360, (s32) (this->yaw + 200.0f) % 360);
this->unk38_31 = 0x5A;
}
@@ -127,7 +127,7 @@ bool func_802DAFBC(Actor *this) {
if (temp_v0 & 4) {
func_8032C9E0(sp38);
sp34 = func_80257248(sp38, this->position);
if (((func_8023DB5C() - local->unk38) == 0x1E) && ((sp34 - this->yaw_moving < 15.0f) && (sp34 - this->yaw_moving > -15.0f))) {
if (((func_8023DB5C() - local->unk38) == 0x1E) && ((sp34 - this->yaw_ideal < 15.0f) && (sp34 - this->yaw_ideal > -15.0f))) {
func_802DAF2C(this->position, this->yaw, this->unk28);
} else {
func_80328CEC(this, (s32) sp34, 0, 0xF);
@@ -139,13 +139,13 @@ bool func_802DAFBC(Actor *this) {
func_802DAE10(this);
this->unk38_31 = 0x5A;
func_80328B8C(this, 2, sp44, 1);
func_80328CEC(this, (s32) this->yaw_moving, 0xB3, 0xB4);
func_80328CEC(this, (s32) this->yaw_ideal, 0xB3, 0xB4);
this->unk38_0 = TRUE;
} else {
func_802DAE10(this);
this->unk38_31 = 0x5A;
func_80328B8C(this, 8, sp44, 1);
func_80328CEC(this, (s32) this->yaw_moving, 120, 180);
func_80328CEC(this, (s32) this->yaw_ideal, 120, 180);
}
return TRUE;
}
@@ -271,7 +271,7 @@ void func_802DB5A0(Actor *this) {
phi_f14 -= 1.0;
}
func_80328B8C(this, 2, phi_f14, 1);
this->yaw_moving = this->yaw;
this->yaw_ideal = this->yaw;
func_802DAE10(this);
}
break;
@@ -281,13 +281,13 @@ void func_802DB5A0(Actor *this) {
func_802DB3B0(this);
if (this->unk38_31 == 0) {
if (!(func_8023DB5C() & 0xF)) {
func_80328CEC(this, this->yaw_moving, 0xA, 0x14);
func_80328CEC(this, this->yaw_ideal, 0xA, 0x14);
}
if (!(func_8023DB5C() & 7)) {
func_80328B38(this, 1, 0.02f);
}
if( !(func_8023DB5C() & 0xF)
&& func_80329078(this, (s32) this->yaw_moving, 0x96)
&& func_80329078(this, (s32) this->yaw_ideal, 0x96)
) {
if (func_80328B38(this, 3, 0.13f) != 0) {
this->unk28 = randf2((f32)local->unk8, (f32)local->unk9);
@@ -300,7 +300,7 @@ void func_802DB5A0(Actor *this) {
case 6://L802DB8C0
func_802DB264(this);
this->yaw_moving = (f32) func_80329784(this);
this->yaw_ideal = (f32) func_80329784(this);
func_80328FB0(this, 4.0f);
if (func_80329480(this)) {
this->unk10_12 = local->unkC_31;
@@ -323,7 +323,7 @@ void func_802DB5A0(Actor *this) {
if (this->unk10_12 < local->unkC_31) {
animctrl_setDuration(this->animctrl, this->unk18[4].duration - ((local->unkC_31 - this->unk10_12) * 0.1));
}
this->yaw_moving = (f32) func_80329784(this);
this->yaw_ideal = (f32) func_80329784(this);
if (!func_803294B4(this, 0x21)) {
func_80328A84(this, 6);
}
@@ -348,7 +348,7 @@ void func_802DB5A0(Actor *this) {
case 7://L802DBB4C
if (this->unk38_31 == 0) {
if ((func_8023DB5C() & 0xF) == 9) {
this->yaw_moving = (f32) func_80329784(this);
this->yaw_ideal = (f32) func_80329784(this);
}
}
func_80328FB0(this, (f32)local->unkB);

6
src/core2/code_59D40.c
View File

@@ -209,7 +209,7 @@ void func_802E1168(Actor *this) {
case 3: //802E13AC
func_803297FC(this, &sp44, &sp40);
this->yaw_moving = sp40;
this->yaw_ideal = sp40;
this->unk6C = func_802E10F0(sp44);
func_80328FB0(this, 4.0f);
func_80328FF0(this, 3.0f);
@@ -221,7 +221,7 @@ void func_802E1168(Actor *this) {
case 4: //802E1424
func_803297FC(this, &sp44, &sp40);
this->yaw_moving = sp40;
this->yaw_ideal = sp40;
this->unk6C = func_802E10F0(sp44);
func_80328FB0(this, this->unk28 / 2);
func_80328FF0(this, this->unk28 / 2);
@@ -235,7 +235,7 @@ void func_802E1168(Actor *this) {
}
if (actor_animationIsAt(this, 0.99f)) {
func_802E0CD0(this);
func_80328CEC(this, (s32) this->yaw_moving, 0x87, 0xAF);
func_80328CEC(this, (s32) this->yaw_ideal, 0x87, 0xAF);
this->unk38_31 = 0x78;
func_80328B8C(this, 2, 0.0f, 1);
actor_loopAnimation(this);

13
src/core2/code_5B6A0.c
View File

@@ -114,6 +114,7 @@ void func_802E28D0(Actor *this) {
marker_setCollisionScripts(this->marker, NULL, NULL, func_802E28A4);
if(local->unk0 == 0){
player_getPosition(this->unk1C);
local->unk0 = 1;
return;
}
this->initialized = TRUE;
@@ -170,12 +171,12 @@ void func_802E28D0(Actor *this) {
break;
case 2:
this->marker->unk40_22 = NOT(func_8028F170());
this->velocity[0] += 0.7;
this->velocity[1] += 0.7;
this->velocity[2] += 0.7;
this->position[0] += this->velocity[0];
this->position[1] += this->velocity[1];
this->position[2] += this->velocity[2];
this->velocity[0] *= 0.7;\
this->velocity[1] *= 0.7;\
this->velocity[2] *= 0.7;
this->position[0] = this->position[0] + this->velocity[0];
this->position[1] = this->position[1] + this->velocity[1];
this->position[2] = this->position[2] + this->velocity[2];
break;
}
}

2
src/core2/code_6B30.c
View File

@@ -133,7 +133,7 @@ void func_8028DE6C(enum actor_e actor_id){
func_802948F8(marker);
}
else{
func_802C3C88(func_8028DE0C, carriedObject_getActorID());
__spawnqueue_add_1(func_8028DE0C, carriedObject_getActorID());
}
}

84
src/core2/code_72060.c
View File

@@ -7,6 +7,8 @@ typedef struct {
f32 unkC[3];
}Struct_core2_72060_0;
extern f32 func_8024C788();
extern int func_8024DD34(f32, f32, f32);
extern void func_80251B5C(f32, f32, f32);
extern void func_80251F8C(f32);
extern void func_8025208C(f32);
@@ -75,7 +77,89 @@ void func_802F9134(s32 gfx){
}
}
#ifndef NONMATCHING
#pragma GLOBAL_ASM("asm/nonmatchings/core2/code_72060/func_802F919C.s")
#else
void func_802F919C(void) {
f32 temp_f20;
s32 sp68;
s32 var_v1;
s32 sp60;
struct4Ds *sp5C;
f32 sp58;
f32 sp4C[3];
f32 var_f20;
s32 sp44;
struct4Ds *sp40;
if (D_80369280 != NULL) {
if (func_802BEF64() != 0) {
D_80369284 = 0;
return;
}
temp_f20 = time_getDelta();
sp60 = (func_8023DB5C() & 1) * 2;
player_getPosition(D_80381040);
D_80369280->unkC[0] = D_80381040[0] - D_80369280->unk0[0];
D_80369280->unkC[1] = D_80381040[1] - D_80369280->unk0[1];
D_80369280->unkC[2] = D_80381040[2] - D_80369280->unk0[2];
D_80369280->unk0[0] = D_80381040[0];
D_80369280->unk0[1] = D_80381040[1];
D_80369280->unk0[2] = D_80381040[2];
D_8038104C = D_80381040[1] - 300.0f;
for(sp68 = 0; sp68 < D_80369284; sp68++){
sp5C = D_80369280->unk1C + sp68;
for(var_v1 = 0; var_v1 < 3; var_v1++){
sp5C->unk0[var_v1] += sp5C->unkC[var_v1] * temp_f20;
}
sp5C->unkC[sp60] += ((randf() * 30.0) - 15.0);
}
D_8036928C++;
if (D_8036928C < D_80369284) {
if (ml_vec3f_distance(D_80369280[0].unk1C[D_8036928C].unk0, D_80381040) > 1300.0f) {
func_802F9134(D_8036928C);
}
} else {
D_8036928C = 0;
}
if (D_80369280->unk18 == 1) {
if (D_80369284 < 100) {
sp40 = D_80369280->unk1C + D_80369284;
D_80369284++;
sp58 = randf2(100.0f, 1300.0f);
sp4C[0] = 0.0f;
sp4C[1] = randf() * 200.0f + 200.0f;
sp4C[2] = -sp58;
if ((D_80369280->unkC[0]*D_80369280->unkC[0] + D_80369280->unkC[1]*D_80369280->unkC[1] + D_80369280->unkC[2]*D_80369280->unkC[2]) < 25.0f) {
var_f20 = 100.0f;
} else {
var_f20 = 70.0f;
}
ml_vec3f_yaw_rotate_copy(sp4C, sp4C, func_8024C788() + randf2(-var_f20, var_f20));
sp4C[0] += D_80381040[0];
sp4C[1] += D_80381040[1];
sp4C[2] += D_80381040[2];
if (sp58 < 650.0) {
for(sp44 = 0; sp44 < 5 && func_8024DD34(sp4C[0], sp4C[1] - 10.0f, sp4C[2]) ; sp44++){
sp4C[1] += 200.0f;
}
}
sp40->unk0[0] = sp4C[0];
sp40->unk0[1] = sp4C[1];
sp40->unk0[2] = sp4C[2];
sp40->unkC[0] = 0.0f;
sp40->unkC[1] = randf2(-150.0f, -50.0f);
sp40->unkC[2] = 0.0f;
}
}
}
}
#endif
#pragma GLOBAL_ASM("asm/nonmatchings/core2/code_72060/func_802F962C.s")
// void func_802F962C(Gfx **gfx, Mtx **mtx, Vtx **vtx) {

6
src/core2/code_76D90.c
View File

@@ -243,10 +243,10 @@ void func_802FE844(s32 arg0, struct8s *arg1){
func_803463D4(ITEM_13_EMPTY_HONEYCOMB, -6);
timedFunc_set_2(0.25f, (TFQM2)func_8025A6EC, COMUSIC_2B_DING_B, 28000);
func_803463D4(ITEM_14_HEALTH, 0);
timedFunc_set_1(1.25f, (TFQM1)item_inc, ITEM_15_HEALTH_TOTAL);
timedFunc_set_1(1.25f, (TFQM1)func_8030E484, SFX_3EA_UNKNOWN);
timedFunc_set_1(1.25f, (GenMethod_1)item_inc, ITEM_15_HEALTH_TOTAL);
timedFunc_set_1(1.25f, (GenMethod_1)func_8030E484, SFX_3EA_UNKNOWN);
timedFunc_set_2(1.25f, (TFQM2)item_set, ITEM_14_HEALTH, item_getCount(ITEM_15_HEALTH_TOTAL)+1);
timedFunc_set_1(1.5f, (TFQM1)gcpausemenu_80314AC8, 1);
timedFunc_set_1(1.5f, (GenMethod_1)gcpausemenu_80314AC8, 1);
}
break;
case 2://L802FECD4

12
src/core2/code_9E370.c
View File

@@ -787,7 +787,7 @@ Actor *actor_new(s32 (* position)[3], s32 yaw, ActorInfo* actorInfo, u32 flags){
D_80383390->position_z = (f32)(*position)[2];
D_80383390->unkF4_8 = 0;
D_80383390->yaw = (f32) yaw;
D_80383390->yaw_moving = (f32) yaw;
D_80383390->yaw_ideal = (f32) yaw;
D_80383390->pitch = 0.0f;
D_80383390->roll = 0.0f;
D_80383390->unk6C = 0.0f;
@@ -1335,7 +1335,7 @@ void func_80328C64(Actor * this, int arg1){
int retVal = arg1;
while(retVal < 0) retVal += 0x168;
while(retVal >= 0x168) retVal -= 0x168;
this->yaw_moving = retVal;
this->yaw_ideal = retVal;
}
void func_80328CA8(Actor *arg0, s32 angle) {
@@ -1395,7 +1395,7 @@ f32 func_80328DCC(Actor *this, f32 angle, f32 angle_ideal, s32 arg3) {
}
void func_80328FB0(Actor *this, f32 arg1){
this->yaw = func_80328DCC(this, this->yaw, this->yaw_moving, (s32)arg1);
this->yaw = func_80328DCC(this, this->yaw, this->yaw_ideal, (s32)arg1);
}
void func_80328FF0(Actor *arg0, f32 arg1) {
@@ -1502,14 +1502,14 @@ bool func_8032944C(Actor *this){
bool func_80329480(Actor *this){
s32 v1;
v1 = this->yaw - this->yaw_moving;
v1 = this->yaw - this->yaw_ideal;
return ((-3 <= v1) && (v1 <= 3));
}
bool func_803294B4(Actor *this, s32 arg1){
s32 v1;
v1 = this->yaw - this->yaw_moving;
v1 = this->yaw - this->yaw_ideal;
return ((-arg1 <= v1) && (v1 <= arg1));
}
@@ -1938,7 +1938,7 @@ void func_8032A88C(Actor *arg0) {
Actorlocal_Core2_9E370 *sp20;
sp20 = &arg0->local;
arg0->yaw_moving = (f32) func_803297C8(arg0, sp20->unk0);
arg0->yaw_ideal = (f32) func_803297C8(arg0, sp20->unk0);
func_80328FB0(arg0, 6.0f);
func_80329030(arg0, 0);
if ((((arg0->position[0] - sp20->unk0[0]) * (arg0->position[0] - sp20->unk0[0])) + ((arg0->position[2] - sp20->unk0[2]) * (arg0->position[2] - sp20->unk0[2]))) <= 144.0f) {

22
src/core2/code_B9770.c
View File

@@ -773,7 +773,7 @@ s32 func_803422D4(Actor *arg0, Union_glspline *arg1, glspline_list *arg2) {
if (arg0->marker->unk14_20 == 0x12) {
arg0->yaw = (f32) func_80342244((s32) arg0->yaw);
}
arg0->yaw_moving = arg0->yaw;
arg0->yaw_ideal = arg0->yaw;
}
if (sp4C != -9999.0f) {
arg0->pitch = sp4C;
@@ -932,7 +932,7 @@ s32 func_803422D4(Actor *arg0, Union_glspline *arg1, glspline_list *arg2) {
arg0->unk38_13 = func_80342244(arg0->unk38_13);
arg0->unk38_21 = func_80342244(arg0->unk38_21);
}
arg0->yaw = arg0->yaw_moving = (f32) arg0->unk38_13;
arg0->yaw = arg0->yaw_ideal = (f32) arg0->unk38_13;
arg0->pitch = arg0->unk6C = (f32) arg0->unk78_31;
}
if (arg1->t1.unk4.bit17 & 2) {
@@ -942,9 +942,9 @@ s32 func_803422D4(Actor *arg0, Union_glspline *arg1, glspline_list *arg2) {
}
if (!arg0->unk10_4) {
if (arg0->unk10_8) {
arg0->yaw_moving = (f32)arg1->t1.unkC.bit31;
arg0->yaw_ideal = (f32)arg1->t1.unkC.bit31;
if (arg0->marker->unk14_20 == 0x12) {
arg0->yaw_moving = (f32) func_80342244((s32) arg0->yaw_moving);
arg0->yaw_ideal = (f32) func_80342244((s32) arg0->yaw_ideal);
}
}
if (arg0->unk10_7) {
@@ -960,7 +960,7 @@ void func_803430B4(Actor *arg0) {
f32 d_yaw;
if ((arg0->marker->unk14_20 == 0x12) && (arg0->unk138_30 == 1)) {
d_yaw = arg0->yaw_moving - arg0->yaw;
d_yaw = arg0->yaw_ideal - arg0->yaw;
while (d_yaw >= 360.0f) { d_yaw -= 360.0f; }
while (d_yaw < 0.0f) { d_yaw += 360.0f; }
@@ -986,7 +986,7 @@ void func_803431D0(Actor *arg0, s32 arg1, s32 arg2, s32 arg3) {
func_8032417C(func_80342038(arg0->unk44_14), arg0->unk48, sp64, sp58);
if (arg1 & 1) {
if (arg1 & 0x100) {
arg0->yaw_moving = sp58[1];
arg0->yaw_ideal = sp58[1];
}
if (arg1 & 0x200) {
arg0->unk6C = sp58[0];
@@ -994,9 +994,9 @@ void func_803431D0(Actor *arg0, s32 arg1, s32 arg2, s32 arg3) {
} else {
if (arg1 & 0x100) {
if (sp58[1] >= 180.0f) {
arg0->yaw_moving = sp58[1] - 180.0f;
arg0->yaw_ideal = sp58[1] - 180.0f;
} else {
arg0->yaw_moving = sp58[1] + 180.0f;
arg0->yaw_ideal = sp58[1] + 180.0f;
}
}
if (arg1 & 0x200) {
@@ -1014,7 +1014,7 @@ void func_803431D0(Actor *arg0, s32 arg1, s32 arg2, s32 arg3) {
}
sp40[0] = 360.0f - sp40[0];
}
arg0->yaw_moving = sp40[1];
arg0->yaw_ideal = sp40[1];
arg0->unk6C = sp40[0];
} else {
if ((arg0->unk70 <= arg0->unk48) && (arg0->unk48 < arg0->unk74)) {
@@ -1024,7 +1024,7 @@ void func_803431D0(Actor *arg0, s32 arg1, s32 arg2, s32 arg3) {
var_f2 = mlDiffDegF(arg0->unk38_21, arg0->unk38_13) * sp3C + arg0->unk38_13;
while (var_f2 >= 360.0f) { var_f2 -= 360.0f; }
while (var_f2 < 0.0f) { var_f2 += 360.0f; }
arg0->yaw_moving = var_f2;
arg0->yaw_ideal = var_f2;
}
if (arg1 & 0x1000) {
var_f2 = mlDiffDegF(arg0->unk78_22, arg0->unk78_31) * sp3C + arg0->unk78_31;
@@ -1133,7 +1133,7 @@ s32 func_803438E0(Actor *actor, s32 arg1, s32 arg2, s32 arg3) {
sp48 = func_803421A4(actor->unk44_14, actor->unk48);
if (!actor->unk44_1) {
actor->unk44_1 = TRUE;
actor->yaw = actor->yaw_moving;
actor->yaw = actor->yaw_ideal;
actor->pitch = actor->unk6C;
}
if ((sp4C == sp48) && (sp44 == 0)) {

2
src/core2/code_C0B80.c
View File

@@ -12,7 +12,7 @@ void func_80347B10(Struct81s *arg0){
}
void func_80347B54(Struct81s *arg0){
func_802C3C88((GenMethod_1)func_80347B10, reinterpret_cast(s32, arg0));
__spawnqueue_add_1((GenMethod_1)func_80347B10, reinterpret_cast(s32, arg0));
}
void func_80347B80(Struct81s *arg0) {

2
src/core2/code_C0CF0.c
View File

@@ -14,7 +14,7 @@ void func_80347C80(Struct81s *arg0){
}
void func_80347CC8(Struct81s *arg0){
func_802C3C88((GenMethod_1)func_80347C80, reinterpret_cast(s32, arg0));
__spawnqueue_add_1((GenMethod_1)func_80347C80, reinterpret_cast(s32, arg0));
}
void func_80347CF4(Struct81s *arg0) {

2
src/core2/code_C0E60.c
View File

@@ -79,7 +79,7 @@ void func_80347DF0(Struct81s *arg0){
}
void func_80347E34(Struct81s *arg0){
func_802C3C88((GenMethod_1) func_80347DF0, reinterpret_cast(s32, arg0));
__spawnqueue_add_1((GenMethod_1) func_80347DF0, reinterpret_cast(s32, arg0));
}
void func_80347E60(Struct81s *arg0) {

2
src/core2/code_D7040.c
View File

@@ -212,7 +212,7 @@ void func_8035E84C(Actor *this) {
func_8035E0D0(this);
}
if (func_8034A6FC(0.73f, 0.76f) && func_80329078(this, (s32) this->yaw, 750) ) {
this->yaw_moving = this->yaw;
this->yaw_ideal = this->yaw;
this->velocity[0] = 35.0f;
this->unk28 = 19.4444447f;
this->unk38_31 = 0x3A;

6
src/core2/code_D7D10.c
View File

@@ -100,7 +100,7 @@ void func_8035EEC0(Actor *this){
}
void func_8035EF00(Actor *this, f32 arg1){
this->yaw_moving = (f32)func_80329784(this);
this->yaw_ideal = (f32)func_80329784(this);
func_80328FB0(this, arg1);
}
@@ -248,7 +248,7 @@ void func_8035F138(Actor *this) {
break;
}
this->yaw_moving = (f32)(s32)func_80257204(this->position[0], this->position[2], this->unk1C[0], this->unk1C[2]);
this->yaw_ideal = (f32)(s32)func_80257204(this->position[0], this->position[2], this->unk1C[0], this->unk1C[2]);
func_80328FB0(this, 7.0f);
func_80329030(this, 2);
break;
@@ -270,7 +270,7 @@ void func_8035F138(Actor *this) {
func_8035EE48(this);
break;
}
this->yaw_moving = this->velocity[0];
this->yaw_ideal = this->velocity[0];
func_80328FB0(this, 7.5f);
func_80329030(this, 2);
break;

18
src/core2/code_D89E0.c
View File

@@ -50,7 +50,7 @@ void func_8035FA48(Actor *this){
void func_8035FA74(Actor *this){
ActorLocal_Core2_D89E0 *local = (ActorLocal_Core2_D89E0 *)&this->local;
this->yaw_moving = local->unk4;
this->yaw_ideal = local->unk4;
func_80328A84(this, 5);
actor_loopAnimation(this);
}
@@ -197,7 +197,7 @@ void func_8035FFAC(Actor *this, f32 arg1){
void func_80360044(Actor *this) {
f32 var_f0;
var_f0 = this->yaw_moving - this->yaw;
var_f0 = this->yaw_ideal - this->yaw;
if (var_f0 >= 180.0f) {
var_f0 -= 360.0f;
}
@@ -308,7 +308,7 @@ f32 func_803603AC(Actor *this, s32 arg1, u8 arg2){
int func_803604E8(Actor *this){
f32 tmp_f0;
this->yaw_moving = (f32) func_80329784(this);
this->yaw_ideal = (f32) func_80329784(this);
tmp_f0 = func_803603AC(this, 170, 1);
func_8035FFAC(this, tmp_f0);
if(!func_80360198(this)){
@@ -323,7 +323,7 @@ bool func_8036054C(Actor *this) {
s32 phi_s2;
if (this->unk60 == 0.0f) {
this->yaw_moving = func_80257204(this->position[0], this->position[2], this->unk1C[0], this->unk1C[2]);
this->yaw_ideal = func_80257204(this->position[0], this->position[2], this->unk1C[0], this->unk1C[2]);
func_8035FFAC(this, func_803603AC(this, -110, 2));
}
else{
@@ -341,16 +341,16 @@ bool func_8036054C(Actor *this) {
phi_s1 = 0;
do{
if (this->unk38_0) {
phi_v0 = func_80329140(this, (s32) this->yaw_moving, 0xC8);
phi_v0 = func_80329140(this, (s32) this->yaw_ideal, 0xC8);
} else {
phi_v0 = func_80329078(this, (s32) this->yaw_moving, 0xC8);
phi_v0 = func_80329078(this, (s32) this->yaw_ideal, 0xC8);
}
if(phi_v0 == 0){
phi_s1++;
this->yaw_moving += 30.0f;
if (this->yaw_moving >= 360.0f) {
this->yaw_moving -= 360.0f;
this->yaw_ideal += 30.0f;
if (this->yaw_ideal >= 360.0f) {
this->yaw_ideal -= 360.0f;
}
}
} while ( phi_v0 == 0 && phi_s1 < 0xC);

10
src/core2/gc/parade.c
View File

@@ -232,13 +232,13 @@ void gcparade_setState(enum parade_state_e next_state) {
break;
case PARADE_STATE_5_WAIT_ON_NAME:
if ((D_803830F0.parade_id == 1) && (D_803830F0.parade_element->exit >= 0)) {
timedFunc_set_1(2.0f, (TFQM1)gcparade_setState, PARADE_STATE_6_NAME_DISAPPEAR);// queue state transition
timedFunc_set_1(2.0f, (GenMethod_1)gcparade_setState, PARADE_STATE_6_NAME_DISAPPEAR);// queue state transition
}
break;
case PARADE_STATE_7_GOTO_NEXT:
D_803830F0.indx++;
D_803830F0.parade_element++;
timedFunc_set_1(0.25f, (TFQM1)gcparade_setState, (D_803830F0.indx == D_803830F0.count) ? PARADE_STATE_8_END : PARADE_STATE_3_WARP);
timedFunc_set_1(0.25f, (GenMethod_1)gcparade_setState, (D_803830F0.indx == D_803830F0.count) ? PARADE_STATE_8_END : PARADE_STATE_3_WARP);
break;
case PARADE_STATE_8_END:
func_803204E4(0x1F, 0);
@@ -294,13 +294,13 @@ void gcparade_update(void) {
sp34 = 0xA0;
if (D_803830F0.parade_element->exit >= 0)
sp34 = 0xA8;
timedFunc_set_1(1.0f, (TFQM1)func_80311714, 0);
timedFunc_set_1(1.0f, (GenMethod_1)func_80311714, 0);
func_80324DBC(1.0f, D_803830F0.indx + 0x11AF, sp34, NULL, NULL, gcparade_textCallback, NULL);
timedFunc_set_1(1.0f, (TFQM1)func_80311714, 1);
timedFunc_set_1(1.0f, (GenMethod_1)func_80311714, 1);
} else if (D_803830F0.parade_element->exit >= 0) {
func_8028F918(2);
}
timedFunc_set_1(1.0f, (TFQM1)gcparade_setState, PARADE_STATE_4_NAME_APPEAR);
timedFunc_set_1(1.0f, (GenMethod_1)gcparade_setState, PARADE_STATE_4_NAME_APPEAR);
D_803830F0.unk5 = 1;
}
}

10
src/core2/timedfuncqueue.c
View File

@@ -13,7 +13,7 @@ typedef struct timed_function_queue_s{
u8 pad5[3];
union {
TFQM0 func0;
TFQM1 func1;
GenMethod_1 func1;
TFQM2 func2;
TFQM3 func3;
TFQM4 func4;
@@ -174,7 +174,7 @@ void func_80324CFC(f32 time, s32 id, s32 volume){
}
void func_80324D2C(f32 time, enum comusic_e arg0){
timedFunc_set_1(time, (TFQM1) func_80324A48, arg0);
timedFunc_set_1(time, (GenMethod_1) func_80324A48, arg0);
}
void func_80324D54(f32 time, enum sfx_e sfx_id, f32 arg2, s32 arg3, f32 position[3], f32 arg5, f32 arg6){
@@ -212,11 +212,11 @@ void func_80324DBC(f32 time, enum asset_e text_id, s32 arg2, f32 position[3], Ac
void func_80324E38(f32 time, s32 arg0){
timedFunc_set_1(time, (TFQM1) func_80324BA0, arg0);
timedFunc_set_1(time, (GenMethod_1) func_80324BA0, arg0);
}
void timed_setCameraToNode(f32 time, s32 arg0){
timedFunc_set_1(time, (TFQM1) set_camera_to_node, arg0);
timedFunc_set_1(time, (GenMethod_1) set_camera_to_node, arg0);
}
void func_80324E88(f32 time){
@@ -227,7 +227,7 @@ void timedFunc_set_0(f32 time, TFQM0 funcPtr){
__timedFuncQueue_insert(time, 0, (void *) funcPtr, 0, 0, 0, 0, 0);
}
void timedFunc_set_1(f32 time, TFQM1 funcPtr, s32 arg0){
void timedFunc_set_1(f32 time, GenMethod_1 funcPtr, s32 arg0){
__timedFuncQueue_insert(time, 1, (void *) funcPtr, arg0, 0, 0, 0, 0);
}