diff options
| author | briaguya <70942617+briaguya-ai@users.noreply.github.com> | 2023-01-17 00:17:49 -0500 |
|---|---|---|
| committer | briaguya <briaguya@alice> | 2023-01-17 00:33:56 -0500 |
| commit | ba13e6b2c40d17adef064c2022ceeef260622981 (patch) | |
| tree | 8dbad888b552342bd7a10a1061657a122ce08f87 /soh/src/code/z_parameter.c | |
| parent | ab104623a74311ed3ba20fc059b012b3940c300b (diff) | |
refactor: use LUS 1.0 RC
Co-authored-by: kenix3 <kenixwhisperwind@gmail.com>
Co-authored-by: David Chavez <david@dcvz.io>
Co-authored-by: KiritoDv <kiritodev01@gmail.com>
Co-authored-by: Christopher Leggett <chris@leggett.dev>
Diffstat (limited to 'soh/src/code/z_parameter.c')
| -rw-r--r-- | soh/src/code/z_parameter.c | 999 |
1 files changed, 500 insertions, 499 deletions
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c index 8295b0845..d82b4922f 100644 --- a/soh/src/code/z_parameter.c +++ b/soh/src/code/z_parameter.c @@ -5,6 +5,7 @@ #include "textures/icon_item_static/icon_item_static.h" #include "soh/Enhancements/randomizer/adult_trade_shuffle.h" #include "soh/Enhancements/randomizer/randomizer_entrance.h" +#include "libultraship/bridge.h" #ifdef _MSC_VER #include <stdlib.h> @@ -21,7 +22,7 @@ static uint16_t DO_ACTION_TEX_WIDTH() { // TODO: Figure out why Ship::Texture is not returning a valid width if (_doActionTexWidth == -1) - _doActionTexWidth = ResourceMgr_LoadTexWidthByName(gCheckDoActionENGTex); + _doActionTexWidth = GetResourceTexWidthByName(gCheckDoActionENGTex, false); return _doActionTexWidth; } static uint16_t DO_ACTION_TEX_HEIGHT() { @@ -29,14 +30,14 @@ static uint16_t DO_ACTION_TEX_HEIGHT() { // TODO: Figure out why Ship::Texture is not returning a valid height if (_doActionTexHeight == -1) - _doActionTexHeight = ResourceMgr_LoadTexHeightByName(gCheckDoActionENGTex); + _doActionTexHeight = GetResourceTexHeightByName(gCheckDoActionENGTex, false); return _doActionTexHeight; } static uint32_t _doActionTexSize = -1; static uint32_t DO_ACTION_TEX_SIZE() { if (_doActionTexSize == -1) - _doActionTexSize = ResourceMgr_LoadTexSizeByName(gCheckDoActionENGTex); + _doActionTexSize = GetResourceTexSizeByName(gCheckDoActionENGTex, false); return _doActionTexSize; } @@ -1139,7 +1140,7 @@ void func_80083108(PlayState* play) { if (interfaceCtx->restrictions.tradeItems != 0) { for (i = 1; i < ARRAY_COUNT(gSaveContext.equips.buttonItems); i++) { - if ((CVar_GetS32("gMMBunnyHood", 0) != 0) + if ((CVarGetInteger("gMMBunnyHood", 0) != 0) && (gSaveContext.equips.buttonItems[i] >= ITEM_MASK_KEATON) && (gSaveContext.equips.buttonItems[i] <= ITEM_MASK_TRUTH)) { gSaveContext.buttonStatus[BUTTON_STATUS_INDEX(i)] = BTN_ENABLED; @@ -2326,7 +2327,7 @@ u8 Item_Give(PlayState* play, u8 item) { } } } else if ((item >= ITEM_WEIRD_EGG) && (item <= ITEM_CLAIM_CHECK)) { - if ((item == ITEM_SAW) && CVar_GetS32("gDekuNutUpgradeFix", 0) == 0) { + if ((item == ITEM_SAW) && CVarGetInteger("gDekuNutUpgradeFix", 0) == 0) { gSaveContext.itemGetInf[1] |= 0x8000; } @@ -2717,10 +2718,10 @@ u8 Item_CheckObtainability(u8 item) { // Save when receiving an item, unless it's purchased from a shop void PerformAutosave(PlayState* play, u8 item) { - if (CVar_GetS32("gAutosave", 0) && (play != NULL) && (play->sceneNum != SCENE_KENJYANOMA) && (gSaveContext.pendingSale == ITEM_NONE) && (play->sceneNum != SCENE_GANON_DEMO)) { - if (CVar_GetS32("gAutosaveAllItems", 0)) { + if (CVarGetInteger("gAutosave", 0) && (play != NULL) && (play->sceneNum != SCENE_KENJYANOMA) && (gSaveContext.pendingSale == ITEM_NONE) && (play->sceneNum != SCENE_GANON_DEMO)) { + if (CVarGetInteger("gAutosaveAllItems", 0)) { Play_PerformSave(play); - } else if (CVar_GetS32("gAutosaveMajorItems", 1)) { + } else if (CVarGetInteger("gAutosaveMajorItems", 1)) { switch (item) { case ITEM_STICK: case ITEM_NUT: @@ -2757,7 +2758,7 @@ void PerformAutosave(PlayState* play, u8 item) { case ITEM_BOMBCHU: case ITEM_BOMBCHUS_5: case ITEM_BOMBCHUS_20: - if (!CVar_GetS32("gBombchuDrops", 0)) { + if (!CVarGetInteger("gBombchuDrops", 0)) { Play_PerformSave(play); } break; @@ -2915,7 +2916,7 @@ bool Inventory_HatchPocketCucco(PlayState* play) { void func_80086D5C(s32* buf, u16 size) { u16 i; - //buf = ResourceMgr_LoadTexByName(buf); + //buf = GetResourceDataByName(buf, false); for (i = 0; i < size; i++) { buf[i] = 0; @@ -2958,7 +2959,7 @@ void Interface_LoadActionLabel(InterfaceContext* interfaceCtx, u16 action, s16 l if (action != DO_ACTION_NONE) { //osCreateMesgQueue(&interfaceCtx->loadQueue, &interfaceCtx->loadMsg, OS_MESG_BLOCK); - memcpy(interfaceCtx->doActionSegment + (loadOffset * DO_ACTION_TEX_SIZE()), ResourceMgr_LoadTexByName(doAction), + memcpy(interfaceCtx->doActionSegment + (loadOffset * DO_ACTION_TEX_SIZE()), GetResourceDataByName(doAction, false), DO_ACTION_TEX_SIZE()); //DmaMgr_SendRequest2(&interfaceCtx->dmaRequest_160, //interfaceCtx->doActionSegment + (loadOffset * DO_ACTION_TEX_SIZE), @@ -2992,7 +2993,7 @@ void Interface_SetNaviCall(PlayState* play, u16 naviCallState) { if (((naviCallState == 0x1D) || (naviCallState == 0x1E)) && !interfaceCtx->naviCalling && (play->csCtx.state == CS_STATE_IDLE)) { - if (!CVar_GetS32("gDisableNaviCallAudio", 0)) { + if (!CVarGetInteger("gDisableNaviCallAudio", 0)) { // clang-format off if (naviCallState == 0x1E) { Audio_PlaySoundGeneral(NA_SE_VO_NAVY_CALL, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } @@ -3046,7 +3047,7 @@ void Interface_LoadActionLabelB(PlayState* play, u16 action) { // OTRTODO osCreateMesgQueue(&interfaceCtx->loadQueue, &interfaceCtx->loadMsg, OS_MESG_BLOCK); - memcpy(interfaceCtx->doActionSegment + DO_ACTION_TEX_SIZE(), ResourceMgr_LoadTexByName(doAction), DO_ACTION_TEX_SIZE()); + memcpy(interfaceCtx->doActionSegment + DO_ACTION_TEX_SIZE(), GetResourceDataByName(doAction, false), DO_ACTION_TEX_SIZE()); //DmaMgr_SendRequest2(&interfaceCtx->dmaRequest_160, interfaceCtx->doActionSegment + DO_ACTION_TEX_SIZE, //(uintptr_t)_do_action_staticSegmentRomStart + (action * DO_ACTION_TEX_SIZE), DO_ACTION_TEX_SIZE, 0, //&interfaceCtx->loadQueue, NULL, __FILE__, __LINE__); @@ -3347,22 +3348,22 @@ void Interface_UpdateMagicBar(PlayState* play) { Color_RGB8 MagicBorder_2 = { 255, 255, 150 }; Color_RGB8 MagicBorder_3 = { 255, 255, 50 }; - if (CVar_GetS32("gCosmetics.Consumable_MagicBorderActive.Changed", 0)) { //This will make custom color based on users selected colors. - sMagicBorderColors[0][0] = CVar_GetRGB("gCosmetics.Consumable_MagicBorderActive.Value", MagicBorder_0).r; - sMagicBorderColors[0][1] = CVar_GetRGB("gCosmetics.Consumable_MagicBorderActive.Value", MagicBorder_0).g; - sMagicBorderColors[0][2] = CVar_GetRGB("gCosmetics.Consumable_MagicBorderActive.Value", MagicBorder_0).b; + if (CVarGetInteger("gCosmetics.Consumable_MagicBorderActive.Changed", 0)) { //This will make custom color based on users selected colors. + sMagicBorderColors[0][0] = CVarGetColor24("gCosmetics.Consumable_MagicBorderActive.Value", MagicBorder_0).r; + sMagicBorderColors[0][1] = CVarGetColor24("gCosmetics.Consumable_MagicBorderActive.Value", MagicBorder_0).g; + sMagicBorderColors[0][2] = CVarGetColor24("gCosmetics.Consumable_MagicBorderActive.Value", MagicBorder_0).b; - sMagicBorderColors[1][0] = CVar_GetRGB("gCosmetics.Consumable_MagicBorderActive.Value", MagicBorder_1).r/2; - sMagicBorderColors[1][1] = CVar_GetRGB("gCosmetics.Consumable_MagicBorderActive.Value", MagicBorder_1).g/2; - sMagicBorderColors[1][2] = CVar_GetRGB("gCosmetics.Consumable_MagicBorderActive.Value", MagicBorder_1).b/2; + sMagicBorderColors[1][0] = CVarGetColor24("gCosmetics.Consumable_MagicBorderActive.Value", MagicBorder_1).r/2; + sMagicBorderColors[1][1] = CVarGetColor24("gCosmetics.Consumable_MagicBorderActive.Value", MagicBorder_1).g/2; + sMagicBorderColors[1][2] = CVarGetColor24("gCosmetics.Consumable_MagicBorderActive.Value", MagicBorder_1).b/2; - sMagicBorderColors[2][0] = CVar_GetRGB("gCosmetics.Consumable_MagicBorderActive.Value", MagicBorder_2).r/2.5; - sMagicBorderColors[2][1] = CVar_GetRGB("gCosmetics.Consumable_MagicBorderActive.Value", MagicBorder_2).g/2.5; - sMagicBorderColors[2][2] = CVar_GetRGB("gCosmetics.Consumable_MagicBorderActive.Value", MagicBorder_2).b/2.5; + sMagicBorderColors[2][0] = CVarGetColor24("gCosmetics.Consumable_MagicBorderActive.Value", MagicBorder_2).r/2.5; + sMagicBorderColors[2][1] = CVarGetColor24("gCosmetics.Consumable_MagicBorderActive.Value", MagicBorder_2).g/2.5; + sMagicBorderColors[2][2] = CVarGetColor24("gCosmetics.Consumable_MagicBorderActive.Value", MagicBorder_2).b/2.5; - sMagicBorderColors[3][0] = CVar_GetRGB("gCosmetics.Consumable_MagicBorderActive.Value", MagicBorder_3).r/3; - sMagicBorderColors[3][1] = CVar_GetRGB("gCosmetics.Consumable_MagicBorderActive.Value", MagicBorder_3).g/3; - sMagicBorderColors[3][2] = CVar_GetRGB("gCosmetics.Consumable_MagicBorderActive.Value", MagicBorder_3).b/3; + sMagicBorderColors[3][0] = CVarGetColor24("gCosmetics.Consumable_MagicBorderActive.Value", MagicBorder_3).r/3; + sMagicBorderColors[3][1] = CVarGetColor24("gCosmetics.Consumable_MagicBorderActive.Value", MagicBorder_3).g/3; + sMagicBorderColors[3][2] = CVarGetColor24("gCosmetics.Consumable_MagicBorderActive.Value", MagicBorder_3).b/3; } static s16 sMagicBorderIndexes[] = { 0, 1, 1, 0 }; @@ -3422,15 +3423,15 @@ void Interface_UpdateMagicBar(PlayState* play) { if (gSaveContext.magic <= 0) { gSaveContext.magic = 0; gSaveContext.magicState = 3; - if (CVar_GetS32("gCosmetics.Consumable_MagicBorder.Changed", 0)) { - sMagicBorder = CVar_GetRGB("gCosmetics.Consumable_MagicBorder.Value", sMagicBorder_ori); + if (CVarGetInteger("gCosmetics.Consumable_MagicBorder.Changed", 0)) { + sMagicBorder = CVarGetColor24("gCosmetics.Consumable_MagicBorder.Value", sMagicBorder_ori); } else { sMagicBorder = sMagicBorder_ori; } } else if (gSaveContext.magic == gSaveContext.magicTarget) { gSaveContext.magicState = 3; - if (CVar_GetS32("gCosmetics.Consumable_MagicBorder.Changed", 0)) { - sMagicBorder = CVar_GetRGB("gCosmetics.Consumable_MagicBorder.Value", sMagicBorder_ori); + if (CVarGetInteger("gCosmetics.Consumable_MagicBorder.Changed", 0)) { + sMagicBorder = CVarGetColor24("gCosmetics.Consumable_MagicBorder.Value", sMagicBorder_ori); } else { sMagicBorder = sMagicBorder_ori; } @@ -3475,8 +3476,8 @@ void Interface_UpdateMagicBar(PlayState* play) { break; case 5: - if (CVar_GetS32("gCosmetics.Consumable_MagicBorder.Changed", 0)) { - sMagicBorder = CVar_GetRGB("gCosmetics.Consumable_MagicBorder.Value", sMagicBorder_ori); + if (CVarGetInteger("gCosmetics.Consumable_MagicBorder.Changed", 0)) { + sMagicBorder = CVarGetColor24("gCosmetics.Consumable_MagicBorder.Value", sMagicBorder_ori); } else { sMagicBorder = sMagicBorder_ori; } @@ -3488,7 +3489,7 @@ void Interface_UpdateMagicBar(PlayState* play) { (msgCtx->msgMode == MSGMODE_NONE) && (play->gameOverCtx.state == GAMEOVER_INACTIVE) && (play->sceneLoadFlag == 0) && (play->transitionMode == 0) && !Play_InCsMode(play)) { bool hasLens = false; - for (int buttonIndex = 1; buttonIndex < (CVar_GetS32("gDpadEquips", 0) != 0) ? ARRAY_COUNT(gSaveContext.equips.buttonItems) : 4; buttonIndex++) { + for (int buttonIndex = 1; buttonIndex < (CVarGetInteger("gDpadEquips", 0) != 0) ? ARRAY_COUNT(gSaveContext.equips.buttonItems) : 4; buttonIndex++) { if (gSaveContext.equips.buttonItems[buttonIndex] == ITEM_LENS) { hasLens = true; break; @@ -3501,8 +3502,8 @@ void Interface_UpdateMagicBar(PlayState* play) { Audio_PlaySoundGeneral(NA_SE_SY_GLASSMODE_OFF, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); gSaveContext.magicState = 0; - if (CVar_GetS32("gCosmetics.Consumable_MagicBorder.Changed", 0)) { - sMagicBorder = CVar_GetRGB("gCosmetics.Consumable_MagicBorder.Value", sMagicBorder_ori); + if (CVarGetInteger("gCosmetics.Consumable_MagicBorder.Changed", 0)) { + sMagicBorder = CVarGetColor24("gCosmetics.Consumable_MagicBorder.Value", sMagicBorder_ori); } else { sMagicBorder = sMagicBorder_ori; } @@ -3581,7 +3582,7 @@ void Interface_DrawLineupTick(PlayState* play) { s16 width = 32; s16 height = 32; s16 x = -8 + (SCREEN_WIDTH / 2); - s16 y = CVar_GetS32("gOpenMenuBar", 0) ? -4 : -6; + s16 y = CVarGetInteger("gOpenMenuBar", 0) ? -4 : -6; OVERLAY_DISP = Gfx_TextureIA8(OVERLAY_DISP, gEmptyCDownArrowTex, width, height, x, y, width, height, 2 << 10, 2 << 10); @@ -3597,11 +3598,11 @@ void Interface_DrawMagicBar(PlayState* play) { Color_RGB8 magicbar_yellow = {250,250,0}; //Magic bar being used Color_RGB8 magicbar_green = {R_MAGIC_FILL_COLOR(0),R_MAGIC_FILL_COLOR(1),R_MAGIC_FILL_COLOR(2)}; //Magic bar fill - if (CVar_GetS32("gCosmetics.Consumable_MagicActive.Changed", 0)) { - magicbar_yellow = CVar_GetRGB("gCosmetics.Consumable_MagicActive.Value", magicbar_yellow); + if (CVarGetInteger("gCosmetics.Consumable_MagicActive.Changed", 0)) { + magicbar_yellow = CVarGetColor24("gCosmetics.Consumable_MagicActive.Value", magicbar_yellow); } - if (CVar_GetS32("gCosmetics.Consumable_Magic.Changed", 0)) { - magicbar_green = CVar_GetRGB("gCosmetics.Consumable_Magic.Value", magicbar_green); + if (CVarGetInteger("gCosmetics.Consumable_Magic.Changed", 0)) { + magicbar_green = CVarGetColor24("gCosmetics.Consumable_Magic.Value", magicbar_green); } OPEN_DISPS(play->state.gfxCtx); @@ -3609,7 +3610,7 @@ void Interface_DrawMagicBar(PlayState* play) { if (gSaveContext.magicLevel != 0) { s16 X_Margins; s16 Y_Margins; - if (CVar_GetS32("gMagicBarUseMargins", 0) != 0) { + if (CVarGetInteger("gMagicBarUseMargins", 0) != 0) { X_Margins = Left_HUD_Margin; Y_Margins = (Top_HUD_Margin*-1); } else { @@ -3627,40 +3628,40 @@ void Interface_DrawMagicBar(PlayState* play) { s16 rMagicBarX; s16 PosX_MidEnd; s16 rMagicFillX; - s32 lineLength = CVar_GetS32("gHeartsLineLength", 10); - if (CVar_GetS32("gMagicBarPosType", 0) != 0) { - magicBarY = CVar_GetS32("gMagicBarPosY", 0)+Y_Margins; - if (CVar_GetS32("gMagicBarPosType", 0) == 1) {//Anchor Left - if (CVar_GetS32("gMagicBarUseMargins", 0) != 0) {X_Margins = Left_HUD_Margin;}; - PosX_Start = OTRGetDimensionFromLeftEdge(CVar_GetS32("gMagicBarPosX", 0)+X_Margins); - rMagicBarX = OTRGetDimensionFromLeftEdge(CVar_GetS32("gMagicBarPosX", 0)+X_Margins); - PosX_MidEnd = OTRGetDimensionFromLeftEdge(CVar_GetS32("gMagicBarPosX", 0)+X_Margins+8); - rMagicFillX = OTRGetDimensionFromLeftEdge(CVar_GetS32("gMagicBarPosX", 0)+X_Margins+8); - } else if (CVar_GetS32("gMagicBarPosType", 0) == 2) {//Anchor Right - if (CVar_GetS32("gMagicBarUseMargins", 0) != 0) {X_Margins = Right_HUD_Margin;}; - PosX_Start = OTRGetDimensionFromRightEdge(CVar_GetS32("gMagicBarPosX", 0)+X_Margins); - rMagicBarX = OTRGetDimensionFromRightEdge(CVar_GetS32("gMagicBarPosX", 0)+X_Margins); - PosX_MidEnd = OTRGetDimensionFromRightEdge(CVar_GetS32("gMagicBarPosX", 0)+X_Margins+8); - rMagicFillX = OTRGetDimensionFromRightEdge(CVar_GetS32("gMagicBarPosX", 0)+X_Margins+8); - } else if (CVar_GetS32("gMagicBarPosType", 0) == 3) {//Anchor None - PosX_Start = CVar_GetS32("gMagicBarPosX", 0)+X_Margins; - rMagicBarX = CVar_GetS32("gMagicBarPosX", 0)+X_Margins; - PosX_MidEnd = CVar_GetS32("gMagicBarPosX", 0)+X_Margins+8; - rMagicFillX = CVar_GetS32("gMagicBarPosX", 0)+X_Margins+8; - } else if (CVar_GetS32("gMagicBarPosType", 0) == 4) {//hidden + s32 lineLength = CVarGetInteger("gHeartsLineLength", 10); + if (CVarGetInteger("gMagicBarPosType", 0) != 0) { + magicBarY = CVarGetInteger("gMagicBarPosY", 0)+Y_Margins; + if (CVarGetInteger("gMagicBarPosType", 0) == 1) {//Anchor Left + if (CVarGetInteger("gMagicBarUseMargins", 0) != 0) {X_Margins = Left_HUD_Margin;}; + PosX_Start = OTRGetDimensionFromLeftEdge(CVarGetInteger("gMagicBarPosX", 0)+X_Margins); + rMagicBarX = OTRGetDimensionFromLeftEdge(CVarGetInteger("gMagicBarPosX", 0)+X_Margins); + PosX_MidEnd = OTRGetDimensionFromLeftEdge(CVarGetInteger("gMagicBarPosX", 0)+X_Margins+8); + rMagicFillX = OTRGetDimensionFromLeftEdge(CVarGetInteger("gMagicBarPosX", 0)+X_Margins+8); + } else if (CVarGetInteger("gMagicBarPosType", 0) == 2) {//Anchor Right + if (CVarGetInteger("gMagicBarUseMargins", 0) != 0) {X_Margins = Right_HUD_Margin;}; + PosX_Start = OTRGetDimensionFromRightEdge(CVarGetInteger("gMagicBarPosX", 0)+X_Margins); + rMagicBarX = OTRGetDimensionFromRightEdge(CVarGetInteger("gMagicBarPosX", 0)+X_Margins); + PosX_MidEnd = OTRGetDimensionFromRightEdge(CVarGetInteger("gMagicBarPosX", 0)+X_Margins+8); + rMagicFillX = OTRGetDimensionFromRightEdge(CVarGetInteger("gMagicBarPosX", 0)+X_Margins+8); + } else if (CVarGetInteger("gMagicBarPosType", 0) == 3) {//Anchor None + PosX_Start = CVarGetInteger("gMagicBarPosX", 0)+X_Margins; + rMagicBarX = CVarGetInteger("gMagicBarPosX", 0)+X_Margins; + PosX_MidEnd = CVarGetInteger("gMagicBarPosX", 0)+X_Margins+8; + rMagicFillX = CVarGetInteger("gMagicBarPosX", 0)+X_Margins+8; + } else if (CVarGetInteger("gMagicBarPosType", 0) == 4) {//hidden PosX_Start = -9999; rMagicBarX = -9999; PosX_MidEnd = -9999; rMagicFillX = -9999; - } else if (CVar_GetS32("gMagicBarPosType", 0) == 5) {//Anchor To life meter + } else if (CVarGetInteger("gMagicBarPosType", 0) == 5) {//Anchor To life meter magicBarY = R_MAGIC_BAR_SMALL_Y-2 + magicDrop*(lineLength == 0 ? 0 : (gSaveContext.healthCapacity-1)/(0x10*lineLength)) + - CVar_GetS32("gMagicBarPosY", 0) + getHealthMeterYOffset(); - s16 xPushover = CVar_GetS32("gMagicBarPosX", 0) + getHealthMeterXOffset() + R_MAGIC_BAR_X-1; + CVarGetInteger("gMagicBarPosY", 0) + getHealthMeterYOffset(); + s16 xPushover = CVarGetInteger("gMagicBarPosX", 0) + getHealthMeterXOffset() + R_MAGIC_BAR_X-1; PosX_Start = xPushover; rMagicBarX = xPushover; PosX_MidEnd = xPushover+8; - rMagicFillX = CVar_GetS32("gMagicBarPosX", 0) + getHealthMeterXOffset() + R_MAGIC_FILL_X-1; + rMagicFillX = CVarGetInteger("gMagicBarPosX", 0) + getHealthMeterXOffset() + R_MAGIC_FILL_X-1; } } else { if ((gSaveContext.healthCapacity-1)/0x10 >= lineLength && lineLength != 0) { @@ -3792,37 +3793,37 @@ void Interface_DrawItemButtons(PlayState* play) { s16 height; Color_RGB8 bButtonColor = { 0, 150, 0 }; - if (CVar_GetS32("gCosmetics.Hud_BButton.Changed", 0)) { - bButtonColor = CVar_GetRGB("gCosmetics.Hud_BButton.Value", bButtonColor); - } else if (CVar_GetS32("gCosmetics.DefaultColorScheme", 0)) { + if (CVarGetInteger("gCosmetics.Hud_BButton.Changed", 0)) { + bButtonColor = CVarGetColor24("gCosmetics.Hud_BButton.Value", bButtonColor); + } else if (CVarGetInteger("gCosmetics.DefaultColorScheme", 0)) { bButtonColor = (Color_RGB8){ 255, 30, 30 }; } Color_RGB8 cButtonsColor = { 255, 160, 0 }; - if (CVar_GetS32("gCosmetics.Hud_CButtons.Changed", 0)) { - cButtonsColor = CVar_GetRGB("gCosmetics.Hud_CButtons.Value", cButtonsColor); + if (CVarGetInteger("gCosmetics.Hud_CButtons.Changed", 0)) { + cButtonsColor = CVarGetColor24("gCosmetics.Hud_CButtons.Value", cButtonsColor); } Color_RGB8 cUpButtonColor = cButtonsColor; - if (CVar_GetS32("gCosmetics.Hud_CUpButton.Changed", 0)) { - cUpButtonColor = CVar_GetRGB("gCosmetics.Hud_CUpButton.Value", cUpButtonColor); + if (CVarGetInteger("gCosmetics.Hud_CUpButton.Changed", 0)) { + cUpButtonColor = CVarGetColor24("gCosmetics.Hud_CUpButton.Value", cUpButtonColor); } Color_RGB8 cDownButtonColor = cButtonsColor; - if (CVar_GetS32("gCosmetics.Hud_CDownButton.Changed", 0)) { - cDownButtonColor = CVar_GetRGB("gCosmetics.Hud_CDownButton.Value", cDownButtonColor); + if (CVarGetInteger("gCosmetics.Hud_CDownButton.Changed", 0)) { + cDownButtonColor = CVarGetColor24("gCosmetics.Hud_CDownButton.Value", cDownButtonColor); } Color_RGB8 cLeftButtonColor = cButtonsColor; - if (CVar_GetS32("gCosmetics.Hud_CLeftButton.Changed", 0)) { - cLeftButtonColor = CVar_GetRGB("gCosmetics.Hud_CLeftButton.Value", cLeftButtonColor); + if (CVarGetInteger("gCosmetics.Hud_CLeftButton.Changed", 0)) { + cLeftButtonColor = CVarGetColor24("gCosmetics.Hud_CLeftButton.Value", cLeftButtonColor); } Color_RGB8 cRightButtonColor = cButtonsColor; - if (CVar_GetS32("gCosmetics.Hud_CRightButton.Changed", 0)) { - cRightButtonColor = CVar_GetRGB("gCosmetics.Hud_CRightButton.Value", cRightButtonColor); + if (CVarGetInteger("gCosmetics.Hud_CRightButton.Changed", 0)) { + cRightButtonColor = CVarGetColor24("gCosmetics.Hud_CRightButton.Value", cRightButtonColor); } Color_RGB8 startButtonColor = { 200, 0, 0 }; - if (CVar_GetS32("gCosmetics.Hud_StartButton.Changed", 0)) { - startButtonColor = CVar_GetRGB("gCosmetics.Hud_StartButton.Value", startButtonColor); - } else if (CVar_GetS32("gCosmetics.DefaultColorScheme", 0)) { + if (CVarGetInteger("gCosmetics.Hud_StartButton.Changed", 0)) { + startButtonColor = CVarGetColor24("gCosmetics.Hud_StartButton.Value", startButtonColor); + } else if (CVarGetInteger("gCosmetics.DefaultColorScheme", 0)) { startButtonColor = (Color_RGB8){ 120, 120, 120 }; } @@ -3831,12 +3832,12 @@ void Interface_DrawItemButtons(PlayState* play) { s16 Y_Margins_BtnB; s16 BBtn_Size = 32; int BBtnScaled = BBtn_Size * 0.95f; - if (CVar_GetS32("gBBtnPosType", 0) != 0) { - BBtnScaled = BBtn_Size * CVar_GetFloat("gBBtnScale", 0.95f); + if (CVarGetInteger("gBBtnPosType", 0) != 0) { + BBtnScaled = BBtn_Size * CVarGetFloat("gBBtnScale", 0.95f); } int BBtn_factor = (1 << 10) * BBtn_Size / BBtnScaled; - if (CVar_GetS32("gBBtnUseMargins", 0) != 0) { - if (CVar_GetS32("gBBtnPosType", 0) == 0) {X_Margins_BtnB = Right_HUD_Margin;}; + if (CVarGetInteger("gBBtnUseMargins", 0) != 0) { + if (CVarGetInteger("gBBtnPosType", 0) == 0) {X_Margins_BtnB = Right_HUD_Margin;}; Y_Margins_BtnB = (Top_HUD_Margin*-1); } else { X_Margins_BtnB = 0; @@ -3846,17 +3847,17 @@ void Interface_DrawItemButtons(PlayState* play) { s16 PosY_BtnB_ori = R_ITEM_BTN_Y(0)+Y_Margins_BtnB; s16 PosX_BtnB; s16 PosY_BtnB; - if (CVar_GetS32("gBBtnPosType", 0) != 0) { - PosY_BtnB = CVar_GetS32("gBBtnPosY", 0)+Y_Margins_BtnB; - if (CVar_GetS32("gBBtnPosType", 0) == 1) {//Anchor Left - if (CVar_GetS32("gBBtnUseMargins", 0) != 0) {X_Margins_BtnB = Left_HUD_Margin;}; - PosX_BtnB = OTRGetDimensionFromLeftEdge(CVar_GetS32("gBBtnPosX", 0)+X_Margins_BtnB); - } else if (CVar_GetS32("gBBtnPosType", 0) == 2) {//Anchor Right - if (CVar_GetS32("gBBtnUseMargins", 0) != 0) {X_Margins_BtnB = Right_HUD_Margin;}; - PosX_BtnB = OTRGetDimensionFromRightEdge(CVar_GetS32("gBBtnPosX", 0)+X_Margins_BtnB); - } else if (CVar_GetS32("gBBtnPosType", 0) == 3) {//Anchor None - PosX_BtnB = CVar_GetS32("gBBtnPosX", 0); - } else if (CVar_GetS32("gBBtnPosType", 0) == 4) {//Hidden + if (CVarGetInteger("gBBtnPosType", 0) != 0) { + PosY_BtnB = CVarGetInteger("gBBtnPosY", 0)+Y_Margins_BtnB; + if (CVarGetInteger("gBBtnPosType", 0) == 1) {//Anchor Left + if (CVarGetInteger("gBBtnUseMargins", 0) != 0) {X_Margins_BtnB = Left_HUD_Margin;}; + PosX_BtnB = OTRGetDimensionFromLeftEdge(CVarGetInteger("gBBtnPosX", 0)+X_Margins_BtnB); + } else if (CVarGetInteger("gBBtnPosType", 0) == 2) {//Anchor Right + if (CVarGetInteger("gBBtnUseMargins", 0) != 0) {X_Margins_BtnB = Right_HUD_Margin;}; + PosX_BtnB = OTRGetDimensionFromRightEdge(CVarGetInteger("gBBtnPosX", 0)+X_Margins_BtnB); + } else if (CVarGetInteger("gBBtnPosType", 0) == 3) {//Anchor None + PosX_BtnB = CVarGetInteger("gBBtnPosX", 0); + } else if (CVarGetInteger("gBBtnPosType", 0) == 4) {//Hidden PosX_BtnB = -9999; } } else { @@ -3866,8 +3867,8 @@ void Interface_DrawItemButtons(PlayState* play) { //Start Button s16 X_Margins_StartBtn; s16 Y_Margins_StartBtn; - if (CVar_GetS32("gStartBtnUseMargins", 0) != 0) { - if (CVar_GetS32("gStartBtnPosType", 0) == 0) { + if (CVarGetInteger("gStartBtnUseMargins", 0) != 0) { + if (CVarGetInteger("gStartBtnPosType", 0) == 0) { X_Margins_StartBtn = Right_HUD_Margin; }; Y_Margins_StartBtn = Top_HUD_Margin*-1; @@ -3878,8 +3879,8 @@ void Interface_DrawItemButtons(PlayState* play) { s16 StartBtn_Icon_H = 32; s16 StartBtn_Icon_W = 32; float Start_BTN_Scale = 0.75f; - if (CVar_GetS32("gStartBtnPosType", 0) != 0) { - Start_BTN_Scale = CVar_GetFloat("gStartBtnScale", 0.75f); + if (CVarGetInteger("gStartBtnPosType", 0) != 0) { + Start_BTN_Scale = CVarGetFloat("gStartBtnScale", 0.75f); } int StartBTN_H_Scaled = StartBtn_Icon_H * Start_BTN_Scale; int StartBTN_W_Scaled = StartBtn_Icon_W * Start_BTN_Scale; @@ -3891,17 +3892,17 @@ void Interface_DrawItemButtons(PlayState* play) { s16 StartBTN_Label_H = DO_ACTION_TEX_HEIGHT(); s16 PosX_StartBtn; s16 PosY_StartBtn; - if (CVar_GetS32("gStartBtnPosType", 0) != 0) { - PosY_StartBtn = CVar_GetS32("gStartBtnPosY", 0)-(Start_BTN_Scale*13)+Y_Margins_StartBtn; - if (CVar_GetS32("gStartBtnPosType", 0) == 1) {//Anchor Left - if (CVar_GetS32("gStartBtnUseMargins", 0) != 0) {X_Margins_StartBtn = Left_HUD_Margin;}; - PosX_StartBtn = OTRGetDimensionFromLeftEdge(CVar_GetS32("gStartBtnPosX", 0)-(Start_BTN_Scale*13)+X_Margins_StartBtn); - } else if (CVar_GetS32("gStartBtnPosType", 0) == 2) {//Anchor Right - if (CVar_GetS32("gStartBtnUseMargins", 0) != 0) {X_Margins_StartBtn = Right_HUD_Margin;}; - PosX_StartBtn = OTRGetDimensionFromRightEdge(CVar_GetS32("gStartBtnPosX", 0)-(Start_BTN_Scale*13)+X_Margins_StartBtn); - } else if (CVar_GetS32("gStartBtnPosType", 0) == 3) {//Anchor None - PosX_StartBtn = CVar_GetS32("gStartBtnPosX", 0); - } else if (CVar_GetS32("gStartBtnPosType", 0) == 4) {//Hidden + if (CVarGetInteger("gStartBtnPosType", 0) != 0) { + PosY_StartBtn = CVarGetInteger("gStartBtnPosY", 0)-(Start_BTN_Scale*13)+Y_Margins_StartBtn; + if (CVarGetInteger("gStartBtnPosType", 0) == 1) {//Anchor Left + if (CVarGetInteger("gStartBtnUseMargins", 0) != 0) {X_Margins_StartBtn = Left_HUD_Margin;}; + PosX_StartBtn = OTRGetDimensionFromLeftEdge(CVarGetInteger("gStartBtnPosX", 0)-(Start_BTN_Scale*13)+X_Margins_StartBtn); + } else if (CVarGetInteger("gStartBtnPosType", 0) == 2) {//Anchor Right + if (CVarGetInteger("gStartBtnUseMargins", 0) != 0) {X_Margins_StartBtn = Right_HUD_Margin;}; + PosX_StartBtn = OTRGetDimensionFromRightEdge(CVarGetInteger("gStartBtnPosX", 0)-(Start_BTN_Scale*13)+X_Margins_StartBtn); + } else if (CVarGetInteger("gStartBtnPosType", 0) == 3) {//Anchor None + PosX_StartBtn = CVarGetInteger("gStartBtnPosX", 0); + } else if (CVarGetInteger("gStartBtnPosType", 0) == 4) {//Hidden PosX_StartBtn = -9999; } } else { @@ -3921,29 +3922,29 @@ void Interface_DrawItemButtons(PlayState* play) { s16 Y_Margins_CR; s16 Y_Margins_CU; s16 Y_Margins_CD; - if (CVar_GetS32("gCBtnLUseMargins", 0) != 0) { - if (CVar_GetS32("gCBtnLPosType", 0) == 0) {X_Margins_CL = Right_HUD_Margin;}; + if (CVarGetInteger("gCBtnLUseMargins", 0) != 0) { + if (CVarGetInteger("gCBtnLPosType", 0) == 0) {X_Margins_CL = Right_HUD_Margin;}; Y_Margins_CL = (Top_HUD_Margin*-1); } else { X_Margins_CL = 0; Y_Margins_CL = 0; } - if (CVar_GetS32("gCBtnRUseMargins", 0) != 0) { - if (CVar_GetS32("gCBtnRPosType", 0) == 0) {X_Margins_CR = Right_HUD_Margin;}; + if (CVarGetInteger("gCBtnRUseMargins", 0) != 0) { + if (CVarGetInteger("gCBtnRPosType", 0) == 0) {X_Margins_CR = Right_HUD_Margin;}; Y_Margins_CR = (Top_HUD_Margin*-1); } else { X_Margins_CR = 0; Y_Margins_CR = 0; } - if (CVar_GetS32("gCBtnUUseMargins", 0) != 0) { - if (CVar_GetS32("gCBtnUPosType", 0) == 0) {X_Margins_CU = Right_HUD_Margin;}; + if (CVarGetInteger("gCBtnUUseMargins", 0) != 0) { + if (CVarGetInteger("gCBtnUPosType", 0) == 0) {X_Margins_CU = Right_HUD_Margin;}; Y_Margins_CU = (Top_HUD_Margin*-1); } else { X_Margins_CU = 0; Y_Margins_CU = 0; } - if (CVar_GetS32("gCBtnDUseMargins", 0) != 0) { - if (CVar_GetS32("gCBtnDPosType", 0) == 0) {X_Margins_CD = Right_HUD_Margin;}; + if (CVarGetInteger("gCBtnDUseMargins", 0) != 0) { + if (CVarGetInteger("gCBtnDPosType", 0) == 0) {X_Margins_CD = Right_HUD_Margin;}; Y_Margins_CD = (Top_HUD_Margin*-1); } else { X_Margins_CD = 0; @@ -3953,7 +3954,7 @@ void Interface_DrawItemButtons(PlayState* play) { const s16 C_Right_BTN_Pos_ori[] = { C_RIGHT_BUTTON_X+X_Margins_CR, C_RIGHT_BUTTON_Y+Y_Margins_CR }; const s16 C_Up_BTN_Pos_ori[] = { C_UP_BUTTON_X+X_Margins_CU, C_UP_BUTTON_Y+Y_Margins_CU }; const s16 C_Down_BTN_Pos_ori[] = { C_DOWN_BUTTON_X+X_Margins_CD, C_DOWN_BUTTON_Y+Y_Margins_CD }; - s16 LabelX_Navi=7 + !!CVar_GetS32("gNaviTextFix", 0); + s16 LabelX_Navi=7 + !!CVarGetInteger("gNaviTextFix", 0); s16 LabelY_Navi=4; s16 C_Left_BTN_Pos[2]; //(X,Y) s16 C_Right_BTN_Pos[2]; @@ -3961,23 +3962,23 @@ void Interface_DrawItemButtons(PlayState* play) { s16 C_Down_BTN_Pos[2]; //C button Left s16 C_Left_BTN_Size = 32; - float CLeftScale = CVar_GetFloat("gCBtnLScale", 0.87f); + float CLeftScale = CVarGetFloat("gCBtnLScale", 0.87f); int CLeftScaled = C_Left_BTN_Size * 0.87f; - if (CVar_GetS32("gCBtnLPosType", 0) != 0) { + if (CVarGetInteger("gCBtnLPosType", 0) != 0) { CLeftScaled = C_Left_BTN_Size * CLeftScale; } int CLeft_factor = (1 << 10) * C_Left_BTN_Size / CLeftScaled; - if (CVar_GetS32("gCBtnLPosType", 0) != 0) { - C_Left_BTN_Pos[1] = CVar_GetS32("gCBtnLPosY", 0)+Y_Margins_CL; - if (CVar_GetS32("gCBtnLPosType", 0) == 1) {//Anchor Left - if (CVar_GetS32("gCBtnLUseMargins", 0) != 0) {X_Margins_CL = Left_HUD_Margin;}; - C_Left_BTN_Pos[0] = OTRGetDimensionFromLeftEdge(CVar_GetS32("gCBtnLPosX", 0)+X_Margins_CL); - } else if (CVar_GetS32("gCBtnLPosType", 0) == 2) {//Anchor Right - if (CVar_GetS32("gCBtnLUseMargins", 0) != 0) {X_Margins_CL = Right_HUD_Margin;}; - C_Left_BTN_Pos[0] = OTRGetDimensionFromRightEdge(CVar_GetS32("gCBtnLPosX", 0)+X_Margins_CL); - } else if (CVar_GetS32("gCBtnLPosType", 0) == 3) {//Anchor None - C_Left_BTN_Pos[0] = CVar_GetS32("gCBtnLPosX", 0); - } else if (CVar_GetS32("gCBtnLPosType", 0) == 4) {//Hidden + if (CVarGetInteger("gCBtnLPosType", 0) != 0) { + C_Left_BTN_Pos[1] = CVarGetInteger("gCBtnLPosY", 0)+Y_Margins_CL; + if (CVarGetInteger("gCBtnLPosType", 0) == 1) {//Anchor Left + if (CVarGetInteger("gCBtnLUseMargins", 0) != 0) {X_Margins_CL = Left_HUD_Margin;}; + C_Left_BTN_Pos[0] = OTRGetDimensionFromLeftEdge(CVarGetInteger("gCBtnLPosX", 0)+X_Margins_CL); + } else if (CVarGetInteger("gCBtnLPosType", 0) == 2) {//Anchor Right + if (CVarGetInteger("gCBtnLUseMargins", 0) != 0) {X_Margins_CL = Right_HUD_Margin;}; + C_Left_BTN_Pos[0] = OTRGetDimensionFromRightEdge(CVarGetInteger("gCBtnLPosX", 0)+X_Margins_CL); + } else if (CVarGetInteger("gCBtnLPosType", 0) == 3) {//Anchor None + C_Left_BTN_Pos[0] = CVarGetInteger("gCBtnLPosX", 0); + } else if (CVarGetInteger("gCBtnLPosType", 0) == 4) {//Hidden C_Left_BTN_Pos[0] = -9999; } } else { @@ -3986,23 +3987,23 @@ void Interface_DrawItemButtons(PlayState* play) { } //C button Right s16 C_Right_BTN_Size = 32; - float CRightScale = CVar_GetFloat("gCBtnRScale", 0.87f); + float CRightScale = CVarGetFloat("gCBtnRScale", 0.87f); int CRightScaled = C_Right_BTN_Size * 0.87f; - if (CVar_GetS32("gCBtnRPosType", 0) != 0) { + if (CVarGetInteger("gCBtnRPosType", 0) != 0) { CRightScaled = C_Right_BTN_Size * CRightScale; } int CRight_factor = (1 << 10) * C_Right_BTN_Size / CRightScaled; - if (CVar_GetS32("gCBtnRPosType", 0) != 0) { - C_Right_BTN_Pos[1] = CVar_GetS32("gCBtnRPosY", 0)+Y_Margins_CR; - if (CVar_GetS32("gCBtnRPosType", 0) == 1) {//Anchor Left - if (CVar_GetS32("gCBtnRUseMargins", 0) != 0) {X_Margins_CR = Left_HUD_Margin;}; - C_Right_BTN_Pos[0] = OTRGetDimensionFromLeftEdge(CVar_GetS32("gCBtnRPosX", 0)+X_Margins_CR); - } else if (CVar_GetS32("gCBtnRPosType", 0) == 2) {//Anchor Right - if (CVar_GetS32("gCBtnRUseMargins", 0) != 0) {X_Margins_CR = Right_HUD_Margin;}; - C_Right_BTN_Pos[0] = OTRGetDimensionFromRightEdge(CVar_GetS32("gCBtnRPosX", 0)+X_Margins_CR); - } else if (CVar_GetS32("gCBtnRPosType", 0) == 3) {//Anchor None - C_Right_BTN_Pos[0] = CVar_GetS32("gCBtnRPosX", 0); - } else if (CVar_GetS32("gCBtnRPosType", 0) == 4) {//Hidden + if (CVarGetInteger("gCBtnRPosType", 0) != 0) { + C_Right_BTN_Pos[1] = CVarGetInteger("gCBtnRPosY", 0)+Y_Margins_CR; + if (CVarGetInteger("gCBtnRPosType", 0) == 1) {//Anchor Left + if (CVarGetInteger("gCBtnRUseMargins", 0) != 0) {X_Margins_CR = Left_HUD_Margin;}; + C_Right_BTN_Pos[0] = OTRGetDimensionFromLeftEdge(CVarGetInteger("gCBtnRPosX", 0)+X_Margins_CR); + } else if (CVarGetInteger("gCBtnRPosType", 0) == 2) {//Anchor Right + if (CVarGetInteger("gCBtnRUseMargins", 0) != 0) {X_Margins_CR = Right_HUD_Margin;}; + C_Right_BTN_Pos[0] = OTRGetDimensionFromRightEdge(CVarGetInteger("gCBtnRPosX", 0)+X_Margins_CR); + } else if (CVarGetInteger("gCBtnRPosType", 0) == 3) {//Anchor None + C_Right_BTN_Pos[0] = CVarGetInteger("gCBtnRPosX", 0); + } else if (CVarGetInteger("gCBtnRPosType", 0) == 4) {//Hidden C_Right_BTN_Pos[0] = -9999; } } else { @@ -4012,22 +4013,22 @@ void Interface_DrawItemButtons(PlayState* play) { //C Button Up s16 C_Up_BTN_Size = 32; int CUpScaled = C_Up_BTN_Size * 0.5f; - float CUpScale = CVar_GetFloat("gCBtnUScale", 0.5f); - if (CVar_GetS32("gCBtnUPosType", 0) != 0) { + float CUpScale = CVarGetFloat("gCBtnUScale", 0.5f); + if (CVarGetInteger("gCBtnUPosType", 0) != 0) { CUpScaled = C_Up_BTN_Size * CUpScale; } int CUp_factor = (1 << 10) * C_Up_BTN_Size / CUpScaled; - if (CVar_GetS32("gCBtnUPosType", 0) != 0) { - C_Up_BTN_Pos[1] = CVar_GetS32("gCBtnUPosY", 0)+Y_Margins_CU; - if (CVar_GetS32("gCBtnUPosType", 0) == 1) {//Anchor Left - if (CVar_GetS32("gCBtnUUseMargins", 0) != 0) {X_Margins_CU = Left_HUD_Margin;}; - C_Up_BTN_Pos[0] = OTRGetDimensionFromLeftEdge(CVar_GetS32("gCBtnUPosX", 0)+X_Margins_CU); - } else if (CVar_GetS32("gCBtnUPosType", 0) == 2) {//Anchor Right - if (CVar_GetS32("gCBtnUUseMargins", 0) != 0) {X_Margins_CU = Right_HUD_Margin;}; - C_Up_BTN_Pos[0] = OTRGetDimensionFromRightEdge(CVar_GetS32("gCBtnUPosX", 0)+X_Margins_CU); - } else if (CVar_GetS32("gCBtnUPosType", 0) == 3) {//Anchor None - C_Up_BTN_Pos[0] = CVar_GetS32("gCBtnUPosX", 0); - } else if (CVar_GetS32("gCBtnUPosType", 0) == 4) {//Hidden + if (CVarGetInteger("gCBtnUPosType", 0) != 0) { + C_Up_BTN_Pos[1] = CVarGetInteger("gCBtnUPosY", 0)+Y_Margins_CU; + if (CVarGetInteger("gCBtnUPosType", 0) == 1) {//Anchor Left + if (CVarGetInteger("gCBtnUUseMargins", 0) != 0) {X_Margins_CU = Left_HUD_Margin;}; + C_Up_BTN_Pos[0] = OTRGetDimensionFromLeftEdge(CVarGetInteger("gCBtnUPosX", 0)+X_Margins_CU); + } else if (CVarGetInteger("gCBtnUPosType", 0) == 2) {//Anchor Right + if (CVarGetInteger("gCBtnUUseMargins", 0) != 0) {X_Margins_CU = Right_HUD_Margin;}; + C_Up_BTN_Pos[0] = OTRGetDimensionFromRightEdge(CVarGetInteger("gCBtnUPosX", 0)+X_Margins_CU); + } else if (CVarGetInteger("gCBtnUPosType", 0) == 3) {//Anchor None + C_Up_BTN_Pos[0] = CVarGetInteger("gCBtnUPosX", 0); + } else if (CVarGetInteger("gCBtnUPosType", 0) == 4) {//Hidden C_Up_BTN_Pos[0] = -9999; } } else { @@ -4036,24 +4037,24 @@ void Interface_DrawItemButtons(PlayState* play) { } //C Button down s16 C_Down_BTN_Size = 32; - float CDownScale = CVar_GetFloat("gCBtnDScale", 0.87f); - if (CVar_GetS32("gCBtnDPosType", 0) == 0) { + float CDownScale = CVarGetFloat("gCBtnDScale", 0.87f); + if (CVarGetInteger("gCBtnDPosType", 0) == 0) { CDownScale = 0.87f; } int CDownScaled = C_Down_BTN_Size * CDownScale; int CDown_factor = (1 << 10) * C_Down_BTN_Size / CDownScaled; int PositionAdjustment = CDownScaled/2; - if (CVar_GetS32("gCBtnDPosType", 0) != 0) { - C_Down_BTN_Pos[1] = CVar_GetS32("gCBtnDPosY", 0)+Y_Margins_CD; - if (CVar_GetS32("gCBtnDPosType", 0) == 1) {//Anchor Left - if (CVar_GetS32("gCBtnDUseMargins", 0) != 0) {X_Margins_CD = Left_HUD_Margin;}; - C_Down_BTN_Pos[0] = OTRGetDimensionFromLeftEdge(CVar_GetS32("gCBtnDPosX", 0)+X_Margins_CD); - } else if (CVar_GetS32("gCBtnDPosType", 0) == 2) {//Anchor Right - if (CVar_GetS32("gCBtnDUseMargins", 0) != 0) {X_Margins_CD = Right_HUD_Margin;}; - C_Down_BTN_Pos[0] = OTRGetDimensionFromRightEdge(CVar_GetS32("gCBtnDPosX", 0)+X_Margins_CD); - } else if (CVar_GetS32("gCBtnDPosType", 0) == 3) {//Anchor None - C_Down_BTN_Pos[0] = CVar_GetS32("gCBtnDPosX", 0); - } else if (CVar_GetS32("gCBtnDPosType", 0) == 4) {//Hidden + if (CVarGetInteger("gCBtnDPosType", 0) != 0) { + C_Down_BTN_Pos[1] = CVarGetInteger("gCBtnDPosY", 0)+Y_Margins_CD; + if (CVarGetInteger("gCBtnDPosType", 0) == 1) {//Anchor Left + if (CVarGetInteger("gCBtnDUseMargins", 0) != 0) {X_Margins_CD = Left_HUD_Margin;}; + C_Down_BTN_Pos[0] = OTRGetDimensionFromLeftEdge(CVarGetInteger("gCBtnDPosX", 0)+X_Margins_CD); + } else if (CVarGetInteger("gCBtnDPosType", 0) == 2) {//Anchor Right + if (CVarGetInteger("gCBtnDUseMargins", 0) != 0) {X_Margins_CD = Right_HUD_Margin;}; + C_Down_BTN_Pos[0] = OTRGetDimensionFromRightEdge(CVarGetInteger("gCBtnDPosX", 0)+X_Margins_CD); + } else if (CVarGetInteger("gCBtnDPosType", 0) == 3) {//Anchor None + C_Down_BTN_Pos[0] = CVarGetInteger("gCBtnDPosX", 0); + } else if (CVarGetInteger("gCBtnDPosType", 0) == 4) {//Hidden C_Down_BTN_Pos[0] = -9999; } } else { @@ -4127,7 +4128,7 @@ void Interface_DrawItemButtons(PlayState* play) { doAction = newName; } - memcpy(interfaceCtx->doActionSegment + DO_ACTION_TEX_SIZE() * 2, ResourceMgr_LoadTexByName(doAction), DO_ACTION_TEX_SIZE()); + memcpy(interfaceCtx->doActionSegment + DO_ACTION_TEX_SIZE() * 2, GetResourceDataByName(doAction, false), DO_ACTION_TEX_SIZE()); gDPLoadTextureBlock_4b(OVERLAY_DISP++, interfaceCtx->doActionSegment + DO_ACTION_TEX_SIZE() * 2, G_IM_FMT_IA, DO_ACTION_TEX_WIDTH(), DO_ACTION_TEX_HEIGHT(), 0, G_TX_NOMIRROR | G_TX_WRAP, @@ -4201,22 +4202,22 @@ void Interface_DrawItemButtons(PlayState* play) { s16 Y_Margins_CL; s16 Y_Margins_CR; s16 Y_Margins_CD; - if (CVar_GetS32("gCBtnLUseMargins", 0) != 0) { - if (CVar_GetS32("gCBtnLPosType", 0) == 0) {X_Margins_CL = Right_HUD_Margin;}; + if (CVarGetInteger("gCBtnLUseMargins", 0) != 0) { + if (CVarGetInteger("gCBtnLPosType", 0) == 0) {X_Margins_CL = Right_HUD_Margin;}; Y_Margins_CL = (Top_HUD_Margin*-1); } else { X_Margins_CL = 0; Y_Margins_CL = 0; } - if (CVar_GetS32("gCBtnRUseMargins", 0) != 0) { - if (CVar_GetS32("gCBtnRPosType", 0) == 0) {X_Margins_CR = Right_HUD_Margin;}; + if (CVarGetInteger("gCBtnRUseMargins", 0) != 0) { + if (CVarGetInteger("gCBtnRPosType", 0) == 0) {X_Margins_CR = Right_HUD_Margin;}; Y_Margins_CR = (Top_HUD_Margin*-1); } else { X_Margins_CR = 0; Y_Margins_CR = 0; } - if (CVar_GetS32("gCBtnDUseMargins", 0) != 0) { - if (CVar_GetS32("gCBtnDPosType", 0) == 0) {X_Margins_CD = Right_HUD_Margin;}; + if (CVarGetInteger("gCBtnDUseMargins", 0) != 0) { + if (CVarGetInteger("gCBtnDPosType", 0) == 0) {X_Margins_CD = Right_HUD_Margin;}; Y_Margins_CD = (Top_HUD_Margin*-1); } else { X_Margins_CD = 0; @@ -4234,17 +4235,17 @@ void Interface_DrawItemButtons(PlayState* play) { }; s16 ItemIconPos[3][2]; //(X,Y) //C button Left - if (CVar_GetS32("gCBtnLPosType", 0) != 0) { - ItemIconPos[0][1] = CVar_GetS32("gCBtnLPosY", 0)+Y_Margins_CL; - if (CVar_GetS32("gCBtnLPosType", 0) == 1) {//Anchor Left - if (CVar_GetS32("gCBtnLUseMargins", 0) != 0) {X_Margins_CL = Left_HUD_Margin;}; - ItemIconPos[0][0] = OTRGetDimensionFromLeftEdge(CVar_GetS32("gCBtnLPosX", 0)+X_Margins_CL); - } else if (CVar_GetS32("gCBtnLPosType", 0) == 2) {//Anchor Right - if (CVar_GetS32("gCBtnLUseMargins", 0) != 0) {X_Margins_CL = Right_HUD_Margin;}; - ItemIconPos[0][0] = OTRGetDimensionFromRightEdge(CVar_GetS32("gCBtnLPosX", 0)+X_Margins_CL); - } else if (CVar_GetS32("gCBtnLPosType", 0) == 3) {//Anchor None - ItemIconPos[0][0] = CVar_GetS32("gCBtnLPosX", 0); - } else if (CVar_GetS32("gCBtnLPosType", 0) == 4) {//Hidden + if (CVarGetInteger("gCBtnLPosType", 0) != 0) { + ItemIconPos[0][1] = CVarGetInteger("gCBtnLPosY", 0)+Y_Margins_CL; + if (CVarGetInteger("gCBtnLPosType", 0) == 1) {//Anchor Left + if (CVarGetInteger("gCBtnLUseMargins", 0) != 0) {X_Margins_CL = Left_HUD_Margin;}; + ItemIconPos[0][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger("gCBtnLPosX", 0)+X_Margins_CL); + } else if (CVarGetInteger("gCBtnLPosType", 0) == 2) {//Anchor Right + if (CVarGetInteger("gCBtnLUseMargins", 0) != 0) {X_Margins_CL = Right_HUD_Margin;}; + ItemIconPos[0][0] = OTRGetDimensionFromRightEdge(CVarGetInteger("gCBtnLPosX", 0)+X_Margins_CL); + } else if (CVarGetInteger("gCBtnLPosType", 0) == 3) {//Anchor None + ItemIconPos[0][0] = CVarGetInteger("gCBtnLPosX", 0); + } else if (CVarGetInteger("gCBtnLPosType", 0) == 4) {//Hidden ItemIconPos[0][0] = -9999; } } else { @@ -4252,17 +4253,17 @@ void Interface_DrawItemButtons(PlayState* play) { ItemIconPos[0][1] = ItemIconPos_ori[0][1]; } //C Button down - if (CVar_GetS32("gCBtnDPosType", 0) != 0) { - ItemIconPos[1][1] = CVar_GetS32("gCBtnDPosY", 0)+Y_Margins_CD; - if (CVar_GetS32("gCBtnDPosType", 0) == 1) {//Anchor Left - if (CVar_GetS32("gCBtnDUseMargins", 0) != 0) {X_Margins_CD = Left_HUD_Margin;}; - ItemIconPos[1][0] = OTRGetDimensionFromLeftEdge(CVar_GetS32("gCBtnDPosX", 0)+X_Margins_CD); - } else if (CVar_GetS32("gCBtnDPosType", 0) == 2) {//Anchor Right - if (CVar_GetS32("gCBtnDUseMargins", 0) != 0) {X_Margins_CD = Right_HUD_Margin;}; - ItemIconPos[1][0] = OTRGetDimensionFromRightEdge(CVar_GetS32("gCBtnDPosX", 0)+X_Margins_CD); - } else if (CVar_GetS32("gCBtnDPosType", 0) == 3) {//Anchor None - ItemIconPos[1][0] = CVar_GetS32("gCBtnDPosX", 0); - } else if (CVar_GetS32("gCBtnDPosType", 0) == 4) {//Hidden + if (CVarGetInteger("gCBtnDPosType", 0) != 0) { + ItemIconPos[1][1] = CVarGetInteger("gCBtnDPosY", 0)+Y_Margins_CD; + if (CVarGetInteger("gCBtnDPosType", 0) == 1) {//Anchor Left + if (CVarGetInteger("gCBtnDUseMargins", 0) != 0) {X_Margins_CD = Left_HUD_Margin;}; + ItemIconPos[1][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger("gCBtnDPosX", 0)+X_Margins_CD); + } else if (CVarGetInteger("gCBtnDPosType", 0) == 2) {//Anchor Right + if (CVarGetInteger("gCBtnDUseMargins", 0) != 0) {X_Margins_CD = Right_HUD_Margin;}; + ItemIconPos[1][0] = OTRGetDimensionFromRightEdge(CVarGetInteger("gCBtnDPosX", 0)+X_Margins_CD); + } else if (CVarGetInteger("gCBtnDPosType", 0) == 3) {//Anchor None + ItemIconPos[1][0] = CVarGetInteger("gCBtnDPosX", 0); + } else if (CVarGetInteger("gCBtnDPosType", 0) == 4) {//Hidden ItemIconPos[1][0] = -9999; } } else { @@ -4270,17 +4271,17 @@ void Interface_DrawItemButtons(PlayState* play) { ItemIconPos[1][1] = ItemIconPos_ori[1][1]; } //C button Right - if (CVar_GetS32("gCBtnRPosType", 0) != 0) { - ItemIconPos[2][1] = CVar_GetS32("gCBtnRPosY", 0)+Y_Margins_CR; - if (CVar_GetS32("gCBtnRPosType", 0) == 1) {//Anchor Left - if (CVar_GetS32("gCBtnRUseMargins", 0) != 0) {X_Margins_CR = Left_HUD_Margin;}; - ItemIconPos[2][0] = OTRGetDimensionFromLeftEdge(CVar_GetS32("gCBtnRPosX", 0)+X_Margins_CR); - } else if (CVar_GetS32("gCBtnRPosType", 0) == 2) {//Anchor Right - if (CVar_GetS32("gCBtnRUseMargins", 0) != 0) {X_Margins_CR = Right_HUD_Margin;}; - ItemIconPos[2][0] = OTRGetDimensionFromRightEdge(CVar_GetS32("gCBtnRPosX", 0)+X_Margins_CR); - } else if (CVar_GetS32("gCBtnRPosType", 0) == 3) {//Anchor None - ItemIconPos[2][0] = CVar_GetS32("gCBtnRPosX", 0); - } else if (CVar_GetS32("gCBtnRPosType", 0) == 4) {//Hidden + if (CVarGetInteger("gCBtnRPosType", 0) != 0) { + ItemIconPos[2][1] = CVarGetInteger("gCBtnRPosY", 0)+Y_Margins_CR; + if (CVarGetInteger("gCBtnRPosType", 0) == 1) {//Anchor Left + if (CVarGetInteger("gCBtnRUseMargins", 0) != 0) {X_Margins_CR = Left_HUD_Margin;}; + ItemIconPos[2][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger("gCBtnRPosX", 0)+X_Margins_CR); + } else if (CVarGetInteger("gCBtnRPosType", 0) == 2) {//Anchor Right + if (CVarGetInteger("gCBtnRUseMargins", 0) != 0) {X_Margins_CR = Right_HUD_Margin;}; + ItemIconPos[2][0] = OTRGetDimensionFromRightEdge(CVarGetInteger("gCBtnRPosX", 0)+X_Margins_CR); + } else if (CVarGetInteger("gCBtnRPosType", 0) == 3) {//Anchor None + ItemIconPos[2][0] = CVarGetInteger("gCBtnRPosX", 0); + } else if (CVarGetInteger("gCBtnRPosType", 0) == 4) {//Hidden ItemIconPos[2][0] = -9999; } } else { @@ -4330,36 +4331,36 @@ void Interface_DrawItemIconTexture(PlayState* play, void* texture, s16 button) { s16 Y_Margins_BtnB; s16 X_Margins_DPad_Items; s16 Y_Margins_DPad_Items; - if (CVar_GetS32("gBBtnUseMargins", 0) != 0) { - if (CVar_GetS32("gBBtnPosType", 0) == 0) {X_Margins_BtnB = Right_HUD_Margin;}; + if (CVarGetInteger("gBBtnUseMargins", 0) != 0) { + if (CVarGetInteger("gBBtnPosType", 0) == 0) {X_Margins_BtnB = Right_HUD_Margin;}; Y_Margins_BtnB = (Top_HUD_Margin*-1); } else { X_Margins_BtnB = 0; Y_Margins_BtnB = 0; } - if (CVar_GetS32("gCBtnLUseMargins", 0) != 0) { - if (CVar_GetS32("gCBtnLPosType", 0) == 0) {X_Margins_CL = Right_HUD_Margin;}; + if (CVarGetInteger("gCBtnLUseMargins", 0) != 0) { + if (CVarGetInteger("gCBtnLPosType", 0) == 0) {X_Margins_CL = Right_HUD_Margin;}; Y_Margins_CL = (Top_HUD_Margin*-1); } else { X_Margins_CL = 0; Y_Margins_CL = 0; } - if (CVar_GetS32("gCBtnRUseMargins", 0) != 0) { - if (CVar_GetS32("gCBtnRPosType", 0) == 0) {X_Margins_CR = Right_HUD_Margin;}; + if (CVarGetInteger("gCBtnRUseMargins", 0) != 0) { + if (CVarGetInteger("gCBtnRPosType", 0) == 0) {X_Margins_CR = Right_HUD_Margin;}; Y_Margins_CR = (Top_HUD_Margin*-1); } else { X_Margins_CR = 0; Y_Margins_CR = 0; } - if (CVar_GetS32("gCBtnDUseMargins", 0) != 0) { - if (CVar_GetS32("gCBtnDPosType", 0) == 0) {X_Margins_CD = Right_HUD_Margin;}; + if (CVarGetInteger("gCBtnDUseMargins", 0) != 0) { + if (CVarGetInteger("gCBtnDPosType", 0) == 0) {X_Margins_CD = Right_HUD_Margin;}; Y_Margins_CD = (Top_HUD_Margin*-1); } else { X_Margins_CD = 0; Y_Margins_CD = 0; } - if (CVar_GetS32("gDPadUseMargins", 0) != 0) { - if (CVar_GetS32("gDPadPosType", 0) == 0) {X_Margins_DPad_Items = Right_HUD_Margin;}; + if (CVarGetInteger("gDPadUseMargins", 0) != 0) { + if (CVarGetInteger("gDPadPosType", 0) == 0) {X_Margins_DPad_Items = Right_HUD_Margin;}; Y_Margins_DPad_Items = (Top_HUD_Margin*-1); } else { X_Margins_DPad_Items = 0; @@ -4393,29 +4394,29 @@ void Interface_DrawItemIconTexture(PlayState* play, void* texture, s16 button) { }; //(X,Y) Used with custom position to place it properly. s16 ItemIconPos[8][2]; //(X,Y) //DPadItems - if (CVar_GetS32("gDPadPosType", 0) != 0) { - ItemIconPos[4][1] = CVar_GetS32("gDPadPosY", 0)+Y_Margins_DPad_Items+DPad_ItemsOffset[0][1];//Up - ItemIconPos[5][1] = CVar_GetS32("gDPadPosY", 0)+Y_Margins_DPad_Items+DPad_ItemsOffset[1][1];//Down - ItemIconPos[6][1] = CVar_GetS32("gDPadPosY", 0)+Y_Margins_DPad_Items+DPad_ItemsOffset[2][1];//Left - ItemIconPos[7][1] = CVar_GetS32("gDPadPosY", 0)+Y_Margins_DPad_Items+DPad_ItemsOffset[3][1];//Right - if (CVar_GetS32("gDPadPosType", 0) == 1) {//Anchor Left - if (CVar_GetS32("gDPadUseMargins", 0) != 0) {X_Margins_DPad_Items = Left_HUD_Margin;}; - ItemIconPos[4][0] = OTRGetDimensionFromLeftEdge(CVar_GetS32("gDPadPosX", 0)+X_Margins_DPad_Items+DPad_ItemsOffset[0][0]); - ItemIconPos[5][0] = OTRGetDimensionFromLeftEdge(CVar_GetS32("gDPadPosX", 0)+X_Margins_DPad_Items+DPad_ItemsOffset[1][0]); - ItemIconPos[6][0] = OTRGetDimensionFromLeftEdge(CVar_GetS32("gDPadPosX", 0)+X_Margins_DPad_Items+DPad_ItemsOffset[2][0]); - ItemIconPos[7][0] = OTRGetDimensionFromLeftEdge(CVar_GetS32("gDPadPosX", 0)+X_Margins_DPad_Items+DPad_ItemsOffset[3][0]); - } else if (CVar_GetS32("gDPadPosType", 0) == 2) {//Anchor Right - if (CVar_GetS32("gDPadUseMargins", 0) != 0) {X_Margins_DPad_Items = Right_HUD_Margin;}; - ItemIconPos[4][0] = OTRGetDimensionFromRightEdge(CVar_GetS32("gDPadPosX", 0)+X_Margins_DPad_Items+DPad_ItemsOffset[0][0]); - ItemIconPos[5][0] = OTRGetDimensionFromRightEdge(CVar_GetS32("gDPadPosX", 0)+X_Margins_DPad_Items+DPad_ItemsOffset[1][0]); - ItemIconPos[6][0] = OTRGetDimensionFromRightEdge(CVar_GetS32("gDPadPosX", 0)+X_Margins_DPad_Items+DPad_ItemsOffset[2][0]); - ItemIconPos[7][0] = OTRGetDimensionFromRightEdge(CVar_GetS32("gDPadPosX", 0)+X_Margins_DPad_Items+DPad_ItemsOffset[3][0]); - } else if (CVar_GetS32("gDPadPosType", 0) == 3) {//Anchor None - ItemIconPos[4][0] = CVar_GetS32("gDPadPosX", 0)+DPad_ItemsOffset[0][0]; - ItemIconPos[5][0] = CVar_GetS32("gDPadPosX", 0)+DPad_ItemsOffset[1][0]; - ItemIconPos[6][0] = CVar_GetS32("gDPadPosX", 0)+DPad_ItemsOffset[2][0]; - ItemIconPos[7][0] = CVar_GetS32("gDPadPosX", 0)+DPad_ItemsOffset[3][0]; - } else if (CVar_GetS32("gDPadPosType", 0) == 4) {//Hidden + if (CVarGetInteger("gDPadPosType", 0) != 0) { + ItemIconPos[4][1] = CVarGetInteger("gDPadPosY", 0)+Y_Margins_DPad_Items+DPad_ItemsOffset[0][1];//Up + ItemIconPos[5][1] = CVarGetInteger("gDPadPosY", 0)+Y_Margins_DPad_Items+DPad_ItemsOffset[1][1];//Down + ItemIconPos[6][1] = CVarGetInteger("gDPadPosY", 0)+Y_Margins_DPad_Items+DPad_ItemsOffset[2][1];//Left + ItemIconPos[7][1] = CVarGetInteger("gDPadPosY", 0)+Y_Margins_DPad_Items+DPad_ItemsOffset[3][1];//Right + if (CVarGetInteger("gDPadPosType", 0) == 1) {//Anchor Left + if (CVarGetInteger("gDPadUseMargins", 0) != 0) {X_Margins_DPad_Items = Left_HUD_Margin;}; + ItemIconPos[4][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger("gDPadPosX", 0)+X_Margins_DPad_Items+DPad_ItemsOffset[0][0]); + ItemIconPos[5][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger("gDPadPosX", 0)+X_Margins_DPad_Items+DPad_ItemsOffset[1][0]); + ItemIconPos[6][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger("gDPadPosX", 0)+X_Margins_DPad_Items+DPad_ItemsOffset[2][0]); + ItemIconPos[7][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger("gDPadPosX", 0)+X_Margins_DPad_Items+DPad_ItemsOffset[3][0]); + } else if (CVarGetInteger("gDPadPosType", 0) == 2) {//Anchor Right + if (CVarGetInteger("gDPadUseMargins", 0) != 0) {X_Margins_DPad_Items = Right_HUD_Margin;}; + ItemIconPos[4][0] = OTRGetDimensionFromRightEdge(CVarGetInteger("gDPadPosX", 0)+X_Margins_DPad_Items+DPad_ItemsOffset[0][0]); + ItemIconPos[5][0] = OTRGetDimensionFromRightEdge(CVarGetInteger("gDPadPosX", 0)+X_Margins_DPad_Items+DPad_ItemsOffset[1][0]); + ItemIconPos[6][0] = OTRGetDimensionFromRightEdge(CVarGetInteger("gDPadPosX", 0)+X_Margins_DPad_Items+DPad_ItemsOffset[2][0]); + ItemIconPos[7][0] = OTRGetDimensionFromRightEdge(CVarGetInteger("gDPadPosX", 0)+X_Margins_DPad_Items+DPad_ItemsOffset[3][0]); + } else if (CVarGetInteger("gDPadPosType", 0) == 3) {//Anchor None + ItemIconPos[4][0] = CVarGetInteger("gDPadPosX", 0)+DPad_ItemsOffset[0][0]; + ItemIconPos[5][0] = CVarGetInteger("gDPadPosX", 0)+DPad_ItemsOffset[1][0]; + ItemIconPos[6][0] = CVarGetInteger("gDPadPosX", 0)+DPad_ItemsOffset[2][0]; + ItemIconPos[7][0] = CVarGetInteger("gDPadPosX", 0)+DPad_ItemsOffset[3][0]; + } else if (CVarGetInteger("gDPadPosType", 0) == 4) {//Hidden ItemIconPos[4][0] = -9999; ItemIconPos[5][0] = -9999; ItemIconPos[6][0] = -9999; @@ -4432,17 +4433,17 @@ void Interface_DrawItemIconTexture(PlayState* play, void* texture, s16 button) { ItemIconPos[7][1] = ItemIconPos_ori[7][1]; } //B Button - if (CVar_GetS32("gBBtnPosType", 0) != 0) { - ItemIconPos[0][1] = CVar_GetS32("gBBtnPosY", 0)+Y_Margins_BtnB; - if (CVar_GetS32("gBBtnPosType", 0) == 1) {//Anchor Left - if (CVar_GetS32("gBBtnUseMargins", 0) != 0) {X_Margins_BtnB = Left_HUD_Margin;}; - ItemIconPos[0][0] = OTRGetDimensionFromLeftEdge(CVar_GetS32("gBBtnPosX", 0)+X_Margins_BtnB); - } else if (CVar_GetS32("gBBtnPosType", 0) == 2) {//Anchor Right - if (CVar_GetS32("gBBtnUseMargins", 0) != 0) {X_Margins_BtnB = Right_HUD_Margin;}; - ItemIconPos[0][0] = OTRGetDimensionFromRightEdge(CVar_GetS32("gBBtnPosX", 0)+X_Margins_BtnB); - } else if (CVar_GetS32("gBBtnPosType", 0) == 3) {//Anchor None - ItemIconPos[0][0] = CVar_GetS32("gBBtnPosX", 0); - } else if (CVar_GetS32("gBBtnPosType", 0) == 4) {//Hidden + if (CVarGetInteger("gBBtnPosType", 0) != 0) { + ItemIconPos[0][1] = CVarGetInteger("gBBtnPosY", 0)+Y_Margins_BtnB; + if (CVarGetInteger("gBBtnPosType", 0) == 1) {//Anchor Left + if (CVarGetInteger("gBBtnUseMargins", 0) != 0) {X_Margins_BtnB = Left_HUD_Margin;}; + ItemIconPos[0][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger("gBBtnPosX", 0)+X_Margins_BtnB); + } else if (CVarGetInteger("gBBtnPosType", 0) == 2) {//Anchor Right + if (CVarGetInteger("gBBtnUseMargins", 0) != 0) {X_Margins_BtnB = Right_HUD_Margin;}; + ItemIconPos[0][0] = OTRGetDimensionFromRightEdge(CVarGetInteger("gBBtnPosX", 0)+X_Margins_BtnB); + } else if (CVarGetInteger("gBBtnPosType", 0) == 3) {//Anchor None + ItemIconPos[0][0] = CVarGetInteger("gBBtnPosX", 0); + } else if (CVarGetInteger("gBBtnPosType", 0) == 4) {//Hidden ItemIconPos[0][0] = -9999; } } else { @@ -4450,17 +4451,17 @@ void Interface_DrawItemIconTexture(PlayState* play, void* texture, s16 button) { ItemIconPos[0][1] = ItemIconPos_ori[0][1]; } //C button Left - if (CVar_GetS32("gCBtnLPosType", 0) != 0) { - ItemIconPos[1][1] = CVar_GetS32("gCBtnLPosY", 0)+Y_Margins_CL; - if (CVar_GetS32("gCBtnLPosType", 0) == 1) {//Anchor Left - if (CVar_GetS32("gCBtnLUseMargins", 0) != 0) {X_Margins_CL = Left_HUD_Margin;}; - ItemIconPos[1][0] = OTRGetDimensionFromLeftEdge(CVar_GetS32("gCBtnLPosX", 0)+X_Margins_CL); - } else if (CVar_GetS32("gCBtnLPosType", 0) == 2) {//Anchor Right - if (CVar_GetS32("gCBtnLUseMargins", 0) != 0) {X_Margins_CL = Right_HUD_Margin;}; - ItemIconPos[1][0] = OTRGetDimensionFromRightEdge(CVar_GetS32("gCBtnLPosX", 0)+X_Margins_CL); - } else if (CVar_GetS32("gCBtnLPosType", 0) == 3) {//Anchor None - ItemIconPos[1][0] = CVar_GetS32("gCBtnLPosX", 0); - } else if (CVar_GetS32("gCBtnLPosType", 0) == 4) {//Hidden + if (CVarGetInteger("gCBtnLPosType", 0) != 0) { + ItemIconPos[1][1] = CVarGetInteger("gCBtnLPosY", 0)+Y_Margins_CL; + if (CVarGetInteger("gCBtnLPosType", 0) == 1) {//Anchor Left + if (CVarGetInteger("gCBtnLUseMargins", 0) != 0) {X_Margins_CL = Left_HUD_Margin;}; + ItemIconPos[1][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger("gCBtnLPosX", 0)+X_Margins_CL); + } else if (CVarGetInteger("gCBtnLPosType", 0) == 2) {//Anchor Right + if (CVarGetInteger("gCBtnLUseMargins", 0) != 0) {X_Margins_CL = Right_HUD_Margin;}; + ItemIconPos[1][0] = OTRGetDimensionFromRightEdge(CVarGetInteger("gCBtnLPosX", 0)+X_Margins_CL); + } else if (CVarGetInteger("gCBtnLPosType", 0) == 3) {//Anchor None + ItemIconPos[1][0] = CVarGetInteger("gCBtnLPosX", 0); + } else if (CVarGetInteger("gCBtnLPosType", 0) == 4) {//Hidden ItemIconPos[1][0] = -9999; } } else { @@ -4468,17 +4469,17 @@ void Interface_DrawItemIconTexture(PlayState* play, void* texture, s16 button) { ItemIconPos[1][1] = ItemIconPos_ori[1][1]; } //C Button down - if (CVar_GetS32("gCBtnDPosType", 0) != 0) { - ItemIconPos[2][1] = CVar_GetS32("gCBtnDPosY", 0)+Y_Margins_CD; - if (CVar_GetS32("gCBtnDPosType", 0) == 1) {//Anchor Left - if (CVar_GetS32("gCBtnDUseMargins", 0) != 0) {X_Margins_CD = Left_HUD_Margin;}; - ItemIconPos[2][0] = OTRGetDimensionFromLeftEdge(CVar_GetS32("gCBtnDPosX", 0)+X_Margins_CD); - } else if (CVar_GetS32("gCBtnDPosType", 0) == 2) {//Anchor Right - if (CVar_GetS32("gCBtnDUseMargins", 0) != 0) {X_Margins_CD = Right_HUD_Margin;}; - ItemIconPos[2][0] = OTRGetDimensionFromRightEdge(CVar_GetS32("gCBtnDPosX", 0)+X_Margins_CD); - } else if (CVar_GetS32("gCBtnDPosType", 0) == 3) {//Anchor None - ItemIconPos[2][0] = CVar_GetS32("gCBtnDPosX", 0); - } else if (CVar_GetS32("gCBtnDPosType", 0) == 4) {//Hidden + if (CVarGetInteger("gCBtnDPosType", 0) != 0) { + ItemIconPos[2][1] = CVarGetInteger("gCBtnDPosY", 0)+Y_Margins_CD; + if (CVarGetInteger("gCBtnDPosType", 0) == 1) {//Anchor Left + if (CVarGetInteger("gCBtnDUseMargins", 0) != 0) {X_Margins_CD = Left_HUD_Margin;}; + ItemIconPos[2][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger("gCBtnDPosX", 0)+X_Margins_CD); + } else if (CVarGetInteger("gCBtnDPosType", 0) == 2) {//Anchor Right + if (CVarGetInteger("gCBtnDUseMargins", 0) != 0) {X_Margins_CD = Right_HUD_Margin;}; + ItemIconPos[2][0] = OTRGetDimensionFromRightEdge(CVarGetInteger("gCBtnDPosX", 0)+X_Margins_CD); + } else if (CVarGetInteger("gCBtnDPosType", 0) == 3) {//Anchor None + ItemIconPos[2][0] = CVarGetInteger("gCBtnDPosX", 0); + } else if (CVarGetInteger("gCBtnDPosType", 0) == 4) {//Hidden ItemIconPos[2][0] = -9999; } } else { @@ -4486,17 +4487,17 @@ void Interface_DrawItemIconTexture(PlayState* play, void* texture, s16 button) { ItemIconPos[2][1] = ItemIconPos_ori[2][1]; } //C button Right - if (CVar_GetS32("gCBtnRPosType", 0) != 0) { - ItemIconPos[3][1] = CVar_GetS32("gCBtnRPosY", 0)+Y_Margins_CR; - if (CVar_GetS32("gCBtnRPosType", 0) == 1) {//Anchor Left - if (CVar_GetS32("gCBtnRUseMargins", 0) != 0) {X_Margins_CR = Left_HUD_Margin;}; - ItemIconPos[3][0] = OTRGetDimensionFromLeftEdge(CVar_GetS32("gCBtnRPosX", 0)+X_Margins_CR); - } else if (CVar_GetS32("gCBtnRPosType", 0) == 2) {//Anchor Right - if (CVar_GetS32("gCBtnRUseMargins", 0) != 0) {X_Margins_CR = Right_HUD_Margin;}; - ItemIconPos[3][0] = OTRGetDimensionFromRightEdge(CVar_GetS32("gCBtnRPosX", 0)+X_Margins_CR); - } else if (CVar_GetS32("gCBtnRPosType", 0) == 3) {//Anchor None - ItemIconPos[3][0] = CVar_GetS32("gCBtnRPosX", 0); - } else if (CVar_GetS32("gCBtnRPosType", 0) == 4) {//Hidden + if (CVarGetInteger("gCBtnRPosType", 0) != 0) { + ItemIconPos[3][1] = CVarGetInteger("gCBtnRPosY", 0)+Y_Margins_CR; + if (CVarGetInteger("gCBtnRPosType", 0) == 1) {//Anchor Left + if (CVarGetInteger("gCBtnRUseMargins", 0) != 0) {X_Margins_CR = Left_HUD_Margin;}; + ItemIconPos[3][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger("gCBtnRPosX", 0)+X_Margins_CR); + } else if (CVarGetInteger("gCBtnRPosType", 0) == 2) {//Anchor Right + if (CVarGetInteger("gCBtnRUseMargins", 0) != 0) {X_Margins_CR = Right_HUD_Margin;}; + ItemIconPos[3][0] = OTRGetDimensionFromRightEdge(CVarGetInteger("gCBtnRPosX", 0)+X_Margins_CR); + } else if (CVarGetInteger("gCBtnRPosType", 0) == 3) {//Anchor None + ItemIconPos[3][0] = CVarGetInteger("gCBtnRPosX", 0); + } else if (CVarGetInteger("gCBtnRPosType", 0) == 4) {//Hidden ItemIconPos[3][0] = -9999; } } else { @@ -4539,36 +4540,36 @@ void Interface_DrawAmmoCount(PlayState* play, s16 button, s16 alpha) { s16 Y_Margins_BtnB; s16 X_Margins_DPad_Items; s16 Y_Margins_DPad_Items; - if (CVar_GetS32("gBBtnUseMargins", 0) != 0) { - if (CVar_GetS32("gBBtnPosType", 0) == 0) {X_Margins_BtnB = Right_HUD_Margin;}; + if (CVarGetInteger("gBBtnUseMargins", 0) != 0) { + if (CVarGetInteger("gBBtnPosType", 0) == 0) {X_Margins_BtnB = Right_HUD_Margin;}; Y_Margins_BtnB = (Top_HUD_Margin*-1); } else { X_Margins_BtnB = 0; Y_Margins_BtnB = 0; } - if (CVar_GetS32("gCBtnLUseMargins", 0) != 0) { - if (CVar_GetS32("gCBtnLPosType", 0) == 0) {X_Margins_CL = Right_HUD_Margin;}; + if (CVarGetInteger("gCBtnLUseMargins", 0) != 0) { + if (CVarGetInteger("gCBtnLPosType", 0) == 0) {X_Margins_CL = Right_HUD_Margin;}; Y_Margins_CL = (Top_HUD_Margin*-1); } else { X_Margins_CL = 0; Y_Margins_CL = 0; } - if (CVar_GetS32("gCBtnRUseMargins", 0) != 0) { - if (CVar_GetS32("gCBtnRPosType", 0) == 0) {X_Margins_CR = Right_HUD_Margin;}; + if (CVarGetInteger("gCBtnRUseMargins", 0) != 0) { + if (CVarGetInteger("gCBtnRPosType", 0) == 0) {X_Margins_CR = Right_HUD_Margin;}; Y_Margins_CR = (Top_HUD_Margin*-1); } else { X_Margins_CR = 0; Y_Margins_CR = 0; } - if (CVar_GetS32("gCBtnDUseMargins", 0) != 0) { - if (CVar_GetS32("gCBtnDPosType", 0) == 0) {X_Margins_CD = Right_HUD_Margin;}; + if (CVarGetInteger("gCBtnDUseMargins", 0) != 0) { + if (CVarGetInteger("gCBtnDPosType", 0) == 0) {X_Margins_CD = Right_HUD_Margin;}; Y_Margins_CD = (Top_HUD_Margin*-1); } else { X_Margins_CD = 0; Y_Margins_CD = 0; } - if (CVar_GetS32("gDPadUseMargins", 0) != 0) { - if (CVar_GetS32("gDPadPosType", 0) == 0) {X_Margins_DPad_Items = Right_HUD_Margin;}; + if (CVarGetInteger("gDPadUseMargins", 0) != 0) { + if (CVarGetInteger("gDPadPosType", 0) == 0) {X_Margins_DPad_Items = Right_HUD_Margin;}; Y_Margins_DPad_Items = (Top_HUD_Margin*-1); } else { X_Margins_DPad_Items = 0; @@ -4592,29 +4593,29 @@ void Interface_DrawAmmoCount(PlayState* play, s16 button, s16 alpha) { {23,19},//Right }; //(X,Y) Used with custom position to place it properly. //DPadItems - if (CVar_GetS32("gDPadPosType", 0) != 0) { - ItemIconPos[4][1] = CVar_GetS32("gDPadPosY", 0)+Y_Margins_DPad_Items+DPad_ItemsOffset[0][1];//Up - ItemIconPos[5][1] = CVar_GetS32("gDPadPosY", 0)+Y_Margins_DPad_Items+DPad_ItemsOffset[1][1];//Down - ItemIconPos[6][1] = CVar_GetS32("gDPadPosY", 0)+Y_Margins_DPad_Items+DPad_ItemsOffset[2][1];//Left - ItemIconPos[7][1] = CVar_GetS32("gDPadPosY", 0)+Y_Margins_DPad_Items+DPad_ItemsOffset[3][1];//Right - if (CVar_GetS32("gDPadPosType", 0) == 1) {//Anchor Left - if (CVar_GetS32("gDPadUseMargins", 0) != 0) {X_Margins_DPad_Items = Left_HUD_Margin;}; - ItemIconPos[4][0] = OTRGetDimensionFromLeftEdge(CVar_GetS32("gDPadPosX", 0)+X_Margins_DPad_Items+DPad_ItemsOffset[0][0]); - ItemIconPos[5][0] = OTRGetDimensionFromLeftEdge(CVar_GetS32("gDPadPosX", 0)+X_Margins_DPad_Items+DPad_ItemsOffset[1][0]); - ItemIconPos[6][0] = OTRGetDimensionFromLeftEdge(CVar_GetS32("gDPadPosX", 0)+X_Margins_DPad_Items+DPad_ItemsOffset[2][0]); - ItemIconPos[7][0] = OTRGetDimensionFromLeftEdge(CVar_GetS32("gDPadPosX", 0)+X_Margins_DPad_Items+DPad_ItemsOffset[3][0]); - } else if (CVar_GetS32("gDPadPosType", 0) == 2) {//Anchor Right - if (CVar_GetS32("gDPadUseMargins", 0) != 0) {X_Margins_DPad_Items = Right_HUD_Margin;}; - ItemIconPos[4][0] = OTRGetDimensionFromRightEdge(CVar_GetS32("gDPadPosX", 0)+X_Margins_DPad_Items+DPad_ItemsOffset[0][0]); - ItemIconPos[5][0] = OTRGetDimensionFromRightEdge(CVar_GetS32("gDPadPosX", 0)+X_Margins_DPad_Items+DPad_ItemsOffset[1][0]); - ItemIconPos[6][0] = OTRGetDimensionFromRightEdge(CVar_GetS32("gDPadPosX", 0)+X_Margins_DPad_Items+DPad_ItemsOffset[2][0]); - ItemIconPos[7][0] = OTRGetDimensionFromRightEdge(CVar_GetS32("gDPadPosX", 0)+X_Margins_DPad_Items+DPad_ItemsOffset[3][0]); - } else if (CVar_GetS32("gDPadPosType", 0) == 3) {//Anchor None - ItemIconPos[4][0] = CVar_GetS32("gDPadPosX", 0)+DPad_ItemsOffset[0][0]; - ItemIconPos[5][0] = CVar_GetS32("gDPadPosX", 0)+DPad_ItemsOffset[1][0]; - ItemIconPos[6][0] = CVar_GetS32("gDPadPosX", 0)+DPad_ItemsOffset[2][0]; - ItemIconPos[7][0] = CVar_GetS32("gDPadPosX", 0)+DPad_ItemsOffset[3][0]; - } else if (CVar_GetS32("gDPadPosType", 0) == 4) {//Hidden + if (CVarGetInteger("gDPadPosType", 0) != 0) { + ItemIconPos[4][1] = CVarGetInteger("gDPadPosY", 0)+Y_Margins_DPad_Items+DPad_ItemsOffset[0][1];//Up + ItemIconPos[5][1] = CVarGetInteger("gDPadPosY", 0)+Y_Margins_DPad_Items+DPad_ItemsOffset[1][1];//Down + ItemIconPos[6][1] = CVarGetInteger("gDPadPosY", 0)+Y_Margins_DPad_Items+DPad_ItemsOffset[2][1];//Left + ItemIconPos[7][1] = CVarGetInteger("gDPadPosY", 0)+Y_Margins_DPad_Items+DPad_ItemsOffset[3][1];//Right + if (CVarGetInteger("gDPadPosType", 0) == 1) {//Anchor Left + if (CVarGetInteger("gDPadUseMargins", 0) != 0) {X_Margins_DPad_Items = Left_HUD_Margin;}; + ItemIconPos[4][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger("gDPadPosX", 0)+X_Margins_DPad_Items+DPad_ItemsOffset[0][0]); + ItemIconPos[5][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger("gDPadPosX", 0)+X_Margins_DPad_Items+DPad_ItemsOffset[1][0]); + ItemIconPos[6][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger("gDPadPosX", 0)+X_Margins_DPad_Items+DPad_ItemsOffset[2][0]); + ItemIconPos[7][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger("gDPadPosX", 0)+X_Margins_DPad_Items+DPad_ItemsOffset[3][0]); + } else if (CVarGetInteger("gDPadPosType", 0) == 2) {//Anchor Right + if (CVarGetInteger("gDPadUseMargins", 0) != 0) {X_Margins_DPad_Items = Right_HUD_Margin;}; + ItemIconPos[4][0] = OTRGetDimensionFromRightEdge(CVarGetInteger("gDPadPosX", 0)+X_Margins_DPad_Items+DPad_ItemsOffset[0][0]); + ItemIconPos[5][0] = OTRGetDimensionFromRightEdge(CVarGetInteger("gDPadPosX", 0)+X_Margins_DPad_Items+DPad_ItemsOffset[1][0]); + ItemIconPos[6][0] = OTRGetDimensionFromRightEdge(CVarGetInteger("gDPadPosX", 0)+X_Margins_DPad_Items+DPad_ItemsOffset[2][0]); + ItemIconPos[7][0] = OTRGetDimensionFromRightEdge(CVarGetInteger("gDPadPosX", 0)+X_Margins_DPad_Items+DPad_ItemsOffset[3][0]); + } else if (CVarGetInteger("gDPadPosType", 0) == 3) {//Anchor None + ItemIconPos[4][0] = CVarGetInteger("gDPadPosX", 0)+DPad_ItemsOffset[0][0]; + ItemIconPos[5][0] = CVarGetInteger("gDPadPosX", 0)+DPad_ItemsOffset[1][0]; + ItemIconPos[6][0] = CVarGetInteger("gDPadPosX", 0)+DPad_ItemsOffset[2][0]; + ItemIconPos[7][0] = CVarGetInteger("gDPadPosX", 0)+DPad_ItemsOffset[3][0]; + } else if (CVarGetInteger("gDPadPosType", 0) == 4) {//Hidden ItemIconPos[4][0] = -9999; ItemIconPos[5][0] = -9999; ItemIconPos[6][0] = -9999; @@ -4633,17 +4634,17 @@ void Interface_DrawAmmoCount(PlayState* play, s16 button, s16 alpha) { //B Button s16 PosX_adjust = 1; s16 PosY_adjust = 17; - if (CVar_GetS32("gBBtnPosType", 0) != 0) { - ItemIconPos[0][1] = CVar_GetS32("gBBtnPosY", 0)+Y_Margins_BtnB+PosY_adjust; - if (CVar_GetS32("gBBtnPosType", 0) == 1) {//Anchor Left - if (CVar_GetS32("gBBtnUseMargins", 0) != 0) {X_Margins_BtnB = Left_HUD_Margin;}; - ItemIconPos[0][0] = OTRGetDimensionFromLeftEdge(CVar_GetS32("gBBtnPosX", 0)+X_Margins_BtnB+PosX_adjust); - } else if (CVar_GetS32("gBBtnPosType", 0) == 2) {//Anchor Right - if (CVar_GetS32("gBBtnUseMargins", 0) != 0) {X_Margins_BtnB = Right_HUD_Margin;}; - ItemIconPos[0][0] = OTRGetDimensionFromRightEdge(CVar_GetS32("gBBtnPosX", 0)+X_Margins_BtnB+PosX_adjust); - } else if (CVar_GetS32("gBBtnPosType", 0) == 3) {//Anchor None - ItemIconPos[0][0] = CVar_GetS32("gBBtnPosX", 0)+PosX_adjust; - } else if (CVar_GetS32("gBBtnPosType", 0) == 4) {//Hidden + if (CVarGetInteger("gBBtnPosType", 0) != 0) { + ItemIconPos[0][1] = CVarGetInteger("gBBtnPosY", 0)+Y_Margins_BtnB+PosY_adjust; + if (CVarGetInteger("gBBtnPosType", 0) == 1) {//Anchor Left + if (CVarGetInteger("gBBtnUseMargins", 0) != 0) {X_Margins_BtnB = Left_HUD_Margin;}; + ItemIconPos[0][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger("gBBtnPosX", 0)+X_Margins_BtnB+PosX_adjust); + } else if (CVarGetInteger("gBBtnPosType", 0) == 2) {//Anchor Right + if (CVarGetInteger("gBBtnUseMargins", 0) != 0) {X_Margins_BtnB = Right_HUD_Margin;}; + ItemIconPos[0][0] = OTRGetDimensionFromRightEdge(CVarGetInteger("gBBtnPosX", 0)+X_Margins_BtnB+PosX_adjust); + } else if (CVarGetInteger("gBBtnPosType", 0) == 3) {//Anchor None + ItemIconPos[0][0] = CVarGetInteger("gBBtnPosX", 0)+PosX_adjust; + } else if (CVarGetInteger("gBBtnPosType", 0) == 4) {//Hidden ItemIconPos[0][0] = -9999; } } else { @@ -4651,17 +4652,17 @@ void Interface_DrawAmmoCount(PlayState* play, s16 button, s16 alpha) { ItemIconPos[0][1] = ItemIconPos_ori[0][1]; } //C button Left - if (CVar_GetS32("gCBtnLPosType", 0) != 0) { - ItemIconPos[1][1] = CVar_GetS32("gCBtnLPosY", 0)+Y_Margins_CL+PosY_adjust; - if (CVar_GetS32("gCBtnLPosType", 0) == 1) {//Anchor Left - if (CVar_GetS32("gCBtnLUseMargins", 0) != 0) {X_Margins_CL = Left_HUD_Margin;}; - ItemIconPos[1][0] = OTRGetDimensionFromLeftEdge(CVar_GetS32("gCBtnLPosX", 0)+X_Margins_CL+PosX_adjust); - } else if (CVar_GetS32("gCBtnLPosType", 0) == 2) {//Anchor Right - if (CVar_GetS32("gCBtnLUseMargins", 0) != 0) {X_Margins_CL = Right_HUD_Margin;}; - ItemIconPos[1][0] = OTRGetDimensionFromRightEdge(CVar_GetS32("gCBtnLPosX", 0)+X_Margins_CL+PosX_adjust); - } else if (CVar_GetS32("gCBtnLPosType", 0) == 3) {//Anchor None - ItemIconPos[1][0] = CVar_GetS32("gCBtnLPosX", 0)+PosX_adjust; - } else if (CVar_GetS32("gCBtnLPosType", 0) == 4) {//Hidden + if (CVarGetInteger("gCBtnLPosType", 0) != 0) { + ItemIconPos[1][1] = CVarGetInteger("gCBtnLPosY", 0)+Y_Margins_CL+PosY_adjust; + if (CVarGetInteger("gCBtnLPosType", 0) == 1) {//Anchor Left + if (CVarGetInteger("gCBtnLUseMargins", 0) != 0) {X_Margins_CL = Left_HUD_Margin;}; + ItemIconPos[1][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger("gCBtnLPosX", 0)+X_Margins_CL+PosX_adjust); + } else if (CVarGetInteger("gCBtnLPosType", 0) == 2) {//Anchor Right + if (CVarGetInteger("gCBtnLUseMargins", 0) != 0) {X_Margins_CL = Right_HUD_Margin;}; + ItemIconPos[1][0] = OTRGetDimensionFromRightEdge(CVarGetInteger("gCBtnLPosX", 0)+X_Margins_CL+PosX_adjust); + } else if (CVarGetInteger("gCBtnLPosType", 0) == 3) {//Anchor None + ItemIconPos[1][0] = CVarGetInteger("gCBtnLPosX", 0)+PosX_adjust; + } else if (CVarGetInteger("gCBtnLPosType", 0) == 4) {//Hidden ItemIconPos[1][0] = -9999; } } else { @@ -4669,17 +4670,17 @@ void Interface_DrawAmmoCount(PlayState* play, s16 button, s16 alpha) { ItemIconPos[1][1] = ItemIconPos_ori[1][1]; } //C Button down - if (CVar_GetS32("gCBtnDPosType", 0) != 0) { - ItemIconPos[2][1] = CVar_GetS32("gCBtnDPosY", 0)+Y_Margins_CD+PosY_adjust; - if (CVar_GetS32("gCBtnDPosType", 0) == 1) {//Anchor Left - if (CVar_GetS32("gCBtnDUseMargins", 0) != 0) {X_Margins_CD = Left_HUD_Margin;}; - ItemIconPos[2][0] = OTRGetDimensionFromLeftEdge(CVar_GetS32("gCBtnDPosX", 0)+X_Margins_CD+PosX_adjust); - } else if (CVar_GetS32("gCBtnDPosType", 0) == 2) {//Anchor Right - if (CVar_GetS32("gCBtnDUseMargins", 0) != 0) {X_Margins_CD = Right_HUD_Margin;}; - ItemIconPos[2][0] = OTRGetDimensionFromRightEdge(CVar_GetS32("gCBtnDPosX", 0)+X_Margins_CD+PosX_adjust); - } else if (CVar_GetS32("gCBtnDPosType", 0) == 3) {//Anchor None - ItemIconPos[2][0] = CVar_GetS32("gCBtnDPosX", 0)+PosX_adjust; - } else if (CVar_GetS32("gCBtnDPosType", 0) == 4) {//Hidden + if (CVarGetInteger("gCBtnDPosType", 0) != 0) { + ItemIconPos[2][1] = CVarGetInteger("gCBtnDPosY", 0)+Y_Margins_CD+PosY_adjust; + if (CVarGetInteger("gCBtnDPosType", 0) == 1) {//Anchor Left + if (CVarGetInteger("gCBtnDUseMargins", 0) != 0) {X_Margins_CD = Left_HUD_Margin;}; + ItemIconPos[2][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger("gCBtnDPosX", 0)+X_Margins_CD+PosX_adjust); + } else if (CVarGetInteger("gCBtnDPosType", 0) == 2) {//Anchor Right + if (CVarGetInteger("gCBtnDUseMargins", 0) != 0) {X_Margins_CD = Right_HUD_Margin;}; + ItemIconPos[2][0] = OTRGetDimensionFromRightEdge(CVarGetInteger("gCBtnDPosX", 0)+X_Margins_CD+PosX_adjust); + } else if (CVarGetInteger("gCBtnDPosType", 0) == 3) {//Anchor None + ItemIconPos[2][0] = CVarGetInteger("gCBtnDPosX", 0)+PosX_adjust; + } else if (CVarGetInteger("gCBtnDPosType", 0) == 4) {//Hidden ItemIconPos[2][0] = -9999; } } else { @@ -4687,17 +4688,17 @@ void Interface_DrawAmmoCount(PlayState* play, s16 button, s16 alpha) { ItemIconPos[2][1] = ItemIconPos_ori[2][1]; } //C button Right - if (CVar_GetS32("gCBtnRPosType", 0) != 0) { - ItemIconPos[3][1] = CVar_GetS32("gCBtnRPosY", 0)+Y_Margins_CR+PosY_adjust; - if (CVar_GetS32("gCBtnRPosType", 0) == 1) {//Anchor Left - if (CVar_GetS32("gCBtnRUseMargins", 0) != 0) {X_Margins_CR = Left_HUD_Margin;}; - ItemIconPos[3][0] = OTRGetDimensionFromLeftEdge(CVar_GetS32("gCBtnRPosX", 0)+X_Margins_CR+PosX_adjust); - } else if (CVar_GetS32("gCBtnRPosType", 0) == 2) {//Anchor Right - if (CVar_GetS32("gCBtnRUseMargins", 0) != 0) {X_Margins_CR = Right_HUD_Margin;}; - ItemIconPos[3][0] = OTRGetDimensionFromRightEdge(CVar_GetS32("gCBtnRPosX", 0)+X_Margins_CR+PosX_adjust); - } else if (CVar_GetS32("gCBtnRPosType", 0) == 3) {//Anchor None - ItemIconPos[3][0] = CVar_GetS32("gCBtnRPosX", 0)+PosX_adjust; - } else if (CVar_GetS32("gCBtnRPosType", 0) == 4) {//Hidden + if (CVarGetInteger("gCBtnRPosType", 0) != 0) { + ItemIconPos[3][1] = CVarGetInteger("gCBtnRPosY", 0)+Y_Margins_CR+PosY_adjust; + if (CVarGetInteger("gCBtnRPosType", 0) == 1) {//Anchor Left + if (CVarGetInteger("gCBtnRUseMargins", 0) != 0) {X_Margins_CR = Left_HUD_Margin;}; + ItemIconPos[3][0] = OTRGetDimensionFromLeftEdge(CVarGetInteger("gCBtnRPosX", 0)+X_Margins_CR+PosX_adjust); + } else if (CVarGetInteger("gCBtnRPosType", 0) == 2) {//Anchor Right + if (CVarGetInteger("gCBtnRUseMargins", 0) != 0) {X_Margins_CR = Right_HUD_Margin;}; + ItemIconPos[3][0] = OTRGetDimensionFromRightEdge(CVarGetInteger("gCBtnRPosX", 0)+X_Margins_CR+PosX_adjust); + } else if (CVarGetInteger("gCBtnRPosType", 0) == 3) {//Anchor None + ItemIconPos[3][0] = CVarGetInteger("gCBtnRPosX", 0)+PosX_adjust; + } else if (CVarGetInteger("gCBtnRPosType", 0) == 4) {//Hidden ItemIconPos[3][0] = -9999; } } else { @@ -4926,19 +4927,19 @@ void Interface_Draw(PlayState* play) { Color_RGB8 rColor; Color_RGB8 keyCountColor = { 200, 230, 255 }; - if (CVar_GetS32("gCosmetics.Hud_KeyCount.Changed", 0)) { - keyCountColor = CVar_GetRGB("gCosmetics.Hud_KeyCount.Value", keyCountColor); + if (CVarGetInteger("gCosmetics.Hud_KeyCount.Changed", 0)) { + keyCountColor = CVarGetColor24("gCosmetics.Hud_KeyCount.Value", keyCountColor); } Color_RGB8 dPadColor = { 255, 255, 255 }; - if (CVar_GetS32("gCosmetics.Hud_Dpad.Changed", 0)) { - dPadColor = CVar_GetRGB("gCosmetics.Hud_Dpad.Value", dPadColor); + if (CVarGetInteger("gCosmetics.Hud_Dpad.Changed", 0)) { + dPadColor = CVarGetColor24("gCosmetics.Hud_Dpad.Value", dPadColor); } Color_RGB8 aButtonColor = { 90, 90, 255 }; - if (CVar_GetS32("gCosmetics.Hud_AButton.Changed", 0)) { - aButtonColor = CVar_GetRGB("gCosmetics.Hud_AButton.Value", aButtonColor); - } else if (CVar_GetS32("gCosmetics.DefaultColorScheme", 0)) { + if (CVarGetInteger("gCosmetics.Hud_AButton.Changed", 0)) { + aButtonColor = CVarGetColor24("gCosmetics.Hud_AButton.Value", aButtonColor); + } else if (CVarGetInteger("gCosmetics.DefaultColorScheme", 0)) { aButtonColor = (Color_RGB8){ 0, 200, 50 }; } @@ -4960,7 +4961,7 @@ void Interface_Draw(PlayState* play) { s16 svar4; s16 svar5; s16 svar6; - bool fullUi = !CVar_GetS32("gMinimalUI", 0) || !R_MINIMAP_DISABLED || play->pauseCtx.state != 0; + bool fullUi = !CVarGetInteger("gMinimalUI", 0) || !R_MINIMAP_DISABLED || play->pauseCtx.state != 0; if (chaosEffectNoUI) { return; @@ -4988,40 +4989,40 @@ void Interface_Draw(PlayState* play) { if (fullUi) { // Rupee Icon - if (CVar_GetS32("gDynamicWalletIcon", 0)) { + if (CVarGetInteger("gDynamicWalletIcon", 0)) { switch (CUR_UPG_VALUE(UPG_WALLET)) { case 0: - if (CVar_GetS32("gCosmetics.Consumable_GreenRupee.Changed", 0)) { - rColor = CVar_GetRGB("gCosmetics.Consumable_GreenRupee.Value", rupeeWalletColors[0]); + if (CVarGetInteger("gCosmetics.Consumable_GreenRupee.Changed", 0)) { + rColor = CVarGetColor24("gCosmetics.Consumable_GreenRupee.Value", rupeeWalletColors[0]); } else { rColor = rupeeWalletColors[0]; } break; case 1: - if (CVar_GetS32("gCosmetics.Consumable_BlueRupee.Changed", 0)) { - rColor = CVar_GetRGB("gCosmetics.Consumable_BlueRupee.Value", rupeeWalletColors[1]); + if (CVarGetInteger("gCosmetics.Consumable_BlueRupee.Changed", 0)) { + rColor = CVarGetColor24("gCosmetics.Consumable_BlueRupee.Value", rupeeWalletColors[1]); } else { rColor = rupeeWalletColors[1]; } break; case 2: - if (CVar_GetS32("gCosmetics.Consumable_RedRupee.Changed", 0)) { - rColor = CVar_GetRGB("gCosmetics.Consumable_RedRupee.Value", rupeeWalletColors[2]); + if (CVarGetInteger("gCosmetics.Consumable_RedRupee.Changed", 0)) { + rColor = CVarGetColor24("gCosmetics.Consumable_RedRupee.Value", rupeeWalletColors[2]); } else { rColor = rupeeWalletColors[2]; } break; case 3: - if (CVar_GetS32("gCosmetics.Consumable_PurpleRupee.Changed", 0)) { - rColor = CVar_GetRGB("gCosmetics.Consumable_PurpleRupee.Value", rupeeWalletColors[3]); + if (CVarGetInteger("gCosmetics.Consumable_PurpleRupee.Changed", 0)) { + rColor = CVarGetColor24("gCosmetics.Consumable_PurpleRupee.Value", rupeeWalletColors[3]); } else { rColor = rupeeWalletColors[3]; } break; } } else { - if (CVar_GetS32("gCosmetics.Consumable_GreenRupee.Changed", rupeeWalletColors)) { - rColor = CVar_GetRGB("gCosmetics.Consumable_GreenRupee.Value", rupeeWalletColors[0]); + if (CVarGetInteger("gCosmetics.Consumable_GreenRupee.Changed", rupeeWalletColors)) { + rColor = CVarGetColor24("gCosmetics.Consumable_GreenRupee.Value", rupeeWalletColors[0]); } else { rColor = rupeeWalletColors[0]; } @@ -5030,8 +5031,8 @@ void Interface_Draw(PlayState* play) { //Rupee icon & counter s16 X_Margins_RC; s16 Y_Margins_RC; - if (CVar_GetS32("gRCUseMargins", 0) != 0) { - if (CVar_GetS32("gRCPosType", 0) == 0) {X_Margins_RC = Left_HUD_Margin;}; + if (CVarGetInteger("gRCUseMargins", 0) != 0) { + if (CVarGetInteger("gRCPosType", 0) == 0) {X_Margins_RC = Left_HUD_Margin;}; Y_Margins_RC = Bottom_HUD_Margin; } else { X_Margins_RC = 0; @@ -5041,17 +5042,17 @@ void Interface_Draw(PlayState* play) { s16 PosY_RC_ori = 206+Y_Margins_RC; s16 PosX_RC; s16 PosY_RC; - if (CVar_GetS32("gRCPosType", 0) != 0) { - PosY_RC = CVar_GetS32("gRCPosY", 0)+Y_Margins_RC; - if (CVar_GetS32("gRCPosType", 0) == 1) {//Anchor Left - if (CVar_GetS32("gRCUseMargins", 0) != 0) {X_Margins_RC = Left_HUD_Margin;}; - PosX_RC = OTRGetDimensionFromLeftEdge(CVar_GetS32("gRCPosX", 0)+X_Margins_RC); - } else if (CVar_GetS32("gRCPosType", 0) == 2) {//Anchor Right - if (CVar_GetS32("gRCUseMargins", 0) != 0) {X_Margins_RC = Right_HUD_Margin;}; - PosX_RC = OTRGetDimensionFromRightEdge(CVar_GetS32("gRCPosX", 0)+X_Margins_RC); - } else if (CVar_GetS32("gRCPosType", 0) == 3) {//Anchor None - PosX_RC = CVar_GetS32("gRCPosX", 0); - } else if (CVar_GetS32("gRCPosType", 0) == 4) {//Hidden + if (CVarGetInteger("gRCPosType", 0) != 0) { + PosY_RC = CVarGetInteger("gRCPosY", 0)+Y_Margins_RC; + if (CVarGetInteger("gRCPosType", 0) == 1) {//Anchor Left + if (CVarGetInteger("gRCUseMargins", 0) != 0) {X_Margins_RC = Left_HUD_Margin;}; + PosX_RC = OTRGetDimensionFromLeftEdge(CVarGetInteger("gRCPosX", 0)+X_Margins_RC); + } else if (CVarGetInteger("gRCPosType", 0) == 2) {//Anchor Right + if (CVarGetInteger("gRCUseMargins", 0) != 0) {X_Margins_RC = Right_HUD_Margin;}; + PosX_RC = OTRGetDimensionFromRightEdge(CVarGetInteger("gRCPosX", 0)+X_Margins_RC); + } else if (CVarGetInteger("gRCPosType", 0) == 3) {//Anchor None + PosX_RC = CVarGetInteger("gRCPosX", 0); + } else if (CVarGetInteger("gRCPosType", 0) == 4) {//Hidden PosX_RC = -9999; } } else { @@ -5079,8 +5080,8 @@ void Interface_Draw(PlayState* play) { if (gSaveContext.inventory.dungeonKeys[gSaveContext.mapIndex] >= 0) { s16 X_Margins_SKC; s16 Y_Margins_SKC; - if (CVar_GetS32("gSKCUseMargins", 0) != 0) { - if (CVar_GetS32("gSKCPosType", 0) == 0) {X_Margins_SKC = Left_HUD_Margin;}; + if (CVarGetInteger("gSKCUseMargins", 0) != 0) { + if (CVarGetInteger("gSKCPosType", 0) == 0) {X_Margins_SKC = Left_HUD_Margin;}; Y_Margins_SKC = Bottom_HUD_Margin; } else { X_Margins_SKC = 0; @@ -5090,17 +5091,17 @@ void Interface_Draw(PlayState* play) { s16 PosY_SKC_ori = 190+Y_Margins_SKC; s16 PosX_SKC; s16 PosY_SKC; - if (CVar_GetS32("gSKCPosType", 0) != 0) { - PosY_SKC = CVar_GetS32("gSKCPosY", 0)+Y_Margins_SKC; - if (CVar_GetS32("gSKCPosType", 0) == 1) {//Anchor Left - if (CVar_GetS32("gSKCUseMargins", 0) != 0) {X_Margins_SKC = Left_HUD_Margin;}; - PosX_SKC = OTRGetDimensionFromLeftEdge(CVar_GetS32("gSKCPosX", 0)+X_Margins_SKC); - } else if (CVar_GetS32("gSKCPosType", 0) == 2) {//Anchor Right - if (CVar_GetS32("gSKCUseMargins", 0) != 0) {X_Margins_SKC = Right_HUD_Margin;}; - PosX_SKC = OTRGetDimensionFromRightEdge(CVar_GetS32("gSKCPosX", 0)+X_Margins_SKC); - } else if (CVar_GetS32("gSKCPosType", 0) == 3) {//Anchor None - PosX_SKC = CVar_GetS32("gSKCPosX", 0); - } else if (CVar_GetS32("gSKCPosType", 0) == 4) {//Hidden + if (CVarGetInteger("gSKCPosType", 0) != 0) { + PosY_SKC = CVarGetInteger("gSKCPosY", 0)+Y_Margins_SKC; + if (CVarGetInteger("gSKCPosType", 0) == 1) {//Anchor Left + if (CVarGetInteger("gSKCUseMargins", 0) != 0) {X_Margins_SKC = Left_HUD_Margin;}; + PosX_SKC = OTRGetDimensionFromLeftEdge(CVarGetInteger("gSKCPosX", 0)+X_Margins_SKC); + } else if (CVarGetInteger("gSKCPosType", 0) == 2) {//Anchor Right + if (CVarGetInteger("gSKCUseMargins", 0) != 0) {X_Margins_SKC = Right_HUD_Margin;}; + PosX_SKC = OTRGetDimensionFromRightEdge(CVarGetInteger("gSKCPosX", 0)+X_Margins_SKC); + } else if (CVarGetInteger("gSKCPosType", 0) == 3) {//Anchor None + PosX_SKC = CVarGetInteger("gSKCPosX", 0); + } else if (CVarGetInteger("gSKCPosType", 0) == 4) {//Hidden PosX_SKC = -9999; } } else { @@ -5186,7 +5187,7 @@ void Interface_Draw(PlayState* play) { gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 0, 0); } - if (CVar_GetS32("gDrawLineupTick", 0)) { + if (CVarGetInteger("gDrawLineupTick", 0)) { Interface_DrawLineupTick(play); } @@ -5250,24 +5251,24 @@ void Interface_Draw(PlayState* play) { s16 BbtnPosY; s16 X_Margins_BtnB_label; s16 Y_Margins_BtnB_label; - if (CVar_GetS32("gBBtnUseMargins", 0) != 0) { - if (CVar_GetS32("gBBtnPosType", 0) == 0) {X_Margins_BtnB_label = Right_HUD_Margin;}; + if (CVarGetInteger("gBBtnUseMargins", 0) != 0) { + if (CVarGetInteger("gBBtnPosType", 0) == 0) {X_Margins_BtnB_label = Right_HUD_Margin;}; Y_Margins_BtnB_label = (Top_HUD_Margin*-1); } else { X_Margins_BtnB_label = 0; Y_Margins_BtnB_label = 0; } - if (CVar_GetS32("gBBtnPosType", 0) != 0) { - BbtnPosY = CVar_GetS32("gBBtnPosY", 0)+Y_Margins_BtnB_label+PosY_adjust; - if (CVar_GetS32("gBBtnPosType", 0) == 1) {//Anchor Left - if (CVar_GetS32("gBBtnUseMargins", 0) != 0) {X_Margins_BtnB_label = Left_HUD_Margin;}; - BbtnPosX = OTRGetDimensionFromLeftEdge(CVar_GetS32("gBBtnPosX", 0)+X_Margins_BtnB_label+PosX_adjust); - } else if (CVar_GetS32("gBBtnPosType", 0) == 2) {//Anchor Right - if (CVar_GetS32("gBBtnUseMargins", 0) != 0) {X_Margins_BtnB_label = Right_HUD_Margin;}; - BbtnPosX = OTRGetDimensionFromRightEdge(CVar_GetS32("gBBtnPosX", 0)+X_Margins_BtnB_label+PosX_adjust); - } else if (CVar_GetS32("gBBtnPosType", 0) == 3) {//Anchor None - BbtnPosX = CVar_GetS32("gBBtnPosX", 0)+PosX_adjust; - } else if (CVar_GetS32("gBBtnPosType", 0) == 4) {//Hidden + if (CVarGetInteger("gBBtnPosType", 0) != 0) { + BbtnPosY = CVarGetInteger("gBBtnPosY", 0)+Y_Margins_BtnB_label+PosY_adjust; + if (CVarGetInteger("gBBtnPosType", 0) == 1) {//Anchor Left + if (CVarGetInteger("gBBtnUseMargins", 0) != 0) {X_Margins_BtnB_label = Left_HUD_Margin;}; + BbtnPosX = OTRGetDimensionFromLeftEdge(CVarGetInteger("gBBtnPosX", 0)+X_Margins_BtnB_label+PosX_adjust); + } else if (CVarGetInteger("gBBtnPosType", 0) == 2) {//Anchor Right + if (CVarGetInteger("gBBtnUseMargins", 0) != 0) {X_Margins_BtnB_label = Right_HUD_Margin;}; + BbtnPosX = OTRGetDimensionFromRightEdge(CVarGetInteger("gBBtnPosX", 0)+X_Margins_BtnB_label+PosX_adjust); + } else if (CVarGetInteger("gBBtnPosType", 0) == 3) {//Anchor None + BbtnPosX = CVarGetInteger("gBBtnPosX", 0)+PosX_adjust; + } else if (CVarGetInteger("gBBtnPosType", 0) == 4) {//Hidden BbtnPosX = -9999; } } else { @@ -5329,7 +5330,7 @@ void Interface_Draw(PlayState* play) { Interface_DrawAmmoCount(play, 3, interfaceCtx->cRightAlpha); } - if (CVar_GetS32("gDpadEquips", 0) != 0) { + if (CVarGetInteger("gDpadEquips", 0) != 0) { // DPad is only greyed-out when all 4 DPad directions are too uint16_t dpadAlpha = MAX(MAX(MAX(interfaceCtx->dpadUpAlpha, interfaceCtx->dpadDownAlpha), interfaceCtx->dpadLeftAlpha), @@ -5340,24 +5341,24 @@ void Interface_Draw(PlayState* play) { s16 DpadPosY; s16 X_Margins_Dpad; s16 Y_Margins_Dpad; - if (CVar_GetS32("gDPadUseMargins", 0) != 0) { - if (CVar_GetS32("gDPadPosType", 0) == 0) {X_Margins_Dpad = Right_HUD_Margin;}; + if (CVarGetInteger("gDPadUseMargins", 0) != 0) { + if (CVarGetInteger("gDPadPosType", 0) == 0) {X_Margins_Dpad = Right_HUD_Margin;}; Y_Margins_Dpad = (Top_HUD_Margin*-1); } else { Y_Margins_Dpad = 0; X_Margins_Dpad = 0; } - if (CVar_GetS32("gDPadPosType", 0) != 0) { - DpadPosY = CVar_GetS32("gDPadPosY", 0)+Y_Margins_Dpad; - if (CVar_GetS32("gDPadPosType", 0) == 1) {//Anchor Left - if (CVar_GetS32("gDPadUseMargins", 0) != 0) {X_Margins_Dpad = Left_HUD_Margin;}; - DpadPosX = OTRGetDimensionFromLeftEdge(CVar_GetS32("gDPadPosX", 0)+X_Margins_Dpad); - } else if (CVar_GetS32("gDPadPosType", 0) == 2) {//Anchor Right - if (CVar_GetS32("gDPadUseMargins", 0) != 0) {X_Margins_Dpad = Right_HUD_Margin;}; - DpadPosX = OTRGetDimensionFromRightEdge(CVar_GetS32("gDPadPosX", 0)+X_Margins_Dpad); - } else if (CVar_GetS32("gDPadPosType", 0) == 3) {//Anchor None - DpadPosX = CVar_GetS32("gDPadPosX", 0); - } else if (CVar_GetS32("gDPadPosType", 0) == 4) {//Hidden + if (CVarGetInteger("gDPadPosType", 0) != 0) { + DpadPosY = CVarGetInteger("gDPadPosY", 0)+Y_Margins_Dpad; + if (CVarGetInteger("gDPadPosType", 0) == 1) {//Anchor Left + if (CVarGetInteger("gDPadUseMargins", 0) != 0) {X_Margins_Dpad = Left_HUD_Margin;}; + DpadPosX = OTRGetDimensionFromLeftEdge(CVarGetInteger("gDPadPosX", 0)+X_Margins_Dpad); + } else if (CVarGetInteger("gDPadPosType", 0) == 2) {//Anchor Right + if (CVarGetInteger("gDPadUseMargins", 0) != 0) {X_Margins_Dpad = Right_HUD_Margin;}; + DpadPosX = OTRGetDimensionFromRightEdge(CVarGetInteger("gDPadPosX", 0)+X_Margins_Dpad); + } else if (CVarGetInteger("gDPadPosType", 0) == 3) {//Anchor None + DpadPosX = CVarGetInteger("gDPadPosX", 0); + } else if (CVarGetInteger("gDPadPosType", 0) == 4) {//Hidden DpadPosX = -9999; } } else { @@ -5426,7 +5427,7 @@ void Interface_Draw(PlayState* play) { Gfx_SetupDL_42Overlay(play->state.gfxCtx); s16 X_Margins_BtnA; s16 Y_Margins_BtnA; - if (CVar_GetS32("gABtnUseMargins", 0) != 0) { + if (CVarGetInteger("gABtnUseMargins", 0) != 0) { X_Margins_BtnA = Right_HUD_Margin; Y_Margins_BtnA = (Top_HUD_Margin*-1); } else { @@ -5441,21 +5442,21 @@ void Interface_Draw(PlayState* play) { s16 PosY_BtnA; s16 rAIconX; s16 rAIconY; - if (CVar_GetS32("gABtnPosType", 0) != 0) { - PosY_BtnA = CVar_GetS32("gABtnPosY", 0)+Y_Margins_BtnA; + if (CVarGetInteger("gABtnPosType", 0) != 0) { + PosY_BtnA = CVarGetInteger("gABtnPosY", 0)+Y_Margins_BtnA; rAIconY = 98.0f - PosY_BtnA; - if (CVar_GetS32("gABtnPosType", 0) == 1) {//Anchor Left - if (CVar_GetS32("gABtnUseMargins", 0) != 0) {X_Margins_BtnA = Left_HUD_Margin;}; - PosX_BtnA = OTRGetDimensionFromLeftEdge(CVar_GetS32("gABtnPosX", 0)+X_Margins_BtnA); - rAIconX = OTRGetDimensionFromLeftEdge(CVar_GetS32("gABtnPosX", 0)+X_Margins_BtnA); - } else if (CVar_GetS32("gABtnPosType", 0) == 2) {//Anchor Right - if (CVar_GetS32("gABtnUseMargins", 0) != 0) {X_Margins_BtnA = Right_HUD_Margin;}; - PosX_BtnA = OTRGetDimensionFromRightEdge(CVar_GetS32("gABtnPosX", 0)+X_Margins_BtnA); - rAIconX= OTRGetDimensionFromRightEdge(CVar_GetS32("gABtnPosX", 0)+X_Margins_BtnA); - } else if (CVar_GetS32("gABtnPosType", 0) == 3) {//Anchor None - PosX_BtnA = CVar_GetS32("gABtnPosX", 0); - rAIconX = CVar_GetS32("gABtnPosX", 0); - } else if (CVar_GetS32("gABtnPosType", 0) == 4) {//Hidden + if (CVarGetInteger("gABtnPosType", 0) == 1) {//Anchor Left + if (CVarGetInteger("gABtnUseMargins", 0) != 0) {X_Margins_BtnA = Left_HUD_Margin;}; + PosX_BtnA = OTRGetDimensionFromLeftEdge(CVarGetInteger("gABtnPosX", 0)+X_Margins_BtnA); + rAIconX = OTRGetDimensionFromLeftEdge(CVarGetInteger("gABtnPosX", 0)+X_Margins_BtnA); + } else if (CVarGetInteger("gABtnPosType", 0) == 2) {//Anchor Right + if (CVarGetInteger("gABtnUseMargins", 0) != 0) {X_Margins_BtnA = Right_HUD_Margin;}; + PosX_BtnA = OTRGetDimensionFromRightEdge(CVarGetInteger("gABtnPosX", 0)+X_Margins_BtnA); + rAIconX= OTRGetDimensionFromRightEdge(CVarGetInteger("gABtnPosX", 0)+X_Margins_BtnA); + } else if (CVarGetInteger("gABtnPosType", 0) == 3) {//Anchor None + PosX_BtnA = CVarGetInteger("gABtnPosX", 0); + rAIconX = CVarGetInteger("gABtnPosX", 0); + } else if (CVarGetInteger("gABtnPosType", 0) == 4) {//Hidden PosX_BtnA = -9999; rAIconX = -9999; } @@ -5549,7 +5550,7 @@ void Interface_Draw(PlayState* play) { if ((play->pauseCtx.state == 0) && (play->pauseCtx.debugState == 0)) { if (gSaveContext.minigameState != 1) { // Carrots rendering if the action corresponds to riding a horse - if (interfaceCtx->unk_1EE == 8 && !CVar_GetS32("gInfiniteEpona", 0)) { + if (interfaceCtx->unk_1EE == 8 && !CVarGetInteger("gInfiniteEpona", 0)) { // Load Carrot Icon gDPLoadTextureBlock(OVERLAY_DISP++, gCarrotIconTex, G_IM_FMT_RGBA, G_IM_SIZ_32b, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, @@ -5559,17 +5560,17 @@ void Interface_Draw(PlayState* play) { s16 CarrotsPosX = ZREG(14); s16 CarrotsPosY = ZREG(15); s16 CarrotsMargins_X = 0; - if (CVar_GetS32("gCarrotsPosType", 0) != 0) { - CarrotsPosY = CVar_GetS32("gCarrotsPosY", 0); - if (CVar_GetS32("gCarrotsPosType", 0) == 1) {//Anchor Left - if (CVar_GetS32("gCarrotsUseMargins", 0) != 0) {CarrotsMargins_X = Left_HUD_Margin;}; - CarrotsPosX = OTRGetDimensionFromLeftEdge(CVar_GetS32("gCarrotsPosX", 0)+CarrotsMargins_X); - } else if (CVar_GetS32("gCarrotsPosType", 0) == 2) {//Anchor Right - if (CVar_GetS32("gCarrotsUseMargins", 0) != 0) {CarrotsMargins_X = Right_HUD_Margin;}; - CarrotsPosX = OTRGetDimensionFromRightEdge(CVar_GetS32("gCarrotsPosX", 0)+CarrotsMargins_X); - } else if (CVar_GetS32("gCarrotsPosType", 0) == 3) {//Anchor None - CarrotsPosX = CVar_GetS32("gCarrotsPosX", 0); - } else if (CVar_GetS32("gCarrotsPosType", 0) == 4) {//Hidden + if (CVarGetInteger("gCarrotsPosType", 0) != 0) { + CarrotsPosY = CVarGetInteger("gCarrotsPosY", 0); + if (CVarGetInteger("gCarrotsPosType", 0) == 1) {//Anchor Left + if (CVarGetInteger("gCarrotsUseMargins", 0) != 0) {CarrotsMargins_X = Left_HUD_Margin;}; + CarrotsPosX = OTRGetDimensionFromLeftEdge(CVarGetInteger("gCarrotsPosX", 0)+CarrotsMargins_X); + } else if (CVarGetInteger("gCarrotsPosType", 0) == 2) {//Anchor Right + if (CVarGetInteger("gCarrotsUseMargins", 0) != 0) {CarrotsMargins_X = Right_HUD_Margin;}; + CarrotsPosX = OTRGetDimensionFromRightEdge(CVarGetInteger("gCarrotsPosX", 0)+CarrotsMargins_X); + } else if (CVarGetInteger("gCarrotsPosType", 0) == 3) {//Anchor None + CarrotsPosX = CVarGetInteger("gCarrotsPosX", 0); + } else if (CVarGetInteger("gCarrotsPosType", 0) == 4) {//Hidden CarrotsPosX = -9999; } } @@ -5588,25 +5589,25 @@ void Interface_Draw(PlayState* play) { } else { // Score for the Horseback Archery s32 X_Margins_Archery; - if (CVar_GetS32("gASUseMargins", 0) != 0) { - if (CVar_GetS32("gASPosType", 0) == 0) {X_Margins_Archery = Right_HUD_Margin;}; + if (CVarGetInteger("gASUseMargins", 0) != 0) { + if (CVarGetInteger("gASPosType", 0) == 0) {X_Margins_Archery = Right_HUD_Margin;}; } else { X_Margins_Archery = 0; } s16 ArcheryPos_Y = ZREG(15); s16 ArcheryPos_X = OTRGetRectDimensionFromRightEdge(WREG(32)+X_Margins_Archery); - if (CVar_GetS32("gASPosType", 0) != 0) { - ArcheryPos_Y = CVar_GetS32("gASPosY", 0); - if (CVar_GetS32("gASPosType", 0) == 1) {//Anchor Left - if (CVar_GetS32("gASUseMargins", 0) != 0) {X_Margins_Archery = Left_HUD_Margin;}; - ArcheryPos_X = OTRGetRectDimensionFromLeftEdge(CVar_GetS32("gASPosX", 0)+X_Margins_Archery); - } else if (CVar_GetS32("gASPosType", 0) == 2) {//Anchor Right - if (CVar_GetS32("gASUseMargins", 0) != 0) {X_Margins_Archery = Right_HUD_Margin;}; - ArcheryPos_X = OTRGetRectDimensionFromRightEdge(CVar_GetS32("gASPosX", 0)+X_Margins_Archery); - } else if (CVar_GetS32("gASPosType", 0) == 3) {//Anchor None - ArcheryPos_X = CVar_GetS32("gASPosX", 0)+204+X_Margins_Archery; - } else if (CVar_GetS32("gASPosType", 0) == 4) {//Hidden + if (CVarGetInteger("gASPosType", 0) != 0) { + ArcheryPos_Y = CVarGetInteger("gASPosY", 0); + if (CVarGetInteger("gASPosType", 0) == 1) {//Anchor Left + if (CVarGetInteger("gASUseMargins", 0) != 0) {X_Margins_Archery = Left_HUD_Margin;}; + ArcheryPos_X = OTRGetRectDimensionFromLeftEdge(CVarGetInteger("gASPosX", 0)+X_Margins_Archery); + } else if (CVarGetInteger("gASPosType", 0) == 2) {//Anchor Right + if (CVarGetInteger("gASUseMargins", 0) != 0) {X_Margins_Archery = Right_HUD_Margin;}; + ArcheryPos_X = OTRGetRectDimensionFromRightEdge(CVarGetInteger("gASPosX", 0)+X_Margins_Archery); + } else if (CVarGetInteger("gASPosType", 0) == 3) {//Anchor None + ArcheryPos_X = CVarGetInteger("gASPosX", 0)+204+X_Margins_Archery; + } else if (CVarGetInteger("gASPosType", 0) == 4) {//Hidden ArcheryPos_X = -9999; } } @@ -6025,24 +6026,24 @@ void Interface_Draw(PlayState* play) { gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, 255); gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 0, 0); s32 X_Margins_Timer; - if (CVar_GetS32("gTimersUseMargins", 0) != 0) { - if (CVar_GetS32("gTimersPosType", 0) == 0) {X_Margins_Timer = Left_HUD_Margin;}; + if (CVarGetInteger("gTimersUseMargins", 0) != 0) { + if (CVarGetInteger("gTimersPosType", 0) == 0) {X_Margins_Timer = Left_HUD_Margin;}; } else { X_Margins_Timer = 0; } svar5 = OTRGetRectDimensionFromLeftEdge(gSaveContext.timerX[svar6]+X_Margins_Timer); svar2 = gSaveContext.timerY[svar6]; - if (CVar_GetS32("gTimersPosType", 0) != 0) { - svar2 = (CVar_GetS32("gTimersPosY", 0)); - if (CVar_GetS32("gTimersPosType", 0) == 1) {//Anchor Left - if (CVar_GetS32("gTimersUseMargins", 0) != 0) {X_Margins_Timer = Left_HUD_Margin;}; - svar5 = OTRGetRectDimensionFromLeftEdge(CVar_GetS32("gTimersPosX", 0)+X_Margins_Timer); - } else if (CVar_GetS32("gTimersPosType", 0) == 2) {//Anchor Right - if (CVar_GetS32("gTimersUseMargins", 0) != 0) {X_Margins_Timer = Right_HUD_Margin;}; - svar5 = OTRGetRectDimensionFromRightEdge(CVar_GetS32("gTimersPosX", 0)+X_Margins_Timer); - } else if (CVar_GetS32("gTimersPosType", 0) == 3) {//Anchor None - svar5 = CVar_GetS32("gTimersPosX", 0)+204+X_Margins_Timer; - } else if (CVar_GetS32("gTimersPosType", 0) == 4) {//Hidden + if (CVarGetInteger("gTimersPosType", 0) != 0) { + svar2 = (CVarGetInteger("gTimersPosY", 0)); + if (CVarGetInteger("gTimersPosType", 0) == 1) {//Anchor Left + if (CVarGetInteger("gTimersUseMargins", 0) != 0) {X_Margins_Timer = Left_HUD_Margin;}; + svar5 = OTRGetRectDimensionFromLeftEdge(CVarGetInteger("gTimersPosX", 0)+X_Margins_Timer); + } else if (CVarGetInteger("gTimersPosType", 0) == 2) {//Anchor Right + if (CVarGetInteger("gTimersUseMargins", 0) != 0) {X_Margins_Timer = Right_HUD_Margin;}; + svar5 = OTRGetRectDimensionFromRightEdge(CVarGetInteger("gTimersPosX", 0)+X_Margins_Timer); + } else if (CVarGetInteger("gTimersPosType", 0) == 3) {//Anchor None + svar5 = CVarGetInteger("gTimersPosX", 0)+204+X_Margins_Timer; + } else if (CVarGetInteger("gTimersPosType", 0) == 4) {//Hidden svar5 = -9999; } } @@ -6108,10 +6109,10 @@ void Interface_Update(PlayState* play) { u16 action; Input* debugInput = &play->state.input[2]; - Top_HUD_Margin = CVar_GetS32("gHUDMargin_T", 0); - Left_HUD_Margin = CVar_GetS32("gHUDMargin_L", 0); - Right_HUD_Margin = CVar_GetS32("gHUDMargin_R", 0); - Bottom_HUD_Margin = CVar_GetS32("gHUDMargin_B", 0); + Top_HUD_Margin = CVarGetInteger("gHUDMargin_T", 0); + Left_HUD_Margin = CVarGetInteger("gHUDMargin_L", 0); + Right_HUD_Margin = CVarGetInteger("gHUDMargin_R", 0); + Bottom_HUD_Margin = CVarGetInteger("gHUDMargin_B", 0); if (CHECK_BTN_ALL(debugInput->press.button, BTN_DLEFT)) { gSaveContext.language = LANGUAGE_ENG; @@ -6256,11 +6257,11 @@ void Interface_Update(PlayState* play) { D_80125A58 = func_8008F2F8(play); if (D_80125A58 == 1) { - if (CUR_EQUIP_VALUE(EQUIP_TUNIC) == 2 || CVar_GetS32("gSuperTunic", 0) != 0) { + if (CUR_EQUIP_VALUE(EQUIP_TUNIC) == 2 || CVarGetInteger("gSuperTunic", 0) != 0) { D_80125A58 = 0; } } else if ((func_8008F2F8(play) >= 2) && (func_8008F2F8(play) < 5)) { - if (CUR_EQUIP_VALUE(EQUIP_TUNIC) == 3 || CVar_GetS32("gSuperTunic", 0) != 0) { + if (CUR_EQUIP_VALUE(EQUIP_TUNIC) == 3 || CVarGetInteger("gSuperTunic", 0) != 0) { D_80125A58 = 0; } } |