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

Decompile hudmsgCalculatePosition

This commit is contained in:
Ryan Dwyer 2021-06-09 12:16:48 +10:00
parent 9c12bb0e99
commit b9788c4b68
15 changed files with 340 additions and 1237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/game/bg.c
View File

@ -8818,8 +8818,8 @@ Gfx *currentPlayerScissorToViewport(Gfx *gdl)
return currentPlayerScissorWithinViewport(gdl,
g_Vars.currentplayer->viewleft,
g_Vars.currentplayer->viewtop,
g_Vars.currentplayer->viewleft + g_Vars.currentplayer->viewx,
g_Vars.currentplayer->viewtop + g_Vars.currentplayer->viewy);
g_Vars.currentplayer->viewleft + g_Vars.currentplayer->viewwidth,
g_Vars.currentplayer->viewtop + g_Vars.currentplayer->viewheight);
}
Gfx *currentPlayerScissorWithinViewportF(Gfx *gdl, f32 viewleft, f32 viewtop, f32 viewright, f32 viewbottom)
@ -8839,12 +8839,12 @@ Gfx *currentPlayerScissorWithinViewport(Gfx *gdl, s32 viewleft, s32 viewtop, s32
viewtop = g_Vars.currentplayer->viewtop;
}
if (viewright > g_Vars.currentplayer->viewleft + g_Vars.currentplayer->viewx) {
viewright = g_Vars.currentplayer->viewleft + g_Vars.currentplayer->viewx;
if (viewright > g_Vars.currentplayer->viewleft + g_Vars.currentplayer->viewwidth) {
viewright = g_Vars.currentplayer->viewleft + g_Vars.currentplayer->viewwidth;
}
if (viewbottom > g_Vars.currentplayer->viewtop + g_Vars.currentplayer->viewy) {
viewbottom = g_Vars.currentplayer->viewtop + g_Vars.currentplayer->viewy;
if (viewbottom > g_Vars.currentplayer->viewtop + g_Vars.currentplayer->viewheight) {
viewbottom = g_Vars.currentplayer->viewtop + g_Vars.currentplayer->viewheight;
}
gDPSetScissor(gdl++, G_SC_NON_INTERLACE, viewleft, viewtop, viewright, viewbottom);

2
src/game/bondeyespy.c
View File

@ -645,7 +645,7 @@ bool eyespyTryLaunch(void)
// "Not enough room to launch "
sprintf(text, "%s%s", langGet(L_MISC_218), weaponGetName(WEAPON_EYESPY));
hudmsgCreateViaPreset(text, HUDMSGTYPE_DEFAULT);
hudmsgCreate(text, HUDMSGTYPE_DEFAULT);
launched = false;
} else {
// Launch successful

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

@ -4674,7 +4674,7 @@ bool aiShowHudmsg(void)
}
setCurrentPlayerNum(playernum);
hudmsgCreateViaPreset(text, 0);
hudmsgCreate(text, HUDMSGTYPE_DEFAULT);
setCurrentPlayerNum(prevplayernum);
g_Vars.aioffset += 5;
@ -4692,11 +4692,11 @@ bool aiShowHudmsgMiddle(void)
if (cmd[2] == 0) {
u32 text_id = cmd[5] | (cmd[4] << 8);
char *text = langGet(text_id);
hudmsgCreateViaPresetWithColour(text, 7, cmd[3]);
hudmsgCreateWithColour(text, HUDMSGTYPE_7, cmd[3]);
} else if (cmd[2] == 1) {
u32 text_id = cmd[5] | (cmd[4] << 8);
char *text = langGet(text_id);
hudmsgCreateViaPresetWithColour(text, 8, cmd[3]);
hudmsgCreateWithColour(text, HUDMSGTYPE_8, cmd[3]);
} else {
hudmsgRemoveAll();
}
@ -4723,7 +4723,7 @@ bool aiShowHudmsgTopMiddle(void)
}
setCurrentPlayerNum(playernum);
hudmsgCreateViaPresetWithColour(text, 6, cmd[5]);
hudmsgCreateWithColour(text, HUDMSGTYPE_INGAMESUBTITLE, cmd[5]);
setCurrentPlayerNum(prevplayernum);
g_Vars.aioffset += 6;
@ -7999,7 +7999,7 @@ glabel var7f1a9d64
/* f05aaa4: 8fa40080 */ lw $a0,0x80($sp)
/* f05aaa8: 8fae009c */ lw $t6,0x9c($sp)
/* f05aaac: 24050006 */ li $a1,0x6
/* f05aab0: 0fc3799a */ jal hudmsgCreateViaPresetWithColour
/* f05aab0: 0fc3799a */ jal hudmsgCreateWithColour
/* f05aab4: 91c60009 */ lbu $a2,0x9($t6)
/* f05aab8: 100000be */ b .PF0f05adb4
/* f05aabc: 00000000 */ nop
@ -8022,7 +8022,7 @@ glabel var7f1a9d64
/* f05aafc: 8fa40080 */ lw $a0,0x80($sp)
/* f05ab00: 8fac009c */ lw $t4,0x9c($sp)
/* f05ab04: 24050006 */ li $a1,0x6
/* f05ab08: 0fc3799a */ jal hudmsgCreateViaPresetWithColour
/* f05ab08: 0fc3799a */ jal hudmsgCreateWithColour
/* f05ab0c: 91860009 */ lbu $a2,0x9($t4)
/* f05ab10: 100000a8 */ b .PF0f05adb4
/* f05ab14: 00000000 */ nop
@ -8190,7 +8190,7 @@ glabel var7f1a9d64
/* f05ad70: 8fa40080 */ lw $a0,0x80($sp)
/* f05ad74: 8fab009c */ lw $t3,0x9c($sp)
/* f05ad78: 24050006 */ li $a1,0x6
/* f05ad7c: 0fc3799a */ jal hudmsgCreateViaPresetWithColour
/* f05ad7c: 0fc3799a */ jal hudmsgCreateWithColour
/* f05ad80: 91660009 */ lbu $a2,0x9($t3)
/* f05ad84: 1000000b */ b .PF0f05adb4
/* f05ad88: 00000000 */ nop
@ -8660,7 +8660,7 @@ glabel var7f1a9d64
/* f05a8a0: 8fa40080 */ lw $a0,0x80($sp)
/* f05a8a4: 8fae009c */ lw $t6,0x9c($sp)
/* f05a8a8: 24050006 */ addiu $a1,$zero,0x6
/* f05a8ac: 0fc3780d */ jal hudmsgCreateViaPresetWithColour
/* f05a8ac: 0fc3780d */ jal hudmsgCreateWithColour
/* f05a8b0: 91c60009 */ lbu $a2,0x9($t6)
/* f05a8b4: 100000be */ b .L0f05abb0
/* f05a8b8: 00000000 */ nop
@ -8683,7 +8683,7 @@ glabel var7f1a9d64
/* f05a8f8: 8fa40080 */ lw $a0,0x80($sp)
/* f05a8fc: 8fac009c */ lw $t4,0x9c($sp)
/* f05a900: 24050006 */ addiu $a1,$zero,0x6
/* f05a904: 0fc3780d */ jal hudmsgCreateViaPresetWithColour
/* f05a904: 0fc3780d */ jal hudmsgCreateWithColour
/* f05a908: 91860009 */ lbu $a2,0x9($t4)
/* f05a90c: 100000a8 */ b .L0f05abb0
/* f05a910: 00000000 */ nop
@ -8851,7 +8851,7 @@ glabel var7f1a9d64
/* f05ab6c: 8fa40080 */ lw $a0,0x80($sp)
/* f05ab70: 8fab009c */ lw $t3,0x9c($sp)
/* f05ab74: 24050006 */ addiu $a1,$zero,0x6
/* f05ab78: 0fc3780d */ jal hudmsgCreateViaPresetWithColour
/* f05ab78: 0fc3780d */ jal hudmsgCreateWithColour
/* f05ab7c: 91660009 */ lbu $a2,0x9($t3)
/* f05ab80: 1000000b */ b .L0f05abb0
/* f05ab84: 00000000 */ nop
@ -9317,7 +9317,7 @@ glabel var7f1a9d64
/* f059cf8: 8fae009c */ lw $t6,0x9c($sp)
/* f059cfc: 00402025 */ or $a0,$v0,$zero
/* f059d00: 24050006 */ addiu $a1,$zero,0x6
/* f059d04: 0fc36d93 */ jal hudmsgCreateViaPresetWithColour
/* f059d04: 0fc36d93 */ jal hudmsgCreateWithColour
/* f059d08: 91c60009 */ lbu $a2,0x9($t6)
/* f059d0c: 100000b6 */ beqz $zero,.NB0f059fe8
/* f059d10: 00000000 */ sll $zero,$zero,0x0
@ -9336,7 +9336,7 @@ glabel var7f1a9d64
/* f059d40: 8fac009c */ lw $t4,0x9c($sp)
/* f059d44: 00402025 */ or $a0,$v0,$zero
/* f059d48: 24050006 */ addiu $a1,$zero,0x6
/* f059d4c: 0fc36d93 */ jal hudmsgCreateViaPresetWithColour
/* f059d4c: 0fc36d93 */ jal hudmsgCreateWithColour
/* f059d50: 91860009 */ lbu $a2,0x9($t4)
/* f059d54: 100000a4 */ beqz $zero,.NB0f059fe8
/* f059d58: 00000000 */ sll $zero,$zero,0x0
@ -9500,7 +9500,7 @@ glabel var7f1a9d64
/* f059fa4: 8fab009c */ lw $t3,0x9c($sp)
/* f059fa8: 00402025 */ or $a0,$v0,$zero
/* f059fac: 24050006 */ addiu $a1,$zero,0x6
/* f059fb0: 0fc36d93 */ jal hudmsgCreateViaPresetWithColour
/* f059fb0: 0fc36d93 */ jal hudmsgCreateWithColour
/* f059fb4: 91660009 */ lbu $a2,0x9($t3)
/* f059fb8: 1000000b */ beqz $zero,.NB0f059fe8
/* f059fbc: 00000000 */ sll $zero,$zero,0x0
@ -9710,14 +9710,14 @@ glabel var7f1a9d64
//
// if (!sndIsFiltered(audioid)) {
// // 8ac
// hudmsgCreateViaPresetWithColour(text, 6, cmd[9]);
// hudmsgCreateWithColour(text, HUDMSGTYPE_INGAMESUBTITLE, cmd[9]);
// }
// } else if (cmd[8]) {
// text = langGet(g_QuipTexts[cmd[8] - 1][1 + g_Vars.chrdata->tude]);
//
// if (!sndIsFiltered(audioid)) {
// // 904
// hudmsgCreateViaPresetWithColour(text, 6, cmd[9]);
// hudmsgCreateWithColour(text, HUDMSGTYPE_INGAMESUBTITLE, cmd[9]);
// }
// }
// } else {
@ -9771,7 +9771,7 @@ glabel var7f1a9d64
//
// if (!sndIsFiltered(audioid)) {
// // b78
// hudmsgCreateViaPresetWithColour(text, 6, cmd[9]);
// hudmsgCreateWithColour(text, HUDMSGTYPE_INGAMESUBTITLE, cmd[9]);
// }
// }
// } else {

