falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some global data placement issues

This commit is contained in:
Ryan Dwyer 2023-08-20 16:48:35 +10:00
parent d7926f12ad
commit 09edfb8545
6 changed files with 52 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/game/chraction.c
View File

@ -1297,14 +1297,16 @@ struct attackanimconfig g_RollAttackAnims[] = {
{ 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
};
struct attackanimconfig g_AttackAnimHeavyWalk = { ANIM_0030, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 1.3999999761581, 1.2999999523163 };
struct attackanimconfig g_AttackAnimHeavyRun = { ANIM_0031, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 1.1000000238419, 1.2000000476837 };
struct attackanimconfig g_AttackAnimLightWalk = { ANIM_0052, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 };
struct attackanimconfig g_AttackAnimLightRun = { ANIM_0055, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 };
struct attackanimconfig g_AttackAnimDualWalk = { ANIM_006C, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 };
struct attackanimconfig g_AttackAnimDualRun = { ANIM_006E, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 };
struct attackanimconfig g_AttackAnimDualCrossedWalk = { ANIM_006D, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 };
struct attackanimconfig g_AttackAnimDualCrossedRun = { ANIM_006F, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 };
struct attackanimconfig g_WalkAttackAnims[] = {
{ ANIM_0030, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 1.3999999761581, 1.2999999523163 },
{ ANIM_0031, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 1.1000000238419, 1.2000000476837 },
{ ANIM_0052, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 },
{ ANIM_0055, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 },
{ ANIM_006C, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 },
{ ANIM_006E, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 },
{ ANIM_006D, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 },
{ ANIM_006F, 0, 0, 0, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 },
};
struct attackanimconfig var80067c50[] = {
{ ANIM_0057, 0, 0, 1.5707963705063, 0, -1, 0, 0, -1, -1, 0, 0, 0.87252569198608, -0.52351540327072, 0.52351540327072, -0.52351540327072, 0, 0 },
@ -2370,9 +2372,9 @@ void chrAttackWalk(struct chrdata *chr, bool run)
if (style == 0) {
if (run) {
animcfg = &g_AttackAnimLightRun;
animcfg = &g_WalkAttackAnims[3];
} else {
animcfg = &g_AttackAnimLightWalk;
animcfg = &g_WalkAttackAnims[2];
}
if (flip) {
@ -2382,17 +2384,17 @@ void chrAttackWalk(struct chrdata *chr, bool run)
}
} else if (style == 1) {
if (run) {
animcfg = &g_AttackAnimDualRun;
animcfg = &g_WalkAttackAnims[5];
} else {
animcfg = &g_AttackAnimDualWalk;
animcfg = &g_WalkAttackAnims[4];
}
firing[HAND_LEFT] = firing[HAND_RIGHT] = true;
} else {
if (run) {
animcfg = &g_AttackAnimDualCrossedRun;
animcfg = &g_WalkAttackAnims[7];
} else {
animcfg = &g_AttackAnimDualCrossedWalk;
animcfg = &g_WalkAttackAnims[6];
}
firing[HAND_LEFT] = firing[HAND_RIGHT] = true;
@ -2402,9 +2404,9 @@ void chrAttackWalk(struct chrdata *chr, bool run)
flip = (bool)leftgun != false;
if (run) {
animcfg = &g_AttackAnimLightRun;
animcfg = &g_WalkAttackAnims[3];
} else {
animcfg = &g_AttackAnimLightWalk;
animcfg = &g_WalkAttackAnims[2];
}
if (flip) {
@ -2416,9 +2418,9 @@ void chrAttackWalk(struct chrdata *chr, bool run)
flip = (bool)leftgun != false;
if (run) {
animcfg = &g_AttackAnimHeavyRun;
animcfg = &g_WalkAttackAnims[1];
} else {
animcfg = &g_AttackAnimHeavyWalk;
animcfg = &g_WalkAttackAnims[0];
}
if (flip) {

21
src/game/game_1531a0.c
View File

@ -118,31 +118,14 @@ u16 var8007fb3c[] = {
u16 var8007fb5c[] = {
0xff00, 0xff58, 0xff74, 0xff90, 0xffac, 0xffc8, 0xffe4, 0xffff,
0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff,
};
u16 var8007fb7c[] = {
0xff00, 0xff00, 0xff00, 0xff00, 0xff00, 0xff00, 0xff00, 0xff00,
0xff00, 0xff18, 0xff30, 0xff5c, 0xff88, 0xffb4, 0xffd8, 0xffff,
};
#if VERSION == VERSION_JPN_FINAL
u16 var800801d8jf[] = {
0xff00,
0xff11,
0xff22,
0xff33,
0xff44,
0xff55,
0xff66,
0xff77,
0xff88,
0xff99,
0xffaa,
0xffbb,
0xffcc,
0xffdd,
0xffee,
0xffff,
0xff00, 0xff11, 0xff22, 0xff33, 0xff44, 0xff55, 0xff66, 0xff77,
0xff88, 0xff99, 0xffaa, 0xffbb, 0xffcc, 0xffdd, 0xffee, 0xffff,
};
#endif

56
src/game/player.c
View File

@ -4144,37 +4144,37 @@ struct var80070ba4 {
struct var80070ba4 var80070ba4[4][7] = { // [wieldmode][turnmode]
{
{ var80065be0, 0, 0.1, 79, 87, 1.0470308065414 },
{ &g_AttackAnimLightWalk, 0, 0.5, -1, -1, 1.0470308065414 },
{ &g_AttackAnimLightRun, 0, 0.5, -1, -1, 1.0470308065414 },
{ &var800709f4, 0, 0.001, 0, 0.1, 1.0470308065414 },
{ &var800709f4, 0, 0.503, -1, -1, 1.0470308065414 },
{ &var80070a3c, 0, 0.001, 0, 0.1, 0.52351540327072 },
{ &var80070a3c, 0, 0.45, -1, -1, 0.52351540327072 },
{ var80065be0, 0, 0.1, 79, 87, 1.0470308065414 },
{ &g_WalkAttackAnims[2], 0, 0.5, -1, -1, 1.0470308065414 },
{ &g_WalkAttackAnims[3], 0, 0.5, -1, -1, 1.0470308065414 },
{ &var800709f4, 0, 0.001, 0, 0.1, 1.0470308065414 },
{ &var800709f4, 0, 0.503, -1, -1, 1.0470308065414 },
{ &var80070a3c, 0, 0.001, 0, 0.1, 0.52351540327072 },
{ &var80070a3c, 0, 0.45, -1, -1, 0.52351540327072 },
}, {
{ var800656c0, 0, 0.05, 35, 40, 1.0470308065414 },
{ &g_AttackAnimHeavyWalk, 0, 0.5, -1, -1, 1.0470308065414 },
{ &g_AttackAnimHeavyRun, 0, 0.5, -1, -1, 1.0470308065414 },
{ &var80070a84, 0, 0.001, 0, 0.1, 1.0470308065414 },
{ &var80070a84, 0, 0.503, -1, -1, 1.0470308065414 },
{ &var80070acc, 0, 0.001, 0, 0.1, 0.52351540327072 },
{ &var80070acc, 0, 0.45, -1, -1, 0.52351540327072 },
{ var800656c0, 0, 0.05, 35, 40, 1.0470308065414 },
{ &g_WalkAttackAnims[0], 0, 0.5, -1, -1, 1.0470308065414 },
{ &g_WalkAttackAnims[1], 0, 0.5, -1, -1, 1.0470308065414 },
{ &var80070a84, 0, 0.001, 0, 0.1, 1.0470308065414 },
{ &var80070a84, 0, 0.503, -1, -1, 1.0470308065414 },
{ &var80070acc, 0, 0.001, 0, 0.1, 0.52351540327072 },
{ &var80070acc, 0, 0.45, -1, -1, 0.52351540327072 },
}, {
{ NULL, ANIM_006A, 0.25, 0, -1, 1.0470308065414 },
{ NULL, ANIM_006B, 0.5, -1, -1, 1.0470308065414 },
{ NULL, ANIM_RUNNING_ONEHANDGUN, 0.5, -1, -1, 1.0470308065414 },
{ NULL, ANIM_0280, 0.001, 0, 0.1, 1.0470308065414 },
{ NULL, ANIM_0280, 0.503, -1, -1, 1.0470308065414 },
{ NULL, ANIM_0284, 0.001, 0, 0.1, 0.52351540327072 },
{ NULL, ANIM_0284, 0.45, -1, -1, 0.52351540327072 },
{ NULL, ANIM_006A, 0.25, 0, -1, 1.0470308065414 },
{ NULL, ANIM_006B, 0.5, -1, -1, 1.0470308065414 },
{ NULL, ANIM_RUNNING_ONEHANDGUN, 0.5, -1, -1, 1.0470308065414 },
{ NULL, ANIM_0280, 0.001, 0, 0.1, 1.0470308065414 },
{ NULL, ANIM_0280, 0.503, -1, -1, 1.0470308065414 },
{ NULL, ANIM_0284, 0.001, 0, 0.1, 0.52351540327072 },
{ NULL, ANIM_0284, 0.45, -1, -1, 0.52351540327072 },
}, {
{ var800663d8, 0, 0.1, 32, 42, 1.0470308065414 },
{ &g_AttackAnimDualWalk, 0, 0.5, -1, -1, 1.0470308065414 },
{ &g_AttackAnimDualRun, 0, 0.5, -1, -1, 1.0470308065414 },
{ &var80070b14, 0, 0.001, 0, 0.1, 1.0470308065414 },
{ &var80070b14, 0, 0.503, -1, -1, 1.0470308065414 },
{ &var80070b5c, 0, 0.001, 0, 0.1, 0.52351540327072 },
{ &var80070b5c, 0, 0.45, -1, -1, 0.52351540327072 },
{ var800663d8, 0, 0.1, 32, 42, 1.0470308065414 },
{ &g_WalkAttackAnims[4], 0, 0.5, -1, -1, 1.0470308065414 },
{ &g_WalkAttackAnims[5], 0, 0.5, -1, -1, 1.0470308065414 },
{ &var80070b14, 0, 0.001, 0, 0.1, 1.0470308065414 },
{ &var80070b14, 0, 0.503, -1, -1, 1.0470308065414 },
{ &var80070b5c, 0, 0.001, 0, 0.1, 0.52351540327072 },
{ &var80070b5c, 0, 0.45, -1, -1, 0.52351540327072 },
},
};

2
src/game/race.c
View File

@ -125,5 +125,5 @@ void raceInitAnims(void)
}
raceInitAnimGroup(g_RollAttackAnims);
raceInitAnimGroup(&g_AttackAnimHeavyWalk);
raceInitAnimGroup(g_WalkAttackAnims);
}

7
src/include/data.h
View File

@ -173,12 +173,7 @@ extern struct attackanimgroup *g_KneelHeavyAttackAnims[][32];
extern struct attackanimgroup *g_KneelLightAttackAnims[][32];
extern struct attackanimgroup *g_KneelDualAttackAnims[][32];
extern struct attackanimconfig g_RollAttackAnims[];
extern struct attackanimconfig g_AttackAnimHeavyWalk;
extern struct attackanimconfig g_AttackAnimHeavyRun;
extern struct attackanimconfig g_AttackAnimLightWalk;
extern struct attackanimconfig g_AttackAnimLightRun;
extern struct attackanimconfig g_AttackAnimDualWalk;
extern struct attackanimconfig g_AttackAnimDualRun;
extern struct attackanimconfig g_WalkAttackAnims[];
extern u32 g_StageFlags;
extern struct chrdata *g_BgChrs;
extern s16 *g_BgChrnums;

10
src/include/game/chraction.h
View File

@ -4,16 +4,6 @@
#include "data.h"
#include "types.h"
extern struct attackanimconfig var800656c0[];
extern struct attackanimconfig var80065be0[];
extern struct attackanimconfig var800663d8[];
extern struct attackanimconfig g_AttackAnimHeavyWalk;
extern struct attackanimconfig g_AttackAnimHeavyRun;
extern struct attackanimconfig g_AttackAnimLightWalk;
extern struct attackanimconfig g_AttackAnimLightRun;
extern struct attackanimconfig g_AttackAnimDualWalk;
extern struct attackanimconfig g_AttackAnimDualRun;
f32 func0f02dff0(s16 animnum);
bool chrGoPosIsWaiting(struct chrdata *chr);
bool weaponIsOneHanded(struct prop *prop);