Fix Puppycam with Anonymous_Moose's extended bounds patch

.gitignore

@@ -12,6 +12,7 @@
 *.pch
 
 # Libraries
+*.lib
 *.a
 *.la
 *.lo
@@ -42,16 +43,14 @@
 .vscode/*
 
 # General project-specific ignores
-__pycache__/*
 doxygen/doxygen/*
 build/*
+puppycam_spline/*
 *.dump
 *.mio0
 *.z64
 *.map
 .assets-local.txt
-sm64_save_file.bin
-sm64config.txt
 
 # Assets. Generally ignored, but ones with "custom" in the name are fine.
 /levels/**/*.png
@@ -72,4 +71,10 @@ sm64config.txt
 !/sound/**/*custom*/**/*.aiff
 !/assets/**/*custom*.bin
 !/assets/**/*custom*/**/*.bin
-enhancements/puppycam.patch
+!/textures/crash_custom/*.png
+# libultra
+
+!/lib/*.a
+
+!/lib/PR/hvqm/*.o
+

CHANGES

@@ -1,5 +1,69 @@
+Refresh 13 2
+
+- No more nonmatchings remain for all builds including Shindou.
+
+1.) Shindou OK (#1118)
+2.) Match shindou sequence_player_process_sequence (#1117)
+3.) Match func_sh_802f4e50 (#1116)
+
+Refresh 13
+
+- No more nonmatchings remain for US, JP, or EU builds. Three(!!!) remain for Shindou (SH).
+
+*) SHINDOU MATCHING (#1081)
+*) Makefile gcc fixes (#1114)
+
+1.) Update diff.py (#1113)
+2.) Add support for generating C arrays from n64graphics and add Texture typedef (#1032)
+3.) Update README and Dockerfile with recomp info (#1105)
+4.) Support building tools with MSYS2 (#1112)
+5.) Support building tools with clang and macOS (#1106)
+6.) Clean tools directory when running distclean target (#1104)
+7.) Make build output cleaner (#1095)
+8.) Added 2 surface defines to bowser.inc.c (#1111)
+9.) fix fake matchings (#1108)
+10.) Use statically recompiled IDO instead of qemu-irix (#1099)
+11.) Add VERBOSE=1 to Jenkinsfile
+12.) updated intro_geo to use layer defines for geo flags (#1090)
+13.) Fix F3DZEX (#1097)
+14.) layer_transpose should take an s8 (#1093)
+15.) Fix tools/ build (#1082)
+16.) Relabel and document fish.inc.c (#1077)
+17.) Ensure all calls to .py files use $(PYTHON) (#1080)
+18.) Name Mario, Peach, and instrument sound files (#1078)
+19.) Goddard labeling, part 2 (#1076)
+20.) Fix envfx_snow and envfx_bubbles fake matches (#1075)
+21.) Use array subscripts instead of pointer math in 2 files (#1074)
+22.) refactor Makefile a bit (#1068)
+23.) Further improvements on field names (#1059)
+24.) Label and document manta_ray.inc.c (#1073)
+25.) Fix level_script and behavior fake matches (#1072)
+26.) Proper cell defines and more floor lower limit values. (#1065)
+27.) Document and re-label some goddard/intro code (#1069)
+28.) Match remaining functions (#1070)
+29.) match 'spawn_special_objects' (#1071)
+30.) Document parts of external.c and format sound defines (#1067)
+
+Refresh 12
+
+1.) Debug box improvements (#1066)
+2.) Improve 'geo_render_mirror_mario' (#1064)
+3.) Cleanup and small labeling (#1063)
+4.) Anim renames and other related renames (#1062)
+5.) remove do while 0 and make one line comments consistent (#1061)
+6.) fixed typo in segments.h (#1060)
+7.) Name unknown fields (from public repo) (#1058)
+8.) Change 'void *' to 'struct MainPoolState *' (#1057)
+9.) Fix type of freeList (#1056)
+10.) Newer version of diff script (#1055)
+11.) Add stubbed_printfs based on unused audio strings (#1054)
+12.) Fix comment in paintings.c (#1053)
+13.) Add defines for hardcoded cell/floor height values (#1051)
+14.) Update README.md: Remove GitHub specific Markdown syntax (#1052)
+15.) Properly label interation status that handle's Bowser's shockwave attack (#1050)
+
 Refresh 11
-1.) (HEAD -> master, origin/master, origin/HEAD) Make geo_process_level_of_detail endian-independent (#1049)
+1.) Make geo_process_level_of_detail endian-independent (#1049)
 2.) Label oMoveFlags and slight cleanup. (#1046)
 3.) Avoid UB in synthesis_resample_and_mix_reverb (#1048)
 4.) Change some void * to correct type (#1047)

Dockerfile

@@ -5,20 +5,13 @@ RUN apt-get update && \
         binutils-mips-linux-gnu \
         bsdmainutils \
         build-essential \
-        libaudiofile-dev \
-        python3 \
-        wget
-
-RUN wget \
-        https://github.com/n64decomp/qemu-irix/releases/download/v2.11-deb/qemu-irix-2.11.0-2169-g32ab296eef_amd64.deb \
-        -O qemu.deb && \
-    echo 8170f37cf03a08cc2d7c1c58f10d650ea0d158f711f6916da9364f6d8c85f741 qemu.deb | sha256sum --check && \
-    dpkg -i qemu.deb && \
-    rm qemu.deb
+        libcapstone-dev \
+        pkgconf \
+        python3
 
 RUN mkdir /sm64
 WORKDIR /sm64
 ENV PATH="/sm64/tools:${PATH}"
 
-CMD echo 'usage: docker run --rm --mount type=bind,source="$(pwd)",destination=/sm64 sm64 make VERSION=${VERSION:-us} -j4\n' \
+CMD echo 'usage: docker run --rm --mount type=bind,source="$(pwd)",destination=/sm64 sm64 make VERSION=us -j4\n' \
          'see https://github.com/n64decomp/sm64/blob/master/README.md for advanced usage'

Jenkinsfile

@@ -11,25 +11,31 @@ pipeline {
         sh 'ln -s "$ROMS_DIR/Super Mario 64 (J) [!].z64" baserom.jp.z64'
         sh 'ln -s "$ROMS_DIR/Super Mario 64 (U) [!].z64" baserom.us.z64'
         sh 'ln -s "$ROMS_DIR/Super Mario 64 (E) (M3) [!].z64" baserom.eu.z64'
+        sh 'ln -s "$ROMS_DIR/Super Mario 64 - Shindou Edition (J) [!].z64" baserom.sh.z64'
         // verify no assets were committed to repo
         sh '[ -z "$(find {actors,levels,textures}/ -name \'*.png\')" ]'
         sh '[ -z "$(find assets/ -name \'*.m64\' -or \'*.bin\')" ]'
-        sh './extract_assets.py jp us eu'
+        sh './extract_assets.py jp us eu sh'
       }
     }
     stage('Build U Source') {
       steps {
-        sh 'make -j4 VERSION=us'
+        sh 'make -j4 VERSION=us VERBOSE=1 COLOR=0'
+      }
+    }
+    stage('Build S Source') {
+      steps {
+        sh 'make -j4 VERSION=sh VERBOSE=1 COLOR=0'
       }
     }
     stage('Build E Source') {
       steps {
-        sh 'make -j4 VERSION=eu'
+        sh 'make -j4 VERSION=eu VERBOSE=1 COLOR=0'
       }
     }
     stage('Build J Source') {
       steps {
-        sh 'make -j4 VERSION=jp'
+        sh 'make -j4 VERSION=jp VERBOSE=1 COLOR=0'
       }
     }
     stage('Test Enhancements') {
@@ -41,7 +47,7 @@ pipeline {
             git clean -fd .
             git checkout -- .
             echo 'y' | tools/apply_patch.sh "$f"
-            make -j4 VERSION=us COMPARE=0
+            make -j4 VERSION=us COMPARE=0 VERBOSE=1
           done
         '''
       }