From dd7927900f3fb0063d7ba13a8dd223b62bcac756 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 17 Jan 2021 01:06:06 +1000 Subject: [PATCH] Minor cleanup --- Makefile | 2 +- src/game/activemenu/activemenu.c | 198 ++++++++++++++-------------- src/game/camdraw.c | 4 +- src/game/core.c | 2 +- src/game/credits.c | 21 ++- src/game/data/data_0258c0.c | 2 +- src/game/game_01bea0.c | 16 +-- src/game/game_097ba0.c | 60 ++++----- src/game/game_0b69d0.c | 4 +- src/game/game_0d4690.c | 4 +- src/game/game_0d7070.c | 92 ++++++------- src/game/game_0dcdb0.c | 84 ++++++------ src/game/game_0e0770.c | 28 ++-- src/game/game_0f09f0.c | 108 +++++++-------- src/game/game_102240.c | 12 +- src/game/game_107fb0.c | 12 +- src/game/game_1531a0.c | 50 +++---- src/game/game_157db0.c | 2 +- src/game/menu/items.c | 78 +++++------ src/game/mplayer/ingame.c | 4 +- src/game/mplayer/setup.c | 12 +- src/game/radar.c | 20 +-- src/game/title.c | 2 +- src/game/training/menus.c | 12 +- src/include/constants.h | 6 +- src/include/game/data/data_020df0.h | 2 +- src/include/game/radar.h | 2 +- src/include/gbiex.h | 6 +- 28 files changed, 425 insertions(+), 420 deletions(-) diff --git a/Makefile b/Makefile index c23492554..834928a55 100644 --- a/Makefile +++ b/Makefile @@ -71,7 +71,7 @@ CFLAGS := -DVERSION=$(VERSION) \ -I src/include \ -mips2 -C_FILES := $(shell find src/boot src/lib src/game src/inflate src/gvars src/mpconfigs src/mpstrings/$(ROMID) src/firingrange src/filenames src/textureconfig -name '*.c') +C_FILES := $(shell find src/gvars src/boot src/lib src/game src/inflate src/mpconfigs src/mpstrings/$(ROMID) src/firingrange src/filenames src/textureconfig -name '*.c') O_FILES := $(patsubst src/%.c, $(B_DIR)/%.o, $(C_FILES)) ASSET_AUDIO_FILES := Arecep01M Arecep02M Arecep03M Arecep04M Arecep05M Arecep06M Arlguard1M Arltech01M Arltech02M Arltech03M Arltech04M Arltech05M Arltech06M Ascie2aM Ascie2bM Ascie2cM Ascie2dM Ascie2eM Ascie2fM Ascie2gM Ascie3aM Ascie3bM Ascie3cM Ascie3dM Ascie3eM Ascie3gM Ascien10aM Ascien2_aM Ascien3_aM Ascien4_aM Ascien5_aM Ascien6_aM Ascien7_aM Ascien9_aM AvilgrimM Awepgd01M Awepgd02M Awepgd03M Awepsc01M Awepsc02M Awepsc03M Aa51elv01M Aa51elv02M Aa51elv03M Aa51grd01M Aa51grd02M Aa51grd03M Aa51grd04M Aa51grd05M Aa51grd06M Aa51grd07M Aa51grd08M Aa51grd09M Aa51grd10M Aa51jo1M Aa51jo2M Aa51jo3M Aa51jo4M Aa51jo5M Aa51jo6M Aa51jon01M Aa51jon02M Aa51jon03M Aa51jon04M Aa51jon05M Aa51jon06M Aa51jon07M Aa51jon08M Aa51jon09M Aa51jon10M Aa51jon11M Aa51jon12M Aa51jon14M Aa51jon15M Aa51sci1M Aaf1jo01M Aaf1jo02M Aaf1jo03M Aaf1pr01M Aaf1pr02M Aaf1pr03M Aaf1pr04M Aaf1pr05M Aaf1pr06M Aaf1pr07M Aaf1pr08M Aaf1pr09M Aaf1pr10M Aaf1tr01M Aaf1tr02M Aaf1tr03M Aairbgd01M Aairbgd02M Aairbgd03M Aairbgd04M Aairbgd05M Aairbgd06M Aairbgd07M Aairbgd08M Aairbgd09M Aairbgd10M Aairbgd11M Aairbgd12M Aairbgd13M Aairbgd14M Aairbgd15M Aairbgd16M Aairstw01M Aairstw02M Aairstw03M Aassael01M Aassael02M Aassael03M Aassael04M Aassael05M Aassael06M Absewrk01M Absewrk02M Absewrk03M Absewrk04M Absewrk05M Acetael01M Achdroid1M Achdroid2M Acsec01M Acsec02M Acsec03M Acstan1M Acstan2M Adevr01M Adevr02M Adevr03M Adevr04M Adevr05M Adevr06M Adevr07M Adevr08M Adevr09M Adevr10M Adevr11M Adevr12M Aexec01M Aexec02M Aexec04M Aexec05M Aexec06M Aexec07M Aexec08M Aexec09M Aexec10M Aexec11M Aexec12M Aexec13M Aexec14M Ahelic01M Ahelic02M Ahelic03M Ahologd01M AholohopkM Ainvcar01M Ainvcar02M Ainvcar03M Ainvcar04M Ainvcar05M Ainvcar06M Ainvcar07M Ainvcar08M Ainvcar09M Ainvcar10M Ainvcar11M Ainvcar12M AinvfarrM AinvfemaM AinvfostM AinvgrimM AinvhopkM AinvmaleM Ajoexec01M Ajoexec02M Ajosci01M Ajosci02M Ajosci03M Alabacc1M Alabacc2M Alabacc3M Alabacc4M Alabacc5M Alabacc6M Alabtech1M Alabtech2M Alabtech3M Alabtech5M Alabtech6M Alabtech7M Alabtech8M Alabtech9M Aoffwrk01M Aoffwrk02M Aoffwrk03M Aoffwrk04M Am1_l1_aM Am1_l1_bM Am1_l1_cM Am1_l1_dM Am1_l2_aM Am1_l2_bM Am1_l2_cM Am1_l2_dM Am1_l3_aM Am1_l3_bM Am1_l3_cM Am1_l3_dM Am2_l1_aM Am2_l1_bM Am2_l1_cM Am2_l1_dM Am3_l1_aM Am3_l1_bM Am3_l1_cM Am3_l1_dM Am3_l2_aM Am3_l2_bM Am3_l2_cM Am3_l2_dM Am4_l1_aM Am4_l1_bM Am4_l1_cM Am4_l1_dM Am4_l2_aM Am4_l2_bM Am4_l2_cM Am4_l2_dM Am4_l3_aM Am4_l3_bM Am4_l3_cM Am4_l3_dM Am5_l1_aM Am5_l1_bM Am5_l1_cM Am5_l1_dM Am5_l2_aM Am5_l2_bM Am5_l2_cM Am5_l2_dM Am5_l3_aM Am5_l3_bM Am5_l3_cM Am5_l3_dM Am6_l1_aM Am6_l1_bM Am6_l1_cM Am6_l1_dM Am6_l2_aM Am6_l2_bM Am6_l2_cM Am6_l2_dM Am7_l1_aM Am7_l1_bM Am7_l1_cM Am7_l1_dM Am8_l1_aM Am8_l1_bM Am8_l1_cM Am8_l1_dM Am9_l1_aM Am9_l1_bM Am9_l1_cM Am9_l1_dM Ap1_01_joM Ap1_02_caM Ap1_03_joM Ap1_04_caM Ap1_05_joM Ap1_06_caM Ap1_07_joM Ap1_08_caM Ap2_01_joM Ap2_02_joM Ap2_03_drM Ap2_04_joM Ap2_05_joM Ap2_06_drM Ap2_07_drM Ap3_01_gdM Ap3_02_joM Ap3_03_joM Ap4_01_dvM Ap4_02_joM Ap4_03_dvM Ap4_04_joM Ap4_05_dvM Ap4_06_joM Ap4_07_blM Ap4_08_dvM Ap4_09_dvM Ap5_01_joM Ap5_02_joM Ap5_03_joM Ap6_01_joM Ap6_02_caM Ap6_03_joM Ap6_04_caM Ap6_05_joM Ap6_06_caM Ap7_01_caM Ap7_02_joM Ap7_03_caM Ap7_04_joM Ap8_01_dvM Ap8_02_blM Ap8_03_dvM Ap8_04_blM Ap8_06_blM Ap8_07_trM Ap8_08_dvM Ap8_09_trM Ap8_10_blM Ap9_01_joM Ap9_02_caM Ap9_03_joM Ap10_01_caM Ap10_02_caM Ap10_03_caM Ap10_04_caM Ap10_05_joM Ap10_06_caM Ap10_07_joM Ap10_08_caM Ap10_09_joM Ap11_01_jnM Ap11_02_joM Ap11_03_jnM Ap11_04_joM Ap11_05_jnM Ap11_06_joM Ap11_07_jnM Ap11_08_joM Ap12_01_jnM Ap12_02_joM Ap12_03_jnM Ap12_04_joM Ap12_05_jnM Ap12_06_joM Ap12_07_jnM Ap12_08_joM Ap12_09_jnM Ap12_10_joM Ap13_01_joM Ap13_02_suM Ap13_03_joM Ap13_04_suM Ap13_06_suM Ap14_03_suM Ap14_04_joM Ap14_05_suM Ap14_07_joM Ap15_01_elM Ap15_02_elM Ap15_03_joM Ap15_04_jnM Ap15_05_elM Ap15_06_joM Ap15_07_elM Ap15_08_joM Ap15_09_elM Ap15_10_joM Ap15_11_elM Ap16_01_joM Ap16_02_caM Ap16_04_caM Ap16_05_joM Ap16_06_caM Ap17_01_trM Ap17_02_prM Ap17_03_trM Ap17_04_prM Ap17_05_trM Ap17_06_trM Ap18_01_joM Ap18_02_elM Ap18_03_elM Ap18_04_joM Ap18_05_elM Ap19_01_caM Ap19_02_caM Ap19_03_joM Ap19_04_caM Ap19_05_joM Ap19_06_joM Ap20_01_joM Ap20_02_prM Ap20_03_joM Ap20_04_prM Ap20_05_joM Ap20_06_blM Ap20_07_trM Ap20_08_trM Ap21_01_elM Ap21_02_joM Ap21_03_elM Ap21_04_joM Ap22_01_elM Ap22_02_joM Ap22_03_elM Ap22_04_joM Ap23_01_joM Ap23_02_drM Ap23_03_joM Ap23_04_drM Ap23_05_joM Ap23_06_drM Ap23_07_joM Ap23_08_drM Ap24_01_caM Ap24_02_joM Ap24_03_caM Ap24_04_joM Ap24_05_caM Ap24_06_caM Ap24_07_joM Ap24_08_joM Ap25_01_joM Ap25_02_joM Ap26_01_joM Ap26_02_dvM Ap26_03_joM Ap26_04_dvM Ap26_05_dvM Ap26_06_joM Ap26_07_dvM Ap26_08_dvM Ap27_01_joM Ap27_02_elM Ap27_03_elM Ap27_04_joM Ap27_05_joM Ap27_06_elM Ap28_01_elM Ap28_02_joM Ap28_03_elM Ap28_04_joM Ap28_05_elM Ap28_06_joM Ap29_01_elM Ap29_02_joM Ap29_03_elM Ap29_04_joM Ap29_05_joM Ap29_06_elM Ap29_07_joM Ap29_08_elM Ap29_09_joM Ap29_10_elM Apelelv01M Apelgrd01M Ap29_11_joM Am3l2carrM Aelvcet01M Aelvcet02M Ajorep01M Ajorep02M Ajorep03M Ajorep04M Ajorpld01M Ajorpld02M Ajorpld03M Ajorpld04M Atrjo01M Atrgrim01M Atrgrim02M Atrcarr06M Atrcarr07M Atrcarr08M Atrcarr01M Atrcarr02M Atrcarr03M Atrcarr04M Atrcarr05M Atrcarr12M Abnblde01M Abncass01M Apelelv02M Avault2M Ap29_12_elM Ap14_09_joM Ap19_07_joM Ap19_08_joM Acicarr06M Acicarr11M Acifarr08M Acifarr12M Acifema01M Acifema04M Acifema07M Acifema08M Acifema09M Acifema14M Acifost08M Acifost12M Acigrim05M Acigrim06M Acigrim07M Acigrim08M Acigrim09M Acigrim10M Acihopk09M Acihopk11M Acimale02M Acimale03M Acimale07M Acimale09M Acimale11M Acimale13M Aciroge08M Aciroge12M Atrfost01M Atrfost02M Atrfost03M Atrcarr09M Atrcarr10M Atrcarr11M Acifarr01M Acifarr02M Acifarr03M Acigrim01M Acigrim03M Acigrim04M Acihopk01M Acihopk04M Acihopk06M Aciroge01M Aciroge02M Atrroge01M Acicarr07M Acicarr08M Ajoinst01M Ajoinst02M Ajoinst03M Ajoinst04M Ap25_03_joM Ap29_13_joM Ap29_14_joM Acicarr09M Acicarr10M Ap29_15_joM Ap16_03_joM Acarrbye02M diff --git a/src/game/activemenu/activemenu.c b/src/game/activemenu/activemenu.c index e1341a23b..f4d4d7944 100644 --- a/src/game/activemenu/activemenu.c +++ b/src/game/activemenu/activemenu.c @@ -1109,7 +1109,7 @@ void amCalculateSlotPosition(s16 column, s16 row, s16 *x, s16 *y) *y = (*y * 3) / 5; } - *x += viGetViewLeft() / g_ScreenWidthMultiplier + viGetViewWidth() / (g_ScreenWidthMultiplier * 2); + *x += viGetViewLeft() / g_ScaleX + viGetViewWidth() / (g_ScaleX * 2); *y += viGetViewTop() + viGetViewHeight() / 2; if ((playercount == 2 && (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL || IS4MB())) @@ -1181,8 +1181,8 @@ Gfx *amRenderAibotInfo(Gfx *gdl, s32 buddynum) textMeasure(&textheight, &textwidth, aibotname, g_AmFont1, g_AmFont2, 0); - x = viGetViewLeft() / g_ScreenWidthMultiplier - + (s32)(viGetViewWidth() / g_ScreenWidthMultiplier * 0.5f) + x = viGetViewLeft() / g_ScaleX + + (s32)(viGetViewWidth() / g_ScaleX * 0.5f) - (s32)(textwidth * 0.5f) + offset; @@ -1193,7 +1193,7 @@ Gfx *amRenderAibotInfo(Gfx *gdl, s32 buddynum) } if (wide) { - x = viGetViewLeft() / g_ScreenWidthMultiplier + 32; + x = viGetViewLeft() / g_ScaleX + 32; } gdl = textRender(gdl, &x, &y, aibotname, g_AmFont1, g_AmFont2, -1, @@ -1202,13 +1202,13 @@ Gfx *amRenderAibotInfo(Gfx *gdl, s32 buddynum) y += (PLAYERCOUNT() >= 2) ? 0 : (s32)(textheight * 1.1f); textMeasure(&textheight, &textwidth, weaponname, g_AmFont1, g_AmFont2, 0); - x = viGetViewLeft() / g_ScreenWidthMultiplier - + (s32)(viGetViewWidth() / g_ScreenWidthMultiplier * 0.5f) + x = viGetViewLeft() / g_ScaleX + + (s32)(viGetViewWidth() / g_ScaleX * 0.5f) - (s32)(textwidth * 0.5f) + offset; if (wide) { - x = viGetViewLeft() / g_ScreenWidthMultiplier + 32; + x = viGetViewLeft() / g_ScaleX + 32; } gdl = textRender(gdl, &x, &y, weaponname, g_AmFont1, g_AmFont2, -1, @@ -1220,8 +1220,8 @@ Gfx *amRenderAibotInfo(Gfx *gdl, s32 buddynum) textMeasure(&textheight, &textwidth, title, g_AmFont1, g_AmFont2, 0); - x = viGetViewLeft() / g_ScreenWidthMultiplier - + (s32)(viGetViewWidth() / g_ScreenWidthMultiplier * 0.5f) + x = viGetViewLeft() / g_ScaleX + + (s32)(viGetViewWidth() / g_ScaleX * 0.5f) - (s32)(textwidth * 0.5f) + offset; @@ -1232,7 +1232,7 @@ Gfx *amRenderAibotInfo(Gfx *gdl, s32 buddynum) } if (wide) { - x = viGetViewLeft() / g_ScreenWidthMultiplier + 32; + x = viGetViewLeft() / g_ScaleX + 32; } gdl = textRender(gdl, &x, &y, title, g_AmFont1, g_AmFont2, -1, @@ -1303,10 +1303,10 @@ Gfx *amRenderSlot(Gfx *gdl, char *text, s16 x, s16 y, s32 mode, s32 flags) gdl = gfxSetPrimColour(gdl, colour); - gDPFillRectangle(gdl++, - (x - g_AmMenus[g_AmIndex].slotwidth / 2 + 1) * g_ScreenWidthMultiplier, + gDPFillRectangleScaled(gdl++, + x - g_AmMenus[g_AmIndex].slotwidth / 2 + 1, y - paddingtop + 1, - (x + g_AmMenus[g_AmIndex].slotwidth / 2) * g_ScreenWidthMultiplier, + x + g_AmMenus[g_AmIndex].slotwidth / 2, y + paddingbottom); gdl = func0f153838(gdl); @@ -1331,31 +1331,31 @@ Gfx *amRenderSlot(Gfx *gdl, char *text, s16 x, s16 y, s32 mode, s32 flags) gdl = gfxSetPrimColour(gdl, colour); // Top border - gDPFillRectangle(gdl++, - (x - g_AmMenus[g_AmIndex].slotwidth / 2) * g_ScreenWidthMultiplier, + gDPFillRectangleScaled(gdl++, + x - g_AmMenus[g_AmIndex].slotwidth / 2, y - paddingtop, - (x + g_AmMenus[g_AmIndex].slotwidth / 2 + 1) * g_ScreenWidthMultiplier, + x + g_AmMenus[g_AmIndex].slotwidth / 2 + 1, y - paddingtop + 1); // Bottom border - gDPFillRectangle(gdl++, - (x - g_AmMenus[g_AmIndex].slotwidth / 2) * g_ScreenWidthMultiplier, + gDPFillRectangleScaled(gdl++, + x - g_AmMenus[g_AmIndex].slotwidth / 2, y + paddingbottom, - (x + g_AmMenus[g_AmIndex].slotwidth / 2 + 1) * g_ScreenWidthMultiplier, + x + g_AmMenus[g_AmIndex].slotwidth / 2 + 1, y + paddingbottom + 1); // Left border - gDPFillRectangle(gdl++, - (x - g_AmMenus[g_AmIndex].slotwidth / 2) * g_ScreenWidthMultiplier, + gDPFillRectangleScaled(gdl++, + x - g_AmMenus[g_AmIndex].slotwidth / 2, y - paddingtop + 1, - (x - g_AmMenus[g_AmIndex].slotwidth / 2 + 1) * g_ScreenWidthMultiplier, + x - g_AmMenus[g_AmIndex].slotwidth / 2 + 1, y + paddingbottom); // Right border - gDPFillRectangle(gdl++, - (x + g_AmMenus[g_AmIndex].slotwidth / 2) * g_ScreenWidthMultiplier, + gDPFillRectangleScaled(gdl++, + x + g_AmMenus[g_AmIndex].slotwidth / 2, y - paddingtop + 1, - (x + g_AmMenus[g_AmIndex].slotwidth / 2 + 1) * g_ScreenWidthMultiplier, + x + g_AmMenus[g_AmIndex].slotwidth / 2 + 1, y + paddingbottom); gdl = func0f153838(gdl); @@ -1401,13 +1401,13 @@ glabel amRender /* f100b08: 15c10005 */ bne $t6,$at,.L0f100b20 /* f100b0c: afa401d8 */ sw $a0,0x1d8($sp) /* f100b10: 240f0002 */ addiu $t7,$zero,0x2 -/* f100b14: 3c018008 */ lui $at,%hi(g_ScreenWidthMultiplier) +/* f100b14: 3c018008 */ lui $at,%hi(g_ScaleX) /* f100b18: 10000004 */ b .L0f100b2c -/* f100b1c: ac2ffac0 */ sw $t7,%lo(g_ScreenWidthMultiplier)($at) +/* f100b1c: ac2ffac0 */ sw $t7,%lo(g_ScaleX)($at) .L0f100b20: /* f100b20: 24180001 */ addiu $t8,$zero,0x1 -/* f100b24: 3c018008 */ lui $at,%hi(g_ScreenWidthMultiplier) -/* f100b28: ac38fac0 */ sw $t8,%lo(g_ScreenWidthMultiplier)($at) +/* f100b24: 3c018008 */ lui $at,%hi(g_ScaleX) +/* f100b28: ac38fac0 */ sw $t8,%lo(g_ScaleX)($at) .L0f100b2c: /* f100b2c: 3c0b800a */ lui $t3,%hi(g_Vars) /* f100b30: 256b9fc0 */ addiu $t3,$t3,%lo(g_Vars) @@ -2129,9 +2129,9 @@ glabel amRender /* f1015c8: 3c0f800a */ lui $t7,%hi(g_AmIndex) /* f1015cc: 8def21b8 */ lw $t7,%lo(g_AmIndex)($t7) /* f1015d0: 8fa201d8 */ lw $v0,0x1d8($sp) -/* f1015d4: 3c068008 */ lui $a2,%hi(g_ScreenWidthMultiplier) +/* f1015d4: 3c068008 */ lui $a2,%hi(g_ScaleX) /* f1015d8: 01fe0019 */ multu $t7,$s8 -/* f1015dc: 24c6fac0 */ addiu $a2,$a2,%lo(g_ScreenWidthMultiplier) +/* f1015dc: 24c6fac0 */ addiu $a2,$a2,%lo(g_ScaleX) /* f1015e0: 244e0008 */ addiu $t6,$v0,0x8 /* f1015e4: afae01d8 */ sw $t6,0x1d8($sp) /* f1015e8: 3c16f600 */ lui $s6,0xf600 @@ -2526,8 +2526,8 @@ glabel amRender /* f101b7c: 00000000 */ nop /* f101b80: 0c002f40 */ jal viGetViewLeft /* f101b84: 00000000 */ nop -/* f101b88: 3c188008 */ lui $t8,%hi(g_ScreenWidthMultiplier) -/* f101b8c: 8f18fac0 */ lw $t8,%lo(g_ScreenWidthMultiplier)($t8) +/* f101b88: 3c188008 */ lui $t8,%hi(g_ScaleX) +/* f101b8c: 8f18fac0 */ lw $t8,%lo(g_ScaleX)($t8) /* f101b90: 44972000 */ mtc1 $s7,$f4 /* f101b94: 0058001a */ div $zero,$v0,$t8 /* f101b98: 00008012 */ mflo $s0 @@ -2553,8 +2553,8 @@ glabel amRender /* f101bdc: 00117c03 */ sra $t7,$s1,0x10 /* f101be0: 0c002f40 */ jal viGetViewLeft /* f101be4: 01e08825 */ or $s1,$t7,$zero -/* f101be8: 3c038008 */ lui $v1,%hi(g_ScreenWidthMultiplier) -/* f101bec: 8c63fac0 */ lw $v1,%lo(g_ScreenWidthMultiplier)($v1) +/* f101be8: 3c038008 */ lui $v1,%hi(g_ScaleX) +/* f101bec: 8c63fac0 */ lw $v1,%lo(g_ScaleX)($v1) /* f101bf0: 44974000 */ mtc1 $s7,$f8 /* f101bf4: 3c013f00 */ lui $at,0x3f00 /* f101bf8: 0043001a */ div $zero,$v0,$v1 @@ -2709,11 +2709,11 @@ glabel amRender /* f101e1c: 46082281 */ sub.s $f10,$f4,$f8 /* f101e20: 44812000 */ mtc1 $at,$f4 /* f101e24: afb901d8 */ sw $t9,0x1d8($sp) -/* f101e28: 3c0b8008 */ lui $t3,%hi(g_ScreenWidthMultiplier) +/* f101e28: 3c0b8008 */ lui $t3,%hi(g_ScaleX) /* f101e2c: 460a3482 */ mul.s $f18,$f6,$f10 /* f101e30: 3c0cfa00 */ lui $t4,0xfa00 /* f101e34: 35ce0060 */ ori $t6,$t6,0x60 -/* f101e38: 256bfac0 */ addiu $t3,$t3,%lo(g_ScreenWidthMultiplier) +/* f101e38: 256bfac0 */ addiu $t3,$t3,%lo(g_ScaleX) /* f101e3c: af0e0004 */ sw $t6,0x4($t8) /* f101e40: af0c0000 */ sw $t4,0x0($t8) /* f101e44: 8d6e0000 */ lw $t6,0x0($t3) @@ -2729,7 +2729,7 @@ glabel amRender /* f101e6c: 03201825 */ or $v1,$t9,$zero /* f101e70: 30e203ff */ andi $v0,$a3,0x3ff /* f101e74: 440f8000 */ mfc1 $t7,$f16 -/* f101e78: 3c078008 */ lui $a3,%hi(g_ScreenWidthMultiplier) +/* f101e78: 3c078008 */ lui $a3,%hi(g_ScaleX) /* f101e7c: 240d0080 */ addiu $t5,$zero,0x80 /* f101e80: 022f3023 */ subu $a2,$s1,$t7 /* f101e84: 00007812 */ mflo $t7 @@ -2742,7 +2742,7 @@ glabel amRender /* f101ea0: 0002c080 */ sll $t8,$v0,0x2 /* f101ea4: 03001025 */ or $v0,$t8,$zero /* f101ea8: 00d90019 */ multu $a2,$t9 -/* f101eac: 24e7fac0 */ addiu $a3,$a3,%lo(g_ScreenWidthMultiplier) +/* f101eac: 24e7fac0 */ addiu $a3,$a3,%lo(g_ScaleX) /* f101eb0: 00007012 */ mflo $t6 /* f101eb4: 31cf03ff */ andi $t7,$t6,0x3ff /* f101eb8: 000fc380 */ sll $t8,$t7,0xe @@ -2798,9 +2798,9 @@ glabel amRender /* f101f7c: 25cf0008 */ addiu $t7,$t6,0x8 /* f101f80: afaf01d8 */ sw $t7,0x1d8($sp) /* f101f84: add80004 */ sw $t8,0x4($t6) -/* f101f88: 3c188008 */ lui $t8,%hi(g_ScreenWidthMultiplier) +/* f101f88: 3c188008 */ lui $t8,%hi(g_ScaleX) /* f101f8c: adcc0000 */ sw $t4,0x0($t6) -/* f101f90: 8f18fac0 */ lw $t8,%lo(g_ScreenWidthMultiplier)($t8) +/* f101f90: 8f18fac0 */ lw $t8,%lo(g_ScaleX)($t8) /* f101f94: 8fa501d8 */ lw $a1,0x1d8($sp) /* f101f98: 00f54821 */ addu $t1,$a3,$s5 /* f101f9c: 02380019 */ multu $s1,$t8 @@ -2816,9 +2816,9 @@ glabel amRender /* f101fc4: 000e7b80 */ sll $t7,$t6,0xe /* f101fc8: 01f6c025 */ or $t8,$t7,$s6 /* f101fcc: 0303c825 */ or $t9,$t8,$v1 -/* f101fd0: 3c0f8008 */ lui $t7,%hi(g_ScreenWidthMultiplier) +/* f101fd0: 3c0f8008 */ lui $t7,%hi(g_ScaleX) /* f101fd4: acb90000 */ sw $t9,0x0($a1) -/* f101fd8: 8deffac0 */ lw $t7,%lo(g_ScreenWidthMultiplier)($t7) +/* f101fd8: 8deffac0 */ lw $t7,%lo(g_ScaleX)($t7) /* f101fdc: 00027080 */ sll $t6,$v0,0x2 /* f101fe0: 01c01025 */ or $v0,$t6,$zero /* f101fe4: 020f0019 */ multu $s0,$t7 @@ -2828,8 +2828,8 @@ glabel amRender /* f101ff4: 01c27825 */ or $t7,$t6,$v0 /* f101ff8: acaf0004 */ sw $t7,0x4($a1) /* f101ffc: c7a60100 */ lwc1 $f6,0x100($sp) -/* f102000: 3c188008 */ lui $t8,%hi(g_ScreenWidthMultiplier) -/* f102004: 8f18fac0 */ lw $t8,%lo(g_ScreenWidthMultiplier)($t8) +/* f102000: 3c188008 */ lui $t8,%hi(g_ScaleX) +/* f102004: 8f18fac0 */ lw $t8,%lo(g_ScaleX)($t8) /* f102008: 46061282 */ mul.s $f10,$f2,$f6 /* f10200c: 8faa01d8 */ lw $t2,0x1d8($sp) /* f102010: 254f0008 */ addiu $t7,$t2,0x8 @@ -2846,9 +2846,9 @@ glabel amRender /* f10203c: 000e7b80 */ sll $t7,$t6,0xe /* f102040: 01f6c025 */ or $t8,$t7,$s6 /* f102044: 0303c825 */ or $t9,$t8,$v1 -/* f102048: 3c0e8008 */ lui $t6,%hi(g_ScreenWidthMultiplier) +/* f102048: 3c0e8008 */ lui $t6,%hi(g_ScaleX) /* f10204c: ad590000 */ sw $t9,0x0($t2) -/* f102050: 8dcefac0 */ lw $t6,%lo(g_ScreenWidthMultiplier)($t6) +/* f102050: 8dcefac0 */ lw $t6,%lo(g_ScaleX)($t6) /* f102054: 026e0019 */ multu $s3,$t6 /* f102058: 00007812 */ mflo $t7 /* f10205c: 31f803ff */ andi $t8,$t7,0x3ff @@ -2860,8 +2860,8 @@ glabel amRender /* f102074: afb801d8 */ sw $t8,0x1d8($sp) /* f102078: aded0004 */ sw $t5,0x4($t7) /* f10207c: adec0000 */ sw $t4,0x0($t7) -/* f102080: 3c0f8008 */ lui $t7,%hi(g_ScreenWidthMultiplier) -/* f102084: 8deffac0 */ lw $t7,%lo(g_ScreenWidthMultiplier)($t7) +/* f102080: 3c0f8008 */ lui $t7,%hi(g_ScaleX) +/* f102084: 8deffac0 */ lw $t7,%lo(g_ScaleX)($t7) /* f102088: 8fa501d8 */ lw $a1,0x1d8($sp) /* f10208c: 00cf0019 */ multu $a2,$t7 /* f102090: 24ae0008 */ addiu $t6,$a1,0x8 @@ -2871,9 +2871,9 @@ glabel amRender /* f1020a0: 00197380 */ sll $t6,$t9,0xe /* f1020a4: 01d67825 */ or $t7,$t6,$s6 /* f1020a8: 01e3c025 */ or $t8,$t7,$v1 -/* f1020ac: 3c198008 */ lui $t9,%hi(g_ScreenWidthMultiplier) +/* f1020ac: 3c198008 */ lui $t9,%hi(g_ScaleX) /* f1020b0: acb80000 */ sw $t8,0x0($a1) -/* f1020b4: 8f39fac0 */ lw $t9,%lo(g_ScreenWidthMultiplier)($t9) +/* f1020b4: 8f39fac0 */ lw $t9,%lo(g_ScaleX)($t9) /* f1020b8: 01190019 */ multu $t0,$t9 /* f1020bc: 00007012 */ mflo $t6 /* f1020c0: 31cf03ff */ andi $t7,$t6,0x3ff @@ -2894,8 +2894,8 @@ glabel amRender /* f1020f8: adec0000 */ sw $t4,0x0($t7) /* f1020fc: 46104182 */ mul.s $f6,$f8,$f16 /* f102100: c7b200fc */ lwc1 $f18,0xfc($sp) -/* f102104: 3c1f8008 */ lui $ra,%hi(g_ScreenWidthMultiplier) -/* f102108: 27fffac0 */ addiu $ra,$ra,%lo(g_ScreenWidthMultiplier) +/* f102104: 3c1f8008 */ lui $ra,%hi(g_ScaleX) +/* f102108: 27fffac0 */ addiu $ra,$ra,%lo(g_ScaleX) /* f10210c: 46121102 */ mul.s $f4,$f2,$f18 /* f102110: 8ff80000 */ lw $t8,0x0($ra) /* f102114: 8fa401d8 */ lw $a0,0x1d8($sp) @@ -2904,10 +2904,10 @@ glabel amRender /* f102120: 24990008 */ addiu $t9,$a0,0x8 /* f102124: 4600328d */ trunc.w.s $f10,$f6 /* f102128: afb901d8 */ sw $t9,0x1d8($sp) -/* f10212c: 3c038008 */ lui $v1,%hi(g_ScreenWidthMultiplier) +/* f10212c: 3c038008 */ lui $v1,%hi(g_ScaleX) /* f102130: 4600220d */ trunc.w.s $f8,$f4 /* f102134: 44155000 */ mfc1 $s5,$f10 -/* f102138: 2463fac0 */ addiu $v1,$v1,%lo(g_ScreenWidthMultiplier) +/* f102138: 2463fac0 */ addiu $v1,$v1,%lo(g_ScaleX) /* f10213c: 440f4000 */ mfc1 $t7,$f8 /* f102140: 00b53821 */ addu $a3,$a1,$s5 /* f102144: 30ee03ff */ andi $t6,$a3,0x3ff @@ -2955,7 +2955,7 @@ glabel amRender /* f1021ec: 8fbf004c */ lw $ra,0x4c($sp) .L0f1021f0: /* f1021f0: 240f0001 */ addiu $t7,$zero,0x1 -/* f1021f4: 3c018008 */ lui $at,%hi(g_ScreenWidthMultiplier) +/* f1021f4: 3c018008 */ lui $at,%hi(g_ScaleX) /* f1021f8: 8fa201d8 */ lw $v0,0x1d8($sp) /* f1021fc: 8fb00028 */ lw $s0,0x28($sp) /* f102200: 8fb1002c */ lw $s1,0x2c($sp) @@ -2966,7 +2966,7 @@ glabel amRender /* f102214: 8fb60040 */ lw $s6,0x40($sp) /* f102218: 8fb70044 */ lw $s7,0x44($sp) /* f10221c: 8fbe0048 */ lw $s8,0x48($sp) -/* f102220: ac2ffac0 */ sw $t7,%lo(g_ScreenWidthMultiplier)($at) +/* f102220: ac2ffac0 */ sw $t7,%lo(g_ScaleX)($at) /* f102224: 03e00008 */ jr $ra /* f102228: 27bd01d8 */ addiu $sp,$sp,0x1d8 /* f10222c: 00000000 */ nop @@ -2998,9 +2998,9 @@ glabel amRender // s32 buddynum; // // if (g_ViMode == VIMODE_HIRES) { -// g_ScreenWidthMultiplier = 2; +// g_ScaleX = 2; // } else { -// g_ScreenWidthMultiplier = 1; +// g_ScaleX = 1; // } // // g_AmIndex = g_Vars.currentplayernum; @@ -3221,31 +3221,31 @@ glabel amRender // } // // // Top -// gDPFillRectangle(gdl++, -// (g_AmMenus[g_AmIndex].selx - halfwidth) * g_ScreenWidthMultiplier, +// gDPFillRectangleScaled(gdl++, +// g_AmMenus[g_AmIndex].selx - halfwidth, // g_AmMenus[g_AmIndex].sely - above, -// (g_AmMenus[g_AmIndex].selx + halfwidth + 1) * g_ScreenWidthMultiplier, +// g_AmMenus[g_AmIndex].selx + halfwidth + 1, // g_AmMenus[g_AmIndex].sely - above + 1); // // // Bottom -// gDPFillRectangle(gdl++, -// (g_AmMenus[g_AmIndex].selx - halfwidth) * g_ScreenWidthMultiplier, +// gDPFillRectangleScaled(gdl++, +// g_AmMenus[g_AmIndex].selx - halfwidth, // g_AmMenus[g_AmIndex].sely + below, -// (g_AmMenus[g_AmIndex].selx + halfwidth + 1) * g_ScreenWidthMultiplier, +// g_AmMenus[g_AmIndex].selx + halfwidth + 1, // g_AmMenus[g_AmIndex].sely + below + 1); // // // Left -// gDPFillRectangle(gdl++, -// (g_AmMenus[g_AmIndex].selx - halfwidth) * g_ScreenWidthMultiplier, +// gDPFillRectangleScaled(gdl++, +// g_AmMenus[g_AmIndex].selx - halfwidth, // g_AmMenus[g_AmIndex].sely - above + 1, -// (g_AmMenus[g_AmIndex].selx - halfwidth + 1) * g_ScreenWidthMultiplier, +// g_AmMenus[g_AmIndex].selx - halfwidth + 1, // g_AmMenus[g_AmIndex].sely + below); // // // Right -// gDPFillRectangle(gdl++, -// (g_AmMenus[g_AmIndex].selx + halfwidth) * g_ScreenWidthMultiplier, +// gDPFillRectangleScaled(gdl++, +// g_AmMenus[g_AmIndex].selx + halfwidth, // g_AmMenus[g_AmIndex].sely - above + 1, -// (g_AmMenus[g_AmIndex].selx + halfwidth + 1) * g_ScreenWidthMultiplier, +// g_AmMenus[g_AmIndex].selx + halfwidth + 1, // g_AmMenus[g_AmIndex].sely + below); // // gdl = func0f153838(gdl); @@ -3286,11 +3286,11 @@ glabel amRender // // // 1b0c // if (PLAYERCOUNT() == 1 && optionsGetEffectiveScreenSize() != SCREENSIZE_FULL) { -// part1left = viGetViewLeft() / g_ScreenWidthMultiplier + 32; // s0 +// part1left = viGetViewLeft() / g_ScaleX + 32; // s0 // } else { // // 1bd0 -// part1left = (s32)((viGetViewWidth() / g_ScreenWidthMultiplier) * 0.5f) -// + (s32)(viGetViewLeft() / g_ScreenWidthMultiplier) +// part1left = (s32)((viGetViewWidth() / g_ScaleX) * 0.5f) +// + (s32)(viGetViewLeft() / g_ScaleX) // - (s32)(width * 0.5f) // + xoffset; // } @@ -3317,52 +3317,52 @@ glabel amRender // gDPSetPrimColorViaWord(gdl++, 0, 0, 0xff000060); // // // Part 1 red -// gDPFillRectangle(gdl++, -// ((part1left + part1width - 1) - (s32)(part1width * 0.25f - healthfrac * 4)) * g_ScreenWidthMultiplier, +// gDPFillRectangleScaled(gdl++, +// (part1left + part1width - 1) - (s32)(part1width * 0.25f - healthfrac * 4), // y, -// (part1left + part1width - 1) * g_ScreenWidthMultiplier, +// part1left + part1width - 1, // y + healthheight); // // gDPSetPrimColorViaWord(gdl++, 0, 0, 0x00000080); // // // Part 1 black -// gDPFillRectangle(gdl++, -// part1left * g_ScreenWidthMultiplier, +// gDPFillRectangleScaled(gdl++, +// part1left, // y, -// (part1left + part1width - 1 - (s32)(part1width * 0.25f - healthfrac * 4)) * g_ScreenWidthMultiplier, +// part1left + part1width - 1 - (s32)(part1width * 0.25f - healthfrac * 4), // y + healthheight); // // // Part 2 black -// gDPFillRectangle(gdl++, -// part2left * g_ScreenWidthMultiplier, +// gDPFillRectangleScaled(gdl++, +// part2left, // y, -// (part1left + width) * g_ScreenWidthMultiplier, +// part1left + width, // y + healthheight); // } else { // // 1f70 // gDPSetPrimColorViaWord(gdl++, 0, 0, 0x00c00060); // // // Part 1 green -// gDPFillRectangle(gdl++, -// part1left * g_ScreenWidthMultiplier, +// gDPFillRectangleScaled(gdl++, +// part1left, // y, -// (part1left + part1width - 1) * g_ScreenWidthMultiplier, +// part1left + part1width - 1, // y + healthheight); // // // Part 2 green -// gDPFillRectangle(gdl++, -// part2left * g_ScreenWidthMultiplier, +// gDPFillRectangleScaled(gdl++, +// part2left, // y, -// (part1left + (s32)(width * healthfrac)) * g_ScreenWidthMultiplier, +// part1left + (s32)(width * healthfrac), // y + healthheight); // // gDPSetPrimColorViaWord(gdl++, 0, 0, 0x00000080); // // // Part 2 black -// gDPFillRectangle(gdl++, -// (part1left + (s32)(width * healthfrac)) * g_ScreenWidthMultiplier, +// gDPFillRectangleScaled(gdl++, +// part1left + (s32)(width * healthfrac), // y, -// (part1left + width) * g_ScreenWidthMultiplier, +// part1left + width, // y + healthheight); // } // @@ -3370,22 +3370,22 @@ glabel amRender // // 20d0 // gDPSetPrimColorViaWord(gdl++, 0, 0, 0x00c00060); // -// gDPFillRectangle(gdl++, -// part1left * g_ScreenWidthMultiplier, +// gDPFillRectangleScaled(gdl++, +// part1left, // y + healthheight + 2, -// (part1left + (s32)(width * shieldfrac)) * g_ScreenWidthMultiplier, +// part1left + (s32)(width * shieldfrac), // y + healthheight + 2 + (s32)(healthheight * 0.75f)); // // gDPSetPrimColorViaWord(gdl++, 0, 0, 0x00000080); // -// gDPFillRectangle(gdl++, -// (part1left + (s32)(width * shieldfrac)) * g_ScreenWidthMultiplier, +// gDPFillRectangleScaled(gdl++, +// part1left + (s32)(width * shieldfrac), // y + healthheight + 2, -// (part1left + width) * g_ScreenWidthMultiplier, +// part1left + width, // y + healthheight + 2 + (s32)(healthheight * 0.75f)); // } // -// g_ScreenWidthMultiplier = 1; +// g_ScaleX = 1; // // return gdl; //} diff --git a/src/game/camdraw.c b/src/game/camdraw.c index ccba08612..edfdb3a25 100644 --- a/src/game/camdraw.c +++ b/src/game/camdraw.c @@ -3826,10 +3826,10 @@ glabel func0f14c870 /* f14cc78: 25f80008 */ addiu $t8,$t7,0x8 /* f14cc7c: afb80040 */ sw $t8,0x40($sp) /* f14cc80: 3c19fcff */ lui $t9,0xfcff -/* f14cc84: 3c068008 */ lui $a2,%hi(g_ScreenWidthMultiplier) +/* f14cc84: 3c068008 */ lui $a2,%hi(g_ScaleX) /* f14cc88: 3739ffff */ ori $t9,$t9,0xffff /* f14cc8c: 35cef279 */ ori $t6,$t6,0xf279 -/* f14cc90: 24c6fac0 */ addiu $a2,$a2,%lo(g_ScreenWidthMultiplier) +/* f14cc90: 24c6fac0 */ addiu $a2,$a2,%lo(g_ScaleX) /* f14cc94: adee0004 */ sw $t6,0x4($t7) /* f14cc98: adf90000 */ sw $t9,0x0($t7) /* f14cc9c: 8cd90000 */ lw $t9,0x0($a2) diff --git a/src/game/core.c b/src/game/core.c index 5c2152583..004c6f7ed 100644 --- a/src/game/core.c +++ b/src/game/core.c @@ -448,7 +448,7 @@ void coreLoadStage(s32 stagenum) func0f10cb2c(); } - if (!IS4MB()) { + if (IS8MB()) { func0f14a3c4(); } diff --git a/src/game/credits.c b/src/game/credits.c index 6723dd223..dc418fcc0 100644 --- a/src/game/credits.c +++ b/src/game/credits.c @@ -389,12 +389,19 @@ struct credit g_Credits[] = { { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE(31), L_TITLE(32) }, // "david clynick", "bangin hardcore choonz" { 0, 0, 0, 0, CREDITSTYLE_R_BIG_R_MED, L_TITLE(33), L_TITLE(34) }, // "keith 'bunny' rabbette", "dinomic backgrounds" + //load next credit for same slide + //| no transition in + //| | no transition out + //| | | duration: 0=4s, 1=8s, 2=12s, 3=16s + //| | | | { 1, 0, 1, 0, CREDITSTYLE_C_BIG, L_TITLE(35), L_TITLE(0) }, // "dd snipers", "" { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(36), L_TITLE(37) }, // "kevin bayliss", "dean smith" { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(38), L_TITLE(1) }, // "graham smith", "\n" + { 1, 1, 1, 0, CREDITSTYLE_C_BIG, L_TITLE(35), L_TITLE(0) }, // "dd snipers", "" { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(39), L_TITLE(40) }, // "mike 'curry' currington", "tony wong" { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(41), L_TITLE(1) }, // "simon farmer", "\n" + { 1, 1, 0, 0, CREDITSTYLE_C_BIG, L_TITLE(35), L_TITLE(0) }, // "dd snipers", "" { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(42), L_TITLE(43) }, // "leigh loverday", "rob harrison" { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(44), L_TITLE(1) }, // "steven hurst", "\n" @@ -406,6 +413,7 @@ struct credit g_Credits[] = { { 1, 0, 1, 0, CREDITSTYLE_C_BIG, L_TITLE(50), L_TITLE(0) }, // "trent's henchmen", "" { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(51), L_TITLE(52) }, // "lee musgrave", "johnni christensen" { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(53), L_TITLE(1) }, // "mark betteridge", "\n" + { 1, 1, 0, 0, CREDITSTYLE_C_BIG, L_TITLE(50), L_TITLE(0) }, // "trent's henchmen", "" { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(54), L_TITLE(55) }, // "chris marlow", "robin beanland" { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(56), L_TITLE(57) }, // "neil gallagher", "feargal plant" @@ -413,9 +421,11 @@ struct credit g_Credits[] = { { 1, 0, 1, 0, CREDITSTYLE_C_BIG, L_TITLE(58), L_TITLE(0) }, // "voices in the dark", "" { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(59), L_TITLE(60) }, // "eveline fischer", "chris sutherland" { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(61), L_TITLE(62) }, // "chris seavor", "john silke" + { 1, 1, 1, 0, CREDITSTYLE_C_BIG, L_TITLE(58), L_TITLE(0) }, // "voices in the dark", "" { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(63), L_TITLE(64) }, // "ben cullum", "louise tilston" { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(65), L_TITLE(66) }, // "alistair", "lindsay" + { 1, 1, 0, 0, CREDITSTYLE_C_BIG, L_TITLE(58), L_TITLE(0) }, // "voices in the dark", "" { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(68), L_TITLE(67) }, // "beau chesluk", "b jones" { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(69), L_TITLE(1) }, // "steve malpass", "\n" @@ -424,10 +434,12 @@ struct credit g_Credits[] = { { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(94), L_TITLE(95) }, // "huw ward", "adam munton" { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(96), L_TITLE(97) }, // "david wong", "luke munton" { 0, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(98), L_TITLE(109) }, // "gary phelps", "andrew wilson" + { 1, 1, 1, 0, CREDITSTYLE_L_BIG, L_TITLE(93), L_TITLE(0) }, // "rare exterminators", "" { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(99), L_TITLE(100) }, // "john silke", "matthew carter" { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(101), L_TITLE(102) }, // "gavin price", "gareth stevenson" { 0, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(103), L_TITLE(1) }, // "bushbaby", "\n" + { 1, 1, 0, 0, CREDITSTYLE_L_BIG, L_TITLE(93), L_TITLE(0) }, // "rare exterminators", "" { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(104), L_TITLE(105) }, // "stephen stamper", "ross bullimore" { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(106), L_TITLE(107) }, // "justin cook", "dale murchie" @@ -463,6 +475,7 @@ struct credit g_Credits[] = { { 1, 0, 1, 0, CREDITSTYLE_L_BIG, L_TITLE(120), L_TITLE(0) }, // "testing (noa)", "" { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(121), L_TITLE(122) }, // "michael kelbaugh", "tim bechtel" { 0, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(123), L_TITLE(124) }, // "tom hertzog", "melvin 'sherwood' forrest" + { 1, 1, 0, 0, CREDITSTYLE_L_BIG, L_TITLE(120), L_TITLE(0) }, // "testing (noa)", "" { 1, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(125), L_TITLE(126) }, // "dougall campbell", "roger harrison" { 0, 0, 0, 0, CREDITSTYLE_R_MED, L_TITLE(127), L_TITLE(1) }, // "jeff kalles", "\n" @@ -479,6 +492,7 @@ struct credit g_Credits[] = { { 1, 0, 1, 0, CREDITSTYLE_C_BIG, L_TITLE(136), L_TITLE(0) }, // "nintendo", "" { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(137), L_TITLE(138) }, // "mr arakawa", "" { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(139), L_TITLE(140) }, // "don james", "" + { 1, 1, 0, 0, CREDITSTYLE_C_BIG, L_TITLE(136), L_TITLE(0) }, // "nintendo", "" { 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(141), L_TITLE(142) }, // "howard lincoln", "ken lobb" { 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(143), L_TITLE(144) }, // "jacqualee story", "gail tilden" @@ -488,6 +502,7 @@ struct credit g_Credits[] = { { 0, 0, 0, 0, CREDITSTYLE_C_SML, L_TITLE(146), L_TITLE(147) }, // "perfect dark and the pd device", "are trademarks" { 0, 0, 0, 0, CREDITSTYLE_C_SML, L_TITLE(150), L_TITLE(0) }, // "perfect dark is forever", "" + { 0, 0, 0, 0, CREDITSTYLE_TERMINATOR, L_TITLE(0), L_TITLE(0) }, // "", "" }; @@ -3356,8 +3371,8 @@ glabel var7f1b5948 /* f13b07c: 0fc54c77 */ jal func0f1531dc /* f13b080: 00002025 */ or $a0,$zero,$zero /* f13b084: 240e0001 */ addiu $t6,$zero,0x1 -/* f13b088: 3c018008 */ lui $at,%hi(g_ScreenWidthMultiplier) -/* f13b08c: ac2efac0 */ sw $t6,%lo(g_ScreenWidthMultiplier)($at) +/* f13b088: 3c018008 */ lui $at,%hi(g_ScaleX) +/* f13b08c: ac2efac0 */ sw $t6,%lo(g_ScaleX)($at) /* f13b090: 0c002ca0 */ jal func0000b280 /* f13b094: 02002025 */ or $a0,$s0,$zero /* f13b098: 0c002c74 */ jal func0000b1d0 @@ -3650,7 +3665,7 @@ glabel var7f1b5948 // // func0f1531dc(false); // -// g_ScreenWidthMultiplier = 1; +// g_ScaleX = 1; // // gdl = func0000b280(gdl); // gdl = func0000b1d0(gdl); diff --git a/src/game/data/data_0258c0.c b/src/game/data/data_0258c0.c index b9e79011d..d97f11890 100644 --- a/src/game/data/data_0258c0.c +++ b/src/game/data/data_0258c0.c @@ -2172,7 +2172,7 @@ s32 g_ScreenSize = SCREENSIZE_FULL; s32 g_ScreenRatio = SCREENRATIO_NORMAL; u8 g_ScreenSplit = SCREENSPLIT_HORIZONTAL; u32 var8007fabc = 0x00000000; -s32 g_ScreenWidthMultiplier = 1; +s32 g_ScaleX = 1; u32 var8007fac4 = 0x00000000; u32 var8007fac8 = 0x00000000; u32 var8007facc = 0x00000000; diff --git a/src/game/game_01bea0.c b/src/game/game_01bea0.c index 1b24ecad9..6aaddef1a 100644 --- a/src/game/game_01bea0.c +++ b/src/game/game_01bea0.c @@ -113,12 +113,12 @@ glabel var7f1a863c /* f01bf5c: 16ce0005 */ bne $s6,$t6,.L0f01bf74 /* f01bf60: 00008025 */ or $s0,$zero,$zero /* f01bf64: 240f0002 */ addiu $t7,$zero,0x2 -/* f01bf68: 3c018008 */ lui $at,%hi(g_ScreenWidthMultiplier) +/* f01bf68: 3c018008 */ lui $at,%hi(g_ScaleX) /* f01bf6c: 10000003 */ b .L0f01bf7c -/* f01bf70: ac2ffac0 */ sw $t7,%lo(g_ScreenWidthMultiplier)($at) +/* f01bf70: ac2ffac0 */ sw $t7,%lo(g_ScaleX)($at) .L0f01bf74: -/* f01bf74: 3c018008 */ lui $at,%hi(g_ScreenWidthMultiplier) -/* f01bf78: ac36fac0 */ sw $s6,%lo(g_ScreenWidthMultiplier)($at) +/* f01bf74: 3c018008 */ lui $at,%hi(g_ScaleX) +/* f01bf78: ac36fac0 */ sw $s6,%lo(g_ScaleX)($at) .L0f01bf7c: /* f01bf7c: 0fc01a77 */ jal func0f0069dc /* f01bf80: 00000000 */ nop @@ -1817,8 +1817,8 @@ glabel var7f1a863c /* f01d714: 8e780314 */ lw $t8,0x314($s3) .L0f01d718: /* f01d718: 8fae0158 */ lw $t6,0x158($sp) -/* f01d71c: 3c018008 */ lui $at,%hi(g_ScreenWidthMultiplier) -/* f01d720: ac36fac0 */ sw $s6,%lo(g_ScreenWidthMultiplier)($at) +/* f01d71c: 3c018008 */ lui $at,%hi(g_ScaleX) +/* f01d720: ac36fac0 */ sw $s6,%lo(g_ScaleX)($at) /* f01d724: 51c00006 */ beqzl $t6,.L0f01d740 /* f01d728: 92af05d5 */ lbu $t7,0x5d5($s5) /* f01d72c: 92ad05d5 */ lbu $t5,0x5d5($s5) @@ -1852,7 +1852,7 @@ glabel var7f1a863c // s32 anyopen = false; // // // bf5c -// g_ScreenWidthMultiplier = g_ViMode == VIMODE_HIRES ? 2 : 1; +// g_ScaleX = g_ViMode == VIMODE_HIRES ? 2 : 1; // // // bf7c // func0f0069dc(); @@ -2584,6 +2584,6 @@ glabel var7f1a863c // } // } // -// g_ScreenWidthMultiplier = 1; +// g_ScaleX = 1; // g_MenuData.unk5d5_06 = sp344 ? true : false; //} diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index 5dbb1790e..d671cebec 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -21532,8 +21532,8 @@ glabel func0f0a9fc0 /* f0aa170: 8fac00dc */ lw $t4,0xdc($sp) /* f0aa174: 11e0001c */ beqz $t7,.L0f0aa1e8 /* f0aa178: 8fad00d4 */ lw $t5,0xd4($sp) -/* f0aa17c: 3c138008 */ lui $s3,%hi(g_ScreenWidthMultiplier) -/* f0aa180: 2673fac0 */ addiu $s3,$s3,%lo(g_ScreenWidthMultiplier) +/* f0aa17c: 3c138008 */ lui $s3,%hi(g_ScaleX) +/* f0aa180: 2673fac0 */ addiu $s3,$s3,%lo(g_ScaleX) /* f0aa184: 8e780000 */ lw $t8,0x0($s3) /* f0aa188: 3c0af600 */ lui $t2,0xf600 /* f0aa18c: 24500008 */ addiu $s0,$v0,0x8 @@ -21560,8 +21560,8 @@ glabel func0f0a9fc0 /* f0aa1e0: 10000018 */ b .L0f0aa244 /* f0aa1e4: ac580004 */ sw $t8,0x4($v0) .L0f0aa1e8: -/* f0aa1e8: 3c138008 */ lui $s3,%hi(g_ScreenWidthMultiplier) -/* f0aa1ec: 2673fac0 */ addiu $s3,$s3,%lo(g_ScreenWidthMultiplier) +/* f0aa1e8: 3c138008 */ lui $s3,%hi(g_ScaleX) +/* f0aa1ec: 2673fac0 */ addiu $s3,$s3,%lo(g_ScaleX) /* f0aa1f0: 8e6f0000 */ lw $t7,0x0($s3) /* f0aa1f4: 3c0af600 */ lui $t2,0xf600 /* f0aa1f8: 24500008 */ addiu $s0,$v0,0x8 @@ -21588,8 +21588,8 @@ glabel func0f0a9fc0 /* f0aa248: 02002025 */ or $a0,$s0,$zero /* f0aa24c: 00408025 */ or $s0,$v0,$zero .L0f0aa250: -/* f0aa250: 3c138008 */ lui $s3,%hi(g_ScreenWidthMultiplier) -/* f0aa254: 2673fac0 */ addiu $s3,$s3,%lo(g_ScreenWidthMultiplier) +/* f0aa250: 3c138008 */ lui $s3,%hi(g_ScaleX) +/* f0aa254: 2673fac0 */ addiu $s3,$s3,%lo(g_ScaleX) /* f0aa258: 02002025 */ or $a0,$s0,$zero /* f0aa25c: 0fc54df7 */ jal gfxSetPrimColour /* f0aa260: 8fa500f4 */ lw $a1,0xf4($sp) @@ -21666,8 +21666,8 @@ glabel func0f0a9fc0 /* f0aa374: 00c0a825 */ or $s5,$a2,$zero /* f0aa378: 4600010d */ trunc.w.s $f4,$f0 /* f0aa37c: 252fffff */ addiu $t7,$t1,-1 -/* f0aa380: 3c138008 */ lui $s3,%hi(g_ScreenWidthMultiplier) -/* f0aa384: 2673fac0 */ addiu $s3,$s3,%lo(g_ScreenWidthMultiplier) +/* f0aa380: 3c138008 */ lui $s3,%hi(g_ScaleX) +/* f0aa384: 2673fac0 */ addiu $s3,$s3,%lo(g_ScaleX) /* f0aa388: 44022000 */ mfc1 $v0,$f4 /* f0aa38c: afaf0040 */ sw $t7,0x40($sp) /* f0aa390: 00c0f025 */ or $s8,$a2,$zero @@ -21927,9 +21927,9 @@ glabel func0f0a9fc0 /* f0aa734: 01164021 */ addu $t0,$t0,$s6 /* f0aa738: afa70094 */ sw $a3,0x94($sp) .L0f0aa73c: -/* f0aa73c: 3c138008 */ lui $s3,%hi(g_ScreenWidthMultiplier) +/* f0aa73c: 3c138008 */ lui $s3,%hi(g_ScaleX) /* f0aa740: 2ac10003 */ slti $at,$s6,0x3 -/* f0aa744: 2673fac0 */ addiu $s3,$s3,%lo(g_ScreenWidthMultiplier) +/* f0aa744: 2673fac0 */ addiu $s3,$s3,%lo(g_ScaleX) /* f0aa748: 10200033 */ beqz $at,.L0f0aa818 /* f0aa74c: 3c0af600 */ lui $t2,0xf600 /* f0aa750: 8faf00f8 */ lw $t7,0xf8($sp) @@ -22098,12 +22098,12 @@ glabel hudRenderAmmo /* f0aa9a4: 24020001 */ addiu $v0,$zero,0x1 /* f0aa9a8: 144f0004 */ bne $v0,$t7,.L0f0aa9bc /* f0aa9ac: 24180002 */ addiu $t8,$zero,0x2 -/* f0aa9b0: 3c018008 */ lui $at,%hi(g_ScreenWidthMultiplier) +/* f0aa9b0: 3c018008 */ lui $at,%hi(g_ScaleX) /* f0aa9b4: 10000003 */ b .L0f0aa9c4 -/* f0aa9b8: ac38fac0 */ sw $t8,%lo(g_ScreenWidthMultiplier)($at) +/* f0aa9b8: ac38fac0 */ sw $t8,%lo(g_ScaleX)($at) .L0f0aa9bc: -/* f0aa9bc: 3c018008 */ lui $at,%hi(g_ScreenWidthMultiplier) -/* f0aa9c0: ac22fac0 */ sw $v0,%lo(g_ScreenWidthMultiplier)($at) +/* f0aa9bc: 3c018008 */ lui $at,%hi(g_ScaleX) +/* f0aa9c0: ac22fac0 */ sw $v0,%lo(g_ScaleX)($at) .L0f0aa9c4: /* f0aa9c4: 0fc54d8a */ jal func0f153628 /* f0aa9c8: 8fa40130 */ lw $a0,0x130($sp) @@ -22198,8 +22198,8 @@ glabel hudRenderAmmo /* f0aab0c: 0c002f22 */ jal viGetViewWidth /* f0aab10: a7a20076 */ sh $v0,0x76($sp) /* f0aab14: 87b90076 */ lh $t9,0x76($sp) -/* f0aab18: 3c0f8008 */ lui $t7,%hi(g_ScreenWidthMultiplier) -/* f0aab1c: 8deffac0 */ lw $t7,%lo(g_ScreenWidthMultiplier)($t7) +/* f0aab18: 3c0f8008 */ lui $t7,%hi(g_ScaleX) +/* f0aab1c: 8deffac0 */ lw $t7,%lo(g_ScaleX)($t7) /* f0aab20: 00597021 */ addu $t6,$v0,$t9 /* f0aab24: 8fb9010c */ lw $t9,0x10c($sp) /* f0aab28: 01cf001a */ div $zero,$t6,$t7 @@ -22303,9 +22303,9 @@ glabel hudRenderAmmo /* f0aac80: 8fa500f4 */ lw $a1,0xf4($sp) /* f0aac84: 0fc54df7 */ jal gfxSetPrimColour /* f0aac88: afaa0058 */ sw $t2,0x58($sp) -/* f0aac8c: 3c068008 */ lui $a2,%hi(g_ScreenWidthMultiplier) +/* f0aac8c: 3c068008 */ lui $a2,%hi(g_ScaleX) /* f0aac90: 8faf0100 */ lw $t7,0x100($sp) -/* f0aac94: 24c6fac0 */ addiu $a2,$a2,%lo(g_ScreenWidthMultiplier) +/* f0aac94: 24c6fac0 */ addiu $a2,$a2,%lo(g_ScaleX) /* f0aac98: 8cd90000 */ lw $t9,0x0($a2) /* f0aac9c: 25f8fffe */ addiu $t8,$t7,-2 /* f0aaca0: 8fa50128 */ lw $a1,0x128($sp) @@ -22447,9 +22447,9 @@ glabel hudRenderAmmo /* f0aaea4: 8fa40130 */ lw $a0,0x130($sp) /* f0aaea8: 0fc54df7 */ jal gfxSetPrimColour /* f0aaeac: afaa0058 */ sw $t2,0x58($sp) -/* f0aaeb0: 3c038008 */ lui $v1,%hi(g_ScreenWidthMultiplier) +/* f0aaeb0: 3c038008 */ lui $v1,%hi(g_ScaleX) /* f0aaeb4: 8fb90100 */ lw $t9,0x100($sp) -/* f0aaeb8: 2463fac0 */ addiu $v1,$v1,%lo(g_ScreenWidthMultiplier) +/* f0aaeb8: 2463fac0 */ addiu $v1,$v1,%lo(g_ScaleX) /* f0aaebc: 8c6f0000 */ lw $t7,0x0($v1) /* f0aaec0: 272efff5 */ addiu $t6,$t9,-11 /* f0aaec4: 3c01f600 */ lui $at,0xf600 @@ -22645,8 +22645,8 @@ glabel hudRenderAmmo /* f0ab194: 8fa40130 */ lw $a0,0x130($sp) /* f0ab198: 0fc54df7 */ jal gfxSetPrimColour /* f0ab19c: afaa0058 */ sw $t2,0x58($sp) -/* f0ab1a0: 3c038008 */ lui $v1,%hi(g_ScreenWidthMultiplier) -/* f0ab1a4: 2463fac0 */ addiu $v1,$v1,%lo(g_ScreenWidthMultiplier) +/* f0ab1a0: 3c038008 */ lui $v1,%hi(g_ScaleX) +/* f0ab1a4: 2463fac0 */ addiu $v1,$v1,%lo(g_ScaleX) /* f0ab1a8: 8c6f0000 */ lw $t7,0x0($v1) /* f0ab1ac: 8fb90060 */ lw $t9,0x60($sp) /* f0ab1b0: 3c01f600 */ lui $at,0xf600 @@ -22749,9 +22749,9 @@ glabel hudRenderAmmo /* f0ab324: 0fc54de0 */ jal func0f153780 /* f0ab328: 8fa40130 */ lw $a0,0x130($sp) /* f0ab32c: 24180001 */ addiu $t8,$zero,0x1 -/* f0ab330: 3c018008 */ lui $at,%hi(g_ScreenWidthMultiplier) +/* f0ab330: 3c018008 */ lui $at,%hi(g_ScaleX) /* f0ab334: 100001e2 */ b .L0f0abac0 -/* f0ab338: ac38fac0 */ sw $t8,%lo(g_ScreenWidthMultiplier)($at) +/* f0ab338: ac38fac0 */ sw $t8,%lo(g_ScaleX)($at) /* f0ab33c: 8fb90110 */ lw $t9,0x110($sp) .L0f0ab340: /* f0ab340: 814f0069 */ lb $t7,0x69($t2) @@ -22791,8 +22791,8 @@ glabel hudRenderAmmo /* f0ab3c4: afa40054 */ sw $a0,0x54($sp) /* f0ab3c8: 0c002f40 */ jal viGetViewLeft /* f0ab3cc: afaa0058 */ sw $t2,0x58($sp) -/* f0ab3d0: 3c0e8008 */ lui $t6,%hi(g_ScreenWidthMultiplier) -/* f0ab3d4: 8dcefac0 */ lw $t6,%lo(g_ScreenWidthMultiplier)($t6) +/* f0ab3d0: 3c0e8008 */ lui $t6,%hi(g_ScaleX) +/* f0ab3d4: 8dcefac0 */ lw $t6,%lo(g_ScaleX)($t6) /* f0ab3d8: 8faf0124 */ lw $t7,0x124($sp) /* f0ab3dc: 8fa40054 */ lw $a0,0x54($sp) /* f0ab3e0: 004e001a */ div $zero,$v0,$t6 @@ -22923,8 +22923,8 @@ glabel hudRenderAmmo /* f0ab5b4: 0c002f22 */ jal viGetViewWidth /* f0ab5b8: a7a20076 */ sh $v0,0x76($sp) /* f0ab5bc: 87b80076 */ lh $t8,0x76($sp) -/* f0ab5c0: 3c198008 */ lui $t9,%hi(g_ScreenWidthMultiplier) -/* f0ab5c4: 8f39fac0 */ lw $t9,%lo(g_ScreenWidthMultiplier)($t9) +/* f0ab5c0: 3c198008 */ lui $t9,%hi(g_ScaleX) +/* f0ab5c4: 8f39fac0 */ lw $t9,%lo(g_ScaleX)($t9) /* f0ab5c8: 00587821 */ addu $t7,$v0,$t8 /* f0ab5cc: 8fb8010c */ lw $t8,0x10c($sp) /* f0ab5d0: 01f9001a */ div $zero,$t7,$t9 @@ -23266,8 +23266,8 @@ glabel hudRenderAmmo /* f0abaac: 0fc54de0 */ jal func0f153780 /* f0abab0: 8fa40130 */ lw $a0,0x130($sp) /* f0abab4: 240e0001 */ addiu $t6,$zero,0x1 -/* f0abab8: 3c018008 */ lui $at,%hi(g_ScreenWidthMultiplier) -/* f0ababc: ac2efac0 */ sw $t6,%lo(g_ScreenWidthMultiplier)($at) +/* f0abab8: 3c018008 */ lui $at,%hi(g_ScaleX) +/* f0ababc: ac2efac0 */ sw $t6,%lo(g_ScaleX)($at) .L0f0abac0: /* f0abac0: 8fbf0034 */ lw $ra,0x34($sp) /* f0abac4: 27bd0130 */ addiu $sp,$sp,0x130 diff --git a/src/game/game_0b69d0.c b/src/game/game_0b69d0.c index 625e7ddb5..0fae5df7b 100644 --- a/src/game/game_0b69d0.c +++ b/src/game/game_0b69d0.c @@ -1755,7 +1755,7 @@ void currentPlayerSpawn(void) currentPlayerEquipWeaponWrapper(HAND_RIGHT, g_DefaultWeapons[HAND_RIGHT]); if (g_Vars.currentplayer->unk00d4 == 0 - && (!IS4MB() || g_Vars.unk0004e0 || g_MpPlayerChrs[g_Vars.currentplayernum] == NULL)) { + && (IS8MB() || g_Vars.unk0004e0 || g_MpPlayerChrs[g_Vars.currentplayernum] == NULL)) { func0f0b8ba0(); } } @@ -4654,7 +4654,7 @@ s16 currentPlayerGetViewportHeight(void) if (PLAYERCOUNT() == 2) { if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) { height = tmp; - } else if (g_Vars.currentplayernum == 0 && !IS4MB()) { + } else if (g_Vars.currentplayernum == 0 && IS8MB()) { height--; } } else if (g_Vars.currentplayernum == 0 || g_Vars.currentplayernum == 1) { diff --git a/src/game/game_0d4690.c b/src/game/game_0d4690.c index 4e2e98173..f54817227 100644 --- a/src/game/game_0d4690.c +++ b/src/game/game_0d4690.c @@ -85,8 +85,8 @@ glabel func0f0d4690 /* f0d4720: 44816000 */ mtc1 $at,$f12 /* f0d4724: 0c005793 */ jal func00015e4c /* f0d4728: 8fa50028 */ lw $a1,0x28($sp) -/* f0d472c: 3c0e8008 */ lui $t6,%hi(g_ScreenWidthMultiplier) -/* f0d4730: 8dcefac0 */ lw $t6,%lo(g_ScreenWidthMultiplier)($t6) +/* f0d472c: 3c0e8008 */ lui $t6,%hi(g_ScaleX) +/* f0d4730: 8dcefac0 */ lw $t6,%lo(g_ScaleX)($t6) /* f0d4734: 24010002 */ addiu $at,$zero,0x2 /* f0d4738: 15c10004 */ bne $t6,$at,.L0f0d474c /* f0d473c: 3c014000 */ lui $at,0x4000 diff --git a/src/game/game_0d7070.c b/src/game/game_0d7070.c index c2c3afabb..914c738e1 100644 --- a/src/game/game_0d7070.c +++ b/src/game/game_0d7070.c @@ -698,8 +698,8 @@ glabel func0f0d78f4 /* f0d7904: afa600a0 */ sw $a2,0xa0($sp) /* f0d7908: 0c002f40 */ jal viGetViewLeft /* f0d790c: afa700a4 */ sw $a3,0xa4($sp) -/* f0d7910: 3c0e8008 */ lui $t6,%hi(g_ScreenWidthMultiplier) -/* f0d7914: 8dcefac0 */ lw $t6,%lo(g_ScreenWidthMultiplier)($t6) +/* f0d7910: 3c0e8008 */ lui $t6,%hi(g_ScaleX) +/* f0d7914: 8dcefac0 */ lw $t6,%lo(g_ScaleX)($t6) /* f0d7918: 004e001a */ div $zero,$v0,$t6 /* f0d791c: 00007812 */ mflo $t7 /* f0d7920: afaf0094 */ sw $t7,0x94($sp) @@ -718,8 +718,8 @@ glabel func0f0d78f4 /* f0d794c: 00000000 */ nop /* f0d7950: 0c002f22 */ jal viGetViewWidth /* f0d7954: afa20090 */ sw $v0,0x90($sp) -/* f0d7958: 3c188008 */ lui $t8,%hi(g_ScreenWidthMultiplier) -/* f0d795c: 8f18fac0 */ lw $t8,%lo(g_ScreenWidthMultiplier)($t8) +/* f0d7958: 3c188008 */ lui $t8,%hi(g_ScaleX) +/* f0d795c: 8f18fac0 */ lw $t8,%lo(g_ScaleX)($t8) /* f0d7960: 8fad0090 */ lw $t5,0x90($sp) /* f0d7964: 0058001a */ div $zero,$v0,$t8 /* f0d7968: 0000c812 */ mflo $t9 @@ -751,8 +751,8 @@ glabel func0f0d78f4 /* f0d79c8: afaf00a4 */ sw $t7,0xa4($sp) /* f0d79cc: 8fb8009c */ lw $t8,0x9c($sp) .L0f0d79d0: -/* f0d79d0: 3c0e8008 */ lui $t6,%hi(g_ScreenWidthMultiplier) -/* f0d79d4: 8dcefac0 */ lw $t6,%lo(g_ScreenWidthMultiplier)($t6) +/* f0d79d0: 3c0e8008 */ lui $t6,%hi(g_ScaleX) +/* f0d79d4: 8dcefac0 */ lw $t6,%lo(g_ScaleX)($t6) /* f0d79d8: 87190004 */ lh $t9,0x4($t8) /* f0d79dc: 8fa50094 */ lw $a1,0x94($sp) /* f0d79e0: 8fa600a4 */ lw $a2,0xa4($sp) @@ -780,8 +780,8 @@ glabel func0f0d78f4 /* f0d7a30: 0fc35e27 */ jal func0f0d789c /* f0d7a34: 24070050 */ addiu $a3,$zero,0x50 /* f0d7a38: 8fb8009c */ lw $t8,0x9c($sp) -/* f0d7a3c: 3c0e8008 */ lui $t6,%hi(g_ScreenWidthMultiplier) -/* f0d7a40: 8dcefac0 */ lw $t6,%lo(g_ScreenWidthMultiplier)($t6) +/* f0d7a3c: 3c0e8008 */ lui $t6,%hi(g_ScaleX) +/* f0d7a40: 8dcefac0 */ lw $t6,%lo(g_ScaleX)($t6) /* f0d7a44: 87190008 */ lh $t9,0x8($t8) /* f0d7a48: 8fb8008c */ lw $t8,0x8c($sp) /* f0d7a4c: 8faf0094 */ lw $t7,0x94($sp) @@ -871,8 +871,8 @@ glabel func0f0d78f4 .L0f0d7b8c: /* f0d7b8c: 01801025 */ or $v0,$t4,$zero .L0f0d7b90: -/* f0d7b90: 3c078008 */ lui $a3,%hi(g_ScreenWidthMultiplier) -/* f0d7b94: 24e7fac0 */ addiu $a3,$a3,%lo(g_ScreenWidthMultiplier) +/* f0d7b90: 3c078008 */ lui $a3,%hi(g_ScaleX) +/* f0d7b94: 24e7fac0 */ addiu $a3,$a3,%lo(g_ScaleX) /* f0d7b98: 8cf80000 */ lw $t8,0x0($a3) /* f0d7b9c: 252f0001 */ addiu $t7,$t1,0x1 /* f0d7ba0: 3c1ff600 */ lui $ra,0xf600 @@ -902,9 +902,9 @@ glabel func0f0d78f4 /* f0d7bfc: 030fc825 */ or $t9,$t8,$t7 /* f0d7c00: ac790004 */ sw $t9,0x4($v1) .L0f0d7c04: -/* f0d7c04: 3c078008 */ lui $a3,%hi(g_ScreenWidthMultiplier) +/* f0d7c04: 3c078008 */ lui $a3,%hi(g_ScaleX) /* f0d7c08: 0105082a */ slt $at,$t0,$a1 -/* f0d7c0c: 24e7fac0 */ addiu $a3,$a3,%lo(g_ScreenWidthMultiplier) +/* f0d7c0c: 24e7fac0 */ addiu $a3,$a3,%lo(g_ScaleX) /* f0d7c10: 14200029 */ bnez $at,.L0f0d7cb8 /* f0d7c14: 3c1ff600 */ lui $ra,0xf600 /* f0d7c18: 0168082a */ slt $at,$t3,$t0 @@ -1146,8 +1146,8 @@ glabel func0f0d7f54 /* f0d7f74: afb00014 */ sw $s0,0x14($sp) /* f0d7f78: 0c002f40 */ jal viGetViewLeft /* f0d7f7c: afa400d0 */ sw $a0,0xd0($sp) -/* f0d7f80: 3c108008 */ lui $s0,%hi(g_ScreenWidthMultiplier) -/* f0d7f84: 2610fac0 */ addiu $s0,$s0,%lo(g_ScreenWidthMultiplier) +/* f0d7f80: 3c108008 */ lui $s0,%hi(g_ScaleX) +/* f0d7f84: 2610fac0 */ addiu $s0,$s0,%lo(g_ScaleX) /* f0d7f88: 8e0e0000 */ lw $t6,0x0($s0) /* f0d7f8c: 8fa400d0 */ lw $a0,0xd0($sp) /* f0d7f90: 004e001a */ div $zero,$v0,$t6 @@ -1880,9 +1880,9 @@ glabel var7f1adde8 /* f0d8a44: afb900cc */ sw $t9,0xcc($sp) /* f0d8a48: 0fc54df7 */ jal gfxSetPrimColour /* f0d8a4c: afaf00c8 */ sw $t7,0xc8($sp) -/* f0d8a50: 3c038008 */ lui $v1,%hi(g_ScreenWidthMultiplier) +/* f0d8a50: 3c038008 */ lui $v1,%hi(g_ScaleX) /* f0d8a54: 8fab00d4 */ lw $t3,0xd4($sp) -/* f0d8a58: 2463fac0 */ addiu $v1,$v1,%lo(g_ScreenWidthMultiplier) +/* f0d8a58: 2463fac0 */ addiu $v1,$v1,%lo(g_ScaleX) /* f0d8a5c: 8c790000 */ lw $t9,0x0($v1) /* f0d8a60: 25650002 */ addiu $a1,$t3,0x2 /* f0d8a64: 8faa00d8 */ lw $t2,0xd8($sp) @@ -1952,8 +1952,8 @@ glabel var7f1adde8 /* f0d8b64: 8fb800dc */ lw $t8,0xdc($sp) /* f0d8b68: 8fb900c8 */ lw $t9,0xc8($sp) /* f0d8b6c: 8fae00cc */ lw $t6,0xcc($sp) -/* f0d8b70: 3c038008 */ lui $v1,%hi(g_ScreenWidthMultiplier) -/* f0d8b74: 2463fac0 */ addiu $v1,$v1,%lo(g_ScreenWidthMultiplier) +/* f0d8b70: 3c038008 */ lui $v1,%hi(g_ScaleX) +/* f0d8b74: 2463fac0 */ addiu $v1,$v1,%lo(g_ScaleX) /* f0d8b78: 0338f821 */ addu $ra,$t9,$t8 /* f0d8b7c: 8c790000 */ lw $t9,0x0($v1) /* f0d8b80: 01d82823 */ subu $a1,$t6,$t8 @@ -2278,8 +2278,8 @@ glabel var7f1ade50 /* f0d8f94: afb00034 */ sw $s0,0x34($sp) /* f0d8f98: afa5009c */ sw $a1,0x9c($sp) /* f0d8f9c: c5041660 */ lwc1 $f4,0x1660($t0) -/* f0d8fa0: 3c188008 */ lui $t8,%hi(g_ScreenWidthMultiplier) -/* f0d8fa4: 8f18fac0 */ lw $t8,%lo(g_ScreenWidthMultiplier)($t8) +/* f0d8fa0: 3c188008 */ lui $t8,%hi(g_ScaleX) +/* f0d8fa4: 8f18fac0 */ lw $t8,%lo(g_ScaleX)($t8) /* f0d8fa8: 4600218d */ trunc.w.s $f6,$f4 /* f0d8fac: 00809825 */ or $s3,$a0,$zero /* f0d8fb0: 02602025 */ or $a0,$s3,$zero @@ -2812,10 +2812,10 @@ glabel func0f0d9544 /* f0d9754: 01ae7825 */ or $t7,$t5,$t6 /* f0d9758: ad4f0004 */ sw $t7,0x4($t2) /* f0d975c: e7b200c4 */ swc1 $f18,0xc4($sp) -/* f0d9760: 3c0d8008 */ lui $t5,%hi(g_ScreenWidthMultiplier) +/* f0d9760: 3c0d8008 */ lui $t5,%hi(g_ScaleX) /* f0d9764: e7a600c8 */ swc1 $f6,0xc8($sp) /* f0d9768: 92180004 */ lbu $t8,0x4($s0) -/* f0d976c: 8dadfac0 */ lw $t5,%lo(g_ScreenWidthMultiplier)($t5) +/* f0d976c: 8dadfac0 */ lw $t5,%lo(g_ScaleX)($t5) /* f0d9770: 00003825 */ or $a3,$zero,$zero /* f0d9774: 0018c843 */ sra $t9,$t8,0x1 /* f0d9778: 44994000 */ mtc1 $t9,$f8 @@ -3110,8 +3110,8 @@ glabel func0f0d9ba0 /* f0d9ba8: afa40090 */ sw $a0,0x90($sp) /* f0d9bac: 0c002f40 */ jal viGetViewLeft /* f0d9bb0: afa50094 */ sw $a1,0x94($sp) -/* f0d9bb4: 3c0e8008 */ lui $t6,%hi(g_ScreenWidthMultiplier) -/* f0d9bb8: 8dcefac0 */ lw $t6,%lo(g_ScreenWidthMultiplier)($t6) +/* f0d9bb4: 3c0e8008 */ lui $t6,%hi(g_ScaleX) +/* f0d9bb8: 8dcefac0 */ lw $t6,%lo(g_ScaleX)($t6) /* f0d9bbc: 8fa40090 */ lw $a0,0x90($sp) /* f0d9bc0: 004e001a */ div $zero,$v0,$t6 /* f0d9bc4: 00007812 */ mflo $t7 @@ -3131,8 +3131,8 @@ glabel func0f0d9ba0 /* f0d9bf4: 00000000 */ nop /* f0d9bf8: 0c002f22 */ jal viGetViewWidth /* f0d9bfc: afa20088 */ sw $v0,0x88($sp) -/* f0d9c00: 3c188008 */ lui $t8,%hi(g_ScreenWidthMultiplier) -/* f0d9c04: 8f18fac0 */ lw $t8,%lo(g_ScreenWidthMultiplier)($t8) +/* f0d9c00: 3c188008 */ lui $t8,%hi(g_ScaleX) +/* f0d9c04: 8f18fac0 */ lw $t8,%lo(g_ScaleX)($t8) /* f0d9c08: 8fa40090 */ lw $a0,0x90($sp) /* f0d9c0c: 0058001a */ div $zero,$v0,$t8 /* f0d9c10: 00005812 */ mflo $t3 @@ -3150,8 +3150,8 @@ glabel func0f0d9ba0 .L0f0d9c3c: /* f0d9c3c: 0c002f26 */ jal viGetViewHeight /* f0d9c40: 00000000 */ nop -/* f0d9c44: 3c0e8008 */ lui $t6,%hi(g_ScreenWidthMultiplier) -/* f0d9c48: 8dcefac0 */ lw $t6,%lo(g_ScreenWidthMultiplier)($t6) +/* f0d9c44: 3c0e8008 */ lui $t6,%hi(g_ScaleX) +/* f0d9c48: 8dcefac0 */ lw $t6,%lo(g_ScaleX)($t6) /* f0d9c4c: 3c03800a */ lui $v1,%hi(g_Vars+0x284) /* f0d9c50: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f0d9c54: 448e3000 */ mtc1 $t6,$f6 @@ -3622,8 +3622,8 @@ glabel var7f1ade54 /* f0da2e4: afa50104 */ sw $a1,0x104($sp) /* f0da2e8: 0c002f40 */ jal viGetViewLeft /* f0da2ec: afa40100 */ sw $a0,0x100($sp) -/* f0da2f0: 3c088008 */ lui $t0,%hi(g_ScreenWidthMultiplier) -/* f0da2f4: 2508fac0 */ addiu $t0,$t0,%lo(g_ScreenWidthMultiplier) +/* f0da2f0: 3c088008 */ lui $t0,%hi(g_ScaleX) +/* f0da2f4: 2508fac0 */ addiu $t0,$t0,%lo(g_ScaleX) /* f0da2f8: 8d0e0000 */ lw $t6,0x0($t0) /* f0da2fc: 8fa60100 */ lw $a2,0x100($sp) /* f0da300: 004e001a */ div $zero,$v0,$t6 @@ -3644,8 +3644,8 @@ glabel var7f1ade54 /* f0da334: 00000000 */ nop /* f0da338: 0c002f22 */ jal viGetViewWidth /* f0da33c: afa200f8 */ sw $v0,0xf8($sp) -/* f0da340: 3c088008 */ lui $t0,%hi(g_ScreenWidthMultiplier) -/* f0da344: 2508fac0 */ addiu $t0,$t0,%lo(g_ScreenWidthMultiplier) +/* f0da340: 3c088008 */ lui $t0,%hi(g_ScaleX) +/* f0da344: 2508fac0 */ addiu $t0,$t0,%lo(g_ScaleX) /* f0da348: 8d180000 */ lw $t8,0x0($t0) /* f0da34c: 8fa60100 */ lw $a2,0x100($sp) /* f0da350: 0058001a */ div $zero,$v0,$t8 @@ -3745,10 +3745,10 @@ glabel var7f1ade54 /* f0da4b0: 3c017f1b */ lui $at,%hi(var7f1ade54) /* f0da4b4: c420de54 */ lwc1 $f0,%lo(var7f1ade54)($at) /* f0da4b8: c7a400cc */ lwc1 $f4,0xcc($sp) -/* f0da4bc: 3c088008 */ lui $t0,%hi(g_ScreenWidthMultiplier) +/* f0da4bc: 3c088008 */ lui $t0,%hi(g_ScaleX) /* f0da4c0: 3c04800a */ lui $a0,%hi(g_Vars) /* f0da4c4: 4600203c */ c.lt.s $f4,$f0 -/* f0da4c8: 2508fac0 */ addiu $t0,$t0,%lo(g_ScreenWidthMultiplier) +/* f0da4c8: 2508fac0 */ addiu $t0,$t0,%lo(g_ScaleX) /* f0da4cc: 8fad00b4 */ lw $t5,0xb4($sp) /* f0da4d0: 24849fc0 */ addiu $a0,$a0,%lo(g_Vars) /* f0da4d4: 45020012 */ bc1fl .L0f0da520 @@ -5725,8 +5725,8 @@ glabel func0f0dc170 /* f0dc180: afb10018 */ sw $s1,0x18($sp) /* f0dc184: 0c002f40 */ jal viGetViewLeft /* f0dc188: afa500b4 */ sw $a1,0xb4($sp) -/* f0dc18c: 3c118008 */ lui $s1,%hi(g_ScreenWidthMultiplier) -/* f0dc190: 2631fac0 */ addiu $s1,$s1,%lo(g_ScreenWidthMultiplier) +/* f0dc18c: 3c118008 */ lui $s1,%hi(g_ScaleX) +/* f0dc190: 2631fac0 */ addiu $s1,$s1,%lo(g_ScaleX) /* f0dc194: 8e2e0000 */ lw $t6,0x0($s1) /* f0dc198: 004e001a */ div $zero,$v0,$t6 /* f0dc19c: 00007812 */ mflo $t7 @@ -6088,8 +6088,8 @@ glabel func0f0dc6e4 /* f0dc6f0: afbf001c */ sw $ra,0x1c($sp) /* f0dc6f4: afb00018 */ sw $s0,0x18($sp) /* f0dc6f8: c4441660 */ lwc1 $f4,0x1660($v0) -/* f0dc6fc: 3c038008 */ lui $v1,%hi(g_ScreenWidthMultiplier) -/* f0dc700: 2463fac0 */ addiu $v1,$v1,%lo(g_ScreenWidthMultiplier) +/* f0dc6fc: 3c038008 */ lui $v1,%hi(g_ScaleX) +/* f0dc700: 2463fac0 */ addiu $v1,$v1,%lo(g_ScaleX) /* f0dc704: 4600218d */ trunc.w.s $f6,$f4 /* f0dc708: 8c780000 */ lw $t8,0x0($v1) /* f0dc70c: c4481664 */ lwc1 $f8,0x1664($v0) @@ -6126,9 +6126,9 @@ glabel func0f0dc6e4 /* f0dc780: 34a50028 */ ori $a1,$a1,0x28 /* f0dc784: 0fc54df7 */ jal gfxSetPrimColour /* f0dc788: 02002025 */ or $a0,$s0,$zero -/* f0dc78c: 3c038008 */ lui $v1,%hi(g_ScreenWidthMultiplier) +/* f0dc78c: 3c038008 */ lui $v1,%hi(g_ScaleX) /* f0dc790: 8fa60024 */ lw $a2,0x24($sp) -/* f0dc794: 2463fac0 */ addiu $v1,$v1,%lo(g_ScreenWidthMultiplier) +/* f0dc794: 2463fac0 */ addiu $v1,$v1,%lo(g_ScaleX) /* f0dc798: 8c790000 */ lw $t9,0x0($v1) /* f0dc79c: 24d80007 */ addiu $t8,$a2,0x7 /* f0dc7a0: 8fa80020 */ lw $t0,0x20($sp) @@ -6355,12 +6355,12 @@ glabel var7f1ade74 /* f0dca9c: 24080001 */ addiu $t0,$zero,0x1 /* f0dcaa0: 24090002 */ addiu $t1,$zero,0x2 /* f0dcaa4: 15190004 */ bne $t0,$t9,.L0f0dcab8 -/* f0dcaa8: 3c018008 */ lui $at,%hi(g_ScreenWidthMultiplier) -/* f0dcaac: 3c018008 */ lui $at,%hi(g_ScreenWidthMultiplier) +/* f0dcaa8: 3c018008 */ lui $at,%hi(g_ScaleX) +/* f0dcaac: 3c018008 */ lui $at,%hi(g_ScaleX) /* f0dcab0: 10000002 */ b .L0f0dcabc -/* f0dcab4: ac29fac0 */ sw $t1,%lo(g_ScreenWidthMultiplier)($at) +/* f0dcab4: ac29fac0 */ sw $t1,%lo(g_ScaleX)($at) .L0f0dcab8: -/* f0dcab8: ac28fac0 */ sw $t0,%lo(g_ScreenWidthMultiplier)($at) +/* f0dcab8: ac28fac0 */ sw $t0,%lo(g_ScaleX)($at) .L0f0dcabc: /* f0dcabc: 8cca006c */ lw $t2,0x6c($a2) /* f0dcac0: 00002025 */ or $a0,$zero,$zero @@ -6562,8 +6562,8 @@ glabel var7f1ade74 .L0f0dcd8c: /* f0dcd8c: 240d0001 */ addiu $t5,$zero,0x1 .L0f0dcd90: -/* f0dcd90: 3c018008 */ lui $at,%hi(g_ScreenWidthMultiplier) -/* f0dcd94: ac2dfac0 */ sw $t5,%lo(g_ScreenWidthMultiplier)($at) +/* f0dcd90: 3c018008 */ lui $at,%hi(g_ScaleX) +/* f0dcd94: ac2dfac0 */ sw $t5,%lo(g_ScaleX)($at) /* f0dcd98: 8fa20030 */ lw $v0,0x30($sp) .L0f0dcd9c: /* f0dcd9c: 8fbf0014 */ lw $ra,0x14($sp) diff --git a/src/game/game_0dcdb0.c b/src/game/game_0dcdb0.c index 5b6f3756e..0865fdc93 100644 --- a/src/game/game_0dcdb0.c +++ b/src/game/game_0dcdb0.c @@ -108,8 +108,8 @@ glabel hudRenderMissionTimer /* f0dcefc: afa40090 */ sw $a0,0x90($sp) /* f0dcf00: 0c002f40 */ jal viGetViewLeft /* f0dcf04: afa50094 */ sw $a1,0x94($sp) -/* f0dcf08: 3c0e8008 */ lui $t6,%hi(g_ScreenWidthMultiplier) -/* f0dcf0c: 8dcefac0 */ lw $t6,%lo(g_ScreenWidthMultiplier)($t6) +/* f0dcf08: 3c0e8008 */ lui $t6,%hi(g_ScaleX) +/* f0dcf0c: 8dcefac0 */ lw $t6,%lo(g_ScaleX)($t6) /* f0dcf10: 004e001a */ div $zero,$v0,$t6 /* f0dcf14: 00007812 */ mflo $t7 /* f0dcf18: afaf0084 */ sw $t7,0x84($sp) @@ -378,7 +378,7 @@ glabel hudRenderMissionTimer // s16 top; // s32 playercount; // -// sp84 = viGetViewLeft() / g_ScreenWidthMultiplier; +// sp84 = viGetViewLeft() / g_ScaleX; // top = viGetViewTop(); // viewy = viGetViewHeight(); // playercount = PLAYERCOUNT(); @@ -455,8 +455,8 @@ glabel hudRenderZoomRange /* f0dd2c0: afa500c4 */ sw $a1,0xc4($sp) /* f0dd2c4: 0c002f40 */ jal viGetViewLeft /* f0dd2c8: afa200bc */ sw $v0,0xbc($sp) -/* f0dd2cc: 3c108008 */ lui $s0,%hi(g_ScreenWidthMultiplier) -/* f0dd2d0: 2610fac0 */ addiu $s0,$s0,%lo(g_ScreenWidthMultiplier) +/* f0dd2cc: 3c108008 */ lui $s0,%hi(g_ScaleX) +/* f0dd2d0: 2610fac0 */ addiu $s0,$s0,%lo(g_ScaleX) /* f0dd2d4: 8e0e0000 */ lw $t6,0x0($s0) /* f0dd2d8: 004e001a */ div $zero,$v0,$t6 /* f0dd2dc: 00007812 */ mflo $t7 @@ -839,8 +839,8 @@ glabel hudRenderZoomRange /* f0dd2a0: afa500c4 */ sw $a1,0xc4($sp) /* f0dd2a4: 0c002f40 */ jal 0xbd00 /* f0dd2a8: afa200bc */ sw $v0,0xbc($sp) -/* f0dd2ac: 3c108008 */ lui $s0,%hi(g_ScreenWidthMultiplier) -/* f0dd2b0: 2610fac0 */ addiu $s0,$s0,%lo(g_ScreenWidthMultiplier) +/* f0dd2ac: 3c108008 */ lui $s0,%hi(g_ScaleX) +/* f0dd2b0: 2610fac0 */ addiu $s0,$s0,%lo(g_ScaleX) /* f0dd2b4: 8e0e0000 */ lw $t6,0x0($s0) /* f0dd2b8: 004e001a */ div $zero,$v0,$t6 /* f0dd2bc: 00007812 */ mflo $t7 @@ -1333,8 +1333,8 @@ glabel var7f1adeac /* f0dd9f8: 00402025 */ or $a0,$v0,$zero /* f0dd9fc: 468021a0 */ cvt.s.w $f6,$f4 /* f0dda00: 46184002 */ mul.s $f0,$f8,$f24 -/* f0dda04: 3c028008 */ lui $v0,%hi(g_ScreenWidthMultiplier) -/* f0dda08: 8c42fac0 */ lw $v0,%lo(g_ScreenWidthMultiplier)($v0) +/* f0dda04: 3c028008 */ lui $v0,%hi(g_ScaleX) +/* f0dda08: 8c42fac0 */ lw $v0,%lo(g_ScaleX)($v0) /* f0dda0c: 3c014300 */ lui $at,0x4300 /* f0dda10: 240b0001 */ addiu $t3,$zero,0x1 /* f0dda14: 46183082 */ mul.s $f2,$f6,$f24 @@ -1417,8 +1417,8 @@ glabel func0f0ddb1c /* f0ddb28: 27bdffe0 */ addiu $sp,$sp,-32 /* f0ddb2c: afbf0014 */ sw $ra,0x14($sp) /* f0ddb30: afa50024 */ sw $a1,0x24($sp) -/* f0ddb34: 3c188008 */ lui $t8,%hi(g_ScreenWidthMultiplier) -/* f0ddb38: 8f18fac0 */ lw $t8,%lo(g_ScreenWidthMultiplier)($t8) +/* f0ddb34: 3c188008 */ lui $t8,%hi(g_ScaleX) +/* f0ddb38: 8f18fac0 */ lw $t8,%lo(g_ScaleX)($t8) /* f0ddb3c: 85cf0630 */ lh $t7,0x630($t6) /* f0ddb40: 00803825 */ or $a3,$a0,$zero /* f0ddb44: 24190018 */ addiu $t9,$zero,0x18 @@ -2186,9 +2186,9 @@ glabel var7f1adec0 /* f0de808: 8c8f01c0 */ lw $t7,0x1c0($a0) /* f0de80c: 3c09800a */ lui $t1,%hi(g_Vars) /* f0de810: 25299fc0 */ addiu $t1,$t1,%lo(g_Vars) -/* f0de814: 3c038008 */ lui $v1,%hi(g_ScreenWidthMultiplier) +/* f0de814: 3c038008 */ lui $v1,%hi(g_ScaleX) /* f0de818: 000fc080 */ sll $t8,$t7,0x2 -/* f0de81c: 8c63fac0 */ lw $v1,%lo(g_ScreenWidthMultiplier)($v1) +/* f0de81c: 8c63fac0 */ lw $v1,%lo(g_ScaleX)($v1) /* f0de820: 0138c821 */ addu $t9,$t1,$t8 /* f0de824: 8f220064 */ lw $v0,0x64($t9) /* f0de828: 00807025 */ or $t6,$a0,$zero @@ -2760,12 +2760,12 @@ glabel hudmsgCreate /* f0defd4: 146a0005 */ bne $v1,$t2,.L0f0defec /* f0defd8: 00008025 */ or $s0,$zero,$zero /* f0defdc: 240b0002 */ addiu $t3,$zero,0x2 -/* f0defe0: 3c018008 */ lui $at,%hi(g_ScreenWidthMultiplier) +/* f0defe0: 3c018008 */ lui $at,%hi(g_ScaleX) /* f0defe4: 10000003 */ b .L0f0deff4 -/* f0defe8: ac2bfac0 */ sw $t3,%lo(g_ScreenWidthMultiplier)($at) +/* f0defe8: ac2bfac0 */ sw $t3,%lo(g_ScaleX)($at) .L0f0defec: -/* f0defec: 3c018008 */ lui $at,%hi(g_ScreenWidthMultiplier) -/* f0deff0: ac23fac0 */ sw $v1,%lo(g_ScreenWidthMultiplier)($at) +/* f0defec: 3c018008 */ lui $at,%hi(g_ScaleX) +/* f0deff0: ac23fac0 */ sw $v1,%lo(g_ScaleX)($at) .L0f0deff4: /* f0deff4: 18800009 */ blez $a0,.L0f0df01c /* f0deff8: 3c028007 */ lui $v0,%hi(g_HudMessages) @@ -2995,8 +2995,8 @@ glabel hudmsgCreate /* f0df33c: 8fac022c */ lw $t4,0x22c($sp) /* f0df340: ae2c01b0 */ sw $t4,0x1b0($s1) .L0f0df344: -/* f0df344: 3c018008 */ lui $at,%hi(g_ScreenWidthMultiplier) -/* f0df348: ac23fac0 */ sw $v1,%lo(g_ScreenWidthMultiplier)($at) +/* f0df344: 3c018008 */ lui $at,%hi(g_ScaleX) +/* f0df348: ac23fac0 */ sw $v1,%lo(g_ScaleX)($at) .L0f0df34c: /* f0df34c: 8fbf002c */ lw $ra,0x2c($sp) /* f0df350: 8fb00020 */ lw $s0,0x20($sp) @@ -3055,7 +3055,7 @@ glabel hudmsgCreate // } // } // -// g_ScreenWidthMultiplier = g_ViMode == VIMODE_HIRES ? 2 : 1; +// g_ScaleX = g_ViMode == VIMODE_HIRES ? 2 : 1; // // // Find an unused index for the new message // for (index = 0; index < g_NumHudMessages; index++) { @@ -3147,7 +3147,7 @@ glabel hudmsgCreate // } // } // -// g_ScreenWidthMultiplier = 1; +// g_ScaleX = 1; // } //} @@ -3183,12 +3183,12 @@ glabel var7f1aded8 /* f0df398: 164e0005 */ bne $s2,$t6,.L0f0df3b0 /* f0df39c: a0200fb0 */ sb $zero,%lo(var80070fb0)($at) /* f0df3a0: 240f0002 */ addiu $t7,$zero,0x2 -/* f0df3a4: 3c018008 */ lui $at,%hi(g_ScreenWidthMultiplier) +/* f0df3a4: 3c018008 */ lui $at,%hi(g_ScaleX) /* f0df3a8: 10000003 */ b .L0f0df3b8 -/* f0df3ac: ac2ffac0 */ sw $t7,%lo(g_ScreenWidthMultiplier)($at) +/* f0df3ac: ac2ffac0 */ sw $t7,%lo(g_ScaleX)($at) .L0f0df3b0: -/* f0df3b0: 3c018008 */ lui $at,%hi(g_ScreenWidthMultiplier) -/* f0df3b4: ac32fac0 */ sw $s2,%lo(g_ScreenWidthMultiplier)($at) +/* f0df3b0: 3c018008 */ lui $at,%hi(g_ScaleX) +/* f0df3b4: ac32fac0 */ sw $s2,%lo(g_ScaleX)($at) .L0f0df3b8: /* f0df3b8: 3c088007 */ lui $t0,%hi(g_NumHudMessages) /* f0df3bc: 8d080fe8 */ lw $t0,%lo(g_NumHudMessages)($t0) @@ -3621,8 +3621,8 @@ glabel var7f1aded8 /* f0df9e8: 8fa40068 */ lw $a0,0x68($sp) .L0f0df9ec: /* f0df9ec: 8fbf0044 */ lw $ra,0x44($sp) -/* f0df9f0: 3c018008 */ lui $at,%hi(g_ScreenWidthMultiplier) -/* f0df9f4: ac32fac0 */ sw $s2,%lo(g_ScreenWidthMultiplier)($at) +/* f0df9f0: 3c018008 */ lui $at,%hi(g_ScaleX) +/* f0df9f4: ac32fac0 */ sw $s2,%lo(g_ScaleX)($at) /* f0df9f8: 8fb20030 */ lw $s2,0x30($sp) /* f0df9fc: 8fb00028 */ lw $s0,0x28($sp) /* f0dfa00: 8fb1002c */ lw $s1,0x2c($sp) @@ -3700,12 +3700,12 @@ glabel var7f1adef4 /* f0dfb24: 144f0005 */ bne $v0,$t7,.L0f0dfb3c /* f0dfb28: afa200dc */ sw $v0,0xdc($sp) /* f0dfb2c: 24180002 */ addiu $t8,$zero,0x2 -/* f0dfb30: 3c018008 */ lui $at,%hi(g_ScreenWidthMultiplier) +/* f0dfb30: 3c018008 */ lui $at,%hi(g_ScaleX) /* f0dfb34: 10000003 */ b .L0f0dfb44 -/* f0dfb38: ac38fac0 */ sw $t8,%lo(g_ScreenWidthMultiplier)($at) +/* f0dfb38: ac38fac0 */ sw $t8,%lo(g_ScaleX)($at) .L0f0dfb3c: -/* f0dfb3c: 3c018008 */ lui $at,%hi(g_ScreenWidthMultiplier) -/* f0dfb40: ac22fac0 */ sw $v0,%lo(g_ScreenWidthMultiplier)($at) +/* f0dfb3c: 3c018008 */ lui $at,%hi(g_ScaleX) +/* f0dfb40: ac22fac0 */ sw $v0,%lo(g_ScaleX)($at) .L0f0dfb44: /* f0dfb44: 0fc54d8a */ jal func0f153628 /* f0dfb48: 02402025 */ or $a0,$s2,$zero @@ -3890,8 +3890,8 @@ glabel var7f1adef4 /* f0dfdd4: 55210031 */ bnel $t1,$at,.L0f0dfe9c /* f0dfdd8: 920d0000 */ lbu $t5,0x0($s0) /* f0dfddc: 8fab00e8 */ lw $t3,0xe8($sp) -/* f0dfde0: 3c0c8008 */ lui $t4,%hi(g_ScreenWidthMultiplier) -/* f0dfde4: 8d8cfac0 */ lw $t4,%lo(g_ScreenWidthMultiplier)($t4) +/* f0dfde0: 3c0c8008 */ lui $t4,%hi(g_ScaleX) +/* f0dfde4: 8d8cfac0 */ lw $t4,%lo(g_ScaleX)($t4) /* f0dfde8: 256afffc */ addiu $t2,$t3,-4 /* f0dfdec: 3c01ed00 */ lui $at,0xed00 /* f0dfdf0: 014c0019 */ multu $t2,$t4 @@ -3912,8 +3912,8 @@ glabel var7f1adef4 /* f0dfe2c: ae280000 */ sw $t0,0x0($s1) /* f0dfe30: 8fa900e8 */ lw $t1,0xe8($sp) /* f0dfe34: 960b001c */ lhu $t3,0x1c($s0) -/* f0dfe38: 3c0d8008 */ lui $t5,%hi(g_ScreenWidthMultiplier) -/* f0dfe3c: 8dadfac0 */ lw $t5,%lo(g_ScreenWidthMultiplier)($t5) +/* f0dfe38: 3c0d8008 */ lui $t5,%hi(g_ScaleX) +/* f0dfe3c: 8dadfac0 */ lw $t5,%lo(g_ScaleX)($t5) /* f0dfe40: 012b5021 */ addu $t2,$t1,$t3 /* f0dfe44: 254c0003 */ addiu $t4,$t2,0x3 /* f0dfe48: 018d0019 */ multu $t4,$t5 @@ -4497,7 +4497,7 @@ glabel var7f1adef4 /* f0e06d4: 02402025 */ or $a0,$s2,$zero /* f0e06d8: 8fbf007c */ lw $ra,0x7c($sp) /* f0e06dc: 240a0001 */ addiu $t2,$zero,0x1 -/* f0e06e0: 3c018008 */ lui $at,%hi(g_ScreenWidthMultiplier) +/* f0e06e0: 3c018008 */ lui $at,%hi(g_ScaleX) /* f0e06e4: d7b40038 */ ldc1 $f20,0x38($sp) /* f0e06e8: d7b60040 */ ldc1 $f22,0x40($sp) /* f0e06ec: d7b80048 */ ldc1 $f24,0x48($sp) @@ -4511,7 +4511,7 @@ glabel var7f1adef4 /* f0e070c: 8fb60070 */ lw $s6,0x70($sp) /* f0e0710: 8fb70074 */ lw $s7,0x74($sp) /* f0e0714: 8fbe0078 */ lw $s8,0x78($sp) -/* f0e0718: ac2afac0 */ sw $t2,%lo(g_ScreenWidthMultiplier)($at) +/* f0e0718: ac2afac0 */ sw $t2,%lo(g_ScaleX)($at) /* f0e071c: 03e00008 */ jr $ra /* f0e0720: 27bd0100 */ addiu $sp,$sp,0x100 ); @@ -4531,9 +4531,9 @@ glabel var7f1adef4 // // // b24 // if (g_ViMode == VIMODE_HIRES) { -// g_ScreenWidthMultiplier = 2; +// g_ScaleX = 2; // } else { -// g_ScreenWidthMultiplier = 1; +// g_ScaleX = 1; // } // // // b44 @@ -4604,8 +4604,8 @@ glabel var7f1adef4 // // dd0 // if (msg->type == HUDMSGTYPE_11) { // gDPSetScissor(gdl++, 0, -// (x - 4) * g_ScreenWidthMultiplier, 0, -// (x + msg->width + 3) * g_ScreenWidthMultiplier, viGetBufY()); +// (x - 4) * g_ScaleX, 0, +// (x + msg->width + 3) * g_ScaleX, viGetBufY()); // } // // // e9c @@ -4770,7 +4770,7 @@ glabel var7f1adef4 // // gdl = func0f153780(gdl); // -// g_ScreenWidthMultiplier = 1; +// g_ScaleX = 1; // // return gdl; //} diff --git a/src/game/game_0e0770.c b/src/game/game_0e0770.c index 6fdd498ca..c3e5786bc 100644 --- a/src/game/game_0e0770.c +++ b/src/game/game_0e0770.c @@ -88,12 +88,12 @@ glabel func0f0e0770 /* f0e07b8: 162e0005 */ bne $s1,$t6,.L0f0e07d0 /* f0e07bc: 3c188007 */ lui $t8,%hi(var80071180) /* f0e07c0: 240f0002 */ addiu $t7,$zero,0x2 -/* f0e07c4: 3c018008 */ lui $at,%hi(g_ScreenWidthMultiplier) +/* f0e07c4: 3c018008 */ lui $at,%hi(g_ScaleX) /* f0e07c8: 10000003 */ b .L0f0e07d8 -/* f0e07cc: ac2ffac0 */ sw $t7,%lo(g_ScreenWidthMultiplier)($at) +/* f0e07cc: ac2ffac0 */ sw $t7,%lo(g_ScaleX)($at) .L0f0e07d0: -/* f0e07d0: 3c018008 */ lui $at,%hi(g_ScreenWidthMultiplier) -/* f0e07d4: ac31fac0 */ sw $s1,%lo(g_ScreenWidthMultiplier)($at) +/* f0e07d0: 3c018008 */ lui $at,%hi(g_ScaleX) +/* f0e07d4: ac31fac0 */ sw $s1,%lo(g_ScaleX)($at) .L0f0e07d8: /* f0e07d8: 8f181180 */ lw $t8,%lo(var80071180)($t8) /* f0e07dc: 24010001 */ addiu $at,$zero,0x1 @@ -125,8 +125,8 @@ glabel func0f0e0770 /* f0e083c: 8fb50044 */ lw $s5,0x44($sp) /* f0e0840: 0000a025 */ or $s4,$zero,$zero .L0f0e0844: -/* f0e0844: 3c118008 */ lui $s1,%hi(g_ScreenWidthMultiplier) -/* f0e0848: 8e31fac0 */ lw $s1,%lo(g_ScreenWidthMultiplier)($s1) +/* f0e0844: 3c118008 */ lui $s1,%hi(g_ScaleX) +/* f0e0848: 8e31fac0 */ lw $s1,%lo(g_ScaleX)($s1) /* f0e084c: 02a0b025 */ or $s6,$s5,$zero /* f0e0850: 26b50002 */ addiu $s5,$s5,0x2 /* f0e0854: 02910019 */ multu $s4,$s1 @@ -199,7 +199,7 @@ glabel func0f0e0770 /* f0e0958: 03d8f021 */ addu $s8,$s8,$t8 /* f0e095c: 8fbf003c */ lw $ra,0x3c($sp) /* f0e0960: 24190001 */ addiu $t9,$zero,0x1 -/* f0e0964: 3c018008 */ lui $at,%hi(g_ScreenWidthMultiplier) +/* f0e0964: 3c018008 */ lui $at,%hi(g_ScaleX) /* f0e0968: 8fb00018 */ lw $s0,0x18($sp) /* f0e096c: 8fb1001c */ lw $s1,0x1c($sp) /* f0e0970: 8fb20020 */ lw $s2,0x20($sp) @@ -209,7 +209,7 @@ glabel func0f0e0770 /* f0e0980: 8fb60030 */ lw $s6,0x30($sp) /* f0e0984: 8fb70034 */ lw $s7,0x34($sp) /* f0e0988: 8fbe0038 */ lw $s8,0x38($sp) -/* f0e098c: ac39fac0 */ sw $t9,%lo(g_ScreenWidthMultiplier)($at) +/* f0e098c: ac39fac0 */ sw $t9,%lo(g_ScaleX)($at) /* f0e0990: 03e00008 */ jr $ra /* f0e0994: 27bd0080 */ addiu $sp,$sp,0x80 ); @@ -490,8 +490,8 @@ glabel func0f0e0dac /* f0e0dbc: afa70044 */ sw $a3,0x44($sp) /* f0e0dc0: 0fc54df7 */ jal gfxSetPrimColour /* f0e0dc4: 8fa50050 */ lw $a1,0x50($sp) -/* f0e0dc8: 3c038008 */ lui $v1,%hi(g_ScreenWidthMultiplier) -/* f0e0dcc: 2463fac0 */ addiu $v1,$v1,%lo(g_ScreenWidthMultiplier) +/* f0e0dc8: 3c038008 */ lui $v1,%hi(g_ScaleX) +/* f0e0dcc: 2463fac0 */ addiu $v1,$v1,%lo(g_ScaleX) /* f0e0dd0: 8c6f0000 */ lw $t7,0x0($v1) /* f0e0dd4: 8fae0044 */ lw $t6,0x44($sp) /* f0e0dd8: 8fab0048 */ lw $t3,0x48($sp) @@ -3162,9 +3162,9 @@ glabel renderCheckbox /* f0e37d0: 8fa50060 */ lw $a1,0x60($sp) /* f0e37d4: 0fc54df7 */ jal gfxSetPrimColour /* f0e37d8: afa70054 */ sw $a3,0x54($sp) -/* f0e37dc: 3c068008 */ lui $a2,%hi(g_ScreenWidthMultiplier) +/* f0e37dc: 3c068008 */ lui $a2,%hi(g_ScaleX) /* f0e37e0: 8fa70054 */ lw $a3,0x54($sp) -/* f0e37e4: 24c6fac0 */ addiu $a2,$a2,%lo(g_ScreenWidthMultiplier) +/* f0e37e4: 24c6fac0 */ addiu $a2,$a2,%lo(g_ScaleX) /* f0e37e8: 8cd80000 */ lw $t8,0x0($a2) /* f0e37ec: 02077821 */ addu $t7,$s0,$a3 /* f0e37f0: 3c01f600 */ lui $at,0xf600 @@ -3205,9 +3205,9 @@ glabel renderCheckbox /* f0e3878: afaa002c */ sw $t2,0x2c($sp) /* f0e387c: 0fc54df7 */ jal gfxSetPrimColour /* f0e3880: 8fa5005c */ lw $a1,0x5c($sp) -/* f0e3884: 3c068008 */ lui $a2,%hi(g_ScreenWidthMultiplier) +/* f0e3884: 3c068008 */ lui $a2,%hi(g_ScaleX) /* f0e3888: 8fa90030 */ lw $t1,0x30($sp) -/* f0e388c: 24c6fac0 */ addiu $a2,$a2,%lo(g_ScreenWidthMultiplier) +/* f0e388c: 24c6fac0 */ addiu $a2,$a2,%lo(g_ScaleX) /* f0e3890: 8ccd0000 */ lw $t5,0x0($a2) /* f0e3894: 25230001 */ addiu $v1,$t1,0x1 /* f0e3898: 26250001 */ addiu $a1,$s1,0x1 diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index 795d443e3..456376234 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -302,8 +302,8 @@ glabel func0f0f0ce8 /* f0f0e24: afae0068 */ sw $t6,0x68($sp) /* f0f0e28: 0fc54df7 */ jal gfxSetPrimColour /* f0f0e2c: afa60084 */ sw $a2,0x84($sp) -/* f0f0e30: 3c038008 */ lui $v1,%hi(g_ScreenWidthMultiplier) -/* f0f0e34: 2463fac0 */ addiu $v1,$v1,%lo(g_ScreenWidthMultiplier) +/* f0f0e30: 3c038008 */ lui $v1,%hi(g_ScaleX) +/* f0f0e34: 2463fac0 */ addiu $v1,$v1,%lo(g_ScaleX) /* f0f0e38: 8c780000 */ lw $t8,0x0($v1) /* f0f0e3c: 8faf009c */ lw $t7,0x9c($sp) /* f0f0e40: 8fac00a0 */ lw $t4,0xa0($sp) @@ -334,8 +334,8 @@ glabel func0f0f0ce8 /* f0f0ea4: 00402025 */ or $a0,$v0,$zero /* f0f0ea8: 0fc54df7 */ jal gfxSetPrimColour /* f0f0eac: 24057f7f */ addiu $a1,$zero,0x7f7f -/* f0f0eb0: 3c038008 */ lui $v1,%hi(g_ScreenWidthMultiplier) -/* f0f0eb4: 2463fac0 */ addiu $v1,$v1,%lo(g_ScreenWidthMultiplier) +/* f0f0eb0: 3c038008 */ lui $v1,%hi(g_ScaleX) +/* f0f0eb4: 2463fac0 */ addiu $v1,$v1,%lo(g_ScaleX) /* f0f0eb8: 8c790000 */ lw $t9,0x0($v1) /* f0f0ebc: 8fb8009c */ lw $t8,0x9c($sp) /* f0f0ec0: 8fac0068 */ lw $t4,0x68($sp) @@ -364,8 +364,8 @@ glabel func0f0f0ce8 /* f0f0f1c: 34a5ff7f */ ori $a1,$a1,0xff7f /* f0f0f20: 0fc54df7 */ jal gfxSetPrimColour /* f0f0f24: 00402025 */ or $a0,$v0,$zero -/* f0f0f28: 3c038008 */ lui $v1,%hi(g_ScreenWidthMultiplier) -/* f0f0f2c: 2463fac0 */ addiu $v1,$v1,%lo(g_ScreenWidthMultiplier) +/* f0f0f28: 3c038008 */ lui $v1,%hi(g_ScaleX) +/* f0f0f2c: 2463fac0 */ addiu $v1,$v1,%lo(g_ScaleX) /* f0f0f30: 8c790000 */ lw $t9,0x0($v1) /* f0f0f34: 8fb8009c */ lw $t8,0x9c($sp) /* f0f0f38: 8fac0068 */ lw $t4,0x68($sp) @@ -3920,10 +3920,10 @@ glabel var7f1b2948 /* f0f4470: 3c0a8009 */ lui $t2,%hi(g_Is4Mb) /* f0f4474: 914a0af0 */ lbu $t2,%lo(g_Is4Mb)($t2) /* f0f4478: 24010001 */ addiu $at,$zero,0x1 -/* f0f447c: 3c0b8008 */ lui $t3,%hi(g_ScreenWidthMultiplier) +/* f0f447c: 3c0b8008 */ lui $t3,%hi(g_ScaleX) /* f0f4480: 51410035 */ beql $t2,$at,.L0f0f4558 /* f0f4484: 27a40390 */ addiu $a0,$sp,0x390 -/* f0f4488: 8d6bfac0 */ lw $t3,%lo(g_ScreenWidthMultiplier)($t3) +/* f0f4488: 8d6bfac0 */ lw $t3,%lo(g_ScaleX)($t3) /* f0f448c: c60a0510 */ lwc1 $f10,0x510($s0) /* f0f4490: 448b3000 */ mtc1 $t3,$f6 /* f0f4494: 00000000 */ nop @@ -3944,8 +3944,8 @@ glabel var7f1b2948 /* f0f44cc: 3c013f00 */ lui $at,0x3f00 /* f0f44d0: 44812000 */ mtc1 $at,$f4 /* f0f44d4: 46805220 */ cvt.s.w $f8,$f10 -/* f0f44d8: 3c0d8008 */ lui $t5,%hi(g_ScreenWidthMultiplier) -/* f0f44dc: 8dadfac0 */ lw $t5,%lo(g_ScreenWidthMultiplier)($t5) +/* f0f44d8: 3c0d8008 */ lui $t5,%hi(g_ScaleX) +/* f0f44dc: 8dadfac0 */ lw $t5,%lo(g_ScaleX)($t5) /* f0f44e0: c7aa0430 */ lwc1 $f10,0x430($sp) /* f0f44e4: 46044182 */ mul.s $f6,$f8,$f4 /* f0f44e8: 448d4000 */ mtc1 $t5,$f8 @@ -4159,8 +4159,8 @@ glabel var7f1b2948 /* f0f47f0: 248425f4 */ addiu $a0,$a0,%lo(var7f1b25f4) /* f0f47f4: 0fc35272 */ jal func0f0d49c8 /* f0f47f8: 8fa40440 */ lw $a0,0x440($sp) -/* f0f47fc: 3c0f8008 */ lui $t7,%hi(g_ScreenWidthMultiplier) -/* f0f4800: 8deffac0 */ lw $t7,%lo(g_ScreenWidthMultiplier)($t7) +/* f0f47fc: 3c0f8008 */ lui $t7,%hi(g_ScaleX) +/* f0f4800: 8deffac0 */ lw $t7,%lo(g_ScaleX)($t7) /* f0f4804: 8e2c0000 */ lw $t4,0x0($s1) /* f0f4808: 3c05800a */ lui $a1,%hi(var800a2040+0x2) /* f0f480c: afa20440 */ sw $v0,0x440($sp) @@ -4173,8 +4173,8 @@ glabel var7f1b2948 /* f0f4828: 3c0b800a */ lui $t3,%hi(var800a203c) /* f0f482c: 8d6b203c */ lw $t3,%lo(var800a203c)($t3) /* f0f4830: 8e2e0000 */ lw $t6,0x0($s1) -/* f0f4834: 3c0c8008 */ lui $t4,%hi(g_ScreenWidthMultiplier) -/* f0f4838: 8d8cfac0 */ lw $t4,%lo(g_ScreenWidthMultiplier)($t4) +/* f0f4834: 3c0c8008 */ lui $t4,%hi(g_ScaleX) +/* f0f4838: 8d8cfac0 */ lw $t4,%lo(g_ScaleX)($t4) /* f0f483c: 016e6823 */ subu $t5,$t3,$t6 /* f0f4840: 3c0a800a */ lui $t2,%hi(g_Vars+0x284) /* f0f4844: 01ac0019 */ multu $t5,$t4 @@ -4472,8 +4472,8 @@ glabel var7f1b2948 /* f0f4c80: 0c002f02 */ jal viGetX /* f0f4c84: 00000000 */ nop /* f0f4c88: c7a400c8 */ lwc1 $f4,0xc8($sp) -/* f0f4c8c: 3c198008 */ lui $t9,%hi(g_ScreenWidthMultiplier) -/* f0f4c90: 8f39fac0 */ lw $t9,%lo(g_ScreenWidthMultiplier)($t9) +/* f0f4c8c: 3c198008 */ lui $t9,%hi(g_ScaleX) +/* f0f4c90: 8f39fac0 */ lw $t9,%lo(g_ScaleX)($t9) /* f0f4c94: 4600218d */ trunc.w.s $f6,$f4 /* f0f4c98: 440f3000 */ mfc1 $t7,$f6 /* f0f4c9c: 04410003 */ bgez $v0,.L0f0f4cac @@ -4782,10 +4782,10 @@ glabel func0f0f50fc /* f0f5108: 3c0ee700 */ lui $t6,0xe700 /* f0f510c: ac4e0000 */ sw $t6,0x0($v0) /* f0f5110: ac400004 */ sw $zero,0x4($v0) -/* f0f5114: 3c038008 */ lui $v1,%hi(g_ScreenWidthMultiplier) +/* f0f5114: 3c038008 */ lui $v1,%hi(g_ScaleX) /* f0f5118: 3c0f800a */ lui $t7,%hi(var800a2038) /* f0f511c: 8def2038 */ lw $t7,%lo(var800a2038)($t7) -/* f0f5120: 8c63fac0 */ lw $v1,%lo(g_ScreenWidthMultiplier)($v1) +/* f0f5120: 8c63fac0 */ lw $v1,%lo(g_ScaleX)($v1) /* f0f5124: 3c058007 */ lui $a1,%hi(g_ScissorX1) /* f0f5128: 24a51190 */ addiu $a1,$a1,%lo(g_ScissorX1) /* f0f512c: 01e30019 */ multu $t7,$v1 @@ -5943,8 +5943,8 @@ glabel func0f0f5360 /* f0f61cc: 01835821 */ addu $t3,$t4,$v1 /* f0f61d0: 0c002f40 */ jal viGetViewLeft /* f0f61d4: afab0088 */ sw $t3,0x88($sp) -/* f0f61d8: 3c0e8008 */ lui $t6,%hi(g_ScreenWidthMultiplier) -/* f0f61dc: 8dcefac0 */ lw $t6,%lo(g_ScreenWidthMultiplier)($t6) +/* f0f61d8: 3c0e8008 */ lui $t6,%hi(g_ScaleX) +/* f0f61dc: 8dcefac0 */ lw $t6,%lo(g_ScaleX)($t6) /* f0f61e0: 004e001a */ div $zero,$v0,$t6 /* f0f61e4: 00009812 */ mflo $s3 /* f0f61e8: 15c00002 */ bnez $t6,.L0f0f61f4 @@ -5966,8 +5966,8 @@ glabel func0f0f5360 /* f0f6220: 0010c403 */ sra $t8,$s0,0x10 /* f0f6224: 0c002f22 */ jal viGetViewWidth /* f0f6228: 03008025 */ or $s0,$t8,$zero -/* f0f622c: 3c0f8008 */ lui $t7,%hi(g_ScreenWidthMultiplier) -/* f0f6230: 8deffac0 */ lw $t7,%lo(g_ScreenWidthMultiplier)($t7) +/* f0f622c: 3c0f8008 */ lui $t7,%hi(g_ScaleX) +/* f0f6230: 8deffac0 */ lw $t7,%lo(g_ScaleX)($t7) /* f0f6234: 0050c821 */ addu $t9,$v0,$s0 /* f0f6238: 032f001a */ div $zero,$t9,$t7 /* f0f623c: 00008812 */ mflo $s1 @@ -6388,8 +6388,8 @@ glabel func0f0f5360 /* f0f684c: 8fa401e8 */ lw $a0,0x1e8($sp) /* f0f6850: 0fc54df7 */ jal gfxSetPrimColour /* f0f6854: 00402825 */ or $a1,$v0,$zero -/* f0f6858: 3c038008 */ lui $v1,%hi(g_ScreenWidthMultiplier) -/* f0f685c: 2463fac0 */ addiu $v1,$v1,%lo(g_ScreenWidthMultiplier) +/* f0f6858: 3c038008 */ lui $v1,%hi(g_ScaleX) +/* f0f685c: 2463fac0 */ addiu $v1,$v1,%lo(g_ScaleX) /* f0f6860: 8c6c0000 */ lw $t4,0x0($v1) /* f0f6864: 3c01f600 */ lui $at,0xf600 /* f0f6868: 327803ff */ andi $t8,$s3,0x3ff @@ -7457,8 +7457,8 @@ glabel var7f1b2990 /* f0f7738: afa60040 */ sw $a2,0x40($sp) /* f0f773c: 0c002f40 */ jal viGetViewLeft /* f0f7740: afa70044 */ sw $a3,0x44($sp) -/* f0f7744: 3c0e8008 */ lui $t6,%hi(g_ScreenWidthMultiplier) -/* f0f7748: 8dcefac0 */ lw $t6,%lo(g_ScreenWidthMultiplier)($t6) +/* f0f7744: 3c0e8008 */ lui $t6,%hi(g_ScaleX) +/* f0f7748: 8dcefac0 */ lw $t6,%lo(g_ScaleX)($t6) /* f0f774c: 8fab0038 */ lw $t3,0x38($sp) /* f0f7750: 8fac0040 */ lw $t4,0x40($sp) /* f0f7754: 004e001a */ div $zero,$v0,$t6 @@ -7484,8 +7484,8 @@ glabel var7f1b2990 /* f0f779c: 0c002f22 */ jal viGetViewWidth /* f0f77a0: a7a2001a */ sh $v0,0x1a($sp) /* f0f77a4: 87af001a */ lh $t7,0x1a($sp) -/* f0f77a8: 3c198008 */ lui $t9,%hi(g_ScreenWidthMultiplier) -/* f0f77ac: 8f39fac0 */ lw $t9,%lo(g_ScreenWidthMultiplier)($t9) +/* f0f77a8: 3c198008 */ lui $t9,%hi(g_ScaleX) +/* f0f77ac: 8f39fac0 */ lw $t9,%lo(g_ScaleX)($t9) /* f0f77b0: 004fc021 */ addu $t8,$v0,$t7 /* f0f77b4: 8fa30030 */ lw $v1,0x30($sp) /* f0f77b8: 0319001a */ div $zero,$t8,$t9 @@ -7746,8 +7746,8 @@ glabel var7f1b2990 /* f0f7b40: 000fc080 */ sll $t8,$t7,0x2 /* f0f7b44: 0078c821 */ addu $t9,$v1,$t8 /* f0f7b48: 8f2e0064 */ lw $t6,0x64($t9) -/* f0f7b4c: 3c188008 */ lui $t8,%hi(g_ScreenWidthMultiplier) -/* f0f7b50: 8f18fac0 */ lw $t8,%lo(g_ScreenWidthMultiplier)($t8) +/* f0f7b4c: 3c188008 */ lui $t8,%hi(g_ScaleX) +/* f0f7b50: 8f18fac0 */ lw $t8,%lo(g_ScaleX)($t8) /* f0f7b54: 85cf0634 */ lh $t7,0x634($t6) /* f0f7b58: 00005025 */ or $t2,$zero,$zero /* f0f7b5c: 01f8001a */ div $zero,$t7,$t8 @@ -7793,8 +7793,8 @@ glabel var7f1b2990 /* f0f7bf4: 000e7880 */ sll $t7,$t6,0x2 /* f0f7bf8: 006fc021 */ addu $t8,$v1,$t7 /* f0f7bfc: 8f020064 */ lw $v0,0x64($t8) -/* f0f7c00: 3c188008 */ lui $t8,%hi(g_ScreenWidthMultiplier) -/* f0f7c04: 8f18fac0 */ lw $t8,%lo(g_ScreenWidthMultiplier)($t8) +/* f0f7c00: 3c188008 */ lui $t8,%hi(g_ScaleX) +/* f0f7c04: 8f18fac0 */ lw $t8,%lo(g_ScaleX)($t8) /* f0f7c08: 84590630 */ lh $t9,0x630($v0) /* f0f7c0c: 844e0634 */ lh $t6,0x634($v0) /* f0f7c10: 032e7821 */ addu $t7,$t9,$t6 @@ -8053,8 +8053,8 @@ glabel func0f0f7e98 /* f0f7f98: 0c002f22 */ jal viGetViewWidth /* f0f7f9c: a7a2002e */ sh $v0,0x2e($sp) /* f0f7fa0: 87ad002e */ lh $t5,0x2e($sp) -/* f0f7fa4: 3c0f8008 */ lui $t7,%hi(g_ScreenWidthMultiplier) -/* f0f7fa8: 8deffac0 */ lw $t7,%lo(g_ScreenWidthMultiplier)($t7) +/* f0f7fa4: 3c0f8008 */ lui $t7,%hi(g_ScaleX) +/* f0f7fa8: 8deffac0 */ lw $t7,%lo(g_ScaleX)($t7) /* f0f7fac: 004d7021 */ addu $t6,$v0,$t5 /* f0f7fb0: 01cf001a */ div $zero,$t6,$t7 /* f0f7fb4: 0000c012 */ mflo $t8 @@ -8550,8 +8550,8 @@ glabel func0f0f86a8 .L0f0f8718: /* f0f8718: 0c002f02 */ jal viGetX /* f0f871c: 00000000 */ nop -/* f0f8720: 3c0e8008 */ lui $t6,%hi(g_ScreenWidthMultiplier) -/* f0f8724: 8dcefac0 */ lw $t6,%lo(g_ScreenWidthMultiplier)($t6) +/* f0f8720: 3c0e8008 */ lui $t6,%hi(g_ScaleX) +/* f0f8724: 8dcefac0 */ lw $t6,%lo(g_ScaleX)($t6) /* f0f8728: 3c188007 */ lui $t8,%hi(g_MpPlayerNum) /* f0f872c: 8f181448 */ lw $t8,%lo(g_MpPlayerNum)($t8) /* f0f8730: 000e7840 */ sll $t7,$t6,0x1 @@ -8784,8 +8784,8 @@ glabel func0f0f86a8 .L0f0f8a84: /* f0f8a84: 0c002f40 */ jal viGetViewLeft /* f0f8a88: 00000000 */ nop -/* f0f8a8c: 3c188008 */ lui $t8,%hi(g_ScreenWidthMultiplier) -/* f0f8a90: 8f18fac0 */ lw $t8,%lo(g_ScreenWidthMultiplier)($t8) +/* f0f8a8c: 3c188008 */ lui $t8,%hi(g_ScaleX) +/* f0f8a90: 8f18fac0 */ lw $t8,%lo(g_ScaleX)($t8) /* f0f8a94: 0058001a */ div $zero,$v0,$t8 /* f0f8a98: 00007012 */ mflo $t6 /* f0f8a9c: afae0070 */ sw $t6,0x70($sp) @@ -8808,8 +8808,8 @@ glabel func0f0f86a8 /* f0f8ad8: 00106c03 */ sra $t5,$s0,0x10 /* f0f8adc: 0c002f22 */ jal viGetViewWidth /* f0f8ae0: 01a08025 */ or $s0,$t5,$zero -/* f0f8ae4: 3c0a8008 */ lui $t2,%hi(g_ScreenWidthMultiplier) -/* f0f8ae8: 8d4afac0 */ lw $t2,%lo(g_ScreenWidthMultiplier)($t2) +/* f0f8ae4: 3c0a8008 */ lui $t2,%hi(g_ScaleX) +/* f0f8ae8: 8d4afac0 */ lw $t2,%lo(g_ScaleX)($t2) /* f0f8aec: 00505821 */ addu $t3,$v0,$s0 /* f0f8af0: 016a001a */ div $zero,$t3,$t2 /* f0f8af4: 00006012 */ mflo $t4 @@ -12396,12 +12396,12 @@ glabel var7f1b2afc /* f0fbc70: 144e0005 */ bne $v0,$t6,.L0f0fbc88 /* f0fbc74: afb00034 */ sw $s0,0x34($sp) /* f0fbc78: 240f0002 */ addiu $t7,$zero,0x2 -/* f0fbc7c: 3c018008 */ lui $at,%hi(g_ScreenWidthMultiplier) +/* f0fbc7c: 3c018008 */ lui $at,%hi(g_ScaleX) /* f0fbc80: 10000003 */ b .L0f0fbc90 -/* f0fbc84: ac2ffac0 */ sw $t7,%lo(g_ScreenWidthMultiplier)($at) +/* f0fbc84: ac2ffac0 */ sw $t7,%lo(g_ScaleX)($at) .L0f0fbc88: -/* f0fbc88: 3c018008 */ lui $at,%hi(g_ScreenWidthMultiplier) -/* f0fbc8c: ac22fac0 */ sw $v0,%lo(g_ScreenWidthMultiplier)($at) +/* f0fbc88: 3c018008 */ lui $at,%hi(g_ScaleX) +/* f0fbc8c: ac22fac0 */ sw $v0,%lo(g_ScaleX)($at) .L0f0fbc90: /* f0fbc90: 0fc351e7 */ jal func0f0d479c /* f0fbc94: 02a02025 */ or $a0,$s5,$zero @@ -12781,8 +12781,8 @@ glabel var7f1b2afc .L0f0fc1f4: /* f0fc1f4: 0c002f40 */ jal viGetViewLeft /* f0fc1f8: 00000000 */ nop -/* f0fc1fc: 3c0e8008 */ lui $t6,%hi(g_ScreenWidthMultiplier) -/* f0fc200: 8dcefac0 */ lw $t6,%lo(g_ScreenWidthMultiplier)($t6) +/* f0fc1fc: 3c0e8008 */ lui $t6,%hi(g_ScaleX) +/* f0fc200: 8dcefac0 */ lw $t6,%lo(g_ScaleX)($t6) /* f0fc204: 004e001a */ div $zero,$v0,$t6 /* f0fc208: 00007812 */ mflo $t7 /* f0fc20c: 25f80014 */ addiu $t8,$t7,0x14 @@ -12807,8 +12807,8 @@ glabel var7f1b2afc /* f0fc250: 00105403 */ sra $t2,$s0,0x10 /* f0fc254: 0c002f22 */ jal viGetViewWidth /* f0fc258: 01408025 */ or $s0,$t2,$zero -/* f0fc25c: 3c0b8008 */ lui $t3,%hi(g_ScreenWidthMultiplier) -/* f0fc260: 8d6bfac0 */ lw $t3,%lo(g_ScreenWidthMultiplier)($t3) +/* f0fc25c: 3c0b8008 */ lui $t3,%hi(g_ScaleX) +/* f0fc260: 8d6bfac0 */ lw $t3,%lo(g_ScaleX)($t3) /* f0fc264: 00506021 */ addu $t4,$v0,$s0 /* f0fc268: 018b001a */ div $zero,$t4,$t3 /* f0fc26c: 00006812 */ mflo $t5 @@ -13145,8 +13145,8 @@ glabel var7f1b2afc /* f0fc730: 00000000 */ nop /* f0fc734: 0c002f40 */ jal viGetViewLeft /* f0fc738: 00000000 */ nop -/* f0fc73c: 3c198008 */ lui $t9,%hi(g_ScreenWidthMultiplier) -/* f0fc740: 8f39fac0 */ lw $t9,%lo(g_ScreenWidthMultiplier)($t9) +/* f0fc73c: 3c198008 */ lui $t9,%hi(g_ScaleX) +/* f0fc740: 8f39fac0 */ lw $t9,%lo(g_ScaleX)($t9) /* f0fc744: 0059001a */ div $zero,$v0,$t9 /* f0fc748: 00006012 */ mflo $t4 /* f0fc74c: afac0098 */ sw $t4,0x98($sp) @@ -13169,8 +13169,8 @@ glabel var7f1b2afc /* f0fc788: 00105403 */ sra $t2,$s0,0x10 /* f0fc78c: 0c002f22 */ jal viGetViewWidth /* f0fc790: 01408025 */ or $s0,$t2,$zero -/* f0fc794: 3c0d8008 */ lui $t5,%hi(g_ScreenWidthMultiplier) -/* f0fc798: 8dadfac0 */ lw $t5,%lo(g_ScreenWidthMultiplier)($t5) +/* f0fc794: 3c0d8008 */ lui $t5,%hi(g_ScaleX) +/* f0fc798: 8dadfac0 */ lw $t5,%lo(g_ScaleX)($t5) /* f0fc79c: 00505821 */ addu $t3,$v0,$s0 /* f0fc7a0: 016d001a */ div $zero,$t3,$t5 /* f0fc7a4: 0000a012 */ mflo $s4 @@ -13335,7 +13335,7 @@ glabel var7f1b2afc /* f0fc9b8: 02a02025 */ or $a0,$s5,$zero /* f0fc9bc: 8fbf0054 */ lw $ra,0x54($sp) /* f0fc9c0: 240d0001 */ addiu $t5,$zero,0x1 -/* f0fc9c4: 3c018008 */ lui $at,%hi(g_ScreenWidthMultiplier) +/* f0fc9c4: 3c018008 */ lui $at,%hi(g_ScaleX) /* f0fc9c8: 8fb00034 */ lw $s0,0x34($sp) /* f0fc9cc: 8fb10038 */ lw $s1,0x38($sp) /* f0fc9d0: 8fb2003c */ lw $s2,0x3c($sp) @@ -13344,7 +13344,7 @@ glabel var7f1b2afc /* f0fc9dc: 8fb50048 */ lw $s5,0x48($sp) /* f0fc9e0: 8fb6004c */ lw $s6,0x4c($sp) /* f0fc9e4: 8fb70050 */ lw $s7,0x50($sp) -/* f0fc9e8: ac2dfac0 */ sw $t5,%lo(g_ScreenWidthMultiplier)($at) +/* f0fc9e8: ac2dfac0 */ sw $t5,%lo(g_ScaleX)($at) /* f0fc9ec: 03e00008 */ jr $ra /* f0fc9f0: 27bd0118 */ addiu $sp,$sp,0x118 ); diff --git a/src/game/game_102240.c b/src/game/game_102240.c index 101b07a07..4da64c8db 100644 --- a/src/game/game_102240.c +++ b/src/game/game_102240.c @@ -2126,8 +2126,8 @@ glabel var7f1b2dfc /* f104dc4: 033f7825 */ or $t7,$t9,$ra /* f104dc8: acaf0004 */ sw $t7,0x4($a1) /* f104dcc: 8fb80138 */ lw $t8,0x138($sp) -/* f104dd0: 3c098008 */ lui $t1,%hi(g_ScreenWidthMultiplier) -/* f104dd4: 2529fac0 */ addiu $t1,$t1,%lo(g_ScreenWidthMultiplier) +/* f104dd0: 3c098008 */ lui $t1,%hi(g_ScaleX) +/* f104dd4: 2529fac0 */ addiu $t1,$t1,%lo(g_ScaleX) /* f104dd8: 270e0008 */ addiu $t6,$t8,0x8 /* f104ddc: afae0138 */ sw $t6,0x138($sp) /* f104de0: 8d590000 */ lw $t9,0x0($t2) @@ -2235,12 +2235,12 @@ glabel var7f1b2dfc /* f104f70: adc00004 */ sw $zero,0x4($t6) /* f104f74: add90000 */ sw $t9,0x0($t6) /* f104f78: 8faf00ec */ lw $t7,0xec($sp) -/* f104f7c: 3c098008 */ lui $t1,%hi(g_ScreenWidthMultiplier) +/* f104f7c: 3c098008 */ lui $t1,%hi(g_ScaleX) /* f104f80: 240e0001 */ addiu $t6,$zero,0x1 /* f104f84: 3c06800a */ lui $a2,%hi(g_SoloSaveFile) /* f104f88: 3c10800a */ lui $s0,%hi(g_SoloSaveFile+0xc) /* f104f8c: 3c0b0010 */ lui $t3,0x10 -/* f104f90: 2529fac0 */ addiu $t1,$t1,%lo(g_ScreenWidthMultiplier) +/* f104f90: 2529fac0 */ addiu $t1,$t1,%lo(g_ScaleX) /* f104f94: 3c0dfb00 */ lui $t5,0xfb00 /* f104f98: 241fff00 */ addiu $ra,$zero,-256 /* f104f9c: 356b01c0 */ ori $t3,$t3,0x1c0 @@ -2414,8 +2414,8 @@ glabel var7f1b2dfc /* f105224: afaf0138 */ sw $t7,0x138($sp) /* f105228: aced0000 */ sw $t5,0x0($a3) /* f10522c: 8d59000c */ lw $t9,0xc($t2) -/* f105230: 3c098008 */ lui $t1,%hi(g_ScreenWidthMultiplier) -/* f105234: 2529fac0 */ addiu $t1,$t1,%lo(g_ScreenWidthMultiplier) +/* f105230: 3c098008 */ lui $t1,%hi(g_ScaleX) +/* f105234: 2529fac0 */ addiu $t1,$t1,%lo(g_ScaleX) /* f105238: 333800ff */ andi $t8,$t9,0xff /* f10523c: 00187080 */ sll $t6,$t8,0x2 /* f105240: 01d87023 */ subu $t6,$t6,$t8 diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c index 16bed31a7..56d50ce35 100644 --- a/src/game/game_107fb0.c +++ b/src/game/game_107fb0.c @@ -1459,11 +1459,11 @@ Gfx *filemgrRenderPerfectHeadThumbnail(Gfx *gdl, struct menuitemrenderdata *rend gDPTileSync(gdl++); gSPTextureRectangle(gdl++, - ((renderdata->x + 4) << 2) * g_ScreenWidthMultiplier, + ((renderdata->x + 4) << 2) * g_ScaleX, (renderdata->y + 2) << 2, - ((renderdata->x + 20) << 2) * g_ScreenWidthMultiplier, + ((renderdata->x + 20) << 2) * g_ScaleX, (renderdata->y + 18) << 2, - G_TX_RENDERTILE, 0, 512, 1024 / g_ScreenWidthMultiplier, -1024); + G_TX_RENDERTILE, 0, 512, 1024 / g_ScaleX, -1024); gDPLoadSync(gdl++); gDPTileSync(gdl++); @@ -2084,11 +2084,11 @@ s32 filemgrChooseAgentListMenuHandler(u32 operation, struct menuitem *item, unio TEXEL0, 0, ENVIRONMENT, 0, TEXEL0, 0, ENVIRONMENT, 0); gSPTextureRectangle(gdl++, - ((renderdata->x + 4) << 2) * g_ScreenWidthMultiplier, + ((renderdata->x + 4) << 2) * g_ScaleX, (renderdata->y + 2) << 2, - ((renderdata->x + 60) << 2) * g_ScreenWidthMultiplier, + ((renderdata->x + 60) << 2) * g_ScaleX, (renderdata->y + 38) << 2, - G_TX_RENDERTILE, 0, 1152, 1024 / g_ScreenWidthMultiplier, -1024); + G_TX_RENDERTILE, 0, 1152, 1024 / g_ScaleX, -1024); x = renderdata->x + 62; y = renderdata->y + 4; diff --git a/src/game/game_1531a0.c b/src/game/game_1531a0.c index c4e10c1fd..206fce204 100644 --- a/src/game/game_1531a0.c +++ b/src/game/game_1531a0.c @@ -272,7 +272,7 @@ Gfx *func0f1538e4(Gfx *gdl, s32 *x1, s32 *y1, s32 *x2, s32 *y2) { gdl = gfxSetPrimColour(gdl, 0x00000000); - gDPFillRectangle(gdl++, *x1 * g_ScreenWidthMultiplier, *y1, *x2 * g_ScreenWidthMultiplier, *y2); + gDPFillRectangleScaled(gdl++, *x1, *y1, *x2, *y2); gdl = func0f153838(gdl); @@ -2271,11 +2271,11 @@ glabel func0f15568c /* f155890: 3c19800a */ lui $t9,%hi(var800a45d0) /* f155894: 933945d0 */ lbu $t9,%lo(var800a45d0)($t9) /* f155898: 26100008 */ addiu $s0,$s0,0x8 -/* f15589c: 3c0f8008 */ lui $t7,%hi(g_ScreenWidthMultiplier) +/* f15589c: 3c0f8008 */ lui $t7,%hi(g_ScaleX) /* f1558a0: 5320001f */ beqzl $t9,.L0f155920 /* f1558a4: 92290003 */ lbu $t1,0x3($s1) /* f1558a8: 8e4e0000 */ lw $t6,0x0($s2) -/* f1558ac: 8deffac0 */ lw $t7,%lo(g_ScreenWidthMultiplier)($t7) +/* f1558ac: 8deffac0 */ lw $t7,%lo(g_ScaleX)($t7) /* f1558b0: 8fb800a0 */ lw $t8,0xa0($sp) /* f1558b4: 02002025 */ or $a0,$s0,$zero /* f1558b8: 01cf001a */ div $zero,$t6,$t7 @@ -2497,8 +2497,8 @@ glabel func0f15568c /* f155bf8: afaa0090 */ sw $t2,0x90($sp) /* f155bfc: 0fc54edb */ jal func0f153b6c /* f155c00: 03382021 */ addu $a0,$t9,$t8 -/* f155c04: 3c0e8008 */ lui $t6,%hi(g_ScreenWidthMultiplier) -/* f155c08: 8dcefac0 */ lw $t6,%lo(g_ScreenWidthMultiplier)($t6) +/* f155c04: 3c0e8008 */ lui $t6,%hi(g_ScaleX) +/* f155c08: 8dcefac0 */ lw $t6,%lo(g_ScaleX)($t6) /* f155c0c: 8e4f0000 */ lw $t7,0x0($s2) /* f155c10: 3c058008 */ lui $a1,%hi(var8007fba0) /* f155c14: 8ca5fba0 */ lw $a1,%lo(var8007fba0)($a1) @@ -2546,8 +2546,8 @@ glabel func0f15568c /* f155cb4: afa20018 */ sw $v0,0x18($sp) /* f155cb8: 3c01800a */ lui $at,%hi(var800a4634) /* f155cbc: ac224634 */ sw $v0,%lo(var800a4634)($at) -/* f155cc0: 3c198008 */ lui $t9,%hi(g_ScreenWidthMultiplier) -/* f155cc4: 8f39fac0 */ lw $t9,%lo(g_ScreenWidthMultiplier)($t9) +/* f155cc0: 3c198008 */ lui $t9,%hi(g_ScaleX) +/* f155cc4: 8f39fac0 */ lw $t9,%lo(g_ScaleX)($t9) /* f155cc8: 8e4e0000 */ lw $t6,0x0($s2) /* f155ccc: 3c0d8008 */ lui $t5,%hi(var8007fad0) /* f155cd0: 3c058008 */ lui $a1,%hi(var8007fba0) @@ -2813,8 +2813,8 @@ glabel textRenderProjected /* f156084: afb1003c */ sw $s1,0x3c($sp) /* f156088: 11e0000a */ beqz $t7,.L0f1560b4 /* f15608c: afae00b0 */ sw $t6,0xb0($sp) -/* f156090: 3c198008 */ lui $t9,%hi(g_ScreenWidthMultiplier) -/* f156094: 8f39fac0 */ lw $t9,%lo(g_ScreenWidthMultiplier)($t9) +/* f156090: 3c198008 */ lui $t9,%hi(g_ScaleX) +/* f156094: 8f39fac0 */ lw $t9,%lo(g_ScaleX)($t9) /* f156098: 8cd80000 */ lw $t8,0x0($a2) /* f15609c: 24090001 */ addiu $t1,$zero,0x1 /* f1560a0: 03190019 */ multu $t8,$t9 @@ -2823,8 +2823,8 @@ glabel textRenderProjected /* f1560ac: 10000008 */ b .L0f1560d0 /* f1560b0: afa900b0 */ sw $t1,0xb0($sp) .L0f1560b4: -/* f1560b4: 3c0b8008 */ lui $t3,%hi(g_ScreenWidthMultiplier) -/* f1560b8: 8d6bfac0 */ lw $t3,%lo(g_ScreenWidthMultiplier)($t3) +/* f1560b4: 3c0b8008 */ lui $t3,%hi(g_ScaleX) +/* f1560b8: 8d6bfac0 */ lw $t3,%lo(g_ScaleX)($t3) /* f1560bc: 8e8a0000 */ lw $t2,0x0($s4) /* f1560c0: 014b0019 */ multu $t2,$t3 /* f1560c4: 00006012 */ mflo $t4 @@ -2838,8 +2838,8 @@ glabel textRenderProjected /* f1560e0: 44816000 */ mtc1 $at,$f12 /* f1560e4: 0fc01ac2 */ jal func0f006b08 /* f1560e8: 00000000 */ nop -/* f1560ec: 3c0f8008 */ lui $t7,%hi(g_ScreenWidthMultiplier) -/* f1560f0: 8deffac0 */ lw $t7,%lo(g_ScreenWidthMultiplier)($t7) +/* f1560ec: 3c0f8008 */ lui $t7,%hi(g_ScaleX) +/* f1560f0: 8deffac0 */ lw $t7,%lo(g_ScaleX)($t7) /* f1560f4: 8e8e0000 */ lw $t6,0x0($s4) /* f1560f8: 24090001 */ addiu $t1,$zero,0x1 /* f1560fc: 3c11800a */ lui $s1,%hi(var800a463c) @@ -3190,8 +3190,8 @@ glabel textRenderProjected /* f156610: 02a01025 */ or $v0,$s5,$zero /* f156614: 11200012 */ beqz $t1,.L0f156660 /* f156618: 00000000 */ nop -/* f15661c: 3c0d8008 */ lui $t5,%hi(g_ScreenWidthMultiplier) -/* f156620: 8dadfac0 */ lw $t5,%lo(g_ScreenWidthMultiplier)($t5) +/* f15661c: 3c0d8008 */ lui $t5,%hi(g_ScaleX) +/* f156620: 8dadfac0 */ lw $t5,%lo(g_ScaleX)($t5) /* f156624: 8e6c0000 */ lw $t4,0x0($s3) /* f156628: 018d001a */ div $zero,$t4,$t5 /* f15662c: 00007012 */ mflo $t6 @@ -3210,8 +3210,8 @@ glabel textRenderProjected /* f156658: 10000011 */ b .L0f1566a0 /* f15665c: 8fbf005c */ lw $ra,0x5c($sp) .L0f156660: -/* f156660: 3c0f8008 */ lui $t7,%hi(g_ScreenWidthMultiplier) -/* f156664: 8deffac0 */ lw $t7,%lo(g_ScreenWidthMultiplier)($t7) +/* f156660: 3c0f8008 */ lui $t7,%hi(g_ScaleX) +/* f156664: 8deffac0 */ lw $t7,%lo(g_ScaleX)($t7) /* f156668: 8e990000 */ lw $t9,0x0($s4) /* f15666c: 032f001a */ div $zero,$t9,$t7 /* f156670: 0000c012 */ mflo $t8 @@ -3338,11 +3338,11 @@ glabel func0f156790 /* f1568a8: 1420004f */ bnez $at,.L0f1569e8 /* f1568ac: 00000000 */ nop /* f1568b0: 933945d0 */ lbu $t9,%lo(var800a45d0)($t9) -/* f1568b4: 3c0c8008 */ lui $t4,%hi(g_ScreenWidthMultiplier) +/* f1568b4: 3c0c8008 */ lui $t4,%hi(g_ScaleX) /* f1568b8: 8fb80048 */ lw $t8,0x48($sp) /* f1568bc: 53200017 */ beqzl $t9,.L0f15691c /* f1568c0: 02001025 */ or $v0,$s0,$zero -/* f1568c4: 8d8cfac0 */ lw $t4,%lo(g_ScreenWidthMultiplier)($t4) +/* f1568c4: 8d8cfac0 */ lw $t4,%lo(g_ScaleX)($t4) /* f1568c8: 8f0d0000 */ lw $t5,0x0($t8) /* f1568cc: 8fae0068 */ lw $t6,0x68($sp) /* f1568d0: 004c001a */ div $zero,$v0,$t4 @@ -3732,8 +3732,8 @@ glabel textRender /* f156e68: afb20040 */ sw $s2,0x40($sp) /* f156e6c: afb1003c */ sw $s1,0x3c($sp) /* f156e70: afb00038 */ sw $s0,0x38($sp) -/* f156e74: 3c0f8008 */ lui $t7,%hi(g_ScreenWidthMultiplier) -/* f156e78: 8deffac0 */ lw $t7,%lo(g_ScreenWidthMultiplier)($t7) +/* f156e74: 3c0f8008 */ lui $t7,%hi(g_ScaleX) +/* f156e78: 8deffac0 */ lw $t7,%lo(g_ScaleX)($t7) /* f156e7c: 8cae0000 */ lw $t6,0x0($a1) /* f156e80: 00808825 */ or $s1,$a0,$zero /* f156e84: 02201025 */ or $v0,$s1,$zero @@ -4002,8 +4002,8 @@ glabel textRender /* f157274: 356b97ff */ ori $t3,$t3,0x97ff /* f157278: acab0000 */ sw $t3,0x0($a1) /* f15727c: acad0004 */ sw $t5,0x4($a1) -/* f157280: 3c0e8008 */ lui $t6,%hi(g_ScreenWidthMultiplier) -/* f157284: 8dcefac0 */ lw $t6,%lo(g_ScreenWidthMultiplier)($t6) +/* f157280: 3c0e8008 */ lui $t6,%hi(g_ScaleX) +/* f157284: 8dcefac0 */ lw $t6,%lo(g_ScaleX)($t6) /* f157288: 8e4c0000 */ lw $t4,0x0($s2) /* f15728c: 26310008 */ addiu $s1,$s1,0x8 /* f157290: 02201025 */ or $v0,$s1,$zero @@ -4163,8 +4163,8 @@ glabel textMeasure /* f1574b8: 1480ffb3 */ bnez $a0,.L0f157388 /* f1574bc: 00804025 */ or $t0,$a0,$zero .L0f1574c0: -/* f1574c0: 3c0e8008 */ lui $t6,%hi(g_ScreenWidthMultiplier) -/* f1574c4: 8dcefac0 */ lw $t6,%lo(g_ScreenWidthMultiplier)($t6) +/* f1574c0: 3c0e8008 */ lui $t6,%hi(g_ScaleX) +/* f1574c4: 8dcefac0 */ lw $t6,%lo(g_ScaleX)($t6) /* f1574c8: 24010001 */ addiu $at,$zero,0x1 /* f1574cc: 3c0f8008 */ lui $t7,%hi(var8007fad0) /* f1574d0: 55c10008 */ bnel $t6,$at,.L0f1574f4 diff --git a/src/game/game_157db0.c b/src/game/game_157db0.c index eea5027d3..9a12bf9c6 100644 --- a/src/game/game_157db0.c +++ b/src/game/game_157db0.c @@ -6650,7 +6650,7 @@ void func0f15ca00(void) if (tickmode == TICKMODE_NORMAL) { var8007fc10 = 4; - if (!IS4MB() && var8007fc0c) { + if (IS8MB() && var8007fc0c) { var8007fc0c--; var8007fc10 = 200; } diff --git a/src/game/menu/items.c b/src/game/menu/items.c index 837c88d3a..3955a4cb7 100644 --- a/src/game/menu/items.c +++ b/src/game/menu/items.c @@ -452,7 +452,7 @@ glabel func0f0e6038 Gfx *menuRenderOverlayList(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2) { - gDPFillRectangle(gdl++, x * g_ScreenWidthMultiplier, y, (x + x2) * g_ScreenWidthMultiplier, y + y2); + gDPFillRectangleScaled(gdl++, x, y, x + x2, y + y2); return gdl; } @@ -507,7 +507,7 @@ glabel menuRenderItemList .L0f0e63dc: /* f0e63dc: 8e2a0008 */ lw $t2,0x8($s1) /* f0e63e0: 8e380010 */ lw $t8,0x10($s1) -/* f0e63e4: 3c038008 */ lui $v1,%hi(g_ScreenWidthMultiplier) +/* f0e63e4: 3c038008 */ lui $v1,%hi(g_ScaleX) /* f0e63e8: 8d4b0004 */ lw $t3,0x4($t2) /* f0e63ec: 8705001e */ lh $a1,0x1e($t8) /* f0e63f0: 000b6200 */ sll $t4,$t3,0x8 @@ -515,7 +515,7 @@ glabel menuRenderItemList /* f0e63f8: 00000000 */ nop /* f0e63fc: 86250004 */ lh $a1,0x4($s1) .L0f0e6400: -/* f0e6400: 8c63fac0 */ lw $v1,%lo(g_ScreenWidthMultiplier)($v1) +/* f0e6400: 8c63fac0 */ lw $v1,%lo(g_ScaleX)($v1) /* f0e6404: 862d0000 */ lh $t5,0x0($s1) /* f0e6408: 3c028007 */ lui $v0,%hi(g_ScissorX1) /* f0e640c: 24421190 */ addiu $v0,$v0,%lo(g_ScissorX1) @@ -1258,8 +1258,8 @@ glabel menuRenderItemList /* f0e6ed0: afa50090 */ sw $a1,0x90($sp) /* f0e6ed4: 0c002f02 */ jal viGetX /* f0e6ed8: afa7008c */ sw $a3,0x8c($sp) -/* f0e6edc: 3c0a8008 */ lui $t2,%hi(g_ScreenWidthMultiplier) -/* f0e6ee0: 8d4afac0 */ lw $t2,%lo(g_ScreenWidthMultiplier)($t2) +/* f0e6edc: 3c0a8008 */ lui $t2,%hi(g_ScaleX) +/* f0e6ee0: 8d4afac0 */ lw $t2,%lo(g_ScaleX)($t2) /* f0e6ee4: 8fa40094 */ lw $a0,0x94($sp) /* f0e6ee8: 8fa50090 */ lw $a1,0x90($sp) /* f0e6eec: 8fa7008c */ lw $a3,0x8c($sp) @@ -1282,8 +1282,8 @@ glabel menuRenderItemList /* f0e6f28: afa50090 */ sw $a1,0x90($sp) /* f0e6f2c: 0c002f02 */ jal viGetX /* f0e6f30: afa7008c */ sw $a3,0x8c($sp) -/* f0e6f34: 3c198008 */ lui $t9,%hi(g_ScreenWidthMultiplier) -/* f0e6f38: 8f39fac0 */ lw $t9,%lo(g_ScreenWidthMultiplier)($t9) +/* f0e6f34: 3c198008 */ lui $t9,%hi(g_ScaleX) +/* f0e6f38: 8f39fac0 */ lw $t9,%lo(g_ScaleX)($t9) /* f0e6f3c: 8fa50090 */ lw $a1,0x90($sp) /* f0e6f40: 8fa7008c */ lw $a3,0x8c($sp) /* f0e6f44: 0059001a */ div $zero,$v0,$t9 @@ -1304,8 +1304,8 @@ glabel menuRenderItemList /* f0e6f74: afa50090 */ sw $a1,0x90($sp) /* f0e6f78: 0c002f02 */ jal viGetX /* f0e6f7c: afa7008c */ sw $a3,0x8c($sp) -/* f0e6f80: 3c0b8008 */ lui $t3,%hi(g_ScreenWidthMultiplier) -/* f0e6f84: 8d6bfac0 */ lw $t3,%lo(g_ScreenWidthMultiplier)($t3) +/* f0e6f80: 3c0b8008 */ lui $t3,%hi(g_ScaleX) +/* f0e6f84: 8d6bfac0 */ lw $t3,%lo(g_ScaleX)($t3) /* f0e6f88: 8fa7008c */ lw $a3,0x8c($sp) /* f0e6f8c: 8fa40094 */ lw $a0,0x94($sp) /* f0e6f90: 8fa50090 */ lw $a1,0x90($sp) @@ -1328,8 +1328,8 @@ glabel menuRenderItemList /* f0e6fcc: afa40094 */ sw $a0,0x94($sp) /* f0e6fd0: 0c002f02 */ jal viGetX /* f0e6fd4: afa50090 */ sw $a1,0x90($sp) -/* f0e6fd8: 3c0e8008 */ lui $t6,%hi(g_ScreenWidthMultiplier) -/* f0e6fdc: 8dcefac0 */ lw $t6,%lo(g_ScreenWidthMultiplier)($t6) +/* f0e6fd8: 3c0e8008 */ lui $t6,%hi(g_ScaleX) +/* f0e6fdc: 8dcefac0 */ lw $t6,%lo(g_ScaleX)($t6) /* f0e6fe0: 8fa40094 */ lw $a0,0x94($sp) /* f0e6fe4: 8fa50090 */ lw $a1,0x90($sp) /* f0e6fe8: 004e001a */ div $zero,$v0,$t6 @@ -1350,8 +1350,8 @@ glabel menuRenderItemList /* f0e7018: 3c0fe700 */ lui $t7,0xe700 /* f0e701c: ac4f0000 */ sw $t7,0x0($v0) /* f0e7020: ac400004 */ sw $zero,0x4($v0) -/* f0e7024: 3c038008 */ lui $v1,%hi(g_ScreenWidthMultiplier) -/* f0e7028: 8c63fac0 */ lw $v1,%lo(g_ScreenWidthMultiplier)($v1) +/* f0e7024: 3c038008 */ lui $v1,%hi(g_ScaleX) +/* f0e7028: 8c63fac0 */ lw $v1,%lo(g_ScaleX)($v1) /* f0e702c: 3c068007 */ lui $a2,%hi(g_ScissorX1) /* f0e7030: 24c61190 */ addiu $a2,$a2,%lo(g_ScissorX1) /* f0e7034: 00830019 */ multu $a0,$v1 @@ -2756,14 +2756,14 @@ Gfx *menuRenderItemKeyboard(Gfx *gdl, struct menurendercontext *context) if (context->item->param3 == 0) { // Half width - gDPFillRectangle(gdl++, - (context->x + 4) * g_ScreenWidthMultiplier, context->y + 1, - (context->x + 63) * g_ScreenWidthMultiplier, context->y + 10); + gDPFillRectangleScaled(gdl++, + context->x + 4, context->y + 1, + context->x + 63, context->y + 10); } else { // Full width - gDPFillRectangle(gdl++, - (context->x + 4) * g_ScreenWidthMultiplier, context->y + 1, - (context->x + 125) * g_ScreenWidthMultiplier, context->y + 10); + gDPFillRectangleScaled(gdl++, + context->x + 4, context->y + 1, + context->x + 125, context->y + 10); } // Render text value @@ -2792,9 +2792,7 @@ Gfx *menuRenderItemKeyboard(Gfx *gdl, struct menurendercontext *context) gdl = gfxSetPrimColour(gdl, cursorcolour); - gDPFillRectangle(gdl++, - (x + 1) * g_ScreenWidthMultiplier, context->y + 2, - (x + 3) * g_ScreenWidthMultiplier, context->y + 9); + gDPFillRectangleScaled(gdl++, x + 1, context->y + 2, x + 3, context->y + 9); gdl = func0f153838(gdl); @@ -4177,15 +4175,11 @@ Gfx *menuRenderItemMeter(Gfx *gdl, struct menurendercontext *context) x3 = x2 + 6; gdl = gfxSetPrimColour(gdl, colour1); - gDPFillRectangle(gdl++, - x1 * g_ScreenWidthMultiplier, context->y, - x2 * g_ScreenWidthMultiplier, context->y + 5); + gDPFillRectangleScaled(gdl++, x1, context->y, x2, context->y + 5); gdl = func0f153838(gdl); gdl = gfxSetPrimColour(gdl, colour2); - gDPFillRectangle(gdl++, - x2 * g_ScreenWidthMultiplier, context->y, - x3 * g_ScreenWidthMultiplier, context->y + 5); + gDPFillRectangleScaled(gdl++, x2, context->y, x3, context->y + 5); gdl = func0f153838(gdl); text = menuResolveParam2Text(context->item); @@ -6509,8 +6503,8 @@ glabel menuRenderItemMarquee /* f0ed70c: 24010001 */ addiu $at,$zero,0x1 /* f0ed710: 5041ffe6 */ beql $v0,$at,.L0f0ed6ac /* f0ed714: 92020000 */ lbu $v0,0x0($s0) -/* f0ed718: 3c028008 */ lui $v0,%hi(g_ScreenWidthMultiplier) -/* f0ed71c: 8c42fac0 */ lw $v0,%lo(g_ScreenWidthMultiplier)($v0) +/* f0ed718: 3c028008 */ lui $v0,%hi(g_ScaleX) +/* f0ed71c: 8c42fac0 */ lw $v0,%lo(g_ScaleX)($v0) /* f0ed720: 862c0000 */ lh $t4,0x0($s1) /* f0ed724: 3c038007 */ lui $v1,%hi(g_ScissorX1) /* f0ed728: 24631190 */ addiu $v1,$v1,%lo(g_ScissorX1) @@ -6789,9 +6783,9 @@ u32 var800711ec = 0x20000000; // // // 718 // // context->x is loaded into a0 but should be t4. Additionally, the loads of -// // context->x and g_ScreenWidthMultiplier are swapped. -// g_ScissorX1 = context->x * g_ScreenWidthMultiplier; -// g_ScissorX2 = (context->x + context->width) * g_ScreenWidthMultiplier; +// // context->x and g_ScaleX are swapped. +// g_ScissorX1 = context->x * g_ScaleX; +// g_ScissorX2 = (context->x + context->width) * g_ScaleX; // g_ScissorY1 = context->y; // g_ScissorY2 = context->y + context->height - 1; // @@ -7119,8 +7113,8 @@ Gfx *menuRenderItemRanking(Gfx *gdl, struct menurendercontext *context) gDPPipeSync(gdl++); - g_ScissorX1 = context->x * g_ScreenWidthMultiplier; - g_ScissorX2 = (context->x + context->width) * g_ScreenWidthMultiplier; + g_ScissorX1 = context->x * g_ScaleX; + g_ScissorX2 = (context->x + context->width) * g_ScaleX; g_ScissorY1 = context->y + 10; g_ScissorY2 = context->y + context->height - 1; @@ -7368,8 +7362,8 @@ Gfx *menuRenderItemPlayerStats(Gfx *gdl, struct menurendercontext *context) gDPPipeSync(gdl++); - g_ScissorX1 = context->x * g_ScreenWidthMultiplier; - g_ScissorX2 = (context->x + context->width) * g_ScreenWidthMultiplier; + g_ScissorX1 = context->x * g_ScaleX; + g_ScissorX2 = (context->x + context->width) * g_ScaleX; g_ScissorY1 = context->y + ypos; g_ScissorY2 = context->y + context->height; @@ -7501,9 +7495,9 @@ void menuInitItemPlayerStats(struct menuitem *item, union menuitemdata *data) GLOBAL_ASM( glabel func0f0ef394 -/* f0ef394: 3c098008 */ lui $t1,%hi(g_ScreenWidthMultiplier) +/* f0ef394: 3c098008 */ lui $t1,%hi(g_ScaleX) /* f0ef398: 8faf0010 */ lw $t7,0x10($sp) -/* f0ef39c: 2529fac0 */ addiu $t1,$t1,%lo(g_ScreenWidthMultiplier) +/* f0ef39c: 2529fac0 */ addiu $t1,$t1,%lo(g_ScaleX) /* f0ef3a0: 8d390000 */ lw $t9,0x0($t1) /* f0ef3a4: 000fc080 */ sll $t8,$t7,0x2 /* f0ef3a8: 04c10004 */ bgez $a2,.L0f0ef3bc @@ -7604,9 +7598,9 @@ Gfx *menuRenderControllerTexture(Gfx *gdl, s32 x, s32 y, s32 texturenum, u32 alp gDPSetColor(gdl++, G_SETENVCOLOR, 0xffffff00 | alpha); gSPTextureRectangle(gdl++, - (x << 2) * g_ScreenWidthMultiplier, y << 2, - ((x + 32) << 2) * g_ScreenWidthMultiplier, (y + 32) << 2, - 0, 16, 1008, 1024 / g_ScreenWidthMultiplier, 0xfc00); + (x << 2) * g_ScaleX, y << 2, + ((x + 32) << 2) * g_ScaleX, (y + 32) << 2, + 0, 16, 1008, 1024 / g_ScaleX, 0xfc00); return gdl; } diff --git a/src/game/mplayer/ingame.c b/src/game/mplayer/ingame.c index dccb85fc1..5ebddae1f 100644 --- a/src/game/mplayer/ingame.c +++ b/src/game/mplayer/ingame.c @@ -445,11 +445,11 @@ glabel menuhandler001786d8 /* f17871c: afae00a4 */ sw $t6,0xa4($sp) /* f178720: 8cd50008 */ lw $s5,0x8($a2) /* f178724: 3c14ba00 */ lui $s4,0xba00 -/* f178728: 3c138008 */ lui $s3,%hi(g_ScreenWidthMultiplier) +/* f178728: 3c138008 */ lui $s3,%hi(g_ScaleX) /* f17872c: 8eaf0000 */ lw $t7,0x0($s5) /* f178730: 8eb80008 */ lw $t8,0x8($s5) /* f178734: 0000b025 */ or $s6,$zero,$zero -/* f178738: 2673fac0 */ addiu $s3,$s3,%lo(g_ScreenWidthMultiplier) +/* f178738: 2673fac0 */ addiu $s3,$s3,%lo(g_ScaleX) /* f17873c: 01f89021 */ addu $s2,$t7,$t8 /* f178740: 2652fff1 */ addiu $s2,$s2,-15 /* f178744: 36940c02 */ ori $s4,$s4,0xc02 diff --git a/src/game/mplayer/setup.c b/src/game/mplayer/setup.c index c195f7aad..db26a7f6b 100644 --- a/src/game/mplayer/setup.c +++ b/src/game/mplayer/setup.c @@ -1126,8 +1126,8 @@ glabel menuhandler0017a20c /* f17a440: 3c1eff37 */ lui $s8,0xff37 /* f17a444: 3c17fc12 */ lui $s7,0xfc12 /* f17a448: 3c16b2ef */ lui $s6,0xb2ef -/* f17a44c: 3c138008 */ lui $s3,%hi(g_ScreenWidthMultiplier) -/* f17a450: 2673fac0 */ addiu $s3,$s3,%lo(g_ScreenWidthMultiplier) +/* f17a44c: 3c138008 */ lui $s3,%hi(g_ScaleX) +/* f17a450: 2673fac0 */ addiu $s3,$s3,%lo(g_ScaleX) /* f17a454: 36d6ff00 */ ori $s6,$s6,0xff00 /* f17a458: 36f79a25 */ ori $s7,$s7,0x9a25 /* f17a45c: 37deffff */ ori $s8,$s8,0xffff @@ -1963,8 +1963,8 @@ glabel menuhandlerMpMedal /* f17b1f8: 3c18fb00 */ lui $t8,0xfb00 /* f17b1fc: adb80000 */ sw $t8,0x0($t5) /* f17b200: 01a01025 */ or $v0,$t5,$zero -/* f17b204: 3c068008 */ lui $a2,%hi(g_ScreenWidthMultiplier) -/* f17b208: 24c6fac0 */ addiu $a2,$a2,%lo(g_ScreenWidthMultiplier) +/* f17b204: 3c068008 */ lui $a2,%hi(g_ScaleX) +/* f17b208: 24c6fac0 */ addiu $a2,$a2,%lo(g_ScaleX) /* f17b20c: 00005012 */ mflo $t2 /* f17b210: 000a5a02 */ srl $t3,$t2,0x8 /* f17b214: 018b2825 */ or $a1,$t4,$t3 @@ -5095,8 +5095,8 @@ glabel var7f1b8288 /* f17e7c0: ad600004 */ sw $zero,0x4($t3) /* f17e7c4: 1ae00074 */ blez $s7,.L0f17e998 /* f17e7c8: ad6e0000 */ sw $t6,0x0($t3) -/* f17e7cc: 3c128008 */ lui $s2,%hi(g_ScreenWidthMultiplier) -/* f17e7d0: 2652fac0 */ addiu $s2,$s2,%lo(g_ScreenWidthMultiplier) +/* f17e7cc: 3c128008 */ lui $s2,%hi(g_ScaleX) +/* f17e7d0: 2652fac0 */ addiu $s2,$s2,%lo(g_ScaleX) /* f17e7d4: 241500ff */ addiu $s5,$zero,0xff /* f17e7d8: 3c14fb00 */ lui $s4,0xfb00 /* f17e7dc: 24510001 */ addiu $s1,$v0,0x1 diff --git a/src/game/radar.c b/src/game/radar.c index 5a64795cb..30a08252e 100644 --- a/src/game/radar.c +++ b/src/game/radar.c @@ -30,7 +30,7 @@ void radarSetYIndicatorsEnabled(bool enable) g_RadarYIndicatorsEnabled = enable; } -Gfx *func0f18e5ac(Gfx *gdl, struct textureconfig *tconfig, s32 arg2, s32 arg3, s32 arg4) +Gfx *radarRenderBackground(Gfx *gdl, struct textureconfig *tconfig, s32 arg2, s32 arg3, s32 arg4) { f32 spb0[2]; f32 spa8[2]; @@ -49,14 +49,14 @@ Gfx *func0f18e5ac(Gfx *gdl, struct textureconfig *tconfig, s32 arg2, s32 arg3, s gDPSetPrimColorViaWord(gdl++, 0, 0, 0x00000000); gDPFillRectangle(gdl++, - arg2 * g_ScreenWidthMultiplier, + arg2 * g_ScaleX, arg3, - (arg2 + tconfig->width) * g_ScreenWidthMultiplier, + (arg2 + tconfig->width) * g_ScaleX, arg3 + tconfig->width); - spb0[0] = arg2 * g_ScreenWidthMultiplier; + spb0[0] = arg2 * g_ScaleX; spb0[1] = arg3; - spa8[0] = arg4 * g_ScreenWidthMultiplier; + spa8[0] = arg4 * g_ScaleX; spa8[1] = arg4; func0f0b39c0(&gdl, tconfig, 2, 0, 0, 1, 0); @@ -254,12 +254,12 @@ Gfx *radarRender(Gfx *gdl) } if (g_ViMode == VIMODE_HIRES) { - g_ScreenWidthMultiplier = 2; + g_ScaleX = 2; } else { - g_ScreenWidthMultiplier = 1; + g_ScaleX = 1; } - g_RadarX = (viGetViewLeft() + viGetViewWidth()) / g_ScreenWidthMultiplier - 41; + g_RadarX = (viGetViewLeft() + viGetViewWidth()) / g_ScaleX - 41; if (playercount == 2) { if (IS4MB() || optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) { @@ -301,7 +301,7 @@ Gfx *radarRender(Gfx *gdl) } } - gdl = func0f18e5ac(gdl, tconfig, g_RadarX, g_RadarY, 0x10); + gdl = radarRenderBackground(gdl, tconfig, g_RadarX, g_RadarY, 0x10); gdl = func0f153134(gdl); // Draw dots for human players @@ -389,7 +389,7 @@ Gfx *radarRender(Gfx *gdl) gdl = radarDrawDot(gdl, g_Vars.currentplayer->prop, &pos, colour, 0, 0); } - g_ScreenWidthMultiplier = 1; + g_ScaleX = 1; return gdl; } diff --git a/src/game/title.c b/src/game/title.c index 5939e9f12..b60f0faad 100644 --- a/src/game/title.c +++ b/src/game/title.c @@ -1317,7 +1317,7 @@ void titleTickPdLogo(void) var8009ccb8 = 1 - var8009ccb8; if (var80062734) { - if (g_AltTitle && !IS4MB()) { + if (g_AltTitle && IS8MB()) { g_TitleMode = TITLEMODE_SKIP; creditsRequestAltTitle(); g_TitleNextStage = STAGE_CREDITS; // for alt title screen diff --git a/src/game/training/menus.c b/src/game/training/menus.c index 03435f62c..84cfc06e9 100644 --- a/src/game/training/menus.c +++ b/src/game/training/menus.c @@ -325,11 +325,11 @@ glabel var7f1b9940 /* f1a3788: 27190008 */ addiu $t9,$t8,0x8 /* f1a378c: afb9009c */ sw $t9,0x9c($sp) /* f1a3790: 3c1ffc12 */ lui $ra,0xfc12 -/* f1a3794: 3c098008 */ lui $t1,%hi(g_ScreenWidthMultiplier) +/* f1a3794: 3c098008 */ lui $t1,%hi(g_ScaleX) /* f1a3798: af000004 */ sw $zero,0x4($t8) /* f1a379c: af0e0000 */ sw $t6,0x0($t8) /* f1a37a0: 8fa60094 */ lw $a2,0x94($sp) -/* f1a37a4: 2529fac0 */ addiu $t1,$t1,%lo(g_ScreenWidthMultiplier) +/* f1a37a4: 2529fac0 */ addiu $t1,$t1,%lo(g_ScaleX) /* f1a37a8: 37ff9a25 */ ori $ra,$ra,0x9a25 /* f1a37ac: 00002825 */ or $a1,$zero,$zero /* f1a37b0: 00003825 */ or $a3,$zero,$zero @@ -1048,8 +1048,8 @@ glabel menuhandler001a44c0 /* f1a47e8: 25cd0008 */ addiu $t5,$t6,0x8 /* f1a47ec: afad015c */ sw $t5,0x15c($sp) /* f1a47f0: add80000 */ sw $t8,0x0($t6) -/* f1a47f4: 3c028008 */ lui $v0,%hi(g_ScreenWidthMultiplier) -/* f1a47f8: 2442fac0 */ addiu $v0,$v0,%lo(g_ScreenWidthMultiplier) +/* f1a47f4: 3c028008 */ lui $v0,%hi(g_ScaleX) +/* f1a47f8: 2442fac0 */ addiu $v0,$v0,%lo(g_ScaleX) /* f1a47fc: 3c08e400 */ lui $t0,0xe400 /* f1a4800: 0000c812 */ mflo $t9 /* f1a4804: 00196202 */ srl $t4,$t9,0x8 @@ -3447,8 +3447,8 @@ glabel menuhandler001a6ea4 /* f1a7068: 03017825 */ or $t7,$t8,$at /* f1a706c: af2f0004 */ sw $t7,0x4($t9) /* f1a7070: 8fb900a4 */ lw $t9,0xa4($sp) -/* f1a7074: 3c078008 */ lui $a3,%hi(g_ScreenWidthMultiplier) -/* f1a7078: 24e7fac0 */ addiu $a3,$a3,%lo(g_ScreenWidthMultiplier) +/* f1a7074: 3c078008 */ lui $a3,%hi(g_ScaleX) +/* f1a7078: 24e7fac0 */ addiu $a3,$a3,%lo(g_ScaleX) /* f1a707c: 272a0008 */ addiu $t2,$t9,0x8 /* f1a7080: afaa00a4 */ sw $t2,0xa4($sp) /* f1a7084: 8e0b0000 */ lw $t3,0x0($s0) diff --git a/src/include/constants.h b/src/include/constants.h index f2b3fda7e..ceea2cc50 100644 --- a/src/include/constants.h +++ b/src/include/constants.h @@ -20,6 +20,7 @@ #define CHRRACE(chr) (chr ? chr->race : RACE_HUMAN) #define FRAMEDURATION (1 / 60.0f) #define IS4MB() (g_Is4Mb == true) +#define IS8MB() (g_Is4Mb != true) #define PLAYERCOUNT() ((g_Vars.players[0] ? 1 : 0) + (g_Vars.players[1] ? 1 : 0) + (g_Vars.players[2] ? 1 : 0) + (g_Vars.players[3] ? 1 : 0)) #define PLAYERCOUNT3012() ((g_Vars.players[3] ? 1 : 0) + (g_Vars.players[0] ? 1 : 0) + (g_Vars.players[1] ? 1 : 0) + (g_Vars.players[2] ? 1 : 0)) #define SECSTOTIME240(secs) (secs * 240) @@ -575,11 +576,6 @@ #define COVERFLAG_0040 0x0040 #define COVERFLAG_0080 0x0080 -#define CREDITFLAG_08 0x08 -#define CREDITFLAG_NOTRANOUT 0x20 // Do not transition out - for titles which continue to the next -#define CREDITFLAG_NOTRANIN 0x40 // Do not transition in - for titles which continue from the previous -#define CREDITFLAG_MORE 0x80 // Load another credit to display on the current slide - // L/C/R = left/centered/right // big/med/sml is the font size #define CREDITSTYLE_R_BIG_R_MED 1 diff --git a/src/include/game/data/data_020df0.h b/src/include/game/data/data_020df0.h index bdced0d8b..b1c0e659f 100644 --- a/src/include/game/data/data_020df0.h +++ b/src/include/game/data/data_020df0.h @@ -213,7 +213,7 @@ extern u8 g_CutsceneSubtitles; extern s32 g_ScreenSize; extern s32 g_ScreenRatio; extern u8 g_ScreenSplit; -extern s32 g_ScreenWidthMultiplier; +extern s32 g_ScaleX; extern u32 var8007fac4; extern u32 var8007fac8; extern u32 var8007facc; diff --git a/src/include/game/radar.h b/src/include/game/radar.h index 082070403..4aa8fedf7 100644 --- a/src/include/game/radar.h +++ b/src/include/game/radar.h @@ -3,7 +3,7 @@ #include #include "types.h" -Gfx *func0f18e5ac(Gfx *gdl, struct textureconfig *tconfig, s32 arg2, s32 arg3, s32 arg4); +Gfx *radarRenderBackground(Gfx *gdl, struct textureconfig *tconfig, s32 arg2, s32 arg3, s32 arg4); s32 radarGetTeamIndex(s32 team); Gfx *radarDrawDot(Gfx *gdl, struct prop *prop, struct coord *dist, u32 colour1, u32 colour2, bool swapcolours); Gfx *radarRender(Gfx *gdl); diff --git a/src/include/gbiex.h b/src/include/gbiex.h index 5336da16c..0b2615430 100644 --- a/src/include/gbiex.h +++ b/src/include/gbiex.h @@ -106,10 +106,10 @@ /** * gDPFillRectangle - a wrapper around gDPFillRectangle which applies - * g_ScreenWidthMultiplier to the X coordinates. + * g_ScaleX to the X coordinates. * - * g_ScreenWidthMultiplier is normally 1, but 2 when using hi-res. + * g_ScaleX is normally 1, but 2 when using hi-res. */ -#define gDPFillRectangleScaled(pkt, x1, y1, x2, y2) gDPFillRectangle(pkt, (x1) * g_ScreenWidthMultiplier, y1, (x2) * g_ScreenWidthMultiplier, y2) +#define gDPFillRectangleScaled(pkt, x1, y1, x2, y2) gDPFillRectangle(pkt, (x1) * g_ScaleX, y1, (x2) * g_ScaleX, y2) #endif