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

Rename a heap of player properties according to XBLA debug data

This commit is contained in:
Ryan Dwyer 2020-01-03 19:51:04 +10:00
parent b63a6d2018
commit 4b54ea0a9a
3 changed files with 58 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/game/chr/chraicommands.c
View File

@ -13545,13 +13545,13 @@ bool aiChrBeginOrEndTeleport(void)
}
if (pad_id == 0) {
g_Vars.currentplayer->unk1bfc = 4;
g_Vars.currentplayer->unk1bfd = 0;
g_Vars.currentplayer->teleportstate = TELEPORTSTATE_4;
g_Vars.currentplayer->teleporttime = 0;
} else {
g_Vars.currentplayer->unk1bfd = 0;
g_Vars.currentplayer->unk1bfc = 1;
g_Vars.currentplayer->teleportdstpad = pad_id;
g_Vars.currentplayer->unk1c00 = 0;
g_Vars.currentplayer->teleporttime = 0;
g_Vars.currentplayer->teleportstate = TELEPORTSTATE_STARTING;
g_Vars.currentplayer->teleportpad = pad_id;
g_Vars.currentplayer->teleportcamerapad = 0;
a = func000488c0(0);
b = func000488c0(&var800915e0);
@ -13590,7 +13590,7 @@ bool aiIfChrTeleportFullWhite(void)
setCurrentPlayerNum(playernum);
}
if (g_Vars.currentplayer->unk1bfc < 3) {
if (g_Vars.currentplayer->teleportstate < TELEPORTSTATE_3) {
g_Vars.aioffset += 4;
} else {
fvalue = var7f1a9dac[0];
@ -13604,7 +13604,7 @@ bool aiIfChrTeleportFullWhite(void)
}
func00048430(0, a);
g_Vars.currentplayer->unk1bfc = 3;
g_Vars.currentplayer->teleportstate = TELEPORTSTATE_3;
g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]);
}

4
src/include/constants.h
View File

@ -904,6 +904,10 @@
#define TARGET_PAD 0x2328
#define TELEPORTSTATE_STARTING 1
#define TELEPORTSTATE_3 3
#define TELEPORTSTATE_4 4
#define WEAPON_NONE 0x00
#define WEAPON_UNARMED 0x01
#define WEAPON_FALCON2 0x02

125
src/include/types.h
View File

@ -2285,79 +2285,41 @@ struct player {
/*0x1860*/ u32 unk1860;
/*0x1864*/ u32 unk1864;
/*0x1868*/ u32 unk1868;
/*0x186c*/ u32 unk186c;
/*0x1870*/ u32 unk1870;
/*0x1874*/ u32 unk1874;
/*0x1878*/ u32 unk1878;
/*0x187c*/ u32 unk187c;
/*0x1880*/ u32 unk1880;
/*0x1884*/ u32 unk1884;
/*0x1888*/ u32 unk1888;
/*0x188c*/ u32 unk188c;
/*0x1890*/ u32 unk1890;
/*0x1894*/ u32 unk1894;
/*0x1898*/ u32 unk1898;
/*0x189c*/ u32 unk189c;
/*0x18a0*/ u32 unk18a0;
/*0x18a4*/ u32 unk18a4;
/*0x18a8*/ u32 unk18a8;
/*0x18ac*/ u32 unk18ac;
/*0x18b0*/ u32 unk18b0;
/*0x18b4*/ u32 unk18b4;
/*0x18b8*/ u32 unk18b8;
/*0x18bc*/ u32 unk18bc;
/*0x18c0*/ u32 unk18c0;
/*0x18c4*/ u32 unk18c4;
/*0x18c8*/ u32 unk18c8;
/*0x18cc*/ u32 unk18cc;
/*0x18d0*/ u32 unk18d0;
/*0x18d4*/ u32 unk18d4;
/*0x18d8*/ u32 unk18d8;
/*0x18dc*/ u32 unk18dc;
/*0x18e0*/ u32 unk18e0;
/*0x18e4*/ u32 unk18e4;
/*0x18e8*/ u32 unk18e8;
/*0x18ec*/ u32 unk18ec;
/*0x18f0*/ u32 unk18f0;
/*0x18f4*/ u32 unk18f4;
/*0x18f8*/ u32 unk18f8;
/*0x18fc*/ u32 unk18fc;
/*0x1900*/ u32 unk1900;
/*0x1904*/ u32 unk1904;
/*0x1908*/ u32 unk1908;
/*0x190c*/ u32 unk190c;
/*0x1910*/ u32 unk1910;
/*0x1914*/ u32 unk1914;
/*0x1918*/ u32 unk1918;
/*0x191c*/ u32 unk191c;
/*0x1920*/ u16 unk1920;
/*0x186c*/ u32 equipmaxitems;
/*0x1870*/ u32 equipallguns;
/*0x1874*/ u32 equipcuritem;
/*0x1878*/ u8 gunheldarr[120];
/*0x18f0*/ u32 magnetattracttime;
/*0x18f4*/ u32 angleoffset;
/*0x18f8*/ u32 buthist[10];
/*0x1920*/ u8 buthistindex;
/*0x1921*/ u8 buthistlen;
/*0x1922*/ u8 invincible;
/*0x1924*/ u32 unk1924;
/*0x1928*/ u32 unk1928;
/*0x192c*/ u32 unk192c;
/*0x1930*/ u32 unk1930;
/*0x1934*/ u32 unk1934;
/*0x1938*/ u32 unk1938;
/*0x193c*/ u32 unk193c;
/*0x1940*/ u32 unk1940;
/*0x1944*/ u32 unk1944;
/*0x1948*/ u32 unk1948;
/*0x194c*/ u32 unk194c;
/*0x1950*/ u32 unk1950;
/*0x1954*/ u32 unk1954;
/*0x1958*/ u32 unk1958;
/*0x195c*/ u32 unk195c;
/*0x1960*/ u32 unk1960;
/*0x1964*/ u32 unk1964;
/*0x1968*/ u32 unk1968;
/*0x196c*/ u32 unk196c;
/*0x1970*/ u32 unk1970;
/*0x1974*/ u32 unk1974;
/*0x1978*/ u32 unk1978;
/*0x197c*/ u32 unk197c;
/*0x1980*/ u32 unk1980;
/*0x1984*/ u32 unk1984;
/*0x1988*/ u32 unk1988;
/*0x1924*/ u32 healthdamagetype;
/*0x1928*/ u32 bondleandown;
/*0x192c*/ u32 mpmenuon;
/*0x1930*/ u32 mpquitconfirm;
/*0x1934*/ u32 mpjoywascentre;
/*0x1938*/ u32 damagetype;
/*0x193c*/ u32 deathcount;
/*0x1940*/ u32 oldcrosspos[2];
/*0x1948*/ u32 lastkilltime60;
/*0x194c*/ u32 lastkilltime60_2;
/*0x1950*/ u32 lastkilltime60_3;
/*0x1954*/ u32 lastkilltime60_4;
/*0x1958*/ u32 lifestarttime60;
/*0x195c*/ u32 killsthislife;
/*0x1960*/ u32 healthdisplaytime60;
/*0x1964*/ u32 guncloseroffset;
/*0x1968*/ u32 shootrotx;
/*0x196c*/ u32 shootroty;
/*0x1970*/ u32 chrmuzzlelast;
/*0x1974*/ u32 healthscale;
/*0x1978*/ u32 armourscale;
/*0x197c*/ u32 speedgo;
/*0x1980*/ u32 sighttimer240;
/*0x1984*/ u32 crouchoffsetreal;
/*0x1988*/ u16 floorroom;
/*0x198c*/ u32 unk198c;
/*0x1990*/ u32 unk1990;
/*0x1994*/ u32 unk1994;
@ -2511,13 +2473,18 @@ struct player {
/*0x1be4*/ u32 unk1be4;
/*0x1be8*/ u32 unk1be8;
/*0x1bec*/ u32 unk1bec;
/*0x1bf0*/ u32 unk1bf0;
/*0x1bf4*/ u32 unk1bf4;
/*0x1bf8*/ u32 unk1bf8;
/*0x1bfc*/ u8 unk1bfc; // teleport related
/*0x1bfd*/ u8 unk1bfd; // teleport related
/*0x1bfe*/ s16 teleportdstpad;
/*0x1c00*/ u16 unk1c00; // teleport related
/*0x1bf0*/ u32 bondexploding;
/*0x1bf4*/ u32 bondnextexplode;
/*0x1bf8*/ u32 bondcurexplode;
/*0x1bfc*/ u8 teleportstate;
/*0x1bfd*/ u8 teleporttime;
/*0x1bfe*/ s16 teleportpad;
/*0x1c00*/ u16 teleportcamerapad;
/*0x1c04*/ u32 training;
/*0x1c08*/ u32 deadtimer;
/*0x1c0c*/ u32 coopcanrestart;
/*0x1c10*/ u32 foot;
/*0x1c14*/ u32 footstepdist;
};
struct ailist {