mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-08-20 21:53:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decompile tvscreenSetImageByNum

Browse Source
This commit is contained in:
Ryan Dwyer
2021-05-27 21:53:05 +10:00
parent 3f326da9e6
commit dfbeb96988
18 changed files with 1166 additions and 1339 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/chr/chraction.c
+1 -1
View File
@@ -6408,7 +6408,7 @@ void chrGoPosChooseAnimation(struct chrdata *chr)
|| chr->hitpart == HITPART_RBICEP) {
anim = 0x1f8;
flip = true;
} else if (stageGetIndex(g_Vars.stagenum) == STAGE_MAIANSOS) {
} else if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_CHICAGO) {
anim = 0x5f;
} else if (male) {
if (random() % 2) {
src/game/chr/chraicommands.c
+2 -2
View File
@@ -5221,12 +5221,12 @@ bool aiSetObjImage(void)
if (obj && obj->prop) {
if (obj->type == OBJTYPE_SINGLEMONITOR) {
struct singlemonitorobj *sm = (struct singlemonitorobj *) obj;
imageSlotSetImage(&sm->screen, cmd[4]);
tvscreenSetImageByNum(&sm->screen, cmd[4]);
} else if (obj->type == OBJTYPE_MULTIMONITOR) {
u8 slot = cmd[3];
if (slot < 4) {
struct multimonitorobj *mm = (struct multimonitorobj *) obj;
imageSlotSetImage(&mm->screens[slot], cmd[4]);
tvscreenSetImageByNum(&mm->screens[slot], cmd[4]);
}
}
}
src/game/game_00c490.c
+12 -12
View File
@@ -44,8 +44,8 @@ u32 var8009cc34;
u32 var8009cc38;
u32 var8009cc3c;
struct monitorscreen var80061a80 = {
(u32) &var80069d90,
struct tvscreen var80061a80 = {
(u32) &g_TvImage00,
0x0000ffff,
0x00000000,
0x00000000,
@@ -76,7 +76,7 @@ struct monitorscreen var80061a80 = {
0x00000000,
};
struct monitorscreen var80061af4 = {
struct tvscreen var80061af4 = {
(u32) &var8006aaa0,
0x0000ffff,
0x00000000,
@@ -108,7 +108,7 @@ struct monitorscreen var80061af4 = {
0x00000000,
};
struct monitorscreen var80061b68 = {
struct tvscreen var80061b68 = {
(u32) &var8006aae4,
0x0000ffff,
0x00000000,
@@ -314,9 +314,9 @@ void addBlockedPath(struct blockedpathobj *blockedpath)
void func0f00cc8c(void)
{
struct monitorscreen tmp1;
struct monitorscreen tmp2;
struct monitorscreen tmp3;
struct tvscreen tmp1;
struct tvscreen tmp2;
struct tvscreen tmp3;
tmp1 = var80061a80;
var8009ce98 = tmp1;
@@ -1306,7 +1306,7 @@ void setupSingleMonitor(struct singlemonitorobj *monitor, s32 cmdindex)
u32 stack[2];
monitor->screen = var8009ce98;
imageSlotSetImage(&monitor->screen, monitor->imagenum);
tvscreenSetImageByNum(&monitor->screen, monitor->imagenum);
// The setup files never place any monitors on a -1 pad, so this code is
// unreachable. It appears to allow attaching monitors to other objects.
@@ -1369,16 +1369,16 @@ void setupSingleMonitor(struct singlemonitorobj *monitor, s32 cmdindex)
void setupMultiMonitor(struct multimonitorobj *monitor, s32 cmdindex)
{
monitor->screens[0] = var8009ce98;
imageSlotSetImage(&monitor->screens[0], monitor->imagenums[0]);
tvscreenSetImageByNum(&monitor->screens[0], monitor->imagenums[0]);
monitor->screens[1] = var8009ce98;
imageSlotSetImage(&monitor->screens[1], monitor->imagenums[1]);
tvscreenSetImageByNum(&monitor->screens[1], monitor->imagenums[1]);
monitor->screens[2] = var8009ce98;
imageSlotSetImage(&monitor->screens[2], monitor->imagenums[2]);
tvscreenSetImageByNum(&monitor->screens[2], monitor->imagenums[2]);
monitor->screens[3] = var8009ce98;
imageSlotSetImage(&monitor->screens[3], monitor->imagenums[3]);
tvscreenSetImageByNum(&monitor->screens[3], monitor->imagenums[3]);
setupGenericObject(&monitor->base, cmdindex);
}
src/game/propobj.c
+977 -1206
View File
File diff suppressed because it is too large Load Diff
src/game/propobjbss.c
+3 -3
View File
@@ -7,9 +7,9 @@ u32 var8009ce70;
u32 var8009ce74;
u32 var8009ce78[4];
u32 var8009ce88[4];
struct monitorscreen var8009ce98;
struct tvscreen var8009ce98;
u32 var8009cf0c;
struct monitorscreen var8009cf10;
struct tvscreen var8009cf10;
u32 var8009cf84;
struct monitorscreen var8009cf88;
struct tvscreen var8009cf88;
u32 var8009cffc[12];