diff --git a/BizHawk.MultiClient/RenderPanel.cs b/BizHawk.MultiClient/RenderPanel.cs index 318829d70f..c928e86c71 100644 --- a/BizHawk.MultiClient/RenderPanel.cs +++ b/BizHawk.MultiClient/RenderPanel.cs @@ -331,7 +331,6 @@ namespace BizHawk.MultiClient case 1: //Top Right case 3: //Bottom Right return backingControl.Width - x - rect.Width; - //return backingControl.Size.Width - Global.Emulator.VideoProvider.BufferWidth + x; } } diff --git a/BizHawk.MultiClient/output/Lua/PunchOutStats.lua b/BizHawk.MultiClient/output/Lua/PunchOutStats.lua index 7ca4e89d9d..ae35136e62 100644 --- a/BizHawk.MultiClient/output/Lua/PunchOutStats.lua +++ b/BizHawk.MultiClient/output/Lua/PunchOutStats.lua @@ -56,15 +56,14 @@ end while true do --***************************************************************************** EnemyHP = mainmemory.read_u8(EHP) - gui.text(EHPx,EHPy,EnemyHP) + gui.text(0,0,"Opponent: " .. EnemyHP, 1) MacHP = mainmemory.read_u8(MHP) - gui.text(MHPx,MHPy,MacHP) + gui.text(0,12,"Mac: " .. MacHP, 1) if IsOppDown() then OppWillGet = mainmemory.read_u8(OppWillGetUpWith) - gui.text(OppDx, OppDy, OppWillGet) - gui.text(OppDx+16,OppDy, "Next health") + gui.text(0, 12, "Next health: " .. OppWillGet, "bottomright") end if OppIsHit() then @@ -74,16 +73,13 @@ while true do end if OppHitTimer > 0 then - gui.text(OHitValuex, OHitValuey, OppHitToDisplay) + gui.text(0, 0, "Damage: " .. OppHitToDisplay, 3) end if OppHitTimer > 0 then OppHitTimer = OppHitTimer - 1 end - --gui.text(10,180,"Timer: ") - --gui.text(10,200,OppHitTimer) --Debug - emu.frameadvance() lastEHP = EnemyHP