From b37f531a262e54bceab9e332f3f54369060a74ae Mon Sep 17 00:00:00 2001
From: aMannus <mannusmenting@gmail.com>
Date: Sat, 27 Jan 2024 21:29:43 +0100
Subject: [PATCH] Fix TWO_ACTOR_PARAMS overlap between pots

---
 soh/soh/Enhancements/randomizer/location_list.cpp          | 2 +-
 soh/soh/Enhancements/randomizer/randomizer_check_objects.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
index f36072eb6..d27bbad01 100644
--- a/soh/soh/Enhancements/randomizer/location_list.cpp
+++ b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -1,6 +1,6 @@
 #include "static_data.h"
 
-#define TWO_ACTOR_PARAMS(a, b) (abs(a) << 16) | abs(b)
+#define TWO_ACTOR_PARAMS(a, b) ((((a)&0xFFFF) << 16) | ((b)&0xFFFF))
 
 std::array<Rando::Location, RC_MAX> Rando::StaticData::locationTable;
 
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_objects.h b/soh/soh/Enhancements/randomizer/randomizer_check_objects.h
index ab7e5538a..2fe530483 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_objects.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_objects.h
@@ -6,7 +6,7 @@
 #include <vector>
 #include <map>
 
-#define TWO_ACTOR_PARAMS(a, b) (abs(a) << 16) | abs(b)
+#define TWO_ACTOR_PARAMS(a, b) ((((a)&0xFFFF) << 16) | ((b)&0xFFFF))
 
 namespace RandomizerCheckObjects {
     bool AreaIsDungeon(RandomizerCheckArea area);