MORE FUNCTIONS!

X-Hax · Jan 5, 2016 · e1fb365 · e1fb365
1 parent 5f1d68b
commit e1fb365
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/SADXModLoader/include/SADXModLoader/SADXFunctions.h b/SADXModLoader/include/SADXModLoader/SADXFunctions.h
@@ -392,13 +392,18 @@ FunctionPointer(void, njSetConstantMaterial, (NJS_ARGB *mat), 0x0077FF90);
 /// <param name="zfunc_type">When in doubt, use 1. Also commonly used is 4. To be detailed once it's figured out.</param>
 FunctionPointer(void, Draw2DSprite, (NJS_SPRITE *sp, Int n, Float pri, Uint32 attr, char zfunc_type), 0x00404660);
 FunctionPointer(void, SetSpriteColor, (NJS_ARGB *a1), 0x00402F40);
-FunctionPointer(Bool, IsControllerEnabled, (Uint8 index), 0x0040EFD0);
 FunctionPointer(char, IsVisible, (NJS_VECTOR *v), 0x004CD730);
-
 FunctionPointer(void, njSetPerspective, (Angle bams), 0x00402ED0);
 FunctionPointer(Angle, GetHorizontalFOV_BAMS, (void), 0x00402F00);
 FunctionPointer(void, njSetScreenDist, (Angle bams), 0x007815C0);
 
+FunctionPointer(void, EnableController, (Uint8 index), 0x0040EF70);
+FunctionPointer(void, DisableController, (Uint8 index), 0x0040EFA0);
+FunctionPointer(Bool, IsControllerEnabled, (Uint8 index), 0x0040EFD0);
+VoidFunc(EnableControl, 0x0040EF40);
+VoidFunc(DisableControl, 0x0040EF50);
+FunctionPointer(Bool, IsControlEnabled, (void), 0x0040EF60);
+
 #ifdef _MSC_VER
 
 // ObjectMaster *__usercall<eax>(signed int a1<edx>, void (__cdecl *LoadSub)(ObjectMaster *)<edi>)

diff --git a/SADXModLoader/include/SADXModLoader/SADXVariables.h b/SADXModLoader/include/SADXModLoader/SADXVariables.h
@@ -73,8 +73,12 @@ DataArray(ControllerData*, ControllerPointers, 0x03B0E77C, 8);
 DataArray(ControllerData, Controllers, 0x03B0E7F0, 8);
 DataPointer(bool, RumbleEnabled, 0x00913B10);
 // Indicates whether all controllers are enabled.
+// It's recommended that you use the IsControlEnabled, EnableControl and DisableControl functions instead of
+// using this directly to prevent compatibility issues with mods that redirect the variable.
 DataPointer(bool, ControlEnabled, 0x00909FB0);
 // Indicates whether the controller at the specified index is enabled.
+// It's recommended you use the IsControllerEnabled, EnableController and DisableController functions instead of
+// using this directly to prevent compatibility issues with mods that redirect the array.
 DataArray(bool, ControllerEnabled, 0x00909FB4, 4);
 
 // Buttons used for attacking.