I'm not sure if this has been resolved, because I remember reading awhile back that someone wanted to "automatically add" the unit offsets of +31 and -1 . While searching through SDK code and found these lines
// Useful macros
#define MkXY(x,y) (LOCATION(x+31,y-1))
#define MkRect(x1,y1,x2,y2) (MAP_RECT(LOCATION(x1+31,y1-1),LOCATION(x2+31,y2-1)))
#define XYPos(x,y) x+31,y-1
#define RectPos(x1,y1,x2,y2) x1+31,y1-1,x2+31,y2-1
// X and Y offset consts
const int X_ = 31;
const int Y_ = -1;
I found these while looking through the OP2Helper.h file that is included. I am unsure if thise would help or not, but could it?