10
src/game/game_127910.c
View File

@ -391,8 +391,8 @@ void playerAllocate(s32 index)
g_Vars.players[index]->viewport[i].unk0e = 0;
}
g_Vars.players[index]->viewx = 100;
g_Vars.players[index]->viewy = 100;
g_Vars.players[index]->viewwidth = 100;
g_Vars.players[index]->viewheight = 100;
g_Vars.players[index]->viewleft = 0;
g_Vars.players[index]->viewtop = 0;
@ -679,10 +679,10 @@ s32 propGetPlayerNum(struct prop *prop)
return -1;
}
void currentPlayerSetViewSize(s32 viewx, s32 viewy)
void currentPlayerSetViewSize(s32 width, s32 height)
{
g_Vars.currentplayer->viewx = viewx;
g_Vars.currentplayer->viewy = viewy;
g_Vars.currentplayer->viewwidth = width;
g_Vars.currentplayer->viewheight = height;
}
void currentPlayerSetViewPosition(s32 viewleft, s32 viewtop)

1322
src/game/hudmsg.c
View File

File diff suppressed because it is too large Load Diff

14
src/game/lv.c
View File

@ -3727,7 +3727,7 @@ Gfx *lvRender(Gfx *gdl)
setCurrentPlayerNum(0);
viSetViewPosition(g_Vars.currentplayer->viewleft, g_Vars.currentplayer->viewtop);
viSetFovAspectAndSize(g_Vars.currentplayer->fovy, g_Vars.currentplayer->aspect,
g_Vars.currentplayer->viewx, g_Vars.currentplayer->viewy);
g_Vars.currentplayer->viewwidth, g_Vars.currentplayer->viewheight);
func00016748(1);
gdl = func0000b1d0(gdl);
@ -3742,7 +3742,7 @@ Gfx *lvRender(Gfx *gdl)
setCurrentPlayerNum(0);
viSetViewPosition(g_Vars.currentplayer->viewleft, g_Vars.currentplayer->viewtop);
viSetFovAspectAndSize(g_Vars.currentplayer->fovy, g_Vars.currentplayer->aspect,
g_Vars.currentplayer->viewx, g_Vars.currentplayer->viewy);
g_Vars.currentplayer->viewwidth, g_Vars.currentplayer->viewheight);
func00016748(1);
gdl = func0000b1d0(gdl);
@ -3760,7 +3760,7 @@ Gfx *lvRender(Gfx *gdl)
setCurrentPlayerNum(0);
viSetViewPosition(g_Vars.currentplayer->viewleft, g_Vars.currentplayer->viewtop);
viSetFovAspectAndSize(g_Vars.currentplayer->fovy, g_Vars.currentplayer->aspect,
g_Vars.currentplayer->viewx, g_Vars.currentplayer->viewy);
g_Vars.currentplayer->viewwidth, g_Vars.currentplayer->viewheight);
func00016748(1);
gdl = func0000b1a8(gdl);
@ -3836,7 +3836,7 @@ Gfx *lvRender(Gfx *gdl)
viSetViewPosition(g_Vars.currentplayer->viewleft, g_Vars.currentplayer->viewtop);
viSetFovAspectAndSize(g_Vars.currentplayer->fovy, g_Vars.currentplayer->aspect,
g_Vars.currentplayer->viewx, g_Vars.currentplayer->viewy);
g_Vars.currentplayer->viewwidth, g_Vars.currentplayer->viewheight);
func00016748(g_Vars.currentplayerstats->scale_bg2gfx);
func0f1657f8();
func0f176298();
@ -7716,7 +7716,7 @@ glabel var7f1b8ed0pf
/* f16d284: 0fc5bdaa */ jal langGet
/* f16d288: 24045807 */ li $a0,0x5807
/* f16d28c: 00402025 */ move $a0,$v0
/* f16d290: 0fc37954 */ jal hudmsgCreateViaPreset
/* f16d290: 0fc37954 */ jal hudmsgCreate
/* f16d294: 00002825 */ move $a1,$zero
/* f16d298: 8e8c006c */ lw $t4,0x6c($s4)
/* f16d29c: 26100001 */ addiu $s0,$s0,0x1
@ -8391,7 +8391,7 @@ void lvTick(void)
for (i = 0; i < PLAYERCOUNT(); i++) {
setCurrentPlayerNum(i);
hudmsgCreateViaPreset(langGet(L_MISC_068), 0); // "One minute left."
hudmsgCreate(langGet(L_MISC_068), HUDMSGTYPE_DEFAULT); // "One minute left."
}
}
@ -9346,7 +9346,7 @@ glabel lvTick
/* f167268: 0fc5a4dd */ jal langGet
/* f16726c: 24045844 */ addiu $a0,$zero,0x5844
/* f167270: 00402025 */ or $a0,$v0,$zero
/* f167274: 0fc36d4d */ jal hudmsgCreateViaPreset
/* f167274: 0fc36d4d */ jal hudmsgCreate
/* f167278: 00002825 */ or $a1,$zero,$zero
/* f16727c: 8e98006c */ lw $t8,0x6c($s4)
/* f167280: 26100001 */ addiu $s0,$s0,0x1

