Merge headers from nitro decomp (#69)

* merge headers from nitro decomp

* cleanup: use inlines from g2.h and gx.h when changing registers

* cleanup: remove externs declarations in source files

include/MapObject/MapObject.hpp

@@ -67,16 +67,16 @@ public:
     /* 0C */ virtual void vfunc_0C()                 = 0;
     /* 10 */ virtual void vfunc_10(Cylinder *param1) = 0;
     /* 14 */ virtual void vfunc_14()                 = 0;
-    /* 18 */ virtual void vfunc_18(Vec3p *param1)    = 0;
-    /* 1C */ virtual void vfunc_1C(Vec3p *param1)    = 0;
+    /* 18 */ virtual void vfunc_18(VecFx32 *param1)  = 0;
+    /* 1C */ virtual void vfunc_1C(VecFx32 *param1)  = 0;
     /* 20 */
 };
 
 class MapObject_10 : public MapObject_10_Base {
 public:
     /* 00 (vtable) */
-    /* 0C */ Vec3p mUnk_0C;
-    /* 18 */ Vec3p mUnk_18;
+    /* 0C */ VecFx32 mUnk_0C;
+    /* 18 */ VecFx32 mUnk_18;
     /* 24 */
 
     MapObject_10() {}
@@ -88,8 +88,8 @@ public:
     /* 0C */ virtual void vfunc_0C();
     /* 10 */ virtual void vfunc_10(Cylinder *param1);
     /* 14 */ virtual void vfunc_14();
-    /* 18 */ virtual void vfunc_18(Vec3p *param1);
-    /* 1C */ virtual void vfunc_1C(Vec3p *param1);
+    /* 18 */ virtual void vfunc_18(VecFx32 *param1);
+    /* 1C */ virtual void vfunc_1C(VecFx32 *param1);
     /* 20 */
 };
 
@@ -116,7 +116,7 @@ public:
 class MapObject : public SysObject {
 public:
     /* 00 (vtable) */
-    /* 04 */ Vec3p mPos;
+    /* 04 */ VecFx32 mPos;
     /* 10 */ MapObject_10 *mUnk_10;
     /* 14 */ s16 mUnk_14;
     /* 16 */ s16 mUnk_16;
@@ -144,7 +144,7 @@ public:
     /* 20 */ virtual void vfunc_20();
     /* 24 */ virtual void vfunc_24();
     /* 28 */ virtual unk32 vfunc_28();
-    /* 2C */ virtual bool vfunc_2C(Vec3p *param1);
+    /* 2C */ virtual bool vfunc_2C(VecFx32 *param1);
     /* 30 */ virtual ~MapObject();
     /* 38 */
 
@@ -175,15 +175,15 @@ public:
     bool func_ov000_0209d29c(unk32 param1);
     void func_ov000_0209d2c4(unk32 param1, unk32 param2);
     void func_ov000_0209d2f0(unk32 param1, unk32 param2, Vec2b *param3);
-    void func_ov000_0209d3b4(unk32 param1, q20 size);
+    void func_ov000_0209d3b4(unk32 param1, fx32 size);
     void func_ov000_0209d434(s8 *param1, UnkStruct_ov019_020d24c8_28_258_00 *param2, unk32 param3);
     void func_ov000_0209d518(unk32 param1, unk32 param2, unk32 param3, u8 param4);
     void func_ov000_0209d5c8(ActorRef ref);
     void func_ov000_0209d614(unk32 param1);
     bool func_ov000_0209d668();
-    void func_ov000_0209d6ac(Vec3p *param1);
+    void func_ov000_0209d6ac(VecFx32 *param1);
 
     static void func_ov000_0209d0bc(Vec2b *param1, MapObject *thisx);
     static void func_ov000_0209d22c(unk16 *param1, MapObject *thisx, unk32 param2);
-    static void func_ov000_0209d54c(void *param1, MapObject *thisx, unk32 param2, Vec3p *param3, unk32 param4, unk32 param5);
+    static void func_ov000_0209d54c(void *param1, MapObject *thisx, unk32 param2, VecFx32 *param3, unk32 param4, unk32 param5);
 };

include/MapObject/MapObjectDoorBase.hpp

@@ -9,7 +9,7 @@ public:
     /* 04 */ unk32 mUnk_44;
     /* 08 */ unk16 mUnk_48;
     /* 0A */ s16 mUnk_4A;
-    /* 0C */ Vec3p mUnk_4C;
+    /* 0C */ VecFx32 mUnk_4C;
     /* 18 */
 
     MapObject_UnkStruct1(); // func_ov000_02073194 & func_ov000_020731c4
@@ -27,7 +27,7 @@ public:
     /* 18 */ bool mUnk_58;
     /* 19 */ unk8 mUnk_59;
     /* 1A */ s16 mUnk_5A;
-    /* 1C */ Vec3p mUnk_5C;
+    /* 1C */ VecFx32 mUnk_5C;
     /* 28 */
 
     MapObject_UnkStruct1_Derived1(); // func_ov000_02073234
@@ -112,7 +112,7 @@ public:
     /* 78 */ virtual void vfunc_78();
     /* 7C */ virtual void vfunc_7C();
     /* 80 */ virtual void vfunc_80();
-    /* 84 */ virtual void vfunc_84(unk32 param1, Vec3p *param2, unk16 *param3);
+    /* 84 */ virtual void vfunc_84(unk32 param1, VecFx32 *param2, unk16 *param3);
     /* 88 */ virtual bool vfunc_88();
     /* 8C */ virtual unk32 vfunc_8C();
     /* 90 */

include/MapObject/MapObjectDoorDangerSpawn.hpp

@@ -63,7 +63,7 @@ public:
     /* 6C */ virtual bool vfunc_6C() override;
     /* 74 */ virtual void vfunc_74() override;
     /* 7C */ virtual void vfunc_7C() override;
-    /* 84 */ virtual void vfunc_84(unk32 param1, Vec3p *param2, unk16 *param3) override;
+    /* 84 */ virtual void vfunc_84(unk32 param1, VecFx32 *param2, unk16 *param3) override;
     /* 88 */ virtual bool vfunc_88() override;
     /* 8C */ virtual unk32 vfunc_8C() override;
 
@@ -72,5 +72,5 @@ public:
 
     bool func_ov031_020fdec8(void);
 
-    static void func_ov031_020fe5fc(Vec3p *param1, MapObjectDoorDangerSpawn *thisx);
+    static void func_ov031_020fe5fc(VecFx32 *param1, MapObjectDoorDangerSpawn *thisx);
 };

include/MapObject/MapObjectDoorSwitch.hpp

@@ -14,14 +14,14 @@ public:
     /* 0F4 */ MapObject_10 mUnk_0F4;
 #if IS_JP
     /* 118 */ MapObject_10 mUnk_118;
-    /* 13C */ q20 mUnkPos;
+    /* 13C */ fx32 mUnkPos;
     /* 140 */ bool mUnk_140;
     /* 141 */ bool mUnk_141;
     /* 142 */ unk8 mUnk_142; // pad
     /* 143 */ unk8 mUnk_143; // pad
     /* 144 */
 #else
-    /* 118 */ q20 mUnkPos;
+    /* 118 */ fx32 mUnkPos;
     /* 11C */
 #endif
 

include/MapObject/MapObjectManager.hpp

@@ -29,7 +29,7 @@ public:
     MapObject *func_01fff498(Vec2b param1);
     void func_01fff4cc(UnkCallback_func_01fff4cc param1, void *param2);
     MapObject **func_01fff520(UnkStruct_ov000_020b34c4 *param1, MapObject **param2);
-    void func_01fff6d0(Vec3p *param1, s32 *param2, s32 *param3);
+    void func_01fff6d0(VecFx32 *param1, s32 *param2, s32 *param3);
 
     MapObjectId func_ov000_0209c3a8(Vec2b *param1);
     void func_ov000_0209c3e8();