v2.0.3

Bugfix: patch_audio_bank crash (hopefully) resolved for good
HackerSM64 2.0.2 release
2026-01-21 10:35:32 -08:00 · 2022-07-19 11:35:48 -05:00 · 2022-07-15 00:25:18 -04:00 · 2022-06-28 09:43:19 -04:00 · 2022-06-28 08:40:54 -05:00 · 2022-06-28 09:30:49 -04:00
122 changed files with 3468 additions and 1707 deletions
--- a/.gitignore
+++ b/.gitignore
--- a/25
+++ b/25
@@ -323,11 +323,25 @@ ifeq ($(filter clean distclean print-%,$(MAKECMDGOALS)),)
  ifeq ($(NOEXTRACT),0)
    DUMMY != $(PYTHON) extract_assets.py $(VERSION) >&2 || echo FAIL
    ifeq ($(DUMMY),FAIL)
-      $(error Failed to extract assets)
+      $(error Failed to extract assets from US ROM)
    endif
-    DUMMY != $(PYTHON) extract_assets.py jp >&2 || echo FAIL
-    ifeq ($(DUMMY),FAIL)
-      $(error Failed to extract assets)
+    ifneq (,$(wildcard baserom.jp.z64))
+      DUMMY != $(PYTHON) extract_assets.py jp >&2 || echo FAIL
+      ifeq ($(DUMMY),FAIL)
+        $(error Failed to extract assets from JP ROM)
+      endif
+    endif
+    ifneq (,$(wildcard baserom.eu.z64))
+      DUMMY != $(PYTHON) extract_assets.py eu >&2 || echo FAIL
+      ifeq ($(DUMMY),FAIL)
+        $(error Failed to extract assets from EU ROM)
+      endif
+    endif
+    ifneq (,$(wildcard baserom.sh.z64))
+      DUMMY != $(PYTHON) extract_assets.py sh >&2 || echo FAIL
+      ifeq ($(DUMMY),FAIL)
+        $(error Failed to extract assets from SH ROM)
+      endif
    endif
  endif

@@ -616,7 +630,8 @@ $(BUILD_DIR)/src/usb/usb.o: CFLAGS += -Wno-unused-variable -Wno-sign-compare -Wn
 $(BUILD_DIR)/src/usb/debug.o: OPT_FLAGS := -O0
 $(BUILD_DIR)/src/usb/debug.o: CFLAGS += -Wno-unused-parameter -Wno-maybe-uninitialized
 # File specific opt flags
-$(BUILD_DIR)/src/audio/*.o:                   OPT_FLAGS := -Os -fno-jump-tables
+$(BUILD_DIR)/src/audio/heap.o:          OPT_FLAGS := -Os -fno-jump-tables
+$(BUILD_DIR)/src/audio/synthesis.o:     OPT_FLAGS := -Os -fno-jump-tables

 $(BUILD_DIR)/src/engine/surface_collision.o:  OPT_FLAGS := $(COLLISION_OPT_FLAGS)
 $(BUILD_DIR)/src/engine/math_util.o:          OPT_FLAGS := $(MATH_UTIL_OPT_FLAGS)
--- a/README.md
+++ b/README.md
@@ -29,6 +29,7 @@ This is a fork of the ultrasm64 repo by CrashOveride which includes the followin
 - **CrashOveride**: creating the [ultrasm64](https://github.com/CrashOveride95/ultrasm64) repo
 - **falcobuster**: Original coordinate overflow fix (world scale), ASM version of extended bounds
 - **anonymous_moose**: porting falco's extended bounds to decomp
+- **tuxlovesyou**: `LOAD_MIO0_TEXTURE` macro and moral support

 Thanks to Frame#5375 and AloXado320 for also helping with silhouette stuff

--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-v2.0.1
+v2.0.3
--- 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/flyguy/flyguy_face.custom.rgba16.png
+++ b/actors/flyguy/flyguy_face.custom.rgba16.png
--- a/actors/flyguy/model.inc.c
+++ b/actors/flyguy/model.inc.c
@@ -10,7 +10,7 @@ ALIGNED8 static const Texture flyguy_seg8_texture_0800E088[] = {

 // 0x0800F088
 ALIGNED8 static const Texture flyguy_seg8_texture_0800F088[] = {
-#include "actors/flyguy/flyguy_face.rgba16.inc.c"
+#include "actors/flyguy/flyguy_face.custom.rgba16.inc.c"
 };

 // 0x0800F888
--- 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/warp_pipe/model.inc.c
+++ b/actors/warp_pipe/model.inc.c
@@ -96,7 +96,7 @@ static const Vtx warp_pipe_seg3_vertex_03007DC0[] = {

 // 0x03007E40
 ALIGNED8 static const Texture warp_pipe_seg3_texture_03007E40[] = {
-#include "actors/warp_pipe/warp_pipe_side.rgba16.inc.c"
+#include "actors/warp_pipe/warp_pipe_side.custom.rgba16.inc.c"
 };

 // 0x03008E40 - 0x03008F98
--- a/actors/warp_pipe/warp_pipe_side.custom.rgba16.png
+++ b/actors/warp_pipe/warp_pipe_side.custom.rgba16.png
--- 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/Show More
+++ b/Show More
Author	SHA1	Message	Date
thecozies	83fea6d310	v2.0.3	2022-07-19 11:35:48 -05:00
gheskett	8698cc0f89	Bugfix: patch_audio_bank crash (hopefully) resolved for good	2022-07-15 00:25:18 -04:00
Mr-Wiseguy	62d6ee135f	HackerSM64 2.0.2 release	2022-06-28 09:43:19 -04:00
thecozies	3d330e0b84	Merge pull request #387 from HackerN64/develop/2.0.1 HackerSM64 2.0.2 Release	2022-06-28 08:40:54 -05:00
Arceveti	1691e48326	Fix inverted tilting pyramids when platform displacement 2 is disabled (#397 )	2022-06-28 09:30:49 -04:00
Reonu	e5af0e8ca5	Add :Zone_Identifier files to gitignore (#428 )	2022-06-28 09:28:54 -04:00
Mr-Wiseguy	cf570b4406	Added dcache coherency emulation test that disables instant input if passed (fixes Ares) (#427 )	2022-06-28 12:57:14 +01:00
Reonu	1012fb7957	Add extra hud defines (#409 ) * Added extra HUD defines * moved the defines to hud.h	2022-06-27 22:17:44 -04:00
Reonu	aa1a48afeb	Fix shindou audio bzero size (#426 )	2022-06-27 22:15:47 -04:00
Mr-Wiseguy	5e1258e806	Merge branch 'master' into develop/2.0.1	2022-06-17 01:11:34 -04:00
Arceveti	c938bbf407	Add missing check for 9 vert shadows in LEGACY_SHADOW_IDS ifdef (#406 ) * Add missing check for 9 vert shadows in LEGACY_SHADOW_IDS ifdef * Add legacy shadow ids to ShadowType enum	2022-06-09 15:52:10 +01:00
KazeEmanuar	a1ab7c51f0	Made raycasts not hit backfaces * Update name of lighting engine branch in readme	2022-06-09 10:04:58 -04:00
Arceveti	4cfbc656a9	Re-implement FALL_DAMAGE_HEIGHT_SMALL usage in play_far_fall_sound (#407 )	2022-05-19 17:12:28 -04:00
Arceveti	fe6aee22e1	Remove redundant snufit offset vector (fixes gcc11 compiler warning) (#395 )	2022-05-02 15:36:59 -04:00
Arceveti	ad3aa42eff	Fix construct_float by changing addiu to ori (#394 )	2022-05-02 14:56:04 -04:00
Mr-Wiseguy	031cc24fa6	New profiler (#390 ) * Implemented new lightweight CPU/RDP profiler * Integrated new profiler into puppyprint debug and improved profiler visuals, removed existing puppyprint profiling code	2022-05-01 00:42:58 -04:00
thecozies	8d06db06e1	Added specific extracted assets to gitignore (#386 ) * Added specific extracted assets to gitignore * Add .orig files to gitignore Co-authored-by: Arceveti <73617174+Arceveti@users.noreply.github.com> Co-authored-by: Arceveti <73617174+Arceveti@users.noreply.github.com>	2022-04-28 17:50:27 +03:00
Arceveti	642a85fec6	Fix build warnings & errors when building non-US versions (#305 ) * Fix build warnings & errors when building non-US versions * Revert ADSR_STATE_LOOP change in adsr_update in effects.c + add fallthrough comments + clean up ifdefs * null initialization for loadedPool in heap.c * Better placement of null initialization of arg0 in alloc_bank_or_seq	2022-04-15 12:46:17 -04:00
Reonu	3092929822	Tie JRB dark skybox with ENABLE_VANILLA_LEVEL_SPECIFIC_CHECKS (#378 ) The JRB skybox is darkened if you haven't collected JRB's first star. This behaviour should be under `ENABLE_VANILLA_LEVEL_SPECIFIC_CHECKS`	2022-04-14 18:53:11 -04:00
CrashOveride95	51f8ccfbb0	Comment out username printing during debug builds because people use their real names on their computers I still wanna give people the option so	2022-04-10 17:37:14 -04:00
CrashOveride95	2118234f9b	Remove datetime from version.c to make debug builds reproducible	2022-04-10 17:37:14 -04:00
Gregory Heskett	ac0299e5b5	Bugfix: 2x+ skyboxes given insufficient memory space (#372 )	2022-03-30 18:41:22 -04:00
Fazana	f98d43c9de	Puppycamera hotfixes (#367 ) * fixed some embarassing typos	2022-03-27 03:20:28 -04:00
someone2639	bf8ea238e5	Fix some bad comment descriptions in math_util (#328 )	2022-03-25 13:23:34 -04:00
Mr-Wiseguy	b3cb639e6e	Fixed makefile issue causing audio files to be compiled with different flags the first time they're built (#318 )	2022-03-18 14:15:08 -04:00
Arceveti	12595397cd	Fix OBJECTS_REJ build error & warning + silhouette incompatibility (#324 ) * Fix OBJECTS_REJ build error & warning * Fix Mario rendering	2022-03-18 11:03:39 -07:00
Arceveti	65eb5a755f	Reimplement 'FIX_WATER_RINGS' (#325 ) * Reimplement 'FIX_WATER_RINGS'	2022-03-18 11:02:38 -07:00
Gregory Heskett	eaf9d3e4f9	Merge pull request #352 from gheskett/develop/mingw-custom-audio-fix Fix custom audio files not compiling under MinGW (in case it ever matters)	2022-03-18 12:47:54 -05:00
Arceveti	8cfd9af4ee	Uncomment the last gSPPopMatrix in render_hud_cannon_reticle (#351 )	2022-03-15 17:38:38 -04:00
gheskett	3f0143ec0f	Fix custom audio files not compiling under MinGW (in case it ever matters)	2022-03-13 18:57:17 -04:00
tuxlovesyou	33b2a07759	Added LOAD_MIO0_TEXTURE alias for backwards-compatibility (#349 ) Sometimes tools like Fast64 will export script.c files with LOAD_MIO0_TEXTURE() macro "calls" even when you have "YAY0" toggled under the export menu. To keep this from being a roadblock for compilation, LOAD_MIO0_TEXTURE() is defined in this commit as an alias to the LOAD_YAY0_TEXTURE() macro! :-)	2022-03-11 22:10:46 -05:00
axollyon	a0e8600776	Saves default conf on boot now, simplify condition (#321 )	2022-03-08 08:49:10 -06:00
Arceveti	4265019923	Fix NON_STOP_STARS & bhvCelebrationStar related issues with Bowser keys (#299 ) Fix NON_STOP_STARS issues & bhvCelebrationStar related issues with Bowser keys	2022-01-22 14:07:55 -08:00
Arceveti	730f020b6d	Fix formatting inconsistencies in config files (#303 ) Fix formatting inconsistencies in config files	2022-01-21 20:00:25 -08:00
Arceveti	483b72e7da	Fix render menu buttons functions (#300 )	2022-01-19 14:41:14 -08:00
Arceveti	36d41a7f94	Renamed HackerSM64 modified assets so they don't conflict with vanilla assets (#293 )	2022-01-16 21:30:06 -08:00
Arceveti	af34a81c06	Fix credits text ifdef (#301 )	2022-01-16 21:29:06 -08:00
Mr-Wiseguy	3fac5ad059	Downgraded from F3DZEX2.08J to F3DZEX2.08I so that point lighting works on Jabo (#313 ) * Downgraded from F3DZEX2.08J to F3DZEX2.08I so that point lighting works on Jabo * Swapped to MM's rspboot to fix bug caused by MM's F3DZEX2	2022-01-15 01:09:34 -05:00
Arceveti	6ba4fcdba1	Set oDrawingDistance to 4500 for WF breakable walls (#304 )	2022-01-14 19:38:10 -08:00
Arceveti	38c6e456f1	Fix level enum conflict with 99+ levels (#307 )	2022-01-14 19:37:56 -08:00
Mr-Wiseguy	7b58f63cbc	Merge pending master hotfixes into 2.0.2 #311	2022-01-14 22:25:09 -05:00
Arceveti	2329786f88	Make CLEARRAM mandatory (#297 )	2022-01-12 15:00:22 -08:00
Arceveti	ca9f7967c8	Merge pull request #285 from Reonu/develop/arceveti/2.0.1/mr_i_iris_clipping Fix wrong Y offset for Mr. I iris	2022-01-11 14:01:25 -08:00
Arceveti	1b66355249	Merge pull request #284 from Reonu/develop/arceveti/2.0.1/jp_baserom_requirement JP Baserom is no longer required for US build	2022-01-10 20:52:31 -08:00
Arceveti	0789cf118e	Only extract assets from JP/EU/SH roms if they exist	2022-01-10 20:50:37 -08:00
Arceveti	1b37e627bc	Merge pull request #283 from Reonu/develop/arceveti/2.0.1/no_getting_buried_compiler_warning Fix build warning when NO_GETTING_BURIED is enabled	2022-01-10 20:31:38 -08:00
Arceveti	886d9841a8	Better Mr. I offset fix	2022-01-10 18:27:08 -08:00
Arceveti	3d24cdee18	Merge pull request #280 from Reonu/develop/arceveti/2.0.1/hardcoded_cos_values Fix hardcoded cos values in sm64.h	2022-01-07 00:00:59 -08:00
Arceveti	c9523aaa0b	Fix wrong Y offset for Mr. I iris	2022-01-04 23:31:39 -08:00
Arceveti	84bbd2ae14	JP Baserom is no longer required for US build	2022-01-04 22:55:19 -08:00
Arceveti	9caafc54eb	Fix build warning when NO_GETTING_BURIED is enabled	2022-01-04 22:18:35 -08:00
Arceveti	feff004ef9	Fix hardcoded cos values in sm64.h	2022-01-02 18:46:31 -08:00