80
src/game/mplayer/scenarios.c
View File

@ -949,7 +949,7 @@ void scenarioHtbCallback14(struct chrdata *chr)
if (g_Vars.currentplayerstats->tokenheldtime >= PALDOWN(7200)) {
sndStart(var80095200, SFX_MP_SCOREPOINT, NULL, -1, -1, -1, -1, -1);
var800ac500[g_Vars.currentplayernum]->unk3e++;
func0f0ddfa4(langGet(L_MPWEAPONS_024), 9, 1); // "1 Point!"
hudmsgCreateWithFlags(langGet(L_MPWEAPONS_024), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); // "1 Point!"
g_Vars.currentplayerstats->tokenheldtime = 0;
}
} else {
@ -3000,12 +3000,12 @@ glabel var7f1b8950
/* f1831e4: 24045416 */ li $a0,0x5416
/* f1831e8: 00402025 */ move $a0,$v0
/* f1831ec: 24050009 */ li $a1,0x9
/* f1831f0: 0fc37976 */ jal func0f0ddfa4
/* f1831f0: 0fc37976 */ jal hudmsgCreateWithFlags
/* f1831f4: 24060001 */ li $a2,0x1
/* f1831f8: 10000004 */ b .PF0f18320c
/* f1831fc: 8e98006c */ lw $t8,0x6c($s4)
.PF0f183200:
/* f183200: 0fc37976 */ jal func0f0ddfa4
/* f183200: 0fc37976 */ jal hudmsgCreateWithFlags
/* f183204: 24060001 */ li $a2,0x1
/* f183208: 8e98006c */ lw $t8,0x6c($s4)
.PF0f18320c:
@ -3138,7 +3138,7 @@ glabel var7f1b8950
/* f1833dc: 24045415 */ li $a0,0x5415
/* f1833e0: 00402025 */ move $a0,$v0
/* f1833e4: 24050009 */ li $a1,0x9
/* f1833e8: 0fc37976 */ jal func0f0ddfa4
/* f1833e8: 0fc37976 */ jal hudmsgCreateWithFlags
/* f1833ec: 24060001 */ li $a2,0x1
.PF0f1833f0:
/* f1833f0: 3c0d800b */ lui $t5,0x800b
@ -3692,12 +3692,12 @@ glabel var7f1b8950
/* f1821e0: 24045415 */ addiu $a0,$zero,0x5415
/* f1821e4: 00402025 */ or $a0,$v0,$zero
/* f1821e8: 24050009 */ addiu $a1,$zero,0x9
/* f1821ec: 0fc377e9 */ jal func0f0ddfa4
/* f1821ec: 0fc377e9 */ jal hudmsgCreateWithFlags
/* f1821f0: 24060001 */ addiu $a2,$zero,0x1
/* f1821f4: 10000004 */ b .L0f182208
/* f1821f8: 8e98006c */ lw $t8,0x6c($s4)
.L0f1821fc:
/* f1821fc: 0fc377e9 */ jal func0f0ddfa4
/* f1821fc: 0fc377e9 */ jal hudmsgCreateWithFlags
/* f182200: 24060001 */ addiu $a2,$zero,0x1
/* f182204: 8e98006c */ lw $t8,0x6c($s4)
.L0f182208:
@ -3828,7 +3828,7 @@ glabel var7f1b8950
/* f1823d0: 24045414 */ addiu $a0,$zero,0x5414
/* f1823d4: 00402025 */ or $a0,$v0,$zero
/* f1823d8: 24050009 */ addiu $a1,$zero,0x9
/* f1823dc: 0fc377e9 */ jal func0f0ddfa4
/* f1823dc: 0fc377e9 */ jal hudmsgCreateWithFlags
/* f1823e0: 24060001 */ addiu $a2,$zero,0x1
.L0f1823e4:
/* f1823e4: 3c0d800b */ lui $t5,%hi(g_MpNumPlayers)
@ -5385,7 +5385,7 @@ glabel var7f1b8960
/* f1834bc: 24045412 */ addiu $a0,$zero,0x5413
/* f1834c0: 00402025 */ or $a0,$v0,$zero
/* f1834c4: 24050009 */ addiu $a1,$zero,0x9
/* f1834c8: 0fc377e9 */ jal func0f0ddfa4
/* f1834c8: 0fc377e9 */ jal hudmsgCreateWithFlags
/* f1834cc: 24060001 */ addiu $a2,$zero,0x1
/* f1834d0: 3c18800b */ lui $t8,%hi(g_ScenarioData+0xd4)
/* f1834d4: 8f18c1e4 */ lw $t8,%lo(g_ScenarioData+0xd4)($t8)
@ -5422,7 +5422,7 @@ glabel var7f1b8960
/* f18354c: 24045413 */ addiu $a0,$zero,0x5414
/* f183550: 00402025 */ or $a0,$v0,$zero
/* f183554: 24050009 */ addiu $a1,$zero,0x9
/* f183558: 0fc377e9 */ jal func0f0ddfa4
/* f183558: 0fc377e9 */ jal hudmsgCreateWithFlags
/* f18355c: 24060001 */ addiu $a2,$zero,0x1
/* f183560: 3c013f80 */ lui $at,0x3f80
/* f183564: 44812000 */ mtc1 $at,$f4
@ -5613,7 +5613,7 @@ glabel var7f1b8960
/* f183814: 24045411 */ addiu $a0,$zero,0x5412
/* f183818: 00402025 */ or $a0,$v0,$zero
/* f18381c: 24050009 */ addiu $a1,$zero,0x9
/* f183820: 0fc377e9 */ jal func0f0ddfa4
/* f183820: 0fc377e9 */ jal hudmsgCreateWithFlags
/* f183824: 24060001 */ addiu $a2,$zero,0x1
/* f183828: 3c18800b */ lui $t8,%hi(g_ScenarioData+0xd4)
/* f18382c: 8f18c1e4 */ lw $t8,%lo(g_ScenarioData+0xd4)($t8)
@ -5668,7 +5668,7 @@ glabel var7f1b8960
/* f1838e8: 24045410 */ addiu $a0,$zero,0x5411
/* f1838ec: 00402025 */ or $a0,$v0,$zero
/* f1838f0: 24050009 */ addiu $a1,$zero,0x9
/* f1838f4: 0fc377e9 */ jal func0f0ddfa4
/* f1838f4: 0fc377e9 */ jal hudmsgCreateWithFlags
/* f1838f8: 24060001 */ addiu $a2,$zero,0x1
/* f1838fc: 3c0c800b */ lui $t4,%hi(g_ScenarioData+0xd4)
/* f183900: 8d8cc1e4 */ lw $t4,%lo(g_ScenarioData+0xd4)($t4)
@ -5816,7 +5816,7 @@ glabel var7f1b8960
/* f1834bc: 24045412 */ addiu $a0,$zero,0x5412
/* f1834c0: 00402025 */ or $a0,$v0,$zero
/* f1834c4: 24050009 */ addiu $a1,$zero,0x9
/* f1834c8: 0fc377e9 */ jal func0f0ddfa4
/* f1834c8: 0fc377e9 */ jal hudmsgCreateWithFlags
/* f1834cc: 24060001 */ addiu $a2,$zero,0x1
/* f1834d0: 3c18800b */ lui $t8,%hi(g_ScenarioData+0xd4)
/* f1834d4: 8f18c1e4 */ lw $t8,%lo(g_ScenarioData+0xd4)($t8)
@ -5853,7 +5853,7 @@ glabel var7f1b8960
/* f18354c: 24045413 */ addiu $a0,$zero,0x5413
/* f183550: 00402025 */ or $a0,$v0,$zero
/* f183554: 24050009 */ addiu $a1,$zero,0x9
/* f183558: 0fc377e9 */ jal func0f0ddfa4
/* f183558: 0fc377e9 */ jal hudmsgCreateWithFlags
/* f18355c: 24060001 */ addiu $a2,$zero,0x1
/* f183560: 3c013f80 */ lui $at,0x3f80
/* f183564: 44812000 */ mtc1 $at,$f4
@ -6044,7 +6044,7 @@ glabel var7f1b8960
/* f183814: 24045411 */ addiu $a0,$zero,0x5411
/* f183818: 00402025 */ or $a0,$v0,$zero
/* f18381c: 24050009 */ addiu $a1,$zero,0x9
/* f183820: 0fc377e9 */ jal func0f0ddfa4
/* f183820: 0fc377e9 */ jal hudmsgCreateWithFlags
/* f183824: 24060001 */ addiu $a2,$zero,0x1
/* f183828: 3c18800b */ lui $t8,%hi(g_ScenarioData+0xd4)
/* f18382c: 8f18c1e4 */ lw $t8,%lo(g_ScenarioData+0xd4)($t8)
@ -6099,7 +6099,7 @@ glabel var7f1b8960
/* f1838e8: 24045410 */ addiu $a0,$zero,0x5410
/* f1838ec: 00402025 */ or $a0,$v0,$zero
/* f1838f0: 24050009 */ addiu $a1,$zero,0x9
/* f1838f4: 0fc377e9 */ jal func0f0ddfa4
/* f1838f4: 0fc377e9 */ jal hudmsgCreateWithFlags
/* f1838f8: 24060001 */ addiu $a2,$zero,0x1
/* f1838fc: 3c0c800b */ lui $t4,%hi(g_ScenarioData+0xd4)
/* f183900: 8d8cc1e4 */ lw $t4,%lo(g_ScenarioData+0xd4)($t4)
@ -8905,10 +8905,10 @@ void mpCreateMatchStartHudmsgs(void)
setCurrentPlayerNum(i);
if (g_MpSetupSaveFile.locktype == MPLOCKTYPE_CHALLENGE) {
func0f0ddfa4(challengename, HUDMSGTYPE_DEFAULT, 1);
hudmsgCreateWithFlags(challengename, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE);
}
func0f0ddfa4(scenarioname, HUDMSGTYPE_DEFAULT, 1);
hudmsgCreateWithFlags(scenarioname, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE);
}
}
@ -10162,7 +10162,7 @@ void mpCreateScenarioHudmsg(s32 playernum, char *message)
s32 prevplayernum = g_Vars.currentplayernum;
setCurrentPlayerNum(playernum);
func0f0ddfa4(message, HUDMSGTYPE_MPSCENARIO, 1);
hudmsgCreateWithFlags(message, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE);
setCurrentPlayerNum(prevplayernum);
}
}
@ -10334,7 +10334,7 @@ glabel chrGiveBriefcase
/* f187a80: 02002025 */ move $a0,$s0
/* f187a84: 27a400d4 */ addiu $a0,$sp,0xd4
/* f187a88: 24050009 */ li $a1,0x9
/* f187a8c: 0fc37976 */ jal func0f0ddfa4
/* f187a8c: 0fc37976 */ jal hudmsgCreateWithFlags
/* f187a90: 24060001 */ li $a2,0x1
/* f187a94: 3c09800a */ lui $t1,0x800a
/* f187a98: 3c08800a */ lui $t0,0x800a
@ -10590,7 +10590,7 @@ glabel chrGiveBriefcase
/* f187e20: 160a0006 */ bne $s0,$t2,.PF0f187e3c
/* f187e24: 27a400d4 */ addiu $a0,$sp,0xd4
/* f187e28: 24050009 */ li $a1,0x9
/* f187e2c: 0fc37976 */ jal func0f0ddfa4
/* f187e2c: 0fc37976 */ jal hudmsgCreateWithFlags
/* f187e30: 24060001 */ li $a2,0x1
/* f187e34: 10000011 */ b .PF0f187e7c
/* f187e38: 8e2c006c */ lw $t4,0x6c($s1)
@ -10604,12 +10604,12 @@ glabel chrGiveBriefcase
/* f187e54: 170d0006 */ bne $t8,$t5,.PF0f187e70
/* f187e58: 00000000 */ nop
/* f187e5c: 27a40094 */ addiu $a0,$sp,0x94
/* f187e60: 0fc37976 */ jal func0f0ddfa4
/* f187e60: 0fc37976 */ jal hudmsgCreateWithFlags
/* f187e64: 24050009 */ li $a1,0x9
/* f187e68: 10000004 */ b .PF0f187e7c
/* f187e6c: 8e2c006c */ lw $t4,0x6c($s1)
.PF0f187e70:
/* f187e70: 0fc37976 */ jal func0f0ddfa4
/* f187e70: 0fc37976 */ jal hudmsgCreateWithFlags
/* f187e74: 24060001 */ li $a2,0x1
/* f187e78: 8e2c006c */ lw $t4,0x6c($s1)
.PF0f187e7c:
@ -10773,7 +10773,7 @@ glabel chrGiveBriefcase
/* f1880ac: 16180006 */ bne $s0,$t8,.PF0f1880c8
/* f1880b0: 27a40054 */ addiu $a0,$sp,0x54
/* f1880b4: 24050009 */ li $a1,0x9
/* f1880b8: 0fc37976 */ jal func0f0ddfa4
/* f1880b8: 0fc37976 */ jal hudmsgCreateWithFlags
/* f1880bc: 24060001 */ li $a2,0x1
/* f1880c0: 10000011 */ b .PF0f188108
/* f1880c4: 8e39006c */ lw $t9,0x6c($s1)
@ -10787,12 +10787,12 @@ glabel chrGiveBriefcase
/* f1880e0: 158f0006 */ bne $t4,$t7,.PF0f1880fc
/* f1880e4: 00000000 */ nop
/* f1880e8: 27a40094 */ addiu $a0,$sp,0x94
/* f1880ec: 0fc37976 */ jal func0f0ddfa4
/* f1880ec: 0fc37976 */ jal hudmsgCreateWithFlags
/* f1880f0: 24050009 */ li $a1,0x9
/* f1880f4: 10000004 */ b .PF0f188108
/* f1880f8: 8e39006c */ lw $t9,0x6c($s1)
.PF0f1880fc:
/* f1880fc: 0fc37976 */ jal func0f0ddfa4
/* f1880fc: 0fc37976 */ jal hudmsgCreateWithFlags
/* f188100: 24060001 */ li $a2,0x1
/* f188104: 8e39006c */ lw $t9,0x6c($s1)
.PF0f188108:
@ -11019,7 +11019,7 @@ glabel chrGiveBriefcase
/* f186a7c: 02002025 */ or $a0,$s0,$zero
/* f186a80: 27a400d4 */ addiu $a0,$sp,0xd4
/* f186a84: 24050009 */ addiu $a1,$zero,0x9
/* f186a88: 0fc377e9 */ jal func0f0ddfa4
/* f186a88: 0fc377e9 */ jal hudmsgCreateWithFlags
/* f186a8c: 24060001 */ addiu $a2,$zero,0x1
/* f186a90: 3c09800a */ lui $t1,%hi(g_Vars+0x6c)
/* f186a94: 3c08800a */ lui $t0,%hi(g_Vars+0x68)
@ -11287,7 +11287,7 @@ glabel chrGiveBriefcase
/* f186e4c: 160a0006 */ bne $s0,$t2,.L0f186e68
/* f186e50: 27a400d4 */ addiu $a0,$sp,0xd4
/* f186e54: 24050009 */ addiu $a1,$zero,0x9
/* f186e58: 0fc377e9 */ jal func0f0ddfa4
/* f186e58: 0fc377e9 */ jal hudmsgCreateWithFlags
/* f186e5c: 24060001 */ addiu $a2,$zero,0x1
/* f186e60: 10000011 */ b .L0f186ea8
/* f186e64: 8e2c006c */ lw $t4,0x6c($s1)
@ -11301,12 +11301,12 @@ glabel chrGiveBriefcase
/* f186e80: 170d0006 */ bne $t8,$t5,.L0f186e9c
/* f186e84: 00000000 */ nop
/* f186e88: 27a40094 */ addiu $a0,$sp,0x94
/* f186e8c: 0fc377e9 */ jal func0f0ddfa4
/* f186e8c: 0fc377e9 */ jal hudmsgCreateWithFlags
/* f186e90: 24050009 */ addiu $a1,$zero,0x9
/* f186e94: 10000004 */ b .L0f186ea8
/* f186e98: 8e2c006c */ lw $t4,0x6c($s1)
.L0f186e9c:
/* f186e9c: 0fc377e9 */ jal func0f0ddfa4
/* f186e9c: 0fc377e9 */ jal hudmsgCreateWithFlags
/* f186ea0: 24060001 */ addiu $a2,$zero,0x1
/* f186ea4: 8e2c006c */ lw $t4,0x6c($s1)
.L0f186ea8:
@ -11482,7 +11482,7 @@ glabel chrGiveBriefcase
/* f187108: 16180006 */ bne $s0,$t8,.L0f187124
/* f18710c: 27a40054 */ addiu $a0,$sp,0x54
/* f187110: 24050009 */ addiu $a1,$zero,0x9
/* f187114: 0fc377e9 */ jal func0f0ddfa4
/* f187114: 0fc377e9 */ jal hudmsgCreateWithFlags
/* f187118: 24060001 */ addiu $a2,$zero,0x1
/* f18711c: 10000011 */ b .L0f187164
/* f187120: 8e39006c */ lw $t9,0x6c($s1)
@ -11496,12 +11496,12 @@ glabel chrGiveBriefcase
/* f18713c: 158f0006 */ bne $t4,$t7,.L0f187158
/* f187140: 00000000 */ nop
/* f187144: 27a40094 */ addiu $a0,$sp,0x94
/* f187148: 0fc377e9 */ jal func0f0ddfa4
/* f187148: 0fc377e9 */ jal hudmsgCreateWithFlags
/* f18714c: 24050009 */ addiu $a1,$zero,0x9
/* f187150: 10000004 */ b .L0f187164
/* f187154: 8e39006c */ lw $t9,0x6c($s1)
.L0f187158:
/* f187158: 0fc377e9 */ jal func0f0ddfa4
/* f187158: 0fc377e9 */ jal hudmsgCreateWithFlags
/* f18715c: 24060001 */ addiu $a2,$zero,0x1
/* f187160: 8e39006c */ lw $t9,0x6c($s1)
.L0f187164:
@ -11728,7 +11728,7 @@ glabel chrGiveBriefcase
/* f180ee4: 02002025 */ or $a0,$s0,$zero
/* f180ee8: 27a400d4 */ addiu $a0,$sp,0xd4
/* f180eec: 24050009 */ addiu $a1,$zero,0x9
/* f180ef0: 0fc36d6f */ jal func0f0ddfa4
/* f180ef0: 0fc36d6f */ jal hudmsgCreateWithFlags
/* f180ef4: 24060001 */ addiu $a2,$zero,0x1
/* f180ef8: 3c09800a */ lui $t1,0x800a
/* f180efc: 3c08800a */ lui $t0,0x800a
@ -11990,7 +11990,7 @@ glabel chrGiveBriefcase
/* f18129c: 160f0006 */ bne $s0,$t7,.NB0f1812b8
/* f1812a0: 27a400d4 */ addiu $a0,$sp,0xd4
/* f1812a4: 24050009 */ addiu $a1,$zero,0x9
/* f1812a8: 0fc36d6f */ jal func0f0ddfa4
/* f1812a8: 0fc36d6f */ jal hudmsgCreateWithFlags
/* f1812ac: 24060001 */ addiu $a2,$zero,0x1
/* f1812b0: 10000011 */ beqz $zero,.NB0f1812f8
/* f1812b4: 8e2b006c */ lw $t3,0x6c($s1)
@ -12004,12 +12004,12 @@ glabel chrGiveBriefcase
/* f1812d0: 170c0006 */ bne $t8,$t4,.NB0f1812ec
/* f1812d4: 00000000 */ sll $zero,$zero,0x0
/* f1812d8: 27a40094 */ addiu $a0,$sp,0x94
/* f1812dc: 0fc36d6f */ jal func0f0ddfa4
/* f1812dc: 0fc36d6f */ jal hudmsgCreateWithFlags
/* f1812e0: 24050009 */ addiu $a1,$zero,0x9
/* f1812e4: 10000004 */ beqz $zero,.NB0f1812f8
/* f1812e8: 8e2b006c */ lw $t3,0x6c($s1)
.NB0f1812ec:
/* f1812ec: 0fc36d6f */ jal func0f0ddfa4
/* f1812ec: 0fc36d6f */ jal hudmsgCreateWithFlags
/* f1812f0: 24060001 */ addiu $a2,$zero,0x1
/* f1812f4: 8e2b006c */ lw $t3,0x6c($s1)
.NB0f1812f8:
@ -12185,7 +12185,7 @@ glabel chrGiveBriefcase
/* f181558: 16180006 */ bne $s0,$t8,.NB0f181574
/* f18155c: 27a40054 */ addiu $a0,$sp,0x54
/* f181560: 24050009 */ addiu $a1,$zero,0x9
/* f181564: 0fc36d6f */ jal func0f0ddfa4
/* f181564: 0fc36d6f */ jal hudmsgCreateWithFlags
/* f181568: 24060001 */ addiu $a2,$zero,0x1
/* f18156c: 10000011 */ beqz $zero,.NB0f1815b4
/* f181570: 8e39006c */ lw $t9,0x6c($s1)
@ -12199,12 +12199,12 @@ glabel chrGiveBriefcase
/* f18158c: 156e0006 */ bne $t3,$t6,.NB0f1815a8
/* f181590: 00000000 */ sll $zero,$zero,0x0
/* f181594: 27a40094 */ addiu $a0,$sp,0x94
/* f181598: 0fc36d6f */ jal func0f0ddfa4
/* f181598: 0fc36d6f */ jal hudmsgCreateWithFlags
/* f18159c: 24050009 */ addiu $a1,$zero,0x9
/* f1815a0: 10000004 */ beqz $zero,.NB0f1815b4
/* f1815a4: 8e39006c */ lw $t9,0x6c($s1)
.NB0f1815a8:
/* f1815a8: 0fc36d6f */ jal func0f0ddfa4
/* f1815a8: 0fc36d6f */ jal hudmsgCreateWithFlags
/* f1815ac: 24060001 */ addiu $a2,$zero,0x1
/* f1815b0: 8e39006c */ lw $t9,0x6c($s1)
.NB0f1815b4:
@ -12434,7 +12434,7 @@ s32 chrGiveUplink(struct chrdata *chr, struct prop *prop)
for (i = 0; i < PLAYERCOUNT(); i++) {
if (chr->aibot || i != playernum) {
setCurrentPlayerNum(i);
func0f0ddfa4(message, HUDMSGTYPE_MPSCENARIO, 1);
hudmsgCreateWithFlags(message, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE);
}
}

