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

Rename some quip related symbols

This commit is contained in:
Ryan Dwyer 2020-02-15 10:19:16 +10:00
parent b33320c1d6
commit 3bb1e43050
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/game/game_02cde0.c
View File

@ -34922,21 +34922,21 @@ s16 *squadronGetChrIds(s32 squadron_id)
return &g_SquadronList[MAX_SQUADRONS - 1];
}
void audioMarkAsRecentlyPlayed(s16 value)
void audioMarkAsRecentlyPlayed(s16 audioid)
{
var8009cd70[var8009cd98++] = value;
g_RecentQuipsPlayed[g_RecentQuipsIndex++] = audioid;
if (var8009cd98 > 4) {
var8009cd98 = 0;
if (g_RecentQuipsIndex > 4) {
g_RecentQuipsIndex = 0;
}
}
bool audioWasNotPlayedRecently(s16 value)
bool audioWasNotPlayedRecently(s16 audioid)
{
u8 i;
for (i = 0; i < 5; i++) {
if (var8009cd70[i] == value) {
if (g_RecentQuipsPlayed[i] == audioid) {
return false;
}
}

4
src/gvars/gvars.c
View File

@ -16046,13 +16046,13 @@ u32 var8009cd60 = 0;
u32 var8009cd64 = 0;
u32 var8009cd68 = 0;
u32 var8009cd6c = 0;
s32 var8009cd70[] = {0, 0, 0, 0, 0};
s32 g_RecentQuipsPlayed[] = {0, 0, 0, 0, 0};
u32 var8009cd84 = 0;
u32 var8009cd88 = 0;
u32 var8009cd8c = 0;
u32 var8009cd90 = 0;
u32 var8009cd94 = 0;
u8 var8009cd98 = 0; // index into var8009cd70
u8 g_RecentQuipsIndex = 0; // index into g_RecentQuipsPlayed
u32 var8009cd9c = 0;
u32 var8009cda0 = 0;
u32 var8009cda4 = 0;

4
src/include/game/game_02cde0.h
View File

@ -329,8 +329,8 @@ bool func0f04c6b4(struct chrdata *chr, u32 distance);
bool func0f04c71c(struct chrdata *chr, u32 distance);
s16 *teamGetChrIds(s32 team_id);
s16 *squadronGetChrIds(s32 squadron_id);
void audioMarkAsRecentlyPlayed(s16 value);
bool audioWasNotPlayedRecently(s16 value);
void audioMarkAsRecentlyPlayed(s16 audioid);
bool audioWasNotPlayedRecently(s16 audioid);
void func0f04cf90(struct chrdata *chr, s32 arg1);
bool func0f04d44c(struct chrdata *chr);
void chrEmitSparks(struct chrdata *chr);

4
src/include/gvars/gvars.h
View File

@ -556,8 +556,8 @@ extern s16 *g_ChrIndexesC;
extern u32 var8009cd20;
extern u32 var8009cd28;
extern u32 var8009cd48;
extern s32 var8009cd70[5];
extern u8 var8009cd98;
extern s32 g_RecentQuipsPlayed[5];
extern u8 g_RecentQuipsIndex;
extern u32 var8009cda0;
extern u32 var8009cda4;
extern u32 var8009cdac;