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

20
src/fight/chbossjinjo.c
View File

@@ -71,7 +71,7 @@ struct31s D_80391968 = {
};
/* .code */
void func_8038C2C0(f32 position[3], s32 count, enum asset_e id, f32 arg3){
void fight_func_8038C2C0(f32 position[3], s32 count, enum asset_e id, f32 arg3){
ParticleEmitter * temp_s0 = partEmitList_pushNew(count);
f32 sp24;
@@ -110,21 +110,21 @@ void func_8038C424(f32 position[3], s32 count, enum asset_e id, f32 arg3){
particleEmitter_emitN(temp_s0, count);
}
void func_8038C588(void){
void fight_func_8038C588(void){
func_80386654(1.0f, &D_80391958, &D_80391948);
}
void func_8038C5BC(void){
void fight_func_8038C5BC(void){
func_80386654(1.0f, &D_80391948, &D_80391958);
}
void chbossjinjo_spawnParticles(Actor *this, enum asset_e arg1, enum asset_e arg2, f32 arg3){
f32 sp1C[3];
func_8038C0DC(&sp1C);
func_8038C2C0(this->position, 0x20, arg1, arg3);
fight_func_8038C0DC(&sp1C);
fight_func_8038C2C0(this->position, 0x20, arg1, arg3);
func_8038C424(this->position, 4, arg2, arg3);
timedFunc_set_0(0.0f, func_8038C588);
timedFunc_set_0(0.3f, func_8038C5BC);
timedFunc_set_0(0.0f, fight_func_8038C588);
timedFunc_set_0(0.3f, fight_func_8038C5BC);
}
void chbossjinjo_spawnAttackParticles(Actor *this){
@@ -156,7 +156,7 @@ void chbossjinjo_spawnAttackParticles(Actor *this){
}
void func_8038C6FC(Actor *this, s16 arg1){
void fight_func_8038C6FC(Actor *this, s16 arg1){
f32 temp_f2 = this->yaw;
f32 tick = time_getDelta();
@@ -250,7 +250,7 @@ void func_8038C840(Actor *this){
}//L8038CB9C
if(sp48){
if(animctrl_getAnimTimer(this->animctrl) < 0.2){
func_8038C6FC(this, sp42);
fight_func_8038C6FC(this, sp42);
}
if(actor_animationIsAt(this, 0.1f)){
@@ -309,7 +309,7 @@ void func_8038C840(Actor *this){
}
break;
case 5: // 8038CE68
func_8038C0DC(&sp50);
fight_func_8038C0DC(&sp50);
sp50[1] += 100.0f;
func_80387470(this, sp50, 1200.0f, 3840.0f, 200.0f, 2500.0f, 70.0f);
func_8038C79C(this);

4
src/fight/chbossjinjobase.c
View File

@@ -74,7 +74,7 @@ void func_8038D428(ActorMarker *arg0, ActorMarker *arg1) {
}
}
void func_8038D510(Actor *arg0) {
void fight_func_8038D510(Actor *arg0) {
ActorLocal_fight_6E90 *sp18 = (ActorLocal_fight_6E90 *)&arg0->local;
if ((u8)arg0->unk44_31 != 0) {
@@ -102,7 +102,7 @@ void func_8038D568(Actor *this){
if(!this->unk16C_4){
this->unk16C_4 = 1;
marker_setCollisionScripts(this->marker, NULL, func_8038D428, NULL);
func_803300D8(this->marker, func_8038D510);
func_803300D8(this->marker, fight_func_8038D510);
this->marker->propPtr->unk8_3 = 1;
actor_collisionOn(this);
this->unk38_31 = 0;

115
src/fight/chfinalboss.c
View File

@@ -14,11 +14,10 @@ void chfinalboss_update(Actor *this);
void func_802C8F70(f32);
s32 func_803297C8(Actor*, f32*);
Actor *func_8032813C();
void func_803900DC(ActorMarker *, f32 *, f32, f32);
void fight_func_803900DC(ActorMarker *, f32 *, f32, f32);
extern Actor* func_80329958(ActorMarker *this, s32 arg1);
extern void func_803298D8();
void func_80324E88(f32);
extern void func_80324E60(Actor*, s32, f32);
extern void func_80324CFC(f32, enum comusic_e, s32);
extern void sfxsource_setSampleRate(u8, s32);
extern void func_80328FF0(Actor *arg0, f32 arg1);
@@ -64,8 +63,8 @@ typedef struct ch_fight_180_s{
}ActorLocal_fight_180;
/* .data */
f32 D_80391380[4] = {1.0f, 1.0f, 1.0f, 1.0f};
f32 D_80391390[4] = {0.33f, 0.33f, 0.33f, 1.0f};
f32 fight_D_80391380[4] = {1.0f, 1.0f, 1.0f, 1.0f};
f32 fight_D_80391390[4] = {0.33f, 0.33f, 0.33f, 1.0f};
ActorAnimationInfo D_803913A0[] = {
{ 0, 0.0f},
{ 0x1C5, 0.6f},
@@ -113,13 +112,13 @@ ActorAnimationInfo D_803913A0[] = {
{ 0x266, 4.0f}
};
ActorInfo D_80391500 = {
ActorInfo fight_D_80391500 = {
MARKER_25E_GRUNTILDA_FINAL_BOSS, ACTOR_38B_GRUNTILDA_FINAL_BOSS, ASSET_53D_MODEL_GRUNTILDA_FINAL_BOSS,
1, D_803913A0,
chfinalboss_update, func_80326224, chfinalboss_draw,
0, 0, 0.0f, 0
};
f32 D_80391524[3] = {0.0f, -8.0f, 400.0f};
f32 fight_D_80391524[3] = {0.0f, -8.0f, 400.0f};
f32 D_80391530[3] = {0.0f, -8.0f, 0.0f};
@@ -172,7 +171,7 @@ struct43s D_80391678 = {
s32 D_803916C0[3] = {0xff, 0xff, 0xff};
s32 D_803916CC[3] = {0xff, 0, 0};
s32 D_803916D8[3] = {0x4B, 0x4B, 0x4B};
s32 fight_D_803916D8[3] = {0x4B, 0x4B, 0x4B};
f32 D_803916E4[4] = {0.1f, 0.2f, 1.9f, 3.9f};
@@ -325,7 +324,7 @@ void func_80386698(f32 arg0) {
temp_v0 = func_8034C528(0x19A);
if (temp_v0 != NULL) {
func_8034DDF0(temp_v0, D_80391524, D_80391530, arg0, 1);
func_8034DDF0(temp_v0, fight_D_80391524, D_80391530, arg0, 1);
}
}
@@ -402,9 +401,9 @@ void func_803869BC(Actor *this) {
sp30[2] = D_803916CC[2];
sp2C = 0x715;
} else if ((temp_t3 == 8) || (temp_t3 == 9)) {
sp30[0] = D_803916D8[0];
sp30[1] = D_803916D8[1];
sp30[2] = D_803916D8[2];
sp30[0] = fight_D_803916D8[0];
sp30[1] = fight_D_803916D8[1];
sp30[2] = fight_D_803916D8[2];
sp2C = 0x000;
} else {
sp30[0] = D_803916C0[0];
@@ -425,7 +424,7 @@ void func_803869BC(Actor *this) {
}
}
void func_80386B54(f32 *arg0, f32 arg1) {
void fight_func_80386B54(f32 *arg0, f32 arg1) {
f32 sp34;
f32 sp28[3];
s32 i;
@@ -437,7 +436,7 @@ void func_80386B54(f32 *arg0, f32 arg1) {
}
}
bool func_80386BEC(Actor *this, f32 arg1) {
bool fight_func_80386BEC(Actor *this, f32 arg1) {
this->yaw_ideal = (f32) func_80329784(this);
func_80328FB0(this, arg1);
if ((this->yaw_ideal < (this->yaw + arg1)) && ((this->yaw - arg1) < this->yaw_ideal)) {
@@ -459,7 +458,7 @@ bool func_80386C68(Actor *this, f32 arg1) {
return FALSE;
}
void func_80386CF8(Actor *actor) {
void fight_func_80386CF8(Actor *actor) {
f32 sp4C[3];
f32 sp40[3];
f32 sp34[3];
@@ -510,7 +509,7 @@ void func_80386EC0(s32 arg0) {
marker = func_8032813C(0x38A, D_80392758, 0)->marker;
func_8030E878(SFX_147_GRUNTY_SPELL_ATTACK_2, randf2(0.95f, 1.05f), 32000, D_80392758, 5000.0f, 12000.0f);
func_803900DC(marker, D_80392758, D_80392768[1], D_80392768[2]);
fight_func_803900DC(marker, D_80392758, D_80392768[1], D_80392768[2]);
}
void func_80386F5C(ActorMarker * arg0, f32 arg1[3], f32 arg2, f32 arg3) {
@@ -528,7 +527,7 @@ void func_80386FD8(s32 arg0) {
marker = func_8032813C(0x389, D_80392758, 0)->marker;
func_8030E878(SFX_146_GRUNTY_SPELL_ATTACK_1, randf2(0.95f, 1.05f), 32000, D_80392758, 5000.0f, 12000.0f);
func_8038FB84(marker, D_80392758, D_80392768, D_80392778);
fight_func_8038FB84(marker, D_80392758, D_80392768, D_80392778);
}
void func_80387074(s32 arg0) {
@@ -536,7 +535,7 @@ void func_80387074(s32 arg0) {
marker = func_8032813C(0x3AA, D_80392758, 0)->marker;
func_8030E878(SFX_146_GRUNTY_SPELL_ATTACK_1, randf2(0.95f, 1.05f), 32000, D_80392758, 5000.0f, 12000.0f);
func_8038FB84(marker, D_80392758, D_80392768, D_80392778);
fight_func_8038FB84(marker, D_80392758, D_80392768, D_80392778);
}
void func_80387110(ActorMarker *marker, f32 arg1[3], f32 arg2, s32 arg3) {
@@ -553,7 +552,7 @@ void func_80387110(ActorMarker *marker, f32 arg1[3], f32 arg2, s32 arg3) {
D_80392758[1] += 80.0f;
if (arg3 == 0) {
func_80386B54(sp2C, arg2);
fight_func_80386B54(sp2C, arg2);
} else if (local->mirror_phase5 == 0) {
sp2C[0] = D_80391710[0];
sp2C[1] = D_80391710[1];
@@ -586,7 +585,7 @@ void func_803872F8(Actor *arg0) {
func_80387110(arg0->marker, vec, 3.0f, 1);
}
s32 func_80387340(Actor *this, f32 arg1) {
s32 fight_func_80387340(Actor *this, f32 arg1) {
f32 sp24[3];
if (actor_animationIsAt(this, 0.50f) != 0) {
@@ -762,7 +761,7 @@ void func_80387B00(Actor *this) {
local = (ActorLocal_fight_180 *) this->local;
func_80386B54(sp28, 0.80f);
fight_func_80386B54(sp28, 0.80f);
this->unk1C_x = sp28[0];
this->unk1C_y = sp28[1];
this->unk1C_z = sp28[2];
@@ -813,7 +812,7 @@ void func_80387BFC(Actor *this, f32 arg1) {
sp44[2] *= this->unk28;
}
void func_80387D4C(Actor *actor) {
void fight_func_80387D4C(Actor *actor) {
ActorLocal_fight_180 *local;
f32 sp20[3];
@@ -1056,9 +1055,9 @@ void chfinalboss_phase1_update(ActorMarker *marker) {
func_80386600(this->marker, 0);
func_803869BC(this);
func_80387ACC(this, 60.0f * sp54);
if (func_80386BEC(this, 240.0f * sp54)) {
if (fight_func_80386BEC(this, 240.0f * sp54)) {
chfinalboss_phase1_setState(this, 5);
func_80386654(1.0f, D_80391380, D_80391390);
func_80386654(1.0f, fight_D_80391380, fight_D_80391390);
}
break;
case 5:
@@ -1091,7 +1090,7 @@ void chfinalboss_phase1_update(ActorMarker *marker) {
FUNC_8030E8B4(SFX_C4_TWINKLY_MUNCHER_GRR, 0.6f, 28000, this->position, 2000, 10000);
}
if ((local->unk14 * 0.75) < local->unk20) {
func_80386B54(sp40, 0);
fight_func_80386B54(sp40, 0);
this->unk1C[0] = sp40[0];
this->unk1C[1] = sp40[1];
this->unk1C[2] = sp40[2];
@@ -1123,7 +1122,7 @@ void chfinalboss_phase1_update(ActorMarker *marker) {
func_80328FB0(this, 30.0f * sp54);
if (this->unk28 < 0) {
chfinalboss_phase1_setState(this, 4);
func_80386654(1.5f, D_80391390, D_80391380);
func_80386654(1.5f, fight_D_80391390, fight_D_80391380);
}
break;
case 8:
@@ -1132,11 +1131,11 @@ void chfinalboss_phase1_update(ActorMarker *marker) {
this->unk28 = this->unk28 + local->unk28 * sp54;
local->unk20 = local->unk20 - this->unk28 * sp54;
func_80387ACC(this, 60.0f * sp54);
func_80387D4C(this);
fight_func_80387D4C(this);
func_80328FB0(this, 30.0f * sp54);
if (this->unk28 < 0) {
chfinalboss_phase1_setState(this, 9);
func_80386654(2.0f, D_80391390, D_80391380);
func_80386654(2.0f, fight_D_80391390, fight_D_80391380);
this->unk60 = 4.0f;
}
break;
@@ -1154,9 +1153,9 @@ void chfinalboss_phase1_update(ActorMarker *marker) {
break;
case 10:
func_80387ACC(this, 60.0f * sp54);
func_80386BEC(this, 30.0f);
fight_func_80386BEC(this, 30.0f);
func_8038871C(this, 460.0f, 400.0f * sp54);
func_80387340(this, 1.0f);
fight_func_80387340(this, 1.0f);
if (actor_animationIsAt(this, 0.9999f)) {
chfinalboss_phase1_setState(this, 2);
func_803880A0(this, 2000.0f);
@@ -1164,14 +1163,14 @@ void chfinalboss_phase1_update(ActorMarker *marker) {
break;
case 11:
func_80387ACC(this, 60.0f * sp54);
func_80386BEC(this, 30.0f);
fight_func_80386BEC(this, 30.0f);
if (local->unk9) {
func_8038871C(this, 460.0f, 400.0f * sp54);
}
break;
case 12:
func_80387ACC(this, 60.0f * sp54);
func_80386BEC(this, 30.0f);
fight_func_80386BEC(this, 30.0f);
func_8038871C(this, 460.0f, 400.0f * sp54);
func_803873DC(this, 600.0f, 2000.0f);
if (actor_animationIsAt(this, 0.9999f)) {
@@ -1182,7 +1181,7 @@ void chfinalboss_phase1_update(ActorMarker *marker) {
break;
case 13:
func_80387ACC(this, 60.0f * sp54);
func_80386BEC(this, 30.0f);
fight_func_80386BEC(this, 30.0f);
if (actor_animationIsAt(this, 0.9999f)) {
if (local->hits >= 4) {
chfinalboss_phase1_setState(this, 0xB);
@@ -1255,13 +1254,13 @@ void chfinalboss_phase2_update(ActorMarker *marker) {
break;
case 15:
if (func_80386BEC(this, 9.0f)) {
if (fight_func_80386BEC(this, 9.0f)) {
chfinalboss_phase2_setState(this, 0x10);
}
break;
case 16:
func_80386BEC(this, 3.0f);
func_80387340(this, 1.3f);
fight_func_80386BEC(this, 3.0f);
fight_func_80387340(this, 1.3f);
if (actor_animationIsAt(this, 0.9999f)) {
chfinalboss_phase2_setState(this, 0x12);
local->unk3++;
@@ -1275,19 +1274,19 @@ void chfinalboss_phase2_update(ActorMarker *marker) {
}
break;
case 17:
func_80386BEC(this, 3.0f);
fight_func_80386BEC(this, 3.0f);
func_803873DC(this, 1200.0f, 2400.0f);
if (actor_animationIsAt(this, 0.9999f)) {
chfinalboss_setPhase(this->marker, 3);
}
break;
case 18:
func_80386BEC(this, 3.0f);
fight_func_80386BEC(this, 3.0f);
if (this->unk60 > 0.0) {
this->unk60 = this->unk60 - sp4C;
break;
}
if (func_80386BEC(this, 3.0f)) {
if (fight_func_80386BEC(this, 3.0f)) {
chfinalboss_phase2_setState(this, 0x10);
}
break;
@@ -1405,7 +1404,7 @@ void chfinalboss_phase3_setState(Actor *this, s32 arg1) {
FUNC_8030E8B4(SFX_131_GRUNTY_WEEEGH, 1.0f, 32000, this->position, 5000, 12000);
break;
case 26:
func_80386CF8(this);
fight_func_80386CF8(this);
func_80324E38(0.0f, 1);
func_80311480(randi2(0, 5) + 0x112C, 0xA8, NULL, this->marker, chfinalboss_phase3_endTextCallback, NULL);
break;
@@ -1421,7 +1420,7 @@ u8 D_8039283C;
u8 D_8039283D;
u8 D_8039283E;
u8 D_8039283F;
u8 D_80392840;
u8 fight_D_80392840;
u8 D_80392841;
u8 D_80392842;
u8 D_80392843;
@@ -1457,7 +1456,7 @@ u8 D_80392860;
u8 D_80392861;
u8 D_80392862;
u8 D_80392863;
u8 D_80392864;
u8 fight_D_80392864;
u8 D_80392865;
u8 D_80392866;
u8 D_80392867;
@@ -1519,13 +1518,13 @@ void chfinalboss_phase3_update(ActorMarker *marker) {
}
break;
case 23:
if (func_80386BEC(this, 9.0f) && (func_80297C6C() != 3)) {
if (fight_func_80386BEC(this, 9.0f) && (func_80297C6C() != 3)) {
chfinalboss_phase3_setState(this, 0x18);
}
break;
case 24:
func_80386BEC(this, 3.0f);
if (func_80387340(this, 1.3f)) {
fight_func_80386BEC(this, 3.0f);
if (fight_func_80387340(this, 1.3f)) {
local->unk3++;
}
if (actor_animationIsAt(this, 0.9999f)) {
@@ -1759,15 +1758,15 @@ void chfinalboss_phase4_update(ActorMarker *marker) {
break;
case 29:
if ((func_80386BEC(this, 9.0f)) && (func_80297C6C() != 3) && (D_803927C4 == 0)) {
if ((fight_func_80386BEC(this, 9.0f)) && (func_80297C6C() != 3) && (D_803927C4 == 0)) {
chfinalboss_phase4_setState(this, 0x1E);
}
break;
case 30:
func_80386BEC(this, 3.0f);
fight_func_80386BEC(this, 3.0f);
if (D_803927C4 == 0) {
func_80387340(this, 1.0f);
fight_func_80387340(this, 1.0f);
if (actor_animationIsAt(this, 0.9999f)) {
static f32 D_803917D0[4] = {2.4f, 2.1f, 1.8f, 1.5f};
@@ -1781,12 +1780,12 @@ void chfinalboss_phase4_update(ActorMarker *marker) {
break;
case 31:
func_80386BEC(this, 3.0f);
fight_func_80386BEC(this, 3.0f);
if (this->unk60 > 0.0) {
this->unk60 -= sp74;
break;
}
if (func_80386BEC(this, 3.0f)) {
if (fight_func_80386BEC(this, 3.0f)) {
chfinalboss_phase4_setState(this, 0x1E);
}
break;
@@ -1798,7 +1797,7 @@ void chfinalboss_phase4_update(ActorMarker *marker) {
break;
case 33:
func_80386BEC(this, 3.0f);
fight_func_80386BEC(this, 3.0f);
sp5C[0] = this->position[0] + (this->velocity[0] * sp74);
sp5C[1] = this->position[1] + (this->velocity[1] * sp74);
sp5C[2] = this->position[2] + (this->velocity[2] * sp74);
@@ -1999,22 +1998,22 @@ void chfinalboss_phase5_update(ActorMarker *marker) {
}
switch (this->state) {
case 35:
func_80386BEC(this, 3.0f);
fight_func_80386BEC(this, 3.0f);
break;
case 36:
if (func_80386BEC(this, 9.0f) && (func_80297C6C() != 3)) {
if (fight_func_80386BEC(this, 9.0f) && (func_80297C6C() != 3)) {
chfinalboss_phase5_setState(this, 0x25);
}
break;
case 37:
func_80386BEC(this, 3.0f);
fight_func_80386BEC(this, 3.0f);
if (func_80297C6C() == 3) {
chfinalboss_phase5_setState(this, 0x24);
break;
}
if (func_80387340(this, 1.0f)) {
if (fight_func_80387340(this, 1.0f)) {
local->unk3++;
}
if ((actor_animationIsAt(this, 0.9999f)) && (local->unk3 >= 5)) {
@@ -2023,7 +2022,7 @@ void chfinalboss_phase5_update(ActorMarker *marker) {
break;
case 38:
func_80386BEC(this, 3.0f);
fight_func_80386BEC(this, 3.0f);
func_803873DC(this, 700.0f, 2400.0f);
if (actor_animationIsAt(this, 0.9999f)) {
chfinalboss_phase5_setState(this, 0x27);
@@ -2035,7 +2034,7 @@ void chfinalboss_phase5_update(ActorMarker *marker) {
if (local->unk8) {
func_80386C68(this, 4.5f);
} else {
func_80386BEC(this, 3.0f);
fight_func_80386BEC(this, 3.0f);
}
if (this->unk60 > 0.0) {
this->unk60 -= dt;
@@ -2317,7 +2316,7 @@ void chfinalboss_update(Actor *this){
func_80386628(this->marker, 1);
func_8038FC00();
func_80386654(1.0f, D_80391380, D_80391390);
func_80386654(1.0f, fight_D_80391380, fight_D_80391390);
func_8028F784(1);
func_8028F4B8(D_80391804, 2000.0f, -2800.0f);
func_8028FA14(0x93, 2);
@@ -2384,7 +2383,7 @@ void chfinalboss_update(Actor *this){
}//L8038C0C8
}
void func_8038C0DC(f32 (*arg0)[3]) {
void fight_func_8038C0DC(f32 (*arg0)[3]) {
(*arg0)[0] = D_80392798[0];
(*arg0)[1] = D_80392798[1];
(*arg0)[2] = D_80392798[2];

6
src/fight/chjinjonator.c
View File

@@ -7,7 +7,7 @@ extern void func_80328B8C(Actor *, s32, f32, s32);
extern void func_80324CFC(f32, s32, s32);
extern void func_802F9E44(s32, f32, f32, f32, f32);
extern void func_80387470(Actor *, f32 [3], f32, f32, f32, f32, f32);
extern void func_8038C0DC(f32[3]);
extern void fight_func_8038C0DC(f32[3]);
extern void chbossjinjo_spawnParticles(Actor *, enum asset_e, enum asset_e, f32);
@@ -282,7 +282,7 @@ void chjinjonator_update(Actor *this){
case 7: //80390B78
sp50 = local->unk24*0.11 + 1.0;
chjinjonator_80390278(this);
func_8038C0DC(local->unk8);
fight_func_8038C0DC(local->unk8);
local->unk8[1] += 100.0f;
func_80387470(this, local->unk8, sp50*2400.0f, sp50*2400.0f*4.2, 170.0f, sp50*2500.0f, 0.0f);
break;
@@ -358,7 +358,7 @@ void chjinjonator_update(Actor *this){
case 12: //80390F7C
sp48 = local->unk24*0.11 + 1.0;
chjinjonator_80390278(this);
func_8038C0DC(local->unk8);
fight_func_8038C0DC(local->unk8);
local->unk8[1] += 100.0f;
func_80387470(this, local->unk8, sp48*2400.0f, sp48*2400.0f*4.2, 170.0f, sp48*2500.0f, 0.0f);
break;

6
src/fight/chjinjonatorbase.c
View File

@@ -9,7 +9,7 @@ typedef struct {
void chjinjonatorbase_update(Actor *);
/* .data */
ActorInfo D_80391A40 = {
ActorInfo fight_D_80391A40 = {
MARKER_27F_JINJONATOR_STATUE_BASE, ACTOR_3A9_JINJONATOR_STATUE_BASE, ASSET_544_MODEL_JINJONATOR_STATUE_BASE,
0x1, NULL,
chjinjonatorbase_update, func_80326224, func_80325888,
@@ -18,7 +18,7 @@ ActorInfo D_80391A40 = {
s32 D_80391A64[3] = {0xC8, 0xC8, 0xA0};
struct31s D_80391A70 = {
struct31s fight_D_80391A70 = {
{1.0f, 1.0f},
{1.7f, 2.7f},
{0.0f, 0.05f},
@@ -53,7 +53,7 @@ void func_8038E03C(f32 arg0[3], u32 arg1) {
particleEmitter_setStartingFrameRange(temp_v0, 0, 7);
particleEmitter_setPosition(temp_v0, arg0);
particleEmitter_setPositionAndVelocityRanges(temp_v0, &D_80391A98);
func_802EFB98(temp_v0, &D_80391A70);
func_802EFB98(temp_v0, &fight_D_80391A70);
particleEmitter_emitN(temp_v0, arg1);
}

14
src/fight/chspellfireball.c
View File

@@ -18,7 +18,7 @@ typedef struct {
void func_8038F620(Actor *this);
/* .data */
ActorInfo D_80391B00 = {
ActorInfo fight_D_80391B00 = {
MARKER_25C_GRUNTY_SPELL_FIREBALL, ACTOR_389_GRUNTY_SPELL_FIREBALL, ASSET_541_SPRITE_FIREBALL_SPELL_ATTACK,
0x1, NULL,
func_8038F620, func_80326224, func_80325888,
@@ -73,13 +73,13 @@ f32 D_80391D34[6] = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f};
f32 D_80391D4C[6] = {-50.0f, -50.0f, -50.0f, 50.0f, 50.0f, 50.0f};
f32 D_80391D64[6] = {0.0f, -1200.0f, 0.0f, 0.0f, -1200.0f, 0.0f};
f32 D_80391D7C[6] = {-260.0f, -260.0f, -260.0f, 260.0f, 260.0f, 260.0f};
f32 D_80391D94[4] = {0.15f, 0.3f, 0.0f, 0.0f};
f32 fight_D_80391D94[4] = {0.15f, 0.3f, 0.0f, 0.0f};
f32 D_80391DA4[4] = {0.0f, 0.01f, 0.7f, 0.8f};
f32 D_80391DB4[2] = {0.0f, 0.65f};
/* .bss */
// u8 pad[0x180]; //TODO!!!! define other file .bss sections
u8 D_803928E0;
u8 fight_D_803928E0;
u8 D_803928E1;
u8 D_803928E2;
u8 D_803928E3;
@@ -226,8 +226,8 @@ void func_8038F3B4(ActorMarker *marker, ActorMarker *other){
func_8038F084(marker);
switch(func_80320424(0x23, 3)){
case 1: //8038F41C
if(!D_803928E0 && func_80311480(randi2(0, 5) + 0x10f2, 0, 0, 0, 0, 0))
D_803928E0 = 1;
if(!fight_D_803928E0 && func_80311480(randi2(0, 5) + 0x10f2, 0, 0, 0, 0, 0))
fight_D_803928E0 = 1;
break;
case 2: //8038F468
if(!D_803928E1 && func_80311480(randi2(0, 5) + 0x110b, 0, 0, 0, 0, 0))
@@ -380,7 +380,7 @@ void func_8038F620(Actor *this){
}//L8038FB74
}
void func_8038FB84(ActorMarker *arg0, f32 *arg1, f32 *arg2, f32 *arg3) {
void fight_func_8038FB84(ActorMarker *arg0, f32 *arg1, f32 *arg2, f32 *arg3) {
Actor *temp_v0 = marker_getActor(arg0);
temp_v0->position_x = arg1[0];
@@ -395,7 +395,7 @@ void func_8038FB84(ActorMarker *arg0, f32 *arg1, f32 *arg2, f32 *arg3) {
}
void func_8038FC00(void) {
D_803928E0 = (u8)0;
fight_D_803928E0 = (u8)0;
D_803928E1 = (u8)0;
D_803928E2 = (u8)0;
D_803928E3 = (u8)0;

6
src/fight/chstonejinjo.c
View File

@@ -10,7 +10,7 @@ extern f32 chbossjinjo_8038D268(void);
void chstonejinjo_update(Actor *);
/* .data */
ActorAnimationInfo D_803919F0[] ={
ActorAnimationInfo fight_D_803919F0[] ={
{0, 0.0f},
{0x265, 1e+8f},
{0x265, 1e+8f},
@@ -18,7 +18,7 @@ ActorAnimationInfo D_803919F0[] ={
};
ActorInfo D_80391A10 = {
MARKER_276_STONE_JINJO, ACTOR_3A1_STONE_JINJO, ASSET_545_MODEL_STONE_JINJO,
0x1, D_803919F0,
0x1, fight_D_803919F0,
chstonejinjo_update, func_80326224, func_80325888,
0, 0x800, 1.0f, 0
};
@@ -124,7 +124,7 @@ void chstonejinjo_breakOpen(ActorMarker *marker){
sp38 = 0x30 + actor->unkF4_8*2;
sp34 = chbossjinjo_8038D268();
sp30 = actor->unk1C[0] + sp34;
func_8038C0DC(&sp24);
fight_func_8038C0DC(&sp24);
func_8028F94C(2, &sp24);
func_8038C27C(1);
timed_setCameraToNode(0 * sp30, sp38);

18
src/fight/code_0.c
View File

@@ -5,16 +5,16 @@
#include "prop.h"
extern ActorInfo D_80366F68;
extern ActorInfo D_80391500;
extern ActorInfo fight_D_80391500;
extern ActorInfo D_80391840;
extern ActorInfo D_80391864;
extern ActorInfo D_80391888;
extern ActorInfo D_803918AC;
extern ActorInfo D_80391990;
extern ActorInfo D_80391A10;
extern ActorInfo D_80391A40;
extern ActorInfo fight_D_80391A10;
extern ActorInfo fight_D_80391A40;
extern ActorInfo D_80391AD0;
extern ActorInfo D_80391B00;
extern ActorInfo fight_D_80391B00;
extern ActorInfo D_80391B24;
extern ActorInfo D_80391DC0;
extern ActorInfo D_80392018;
@@ -23,18 +23,18 @@ extern ActorInfo D_80392090;
/* .bss */
u8 pad_80392750[0x10];
void func_803863F0(void)
void fight_func_803863F0(void)
{
spawnableActorList_add(&D_80391B00, actor_new, 0X108444);
spawnableActorList_add(&fight_D_80391B00, actor_new, 0X108444);
spawnableActorList_add(&D_80391DC0, actor_new, 0X108444);
spawnableActorList_add(&D_80391500, actor_new, 0X300468);
spawnableActorList_add(&fight_D_80391500, actor_new, 0X300468);
spawnableActorList_add(&D_80391840, actor_new, 0X8464);
spawnableActorList_add(&D_80391864, actor_new, 0X8464);
spawnableActorList_add(&D_80391888, actor_new, 0X8464);
spawnableActorList_add(&D_803918AC, actor_new, 0X8464);
spawnableActorList_add(&D_80391A10, actor_new, 0X20004);
spawnableActorList_add(&fight_D_80391A10, actor_new, 0X20004);
spawnableActorList_add(&D_80391990, actor_new, 0X800100C);
spawnableActorList_add(&D_80391A40, actor_new, 0X8009404);
spawnableActorList_add(&fight_D_80391A40, actor_new, 0X8009404);
spawnableActorList_add(&D_80391B24, actor_new, 0X108444);
spawnableActorList_add(&D_80391AD0, actor_new, 0X101404);
spawnableActorList_add(&D_80366F68, actor_new, 0X100404);

12
src/fight/code_9850.c
View File

@@ -22,12 +22,12 @@ f32 D_80391DF4[4] = {0.3f, 0.3f, 0.3f, 1.0f};
s32 D_80391E04[2] = {1, 9};
f32 D_80391E0C[4] = {4.5f, 4.5f, 4.5f, 4.5f};
f32 D_80391E1C[4] = {0.0f, 0.0f, 0.85f, 1.35f};
f32 D_80391E2C[2] = {0.6f, 0.7f};
f32 fight_D_80391E2C[2] = {0.6f, 0.7f};
f32 D_80391E34[6] = {-130.0f, 0.0f, -130.0f, 130.0f, 0.0f, 130.0f};
f32 D_80391E4C[4] = {1.1f, 1.1f, 4.0f, 5.4f};
f32 D_80391E5C[6] = {-20.0f, 0.0f, -20.0f, 20.0f, 40.0f, 20.0f};
f32 D_80391E74[6] = {0.0f, -1200.0f, 0.0f, 0.0f, -1200.0f, 0.0f};
f32 fight_D_80391E74[6] = {0.0f, -1200.0f, 0.0f, 0.0f, -1200.0f, 0.0f};
f32 D_80391E8C[6] = {-420.0f, 410.0f, -420.0f, 480.0f, 860.0f, 480.0f};
f32 D_80391EA4[4] = {0.35f, 0.65f, 0.0f, 0.0f};
f32 D_80391EB4[4] = {0.0f, 0.01f, 2.0f, 2.3f};
@@ -73,17 +73,17 @@ void func_8038FCF0(ActorMarker *marker, ActorMarker *other_marker){
timedFunc_set_0(0.0f, func_8038FC88);
timedFunc_set_0(0.3f, func_8038FCBC);
func_8038EBE0(actor->position, 4, ASSET_710_SPRITE_SPARKLE_PURPLE,
&D_80391E5C, &D_80391E74, &D_80391E8C,
&D_80391E5C, &fight_D_80391E74, &D_80391E8C,
&D_80391EA4, &D_80391EB4, &D_80391EC4
);
func_8038EBE0(actor->position, 4, ASSET_711_SPRITE_SPARKLE_DARK_BLUE,
&D_80391E5C, &D_80391E74, &D_80391E8C,
&D_80391E5C, &fight_D_80391E74, &D_80391E8C,
&D_80391EA4, &D_80391EB4, &D_80391EC4
);
func_8038EEFC(actor->position, 3, &D_80391E4C);
func_8038ED9C(&sp38, 0x6C8, 3,
&D_80391E04, &D_80391E34,
&D_80391E0C, &D_80391E1C, &D_80391E2C
&D_80391E0C, &D_80391E1C, &fight_D_80391E2C
);
marker_despawn(actor->marker);
}
@@ -132,7 +132,7 @@ void func_8038FE94(Actor *this){
}
}
void func_803900DC(ActorMarker *marker, f32 (*arg1)[3], f32 arg2, f32 arg3){
void fight_func_803900DC(ActorMarker *marker, f32 (*arg1)[3], f32 arg2, f32 arg3){
Actor *actor = marker_getActor(marker);
actor->position_x = (*arg1)[0];
actor->position_y = (*arg1)[1];