10
src/game/mpstats.c
View File

@ -94,7 +94,7 @@ void mpstatsRecordPlayerKill(void)
// Show HUD message
// "Kill count: %d"
sprintf(text, "%s: %d\n", langGet(L_GUN_001), g_Vars.currentplayerstats->killcount);
hudmsgCreateViaPreset(text, HUDMSGTYPE_DEFAULT);
hudmsgCreate(text, HUDMSGTYPE_DEFAULT);
// Update slowest/fastest two kills
if (g_Vars.currentplayerstats->killcount > 1) {
@ -161,7 +161,7 @@ void mpstatsRecordPlayerDeath(void)
langGet(L_GUN_004)); // "times"
}
hudmsgCreateViaPreset(buffer, HUDMSGTYPE_DEFAULT);
hudmsgCreate(buffer, HUDMSGTYPE_DEFAULT);
}
}
@ -187,7 +187,7 @@ void mpstatsRecordPlayerSuicide(void)
// Show HUD message
// "Suicide count: %d"
sprintf(text, "%s: %d\n", langGet(L_GUN_005), mpchr->killcounts[mpindex]);
hudmsgCreateViaPreset(text, HUDMSGTYPE_DEFAULT);
hudmsgCreate(text, HUDMSGTYPE_DEFAULT);
// Update slowest/fastest two kills
if (g_Vars.currentplayerstats->killcount > 1) {
@ -294,7 +294,7 @@ void mpstatsRecordDeath(s32 aplayernum, s32 vplayernum)
if (g_Vars.normmplayerisrunning && aplayernum >= 0) {
// "Killed by %s"
sprintf(text, "%s %s", langGet(L_MISC_183), var800ac500[aplayernum]->name);
hudmsgCreateViaPreset(text, HUDMSGTYPE_DEFAULT);
hudmsgCreate(text, HUDMSGTYPE_DEFAULT);
}
mpstatsRecordPlayerDeath();
@ -314,7 +314,7 @@ void mpstatsRecordDeath(s32 aplayernum, s32 vplayernum)
if (g_Vars.normmplayerisrunning && vplayernum >= 0) {
// "Killed %s"
sprintf(text, "%s %s", langGet(L_MISC_184), var800ac500[vplayernum]->name);
hudmsgCreateViaPreset(text, HUDMSGTYPE_DEFAULT);
hudmsgCreate(text, HUDMSGTYPE_DEFAULT);
}
mpstatsRecordPlayerKill();

8
src/game/objectives/objectives.c
View File

@ -369,7 +369,7 @@ void objectivesShowHudmsg(char *buffer, s32 hudmsgtype)
setCurrentPlayerNum(i);
if (g_Vars.currentplayer == g_Vars.bond || g_Vars.currentplayer == g_Vars.coop) {
func0f0ddfa4(buffer, hudmsgtype, 24);
hudmsgCreateWithFlags(buffer, hudmsgtype, HUDMSGFLAG_DELAY | HUDMSGFLAG_ALLOWDUPES);
}
}
@ -409,13 +409,13 @@ void objectivesCheckAll(void)
#else
if (status == OBJECTIVE_COMPLETE) {
strcat(buffer, langGet(L_MISC_045)); // "Completed"
func0f0ddfa4(buffer, HUDMSGTYPE_OBJECTIVECOMPLETE, 24);
hudmsgCreateWithFlags(buffer, HUDMSGTYPE_OBJECTIVECOMPLETE, HUDMSGFLAG_DELAY | HUDMSGFLAG_ALLOWDUPES);
} else if (status == OBJECTIVE_INCOMPLETE) {
strcat(buffer, langGet(L_MISC_046)); // "Incomplete"
func0f0ddfa4(buffer, HUDMSGTYPE_OBJECTIVECOMPLETE, 24);
hudmsgCreateWithFlags(buffer, HUDMSGTYPE_OBJECTIVECOMPLETE, HUDMSGFLAG_DELAY | HUDMSGFLAG_ALLOWDUPES);
} else if (status == OBJECTIVE_FAILED) {
strcat(buffer, langGet(L_MISC_047)); // "Failed"
func0f0ddfa4(buffer, HUDMSGTYPE_OBJECTIVEFAILED, 24);
hudmsgCreateWithFlags(buffer, HUDMSGTYPE_OBJECTIVEFAILED, HUDMSGFLAG_DELAY | HUDMSGFLAG_ALLOWDUPES);
}
#endif
}

