Match/Improve more non matching functions (#366)

* Match/Improve more non matchings

* Remove SET_NEXT_GAMESTATE from preserved macros

include/macros.h

@@ -74,15 +74,14 @@
     }                                      \
     (void)0
 
-#define OPEN_DISPS_INNER(gfxCtx, file, line)      \
-    oGfxCtx = gfxCtx;                             \
-    Graph_OpenDisps(dispRefs, gfxCtx, file, line)
+extern GraphicsContext* oGfxCtx;
 
-#define OPEN_DISPS(gfxCtx, file, line)       \
-    {                                        \
-        GraphicsContext* oGfxCtx;            \
-        Gfx* dispRefs[4];                    \
-        OPEN_DISPS_INNER(gfxCtx, file, line)
+#define OPEN_DISPS(gfxCtx, file, line) \
+    {                                  \
+        GraphicsContext* oGfxCtx;      \
+        Gfx* dispRefs[4];              \
+        oGfxCtx = gfxCtx;              \
+        Graph_OpenDisps(dispRefs, gfxCtx, file, line)
 
 #define CLOSE_DISPS(gfxCtx, file, line)                 \
         Graph_CloseDisps(dispRefs, gfxCtx, file, line); \

include/ultra64/mbi.h

@@ -49,8 +49,6 @@
 #define _SHIFTR(v, s, w)	\
     ((unsigned int)(((unsigned int)(v) >> (s)) & ((0x01 << (w)) - 1)))
 
-#define _SHIFT _SHIFTL	/* old, for compatibility only */
-
 #define G_ON	(1)
 #define G_OFF	(0)