m_Do_main / f_ap_game / f_op_actor debug work and misc (#2744)

* m_Do_main / f_ap_game debug stuff

* revolution sdk compatibility

* f_op_actor debug work

* rename fopAcM_SetupActor to fopAcM_ct

* fix build

* fix jp/pal splits

include/dolphin/gf/GFGeometry.h

@@ -1,6 +1,9 @@
-#ifndef GFGEOMETRY_H
-#define GFGEOMETRY_H
+#ifndef _DOLPHIN_GF_GFGEOMETRY_H_
+#define _DOLPHIN_GF_GFGEOMETRY_H_
 
+#ifdef __REVOLUTION_SDK__
+#include <revolution/gf/GFGeometry.h>
+#else
 #include <dolphin/gx.h>
 
 #define GF_GEN_MODE(nTexGens, nChans, nTevs, cm, nInds) \
@@ -38,4 +41,5 @@ static inline void GFWriteXFCmd(u16 addr, u32 val) {
 
 void GFSetGenMode2(u8 nTexGens, u8 nChans, u8 nTevs, u8 nInds, GXCullMode cm);
 
-#endif /* GFGEOMETRY_H */
+#endif
+#endif /* _DOLPHIN_GF_GFGEOMETRY_H_ */

include/dolphin/gf/GFLight.h

@@ -1,8 +1,12 @@
-#ifndef GFLIGHT_H
-#define GFLIGHT_H
+#ifndef _DOLPHIN_GF_GFLIGHT_H
+#define _DOLPHIN_GF_GFLIGHT_H
 
+#ifdef __REVOLUTION_SDK__
+#include <revolution/gf/GFLight.h>
+#else
 #include <dolphin/gx.h>
 
 void GFSetChanAmbColor(GXChannelID chan, GXColor color);
 
-#endif /* GFLIGHT_H */
+#endif
+#endif /* _DOLPHIN_GF_GFLIGHT_H */

include/dolphin/gf/GFPixel.h

@@ -1,6 +1,9 @@
-#ifndef GFPIXEL_H
-#define GFPIXEL_H
+#ifndef _DOLPHIN_GF_GFPIXEL_H
+#define _DOLPHIN_GF_GFPIXEL_H
 
+#ifdef __REVOLUTION_SDK__
+#include <revolution/gf/GFPixel.h>
+#else
 #include <dolphin/gx.h>
 
 void GFSetFog(GXFogType type, f32 startz, f32 endz, f32 nearz, f32 farz, GXColor color);
@@ -10,4 +13,5 @@ void GFSetBlendModeEtc(GXBlendMode type, GXBlendFactor src_factor,
                        u8 dither_enable);
 void GFSetZMode(u8 compare_enable, GXCompare func, u8 update_enable);
 
-#endif /* GFPIXEL_H */
+#endif
+#endif /* _DOLPHIN_GF_GFPIXEL_H */

include/dolphin/gf/GFTev.h

@@ -1,8 +1,12 @@
-#ifndef GFTEV_H
-#define GFTEV_H
+#ifndef _DOLPHIN_GF_GFTEV_H
+#define _DOLPHIN_GF_GFTEV_H
 
+#ifdef __REVOLUTION_SDK__
+#include <revolution/gf/GFTev.h>
+#else
 #include <dolphin/gx.h>
 
 void GFSetTevColorS10(GXTevRegID reg, GXColorS10 color);
 
-#endif /* GFTEV_H */
+#endif
+#endif /* _DOLPHIN_GF_GFTEV_H */