From eab37fe54a5ad7227e7db2fffb290ce3eeed228f Mon Sep 17 00:00:00 2001
From: cadmic <cadmic24@gmail.com>
Date: Wed, 4 Sep 2024 00:15:52 -0700
Subject: [PATCH] Run CC_CHECK in CI (#2109)

* Run CC_CHECK in CI

* Fix n64dd.h (guess this is why we need this change)
---
 Jenkinsfile     | 18 +++++++++---------
 include/n64dd.h |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 8cebe7dcbb..f18b97e118 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -28,7 +28,7 @@ pipeline {
             steps {
                 sh 'ln -s /usr/local/etc/roms/oot-ntsc-1.2-us.z64 baseroms/ntsc-1.2/baserom.z64'
                 sh 'make -j setup VERSION=ntsc-1.2'
-                sh 'make -j RUN_CC_CHECK=0 VERSION=ntsc-1.2'
+                sh 'make -j VERSION=ntsc-1.2'
                 sh '.venv/bin/python3 tools/check_disasm_metadata_unksyms.py -v ntsc-1.2'
                 sh 'make clean assetclean VERSION=ntsc-1.2'
             }
@@ -40,7 +40,7 @@ pipeline {
             steps {
                 sh 'ln -s /usr/local/etc/roms/oot-gc-jp.z64 baseroms/gc-jp/baserom.z64'
                 sh 'make -j setup VERSION=gc-jp'
-                sh 'make -j RUN_CC_CHECK=0 VERSION=gc-jp'
+                sh 'make -j VERSION=gc-jp'
                 sh 'make clean assetclean VERSION=gc-jp'
             }
         }
@@ -48,7 +48,7 @@ pipeline {
             steps {
                 sh 'ln -s /usr/local/etc/roms/oot-gc-eu-mq.z64 baseroms/gc-eu-mq/baserom.z64'
                 sh 'make -j setup VERSION=gc-eu-mq'
-                sh 'make -j RUN_CC_CHECK=0 VERSION=gc-eu-mq'
+                sh 'make -j VERSION=gc-eu-mq'
                 sh 'make clean assetclean VERSION=gc-eu-mq'
             }
         }
@@ -56,7 +56,7 @@ pipeline {
             steps {
                 sh 'ln -s /usr/local/etc/roms/oot-gc-eu-mq-dbg.z64 baseroms/gc-eu-mq-dbg/baserom.z64'
                 sh 'make -j setup VERSION=gc-eu-mq-dbg'
-                sh 'make -j RUN_CC_CHECK=0 VERSION=gc-eu-mq-dbg'
+                sh 'make -j VERSION=gc-eu-mq-dbg'
                 sh 'make clean assetclean VERSION=gc-eu-mq-dbg'
             }
         }
@@ -64,7 +64,7 @@ pipeline {
             steps {
                 sh 'ln -s /usr/local/etc/roms/oot-gc-us.z64 baseroms/gc-us/baserom.z64'
                 sh 'make -j setup VERSION=gc-us'
-                sh 'make -j RUN_CC_CHECK=0 VERSION=gc-us'
+                sh 'make -j VERSION=gc-us'
                 sh 'make clean assetclean VERSION=gc-us'
             }
         }
@@ -72,7 +72,7 @@ pipeline {
             steps {
                 sh 'ln -s /usr/local/etc/roms/oot-gc-jp-ce.z64 baseroms/gc-jp-ce/baserom.z64'
                 sh 'make -j setup VERSION=gc-jp-ce'
-                sh 'make -j RUN_CC_CHECK=0 VERSION=gc-jp-ce'
+                sh 'make -j VERSION=gc-jp-ce'
                 sh 'make clean assetclean VERSION=gc-jp-ce'
             }
         }
@@ -80,7 +80,7 @@ pipeline {
             steps {
                 sh 'ln -s /usr/local/etc/roms/oot-gc-eu.z64 baseroms/gc-eu/baserom.z64'
                 sh 'make -j setup VERSION=gc-eu'
-                sh 'make -j RUN_CC_CHECK=0 VERSION=gc-eu'
+                sh 'make -j VERSION=gc-eu'
                 sh 'make clean assetclean VERSION=gc-eu'
             }
         }
@@ -88,7 +88,7 @@ pipeline {
             steps {
                 sh 'ln -s /usr/local/etc/roms/oot-gc-jp-mq.z64 baseroms/gc-jp-mq/baserom.z64'
                 sh 'make -j setup VERSION=gc-jp-mq'
-                sh 'make -j RUN_CC_CHECK=0 VERSION=gc-jp-mq'
+                sh 'make -j VERSION=gc-jp-mq'
                 sh 'make clean assetclean VERSION=gc-jp-mq'
             }
         }
@@ -96,7 +96,7 @@ pipeline {
             steps {
                 sh 'ln -s /usr/local/etc/roms/oot-gc-us-mq.z64 baseroms/gc-us-mq/baserom.z64'
                 sh 'make -j setup VERSION=gc-us-mq'
-                sh 'make -j RUN_CC_CHECK=0 VERSION=gc-us-mq'
+                sh 'make -j VERSION=gc-us-mq'
                 sh 'make clean assetclean VERSION=gc-us-mq'
             }
         }
diff --git a/include/n64dd.h b/include/n64dd.h
index 6a9867fcdc..376665ac32 100644
--- a/include/n64dd.h
+++ b/include/n64dd.h
@@ -2,12 +2,12 @@
 #define N64DD_H
 
 #include "ultra64.h"
+#include "z64pause.h"
 #include "z64scene.h"
 
 struct GameState;
 union Gfx;
 struct PlayState;
-struct PauseMapMarksData;
 struct RegEditor;
 struct RoomContext;
 struct SaveContext;
@@ -33,8 +33,8 @@ typedef struct n64ddStruct_80121AF0 {
     void (*unk_10)(struct PlayState* play);
     void (*unk_14)(struct PlayState* play);
     char unk_18[0x1C];
-    void (*unk_34)(struct PauseMapMarksData**);
-    void (*unk_38)(struct PauseMapMarksData**);
+    void (*unk_34)(PauseMapMarksData**);
+    void (*unk_38)(PauseMapMarksData**);
     void (*unk_3C)(void);
     void (*unk_40)(void);
     s32 (*unk_44)(struct PlayState*);