Rename some g_Vars properties according to XBLA debug data

This commit is contained in:
Ryan Dwyer
2020-01-03 19:09:11 +10:00
parent b014e99606
commit b63a6d2018
5 changed files with 42 additions and 42 deletions
+5 -5
View File
@@ -30773,7 +30773,7 @@ glabel func0f038b9c
void chrRecordLastVisibleTargetTime(struct chrdata *chr)
{
chr->lastvisibletarget60 = g_Vars.tickcount;
chr->lastvisibletarget60 = g_Vars.lvframe60;
}
GLOBAL_ASM(
@@ -31235,13 +31235,13 @@ glabel func0f039558
void chrRecordLastSeeTargetTime(struct chrdata *chr)
{
chr->lastseetarget60 = g_Vars.tickcount;
chr->lastseetarget60 = g_Vars.lvframe60;
}
void chrRecordLastHearTargetTime(struct chrdata *chr)
{
chr->hidden |= CHRHFLAG_00000002;
chr->lastheartarget60 = g_Vars.tickcount;
chr->lastheartarget60 = g_Vars.lvframe60;
}
GLOBAL_ASM(
@@ -47932,7 +47932,7 @@ glabel func0f048398
bool chrSawTargetRecently(struct chrdata *chr)
{
if (chr->lastseetarget60 > 0 && g_Vars.tickcount - chr->lastseetarget60 < 600) {
if (chr->lastseetarget60 > 0 && g_Vars.lvframe60 - chr->lastseetarget60 < 600) {
return true;
}
@@ -47941,7 +47941,7 @@ bool chrSawTargetRecently(struct chrdata *chr)
bool chrHeardTargetRecently(struct chrdata *chr)
{
if (chr->lastheartarget60 > 0 && g_Vars.tickcount - chr->lastheartarget60 < 600) {
if (chr->lastheartarget60 > 0 && g_Vars.lvframe60 - chr->lastheartarget60 < 600) {
return true;
}
+4 -4
View File
@@ -7487,7 +7487,7 @@ bool aiSetDoorClosed(void)
struct doorobj *door = (struct doorobj *) obj;
door->speed = door->unk5c;
door->unk80 = 0;
door->unkc0 = g_Vars.tickcount;
door->unkc0 = g_Vars.lvframe60;
door->state = 0;
func0f08c54c(door);
func0f08d4e8(door);
@@ -12050,7 +12050,7 @@ bool aiIfPlayerAutoWalkFinished(void)
u32 playernum = propGetPlayerNum(chr->prop);
setCurrentPlayerNum(playernum);
if (g_Vars.unk0002ac == 7) {
if (g_Vars.tickmode == 7) {
pass = true;
}
@@ -13920,7 +13920,7 @@ bool aiSetDrCarollImages(void)
if (drcaroll) {
if (cmd[4] == 7) {
if ((g_Vars.unk00000c % 4) == 2) {
if ((g_Vars.lvframenum % 4) == 2) {
drcaroll->drcarollimage_left = random() % 6;
}
} else if (cmd[4] == 8) {
@@ -13930,7 +13930,7 @@ bool aiSetDrCarollImages(void)
}
if (cmd[3] == 7) {
if ((g_Vars.unk00000c % 4) == 2) {
if ((g_Vars.lvframenum % 4) == 2) {
drcaroll->drcarollimage_right = random() % 6;
}
} else if (cmd[3] == 8) {
+1 -1
View File
@@ -49126,7 +49126,7 @@ bool countdownTimerIsRunning(void)
void countdownTimerTick(void)
{
if (g_CountdownTimerRunning) {
g_CountdownTimerValue -= g_Vars.countdowntimerstep;
g_CountdownTimerValue -= g_Vars.lvupdate240freal;
}
}
+1 -1
View File
@@ -1153,7 +1153,7 @@ glabel menuhandlerAcceptMission
// func0f01bea0();
//
// if (g_Vars.stagenum == g_MissionConfig.stagenum) {
// g_Vars.isreplayingmission = true;
// g_Vars.restartlevel = true;
// }
//
// func0f01b154(g_MissionConfig.stagenum);