diff --git a/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/Tst.cs b/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/Tst.cs
index 5783198776..38c62268e5 100644
--- a/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/Tst.cs
+++ b/BizHawk.Emulation.Cores/Consoles/NEC/PCFX/Tst.cs
@@ -41,9 +41,9 @@ namespace BizHawk.Emulation.Cores.Consoles.NEC.PCFX
 				DefaultFpsNumerator = 7159091,
 				DefaultFpsDenominator = 455 * 263,
 				DefaultWidth = 256,
-				DefaultHeight = 240,
+				DefaultHeight = 232,
 				MaxWidth = 1024,
-				MaxHeight = 232,
+				MaxHeight = 480,
 				MaxSamples = 2048,
 				SystemId = "PCFX"
 			})
diff --git a/waterbox/pcfx/pcfx.cpp b/waterbox/pcfx/pcfx.cpp
index 6a96c95b70..60f12f836e 100644
--- a/waterbox/pcfx/pcfx.cpp
+++ b/waterbox/pcfx/pcfx.cpp
@@ -671,8 +671,8 @@ struct MyFrameInfo: public FrameInfo
 	uint32_t Buttons[3]; // port 1, port 2, console
 };
 static EmulateSpecStruct Ess;
-static int32_t LineWidths[256];
-static uint32_t FrameBuffer[1024 * 512];
+static int32_t LineWidths[480];
+static uint32_t FrameBuffer[1024 * 480];
 
 EXPORT bool Init(int numDisks, const uint8_t *bios)
 {