Merge pull request #21 from vaguerant/master

Merge upstream

CHANGES

@@ -1,3 +1,95 @@
+Refresh 14
+
+1.) Label whomp and some object fields (#1174)
+2.) Generate MIO0 object files using binutils `ld` instead of `as` (#1173)
+3.) Bowser documentation (#1166)
+4.) Fix comment syntax in 00_sound_player.0 (#1172)
+5.) Rename in-game menu variables (#1163)
+6.) Document double red coin sound and JP sound glitch (#1170)
+7.) Document different bug in external.c (#1168)
+8.) updated names/types of octagonal platform data (#1164)
+9.) Label a number of unnamed variables. (#1169)
+10.) Document JP PU sound glitch (#1167)
+11.) Set model ids to spawn_triangle_break_particles (#1165)
+12.) Fix borders in clear_frame_buffer (#1162)
+13.) Fix seq header files for 64-bit (#1161)
+14.) Game_init.c remaining doc (#1158)
+15.) Label a couple static variables in sound_init.c (#1159)
+16.) Properly define dialog values (status, flags, cutscenes) (#1153)
+17.) Label all of amp's assets. (#1018)
+18.) Split audio/synthesis.c into Shindou/non-Shindou files (#1144)
+19.) Avoid CC_CHECK warnings when using gcc (#1157)
+20.) level_select_menu.c => title_screen.c (#1152)
+21.) Use C preprocessor on assembly files (#1126)
+22.) Replace output_level_headers.py with sed equivalent (#1109)
+23.) Fix CC_CHECK warnings related to unused symbols and UB (#1155)
+24.) Define remaining floor lower limit values (#1147)
+25.) use r+b mode for libultra.a patch tool (#1148)
+26.) Use proper values for gPrevFrameObjectCount ifs (#1146)
+27.) Some minor bowser.inc.c labelling. (#1150)
+28.) fix king bob-omb texture pointers (#1145)
+29.) Split audio/load.c into Shindou/non-Shindou files (#1143)
+30.) Small Shindou audio cleanups (#1142)
+31.) Fix endians in ALSeqData (#1141)
+32.) Document S8 decoder rsp operation and some more (#1139)
+33.) Fix Shindou synthesis_process_note fake match (#1140)
+34.) More audio documentation, for the new rsp code and other fixes (#1138)
+35.) Build fixes for macOS: cpp, clang, recomp, aiff_extract_codebook (#1135)
+36.) Add ENABLE_RUMBLE to config.h (#1122)
+37.) Reduce recomp memory consumption by using smaller disassembly blocks (#1128)
+38.) Makefile fixes (#1123)
+39.) Update README.md
+40.) Update README.md
+41.) Reflect current decompilation status
+42.) Allow both archives and ELF objects to be patched (#1127)
+43.) Remove WIP mention in README for sh version.
+
+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)

Dockerfile

@@ -6,19 +6,16 @@ RUN apt-get update && \
         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
+        libsdl2-dev \
+        libusb-1.0 \
+        libx11-dev \
+        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
         '''
       }