40
src/game/propobj.c
View File

@ -60480,7 +60480,7 @@ void currentPlayerQueuePickupAmmoHudmsg(s32 ammotype, s32 pickupqty)
char buffer[100] = "";
ammotypeGetPickupMessage(buffer, ammotype, pickupqty);
func0f0ddfa4(buffer, HUDMSGTYPE_DEFAULT, 1);
hudmsgCreateWithFlags(buffer, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE);
}
GLOBAL_ASM(
@ -60879,7 +60879,7 @@ void currentPlayerQueuePickupWeaponHudmsg(u32 weaponnum, bool dual)
char buffer[100] = "";
weaponGetPickupText(buffer, weaponnum, dual);
func0f0ddfa4(buffer, HUDMSGTYPE_DEFAULT, 9);
hudmsgCreateWithFlags(buffer, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_ALLOWDUPES);
}
const char var7f1aa140[] = "autodoorcanclose: blocking door\n\n";
@ -61040,7 +61040,7 @@ glabel var7f1aae70
/* f08891c: 00402025 */ or $a0,$v0,$zero
.L0f088920:
/* f088920: 00002825 */ or $a1,$zero,$zero
/* f088924: 0fc377e9 */ jal func0f0ddfa4
/* f088924: 0fc377e9 */ jal hudmsgCreateWithFlags
/* f088928: 24060009 */ addiu $a2,$zero,0x9
.L0f08892c:
/* f08892c: 1000019d */ b .L0f088fa4
@ -61189,7 +61189,7 @@ glabel var7f1aae70
/* f088b40: 10400006 */ beqz $v0,.L0f088b5c
/* f088b44: 00402025 */ or $a0,$v0,$zero
/* f088b48: 00002825 */ or $a1,$zero,$zero
/* f088b4c: 0fc377e9 */ jal func0f0ddfa4
/* f088b4c: 0fc377e9 */ jal hudmsgCreateWithFlags
/* f088b50: 24060009 */ addiu $a2,$zero,0x9
/* f088b54: 10000008 */ b .L0f088b78
/* f088b58: 240f0001 */ addiu $t7,$zero,0x1
@ -61246,7 +61246,7 @@ glabel var7f1aae70
/* f088c0c: 24190001 */ addiu $t9,$zero,0x1
/* f088c10: afb90070 */ sw $t9,0x70($sp)
/* f088c14: 00002825 */ or $a1,$zero,$zero
/* f088c18: 0fc377e9 */ jal func0f0ddfa4
/* f088c18: 0fc377e9 */ jal hudmsgCreateWithFlags
/* f088c1c: 24060009 */ addiu $a2,$zero,0x9
/* f088c20: 1000000a */ b .L0f088c4c
/* f088c24: 240c0001 */ addiu $t4,$zero,0x1
@ -61453,7 +61453,7 @@ glabel var7f1aae70
/* f088f00: 00402025 */ or $a0,$v0,$zero
.L0f088f04:
/* f088f04: 00002825 */ or $a1,$zero,$zero
/* f088f08: 0fc377e9 */ jal func0f0ddfa4
/* f088f08: 0fc377e9 */ jal hudmsgCreateWithFlags
/* f088f0c: 24060001 */ addiu $a2,$zero,0x1
/* f088f10: 240e0001 */ addiu $t6,$zero,0x1
.L0f088f14:
@ -61491,7 +61491,7 @@ glabel var7f1aae70
/* f088f88: 00402025 */ or $a0,$v0,$zero
.L0f088f8c:
/* f088f8c: 00002825 */ or $a1,$zero,$zero
/* f088f90: 0fc377e9 */ jal func0f0ddfa4
/* f088f90: 0fc377e9 */ jal hudmsgCreateWithFlags
/* f088f94: 24060009 */ addiu $a2,$zero,0x9
/* f088f98: 240b0004 */ addiu $t3,$zero,0x4
.L0f088f9c:
@ -61687,7 +61687,7 @@ glabel var7f1aae70
/* f08891c: 00402025 */ or $a0,$v0,$zero
.L0f088920:
/* f088920: 00002825 */ or $a1,$zero,$zero
/* f088924: 0fc377e9 */ jal func0f0ddfa4
/* f088924: 0fc377e9 */ jal hudmsgCreateWithFlags
/* f088928: 24060009 */ addiu $a2,$zero,0x9
.L0f08892c:
/* f08892c: 1000019d */ b .L0f088fa4
@ -61836,7 +61836,7 @@ glabel var7f1aae70
/* f088b40: 10400006 */ beqz $v0,.L0f088b5c
/* f088b44: 00402025 */ or $a0,$v0,$zero
/* f088b48: 00002825 */ or $a1,$zero,$zero
/* f088b4c: 0fc377e9 */ jal func0f0ddfa4
/* f088b4c: 0fc377e9 */ jal hudmsgCreateWithFlags
/* f088b50: 24060009 */ addiu $a2,$zero,0x9
/* f088b54: 10000008 */ b .L0f088b78
/* f088b58: 240f0001 */ addiu $t7,$zero,0x1
@ -61893,7 +61893,7 @@ glabel var7f1aae70
/* f088c0c: 24190001 */ addiu $t9,$zero,0x1
/* f088c10: afb90070 */ sw $t9,0x70($sp)
/* f088c14: 00002825 */ or $a1,$zero,$zero
/* f088c18: 0fc377e9 */ jal func0f0ddfa4
/* f088c18: 0fc377e9 */ jal hudmsgCreateWithFlags
/* f088c1c: 24060009 */ addiu $a2,$zero,0x9
/* f088c20: 1000000a */ b .L0f088c4c
/* f088c24: 240c0001 */ addiu $t4,$zero,0x1
@ -62100,7 +62100,7 @@ glabel var7f1aae70
/* f088f00: 00402025 */ or $a0,$v0,$zero
.L0f088f04:
/* f088f04: 00002825 */ or $a1,$zero,$zero
/* f088f08: 0fc377e9 */ jal func0f0ddfa4
/* f088f08: 0fc377e9 */ jal hudmsgCreateWithFlags
/* f088f0c: 24060001 */ addiu $a2,$zero,0x1
/* f088f10: 240e0001 */ addiu $t6,$zero,0x1
.L0f088f14:
@ -62138,7 +62138,7 @@ glabel var7f1aae70
/* f088f88: 00402025 */ or $a0,$v0,$zero
.L0f088f8c:
/* f088f8c: 00002825 */ or $a1,$zero,$zero
/* f088f90: 0fc377e9 */ jal func0f0ddfa4
/* f088f90: 0fc377e9 */ jal hudmsgCreateWithFlags
/* f088f94: 24060009 */ addiu $a2,$zero,0x9
/* f088f98: 240b0004 */ addiu $t3,$zero,0x4
.L0f088f9c:
@ -62208,7 +62208,7 @@ glabel var7f1aae70
// text = langGet(L_PROPOBJ_040); // "Picked up a key."
// }
//
// func0f0ddfa4(text, HUDMSGTYPE_DEFAULT, 9);
// hudmsgCreateWithFlags(text, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_ALLOWDUPES);
// }
//
// result = TICKOP_GIVETOPLAYER;
@ -62289,7 +62289,7 @@ glabel var7f1aae70
// char *text = invGetActivatedTextByObj(obj);
//
// if (text) {
// func0f0ddfa4(text, HUDMSGTYPE_DEFAULT, 9);
// hudmsgCreateWithFlags(text, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_ALLOWDUPES);
// } else {
// currentPlayerQueuePickupWeaponHudmsg(weapon->weaponnum, count == 2);
// }
@ -62322,7 +62322,7 @@ glabel var7f1aae70
//
// if (text) {
// sp112 = true;
// func0f0ddfa4(text, HUDMSGTYPE_DEFAULT, 9);
// hudmsgCreateWithFlags(text, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_ALLOWDUPES);
// } else {
// if (sp112) {
// currentPlayerQueuePickupWeaponHudmsg(weapon->weaponnum, count == 2);
@ -62405,7 +62405,7 @@ glabel var7f1aae70
// }
// }
//
// func0f0ddfa4(text, HUDMSGTYPE_DEFAULT, 1);
// hudmsgCreateWithFlags(text, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE);
// }
//
// sp94[1] = TICKOP_FREE;
@ -62464,7 +62464,7 @@ glabel var7f1aae70
// text = langGet(L_PROPOBJ_043); // "Picked up something."
// }
//
// func0f0ddfa4(text, HUDMSGTYPE_DEFAULT, 9);
// hudmsgCreateWithFlags(text, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_ALLOWDUPES);
// }
//
// sp94[1] = TICKOP_GIVETOPLAYER;
@ -68653,11 +68653,11 @@ bool propdoorInteract(struct prop *doorprop)
}
if (override && override->activatetextid) {
func0f0ddfa4(langGet(override->activatetextid), 0, 1);
hudmsgCreateWithFlags(langGet(override->activatetextid), HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE);
} else if (intraining) {
func0f0ddfa4(langGet(L_DISH_080), 0, 1); // "Cannot exit while training is in progress."
hudmsgCreateWithFlags(langGet(L_DISH_080), HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE); // "Cannot exit while training is in progress."
} else {
func0f0ddfa4(langGet(PAL ? L_PROPOBJ_041 : L_PROPOBJ_044), 0, 1); // "This door is locked."
hudmsgCreateWithFlags(langGet(PAL ? L_PROPOBJ_041 : L_PROPOBJ_044), HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE); // "This door is locked."
}
}

2
src/game/training/training.c
View File

@ -1181,7 +1181,7 @@ void frExecuteHelpScript(void)
g_FrData.helpscriptenabled = false;
break;
case FRCMD_HUDMSG:
hudmsgCreateViaPreset(frGetInstructionalText(script[offset + 1]), HUDMSGTYPE_TRAINING);
hudmsgCreate(frGetInstructionalText(script[offset + 1]), HUDMSGTYPE_TRAINING);
g_FrData.helpscriptoffset += 2;
break;
case FRCMD_HELPWAITSECONDS:

13
src/include/constants.h
View File

@ -1106,6 +1106,16 @@
#define HUDHALIGN_LEFT 1
#define HUDHALIGN_MIDDLE 2
#define HUDMSGALIGN_SCREENLEFT 0
#define HUDMSGALIGN_LEFT 1
#define HUDMSGALIGN_RIGHT 2
#define HUDMSGALIGN_XMIDDLE 3
#define HUDMSGALIGN_SCREENTOP 4
#define HUDMSGALIGN_TOP 5
#define HUDMSGALIGN_BOTTOM 6
#define HUDMSGALIGN_YMIDDLE 7
#define HUDMSGALIGN_BELOWVIEWPORT 8
#define HUDMSGFLAG_ONLYIFALIVE 0x01
#define HUDMSGFLAG_FORCEOFF 0x02 // for subtitles - turn off message immediately rather than when audio finishes
#define HUDMSGFLAG_NOCHANNEL 0x04 // not linked to audio
@ -1126,7 +1136,10 @@
#define HUDMSGTYPE_OBJECTIVEFAILED 2
#define HUDMSGTYPE_3 3
#define HUDMSGTYPE_4 4
#define HUDMSGTYPE_5 5
#define HUDMSGTYPE_INGAMESUBTITLE 6
#define HUDMSGTYPE_7 7
#define HUDMSGTYPE_8 8
#define HUDMSGTYPE_MPSCENARIO 9
#define HUDMSGTYPE_TRAINING 10
#define HUDMSGTYPE_CUTSCENESUBTITLE 11

14
src/include/game/hudmsg.h
View File

@ -4,7 +4,7 @@
#include "data.h"
#include "types.h"
u8 func0f0dcdb0(void);
u8 hudmsgsAreActive(void);
s32 hudmsgIsZoomRangeVisible(void);
Gfx *hudmsgRenderMissionTimer(Gfx *gdl, u32 arg1);
Gfx *hudmsgRenderZoomRange(Gfx *gdl, s32 arg1);
@ -14,13 +14,13 @@ void hudmsgsHideByChannel(s32 value);
void hudmsgsInit(void);
void hudmsgRemoveAll(void);
s32 hudmsgGetNext(s32 refid);
void hudmsgCreateViaPreset(char *text, s32 type);
void func0f0ddfa4(char *text, s32 type, s32 arg2);
void hudmsgCreateViaPresetWithColour(char *text, s32 type, u8 colour);
void hudmsgCreateViaStruct(char *text, s32 type, struct hudmessageconfig *config, s32 arg3);
void hudmsgCreate(char *text, s32 type);
void hudmsgCreateWithFlags(char *text, s32 type, u32 flags);
void hudmsgCreateWithColour(char *text, s32 type, u8 colour);
void hudmsgCreateWithDuration(char *text, s32 type, struct hudmsgtype *config, s32 duration60);
u32 func0f0de160(void);
void func0f0de7fc(struct hudmessage *msg);
void hudmsgCreate(char *text, s32 type, s32 conf00, s32 conf01, s32 conf02,
void hudmsgCalculatePosition(struct hudmessage *msg);
void hudmsgCreateFromArgs(char *text, s32 type, s32 conf00, s32 conf01, s32 conf02,
struct hudmessagething *conf04, struct hudmessagething *conf08,
u32 textcolour, u32 shadowcolour,
u32 alignh, s32 conf16, u32 alignv, s32 conf18, s32 arg14, u32 flags);

16
src/include/types.h
View File

@ -2671,10 +2671,10 @@ struct player {
/*0x050c*/ u32 unk050c;
/*0x0510*/ Mtxf bondheadmatrices[4];
/*0x0610*/ struct player0610 viewport[2];
/*0x0630*/ s16 viewx; // 320 lo-res, 640 hi-res
/*0x0632*/ s16 viewy; // 220 regardless of res
/*0x0634*/ s16 viewleft; // 0
/*0x0636*/ s16 viewtop; // 0
/*0x0630*/ s16 viewwidth; // 320 lo-res, 640 hi-res
/*0x0632*/ s16 viewheight; // 220 regardless of res
/*0x0634*/ s16 viewleft; // 0
/*0x0636*/ s16 viewtop; // 0
/*0x0638*/ struct hand hands[2];
struct gunctrl gunctrl;
/*0x15f8*/ f32 gunposamplitude;
@ -5148,7 +5148,7 @@ struct hudmessagething {
s32 unk00;
};
struct hudmessageconfig {
struct hudmsgtype {
/*0x00*/ u8 unk00;
/*0x01*/ u8 unk01;
/*0x02*/ u8 unk02;
@ -5187,9 +5187,9 @@ struct hudmessage {
/*0x1c4*/ u32 flags;
/*0x1c8*/ u8 alignh;
/*0x1c9*/ u8 alignv;
/*0x1cc*/ u32 unk1cc;
/*0x1d0*/ u32 unk1d0;
/*0x1d4*/ u32 unk1d4;
/*0x1cc*/ u32 xmarginextra;
/*0x1d0*/ u32 xmargin;
/*0x1d4*/ u32 ymargin;
/*0x1d8*/ u32 hash;
};

2
src/lib/main.c
View File

@ -2624,7 +2624,7 @@ void mainTick(void)
viSetViewPosition(g_Vars.currentplayer->viewleft, g_Vars.currentplayer->viewtop);
viSetFovAspectAndSize(
g_Vars.currentplayer->fovy, g_Vars.currentplayer->aspect,
g_Vars.currentplayer->viewx, g_Vars.currentplayer->viewy);
g_Vars.currentplayer->viewwidth, g_Vars.currentplayer->viewheight);
}
lvRecordDistanceMoved();