diff --git a/raylib.ads b/raylib.ads
index 6340303..708ebe4 100644
--- a/raylib.ads
+++ b/raylib.ads
@@ -3404,15 +3404,29 @@ package Raylib is
       Convention    => C,
       External_Name => "DrawTextPro";
 
-   --~procedure DrawTextCodepoint (Font font, int codepoint, Vector2 position, float fontSize, Color tint) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Draw_Text_Codepoint (
+      Data       : Font      := Get_Font_Default;
+      Code_Point : Integer   := 0;
+      Position   : Vector_2D := (others => 0.0);
+      Font_Size  : Float     := 0.0;
+      Tint       : Color     := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "DrawTextCodepoint";
 
-   --~procedure DrawTextCodepoints (Font font, const int *codepoints, int codepointCount, Vector2 position, float fontSize, float spacing, Color tint) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Draw_Text_Codepoints (
+      Data             :        Font      := Get_Font_Default;
+      Code_Points      : access Integer   := null;
+      Code_Point_Count :        Integer   := 0;
+      Position         :        Vector_2D := (others => 0.0);
+      Font_Size        :        Float     := 0.0;
+      Spacing          :        Float     := 0.0;
+      Tint             :        Color     := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "DrawTextCodepoints";
 
    procedure Set_Text_Line_Spacing (
       Spacing : Integer := 0
@@ -3624,10 +3638,14 @@ package Raylib is
       Convention    => C,
       External_Name => "DrawCube";
 
-   --~procedure DrawCubeV (Vector3 position, Vector3 size, Color color) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Draw_Cube_V (
+      Position : Vector_3D := (others => 0.0);
+      Size     : Vector_3D := (others => 0.0);
+      Tint     : Color     := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "DrawCubeV";
 
    procedure Draw_Cube_Wires (
       Position : Vector_3D := (others => 0.0);
@@ -3640,55 +3658,117 @@ package Raylib is
       Convention    => C,
       External_Name => "DrawCubeWires";
 
-   --~procedure DrawCubeWiresV (Vector3 position, Vector3 size, Color color) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Draw_Cube_Wires_V (
+      Position : Vector_3D := (others => 0.0);
+      Size     : Vector_3D := (others => 0.0);
+      Tint     : Color     := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "DrawCubeWiresV";
 
-   --~procedure DrawSphere (Vector3 centerPos, float radius, Color color) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Draw_Sphere (
+      Center : Vector_3D := (others => 0.0);
+      Radius : Float     := 0.0;
+      Tint   : Color     := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "DrawSphere";
 
-   --~procedure DrawSphereEx (Vector3 centerPos, float radius, int rings, int slices, Color color) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Draw_Sphere_Ex (
+      Center : Vector_3D := (others => 0.0);
+      Radius : Float     := 0.0;
+      Rings  : Integer   := 0;
+      Slices : Integer   := 0;
+      Tint   : Color     := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "DrawSphereEx";
 
-   --~procedure DrawSphereWires (Vector3 centerPos, float radius, int rings, int slices, Color color) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Draw_Sphere_Wires (
+      Center : Vector_3D := (others => 0.0);
+      Radius : Float     := 0.0;
+      Rings  : Integer   := 0;
+      Slices : Integer   := 0;
+      Tint   : Color     := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "DrawSphereWires";
 
-   --~procedure DrawCylinder (Vector3 position, float radiusTop, float radiusBottom, float height, int slices, Color color) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Draw_Cylinder (
+      Position      : Vector_3D := (others => 0.0);
+      Radius_Top    : Float     := 0.0;
+      Radius_Bottom : Float     := 0.0;
+      Height        : Float     := 0.0;
+      Slices        : Natural   := 0;
+      Tint          : Color     := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "DrawCylinder";
 
-   --~procedure DrawCylinderEx (Vector3 startPos, Vector3 endPos, float startRadius, float endRadius, int sides, Color color) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Draw_Cylinder_Ex (
+      From        : Vector_3D := (others => 0.0);
+      To          : Vector_3D := (others => 0.0);
+      From_Radius : Float     := 0.0;
+      To_Radius   : Float     := 0.0;
+      Sides       : Natural   := 0;
+      Tint        : Color     := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "DrawCylinderEx";
 
-   --~procedure DrawCylinderWires (Vector3 position, float radiusTop, float radiusBottom, float height, int slices, Color color) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Draw_Cylinder_Wires (
+      Position      : Vector_3D := (others => 0.0);
+      Radius_Top    : Float     := 0.0;
+      Radius_Bottom : Float     := 0.0;
+      Height        : Float     := 0.0;
+      Slices        : Natural   := 0;
+      Tint          : Color     := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "DrawCylinderWires";
 
-   --~procedure DrawCylinderWiresEx (Vector3 startPos, Vector3 endPos, float startRadius, float endRadius, int sides, Color color) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Draw_Cylinder_Wires_Ex (
+      From        : Vector_3D := (others => 0.0);
+      To          : Vector_3D := (others => 0.0);
+      From_Radius : Float     := 0.0;
+      To_Radius   : Float     := 0.0;
+      Sides       : Natural   := 0;
+      Tint        : Color     := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "DrawCylinderWiresEx";
 
-   --~procedure DrawCapsule (Vector3 startPos, Vector3 endPos, float radius, int slices, int rings, Color color) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Draw_Capsule (
+      From   : Vector_3D := (others => 0.0);
+      To     : Vector_3D := (others => 0.0);
+      Radius : Float     := 0.0;
+      Slices : Natural   := 0;
+      Rings  : Natural   := 0;
+      Tint   : Color     := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "DrawCapsule";
 
-   --~procedure DrawCapsuleWires (Vector3 startPos, Vector3 endPos, float radius, int slices, int rings, Color color) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Draw_Capsule_Wires (
+      From   : Vector_3D := (others => 0.0);
+      To     : Vector_3D := (others => 0.0);
+      Radius : Float     := 0.0;
+      Slices : Natural   := 0;
+      Rings  : Natural   := 0;
+      Tint   : Color     := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "DrawCapsuleWires";
 
    procedure Draw_Plane (
       Center : Vector_3D := (others => 0.0);
@@ -3699,15 +3779,21 @@ package Raylib is
       Convention    => C,
       External_Name => "DrawPlane";
 
-   --~procedure DrawRay (Ray ray, Color color) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Draw_Ray (
+      Data : Ray   := No_Ray;
+      Tint : Color := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "DrawRay";
 
-   --~procedure DrawGrid (int slices, float spacing) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Draw_Grid (
+      Slices  : Integer := 0;
+      Spacing : Float   := 0.0
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "DrawGrid";
 
    function Load_Model (
       File_Name : String := ""
@@ -3716,15 +3802,19 @@ package Raylib is
       Convention    => C,
       External_Name => "LoadModel";
 
-   --~function Model LoadModelFromMesh (Mesh mesh) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   function Load_Model_From_Mesh (
+      Data : Mesh := No_Mesh
+   ) return Model with
+      Import        => True,
+      Convention    => C,
+      External_Name => "LoadModelFromMesh";
 
-   --~function bool IsModelReady (Model model) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   function Is_Model_Ready (
+      Data : Model := No_Model
+   ) return Logical with
+      Import        => True,
+      Convention    => C,
+      External_Name => "IsModelReady";
 
    procedure Unload_Model (
       Data : Model := No_Model