From a9e8b37d498468ad9f1b7c624344f1537eaacd84 Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Wed, 6 Feb 2019 20:06:53 +0000
Subject: [PATCH] Widescreen/tallscreen fixes

---
 src/NpcAct140.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/NpcAct140.cpp b/src/NpcAct140.cpp
index d83cd499..5c1a01dc 100644
--- a/src/NpcAct140.cpp
+++ b/src/NpcAct140.cpp
@@ -12,6 +12,7 @@
 #include "Frame.h"
 #include "Flash.h"
 #include "Bullet.h"
+#include "CommonDefines.h"
 
 //Toroko (frenzied)
 void ActNpc140(NPCHAR *npc)
@@ -1337,7 +1338,7 @@ static const RECT grcKitR[21] = {
 //Gaudi
 void ActNpc153(NPCHAR *npc)
 {
-	if (npc->x <= gMC.x + 0x28000 && npc->x >= gMC.x - 0x28000 && npc->y <= gMC.y + 0x1E000 && npc->y >= gMC.y - 0x1E000)
+	if (npc->x <= gMC.x + (WINDOW_WIDTH * 0x200) && npc->x >= gMC.x - (WINDOW_WIDTH * 0x200) && npc->y <= gMC.y + (WINDOW_HEIGHT * 0x200) && npc->y >= gMC.y - (WINDOW_HEIGHT * 0x200))
 	{
 		switch (npc->act_no)
 		{
@@ -1566,7 +1567,7 @@ void ActNpc154(NPCHAR *npc)
 //Gaudi (flying)
 void ActNpc155(NPCHAR *npc)
 {
-	if (npc->x > gMC.x + 0x28000 || npc->x < gMC.x - 0x28000 || npc->y > gMC.y + 0x1E000 || npc->y < gMC.y - 0x1E000)
+	if (npc->x > gMC.x + (WINDOW_WIDTH * 0x200) || npc->x < gMC.x - (WINDOW_WIDTH * 0x200) || npc->y > gMC.y + (WINDOW_HEIGHT * 0x200) || npc->y < gMC.y - (WINDOW_HEIGHT * 0x200))
 		return;
 
 	unsigned char deg;