v2.0.0

Update README.md (#277 )
rename CUSTOM_DEBUG, add comments (#275 )
2026-01-21 10:35:32 -08:00 · 2021-12-30 10:49:10 -06:00 · 2021-12-30 10:47:36 -06:00 · 2021-12-30 09:35:37 -06:00 · 2021-12-30 04:57:36 -06:00 · 2021-12-29 18:19:41 -06:00
56 changed files with 274 additions and 600 deletions
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -25,7 +25,7 @@
                "TARGET_N64=1",
                "VERSION_US=1",
                "F3DEX_GBI_2=1",
-                "F3DZEX_NON_GBI_2=1",
+                "F3DZEX_GBI_2=1",
                "F3DEX_GBI_SHARED=1",
                "NON_MATCHING=1",
                "AVOID_UB=1"
--- a/1
+++ b/1
@@ -4,7 +4,6 @@
 # These owners will be the default owners for everything in the repo.
 *       @Reonu
 *       @thecozies
-*       @Mr-Wiseguy

 # Order is important. The last matching pattern has the most precedence.
 # So if a pull request only touches javascript files, only these owners
--- a/2
+++ b/2
@@ -108,7 +108,7 @@ else ifeq ($(GRUCODE),l3dex2) # Line3DEX2
 else ifeq ($(GRUCODE),f3dex2pl) # Fast3DEX2_PosLight
  DEFINES += F3DEX2PL_GBI=1 F3DEX_GBI_2=1 F3DEX_GBI_SHARED=1
 else ifeq ($(GRUCODE),f3dzex) # Fast3DZEX (2.08J / Animal Forest - Dōbutsu no Mori)
-  DEFINES += F3DZEX_NON_GBI_2=1 F3DEX_GBI_2=1 F3DEX_GBI_SHARED=1
+  DEFINES += F3DZEX_GBI_2=1 F3DEX_GBI_2=1 F3DEX_GBI_SHARED=1
 else ifeq ($(GRUCODE),super3d) # Super3D
  $(warning Super3D is experimental. Try at your own risk.)
  DEFINES += SUPER3D_GBI=1 F3D_NEW=1
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-v2.0.1
+v2.0.0
--- a/actors/bubble/model.inc.c
+++ b/actors/bubble/model.inc.c
@@ -27,7 +27,6 @@ const Gfx bubble_seg4_dl_0401DD60[] = {
    gsSPVertex(bubble_seg4_vertex_0401CD20, 4, 0),
    gsSP2Triangles( 0,  1,  2, 0x0,  0,  2,  3, 0x0),
    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
-    gsDPPipeSync(),
    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
    gsSPEndDisplayList(),
 };
@@ -41,7 +40,6 @@ const Gfx bubble_seg4_dl_0401DDE0[] = {
    gsSPVertex(bubble_seg4_vertex_0401CD20, 4, 0),
    gsSP2Triangles( 0,  1,  2, 0x0,  0,  2,  3, 0x0),
    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
-    gsDPPipeSync(),
    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
    gsSPEndDisplayList(),
 };
--- a/actors/coin/model.inc.c
+++ b/actors/coin/model.inc.c
@@ -123,7 +123,6 @@ const Gfx coin_seg3_dl_start[] = {
 const Gfx coin_seg3_dl_end[] = {
    gsSP2Triangles( 0,  1,  2, 0x0,  0,  2,  3, 0x0),
    gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
-    gsDPPipeSync(),
    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
    gsSPSetGeometryMode(G_LIGHTING),
    gsSPEndDisplayList(),
@@ -504,7 +503,6 @@ const Gfx coin_seg3_sub_dl_begin[] = {
 const Gfx coin_seg3_sub_dl_end[] = {
    gsSP2Triangles( 0,  1,  2, 0x0,  0,  2,  3, 0x0),
    gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
-    gsDPPipeSync(),
    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
    gsSPSetGeometryMode(G_LIGHTING),
    gsSPEndDisplayList(),
--- a/actors/leaves/model.inc.c
+++ b/actors/leaves/model.inc.c
@@ -24,7 +24,6 @@ const Gfx leaves_seg3_dl_0301CDE0[] = {
    gsSP2Triangles( 0,  1,  2, 0x0,  0,  2,  3, 0x0),
    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
    gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK),
-    gsDPPipeSync(),
    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
    gsSPEndDisplayList(),
 };
--- a/actors/mr_i_eyeball/model.inc.c
+++ b/actors/mr_i_eyeball/model.inc.c
@@ -36,13 +36,11 @@ const Gfx mr_i_eyeball_seg6_dl_06002080[] = {
    gsDPLoadSync(),
    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
    gsSP2Triangles( 0,  1,  2, 0x0,  0,  2,  3, 0x0),
-    gsDPPipeSync(),
    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, mr_i_eyeball_seg6_texture_06001080),
    gsDPLoadSync(),
    gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
    gsSP2Triangles( 4,  5,  6, 0x0,  4,  6,  7, 0x0),
    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
-    gsDPPipeSync(),
    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
    gsSPEndDisplayList(),
 };
--- a/actors/mr_i_iris/model.inc.c
+++ b/actors/mr_i_iris/model.inc.c
@@ -40,7 +40,6 @@ const Gfx mr_i_iris_seg6_dl_06004170[] = {
    gsSPVertex(mr_i_iris_seg6_vertex_06002130, 4, 0),
    gsSP2Triangles( 0,  1,  2, 0x0,  0,  2,  3, 0x0),
    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
-    gsDPPipeSync(),
    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
    gsSPEndDisplayList(),
 };
--- a/actors/sand/model.inc.c
+++ b/actors/sand/model.inc.c
@@ -23,7 +23,6 @@ const Gfx sand_seg3_dl_particle[] = {
    gsSPVertex(sand_seg3_vertex_billboard_16x16, 4, 0),
    gsSP2Triangles( 0,  1,  2, 0x0,  0,  2,  3, 0x0),
    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
-    gsDPPipeSync(),
    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
    gsSPSetGeometryMode(G_LIGHTING),
    gsSPEndDisplayList(),
--- a/actors/sparkle/model.inc.c
+++ b/actors/sparkle/model.inc.c
@@ -50,7 +50,6 @@ const Gfx sparkles_seg4_dl_0402A490[] = {
    gsSPVertex(sparkles_seg4_vertex_04027450, 4, 0),
    gsSP2Triangles( 0,  1,  2, 0x0,  0,  2,  3, 0x0),
    gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
-    gsDPPipeSync(),
    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
    gsSPEndDisplayList(),
 };
--- a/actors/sparkle_animation/model.inc.c
+++ b/actors/sparkle_animation/model.inc.c
@@ -47,7 +47,6 @@ const Gfx sparkles_animation_seg4_dl_04035288[] = {
    gsSP2Triangles( 0,  1,  2, 0x0,  0,  2,  3, 0x0),
    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
    gsSPSetGeometryMode(G_LIGHTING),
-    gsDPPipeSync(),
    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
    gsSPEndDisplayList(),
 };
--- a/actors/transparent_star/model.inc.c
+++ b/actors/transparent_star/model.inc.c
@@ -46,7 +46,6 @@ const Gfx transparent_star_seg3_dl_body[] = {
    gsDPSetCombineMode(G_CC_SHADEFADEA, G_CC_SHADEFADEA),
    gsDPSetEnvColor(255, 255, 255, 120),
    gsSPDisplayList(transparent_star_seg3_sub_dl_body),
-    gsDPPipeSync(),
    gsDPSetEnvColor(255, 255, 255, 255),
    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
    gsSPEndDisplayList(),
--- a/actors/walk_smoke/model.inc.c
+++ b/actors/walk_smoke/model.inc.c
@@ -56,7 +56,6 @@ const Gfx smoke_seg4_dl_040216A0[] = {
    gsSPVertex(smoke_seg4_vertex_0401DE60, 4, 0),
    gsSP2Triangles( 0,  1,  2, 0x0,  0,  2,  3, 0x0),
    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
-    gsDPPipeSync(),
    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
    gsSPSetGeometryMode(G_LIGHTING),
    gsSPEndDisplayList(),
--- a/actors/water_splash/model.inc.c
+++ b/actors/water_splash/model.inc.c
@@ -61,7 +61,6 @@ const Gfx water_splash_seg4_dl_040325C8[] = {
    gsSPVertex(water_splash_seg4_vertex_0402A588, 4, 0),
    gsSP2Triangles( 0,  1,  2, 0x0,  0,  2,  3, 0x0),
    gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
-    gsDPPipeSync(),
    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
    gsSPSetGeometryMode(G_LIGHTING),
    gsSPEndDisplayList(),
--- a/asm/rom_header.s
+++ b/asm/rom_header.s
@@ -17,11 +17,7 @@
 .ascii INTERNAL_ROM_NAME   /* Internal ROM name */
 .word  0x00000000               /* Unknown */
 .word  0x0000004E               /* Cartridge */
-#if defined(EEP4K)
-.ascii "SM"                     /* Cartridge ID */
-#else
 .ascii "ED"                     /* Cartridge ID */
-#endif

 /* Region */
 #if defined(VERSION_JP) || defined(VERSION_SH)
--- a/asm/vc_bin.s
+++ b/asm/vc_bin.s
@@ -1,23 +0,0 @@
-// VC is using binary matching to stub functions - this hex was copied from SM64
-// osEepromRead/Write are performing infinite cycle inside them which causes recompiler do go crazy
-// _osEepStatus does not have any suspicious asm in it but it is just VC hacked anyways
-//   If it is not replaced with a VC variant, EEP probe fails
-
-.include "macros.inc"
-.section .text
-
-#if defined(EEP)
-// 0x80329150 = 0xE4150
-.balign 16
-glabel osEepromReadVC
-.incbin "bin/vc/osEepromReadVC.bin"
-
-// 0x80328af0 = 0xE3AF0
-.balign 16
-glabel osEepromWriteVC
-.incbin "bin/vc/osEepromWriteVC.bin"
-
-.balign 16
-glabel __osEepStatusVC
-.incbin "bin/vc/osEepStatusVC.bin"
-#endif
--- a/bin/effect.c
+++ b/bin/effect.c
@@ -130,7 +130,6 @@ const Gfx tiny_bubble_dl_0B006A50[] = {
 // 0x0B006AB0 - 0x0B006AD8
 const Gfx tiny_bubble_dl_0B006AB0[] = {
    gsSPTexture(0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF),
-    gsDPPipeSync(),
    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
    gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
    gsSPSetGeometryMode(G_LIGHTING | G_CULL_BACK | G_SHADING_SMOOTH),
--- a/bin/segment2.c
+++ b/bin/segment2.c
@@ -2328,7 +2328,6 @@ const Gfx dl_draw_triangle[] = {
    gsSPVertex(vertex_triangle, 3, 0),
    gsSP1Triangle( 0,  1,  2, 0x0),
    gsSPSetGeometryMode(G_LIGHTING),
-    gsDPPipeSync(),
    gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2),
    gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
    gsSPEndDisplayList(),
--- a/bin/vc/osEepStatusVC.bin
+++ b/bin/vc/osEepStatusVC.bin
--- a/Show More
+++ b/Show More