Merge branch 'master' of https://github.com/Render96/Render96ex

Makefile

@@ -70,6 +70,7 @@ RMODERN ?= 0
 
 # Misc settings for EXTERNAL_DATA
 
+LEGACY_RES ?= 0
 BASEDIR ?= res
 
 # Automatic settings for PC port(s)
@@ -139,12 +140,14 @@ TARGET := sm64.$(VERSION)
 VERSION_CFLAGS := -D$(VERSION_DEF) -D_LANGUAGE_C
 VERSION_ASFLAGS := --defsym $(VERSION_DEF)=1
 
-# Stuff for showing the git hash in the intro on nightly builds
+# Stuff for showing the git hash in the intro
 # From https://stackoverflow.com/questions/44038428/include-git-commit-hash-and-or-branch-name-in-c-c-source
-ifeq ($(shell git rev-parse --abbrev-ref HEAD),nightly)
 GIT_HASH=`git rev-parse --short HEAD`
 COMPILE_TIME=`date -u +'%Y-%m-%d %H:%M:%S UTC'`
-  VERSION_CFLAGS += -DNIGHTLY -DGIT_HASH="\"$(GIT_HASH)\"" -DCOMPILE_TIME="\"$(COMPILE_TIME)\""
+VERSION_CFLAGS += -DGIT_HASH="\"$(GIT_HASH)\"" -DCOMPILE_TIME="\"$(COMPILE_TIME)\""
+
+ifeq ($(shell git rev-parse --abbrev-ref HEAD),nightly)
+  VERSION_CFLAGS += -DNIGHTLY
 endif
 
 # Microcode
@@ -715,7 +718,7 @@ $(BASEPACK_LST): $(EXE)
 
 # prepares the resource ZIP with base data
 $(BASEPACK_PATH): $(BASEPACK_LST)
-	@$(PYTHON) $(TOOLS_DIR)/mkzip.py $(BASEPACK_LST) $(BASEPACK_PATH)
+	@$(PYTHON) $(TOOLS_DIR)/mkzip.py $(BASEPACK_LST) $(BASEPACK_PATH) $(LEGACY_RES)
 
 endif
 

levels/intro/header.h

@@ -10,7 +10,17 @@ extern const GeoLayout intro_geo_0003B8[];
 extern const GeoLayout intro_geo_000414[];
 
 // leveldata
-extern const Gfx intro_seg7_dl_0700B3A0[];
+extern Vtx titletest_test_mesh_vtx_0[133];
+extern Gfx titletest_test_mesh_tri_0[];
+extern Vtx titletest_test_mesh_vtx_1[407];
+extern Gfx titletest_test_mesh_tri_1[];
+extern Vtx titletest_test_mesh_vtx_2[183];
+extern Gfx titletest_test_mesh_tri_2[];
+extern Vtx titletest_test_mesh_vtx_3[568];
+extern Gfx titletest_test_mesh_tri_3[];
+
+extern Gfx titletest_test_mesh[];
+
 extern const Gfx intro_seg7_dl_0700C6A0[];
 extern const f32 intro_seg7_table_0700C790[];
 extern const f32 intro_seg7_table_0700C880[];

src/game/segment7.h

@@ -24,7 +24,7 @@ extern const u8 eu_course_strings_de_table[];
 #endif
 
 // from intro_segment7
-extern Gfx *intro_seg7_dl_0700B3A0;
+extern Gfx *titletest_test_mesh;
 extern Gfx *intro_seg7_dl_0700C6A0;
 extern f32 intro_seg7_table_0700C790[];
 extern f32 intro_seg7_table_0700C880[];

src/menu/intro_geo.c

@@ -112,7 +112,7 @@ Gfx *geo_title_screen(s32 sp50, struct GraphNode *sp54, UNUSED void *context) {
         }
         guScale(scaleMat, scaleX, scaleY, scaleZ);
         gSPMatrix(displayListIter++, scaleMat, G_MTX_MODELVIEW | G_MTX_MUL | G_MTX_PUSH);
-        gSPDisplayList(displayListIter++, &intro_seg7_dl_0700B3A0);
+        gSPDisplayList(displayListIter++, &titletest_test_mesh);
         gSPPopMatrix(displayListIter++, G_MTX_MODELVIEW);
         gSPEndDisplayList(displayListIter);
         gTitleZoomCounter++;
@@ -142,7 +142,7 @@ Gfx *geo_fade_transition(s32 sp40, struct GraphNode *sp44, UNUSED void *context)
             if (0) {
             }
         }
-        gSPDisplayList(displayListIter++, &intro_seg7_dl_0700C6A0);
+        //gSPDisplayList(displayListIter++, &intro_seg7_dl_0700C6A0);
         gSPEndDisplayList(displayListIter);
         if (gTitleZoomCounter >= 0x13) {
             gTitleFadeCounter += 0x1a;

src/pc/pc_main.c

@@ -221,9 +221,11 @@ void main_func(void) {
     #endif
 
     char window_title[96] =
-    "Super Mario 64 EX (" RAPI_NAME ")"
+    "Super Mario 64 Render96ex (" RAPI_NAME ")"
     #ifdef NIGHTLY
     " nightly " GIT_HASH
+    #else
+    " " GIT_HASH
     #endif
     ;
 

tools/mkzip.py

@@ -14,8 +14,8 @@ def md5(fname):
             hash_md5.update(chunk)
     return hash_md5.hexdigest()
 
-if len(sys.argv) < 3:
+if len(sys.argv) < 4:
-    print('usage: mkzip <lstfile> <dstpath>')
+    print('usage: mkzip <lstfile> <dstpath> <legacy>')
     sys.exit(1)
 
 lst = []
@@ -26,14 +26,20 @@ with open(sys.argv[1], 'r') as f:
             continue
         tok = line.split()
         lst.append((tok[0], tok[1]))
-
+    if not sys.argv[3] or not sys.argv[3] == "1":
         for (fname, aname) in lst:
             path = os.path.join(sys.argv[2], aname)
-        old_md5 = md5(fname);
+            old_md5 = md5(fname)
-        new_md5 = md5(path);
+            if not os.path.exists(path) or os.path.exists(path) and old_md5 != md5(path):
-        if not os.path.exists(path) or old_md5 != new_md5:
                 os.makedirs(os.path.dirname(path), exist_ok=True)
                 copyfile(fname, path)
                 print("Copying: " + path)
             else:
                 print("Skipping: " + path + " - MD5: "+md5(fname))
+    else:
+        zipPath = os.path.join(sys.argv[2], "awesome-legacy.zip")
+        print("Using Legacy System")
+        with zipfile.ZipFile(zipPath, 'w', allowZip64=False) as zipf:
+            for (fname, aname) in lst:
+                zipf.write(fname, arcname=aname)
+                print("Legacy - Copying: " + aname)