Compare commits

..

49 Commits

Author SHA1 Message Date
someone2639
93a0816b6c Add system capabilities variable that tracks individual features instead of broad emulator support (#907)
Also implements check for FBE.

* start implementing selftest

* add some more

* gSupportsLibpl destroyed

* SYS_SUPPORTS -> SYSCAP

* add emux check

* make it compile

* play around with it until it writes the ASM i want

* format

* explain what im doing

* hopefully guard emux

* one feedback

* two feedback

* better libpl check

* better comment

* resolve some feedbackg

* add FBE check

* dont need to skip this check if its only for the first frame'

* skip framebuffer check if on a system that we know supports it.

* document that nothing in the repo has emux yet

* goodbye emux

* feed1

* various detectable

---------

Co-authored-by: someone2639 <someone2639@gmail.com>
2026-01-17 01:52:48 -05:00
Gregory Heskett
85b72619e4 Bugfix: Floating platform in JRB rises instead of sinks when Mario stands on its edge (#924)
This was introduced back in 2021 by some very absolutely quite small changes :)
2026-01-17 01:51:24 -05:00
LucretiaArc
9500f7a8d7 Fix build errors and warnings (#926)
* Close .assets-local.txt before attempting to remove it in extract_assets.py
* Bare $(MAKE) doesn't work if the path to make has spaces, so quote it
* Suppress warning for unused parameter in Flips.cpp
* Don't override OS environment variable, since it broke MinGW
* Specify extension for aiff_extract_codebook target, fixes dependency order for MinGW
2026-01-17 01:51:06 -05:00
someone2639
e206d4477c Fix getGoddardSize so that any arbitrary build folder can be used (#915)
* fix getGoddardSize

* newline

* HOW did this get in here

---------

Co-authored-by: someone2639 <someone2639@gmail.com>
2026-01-17 01:50:46 -05:00
Gregory Heskett
63250a04fb Replace render_multi_image() with draw_sprite() (#914)
* Replace render_multi_image() with draw_sprite()

This function is more stable and can handle more use cases than render_multi_image() could. It can handle fractional scaling and also doesn't suffer from the seams that ParaLLEl displays when upscaling texrects.

It does have some minor drawbacks though, mainly that it doesn't handle the complete displaylist for the user (mainly to allow customization of primitives outside of the function). It also isn't currently as optimized as render_multi_image() was for combiner and render modes (also copy mode does not render correctly).

Neither function supports rendering of CI textures still.

* Add additional comments and documentation to draw_sprite function
2026-01-17 01:50:23 -05:00
Denis Kopyrin
d20112107c Fixed incorrect RDP sync in act select menu (#920)
DPRenderMode is not allowed to be changed before DPPipeSync is done.
This causes crashes on act select with F3DEX3 during tri draw before.
2026-01-08 14:53:24 -05:00
arthurtilly
29a402dbb1 Change optimization flags (#916)
This saves about 90KB of RAM in the code segment

When Kaze found out we still use Ofast his response was "LOL"

Never listen to Fazana ever again

I did this PR through github file editor out of spite
2025-11-19 01:14:37 -05:00
Gregory Heskett
8bb943d533 Tie Bowser key celebration to key model rather than course ID (#913)
This should allow people to put course-exiting ordinary stars into Bowser courses without playing a key animation. Similarly, this will allow Bowser fights to exist in ordinary levels without playing the standard star animation on level exit. Save flags for keys still need to be handled manually in these cases though.
2025-11-07 09:22:28 -05:00
someone2639
76559c07f7 fish behavior level check -> param check (#906)
* Make fish SA check into a bparam2 flag

* light docs; rename the bp flag

* actually rename the thing

---------

Co-authored-by: Arceveti <73617174+Arceveti@users.noreply.github.com>
Co-authored-by: someone2639 <someone2639@gmail.com>
2025-11-06 23:44:00 -05:00
Gregory Heskett
83426bae74 Do not apply config_local.h if DISABLE_ALL is active (#909)
It does not make sense to apply a config that doesn't even exist upstream for a release build.
2025-11-06 23:39:17 -05:00
Denis Kopyrin
233d105662 Fix deflate buffers overrunning decompressor context (#897)
* Fix deflate buffers overrunning decompressor context

* Add NULL checks

---------

Co-authored-by: Gregory Heskett <gheskett@gmail.com>
2025-11-06 03:54:21 -05:00
LucretiaArc
cf88d09f5e Debug fly improvements (#908)
* Prevent interference between debug fly and other uses of dpad, dejank debug fly camera transitions

* Better whitespace

* Move extern to puppyprint.h

* This bothered Arctic
2025-11-05 18:07:04 -05:00
Anoliah
533d1ddaa2 Add vanilla cam processing ifdef to vanilla camera trigger arrays (#912) 2025-11-05 02:38:20 -05:00
bicyclesoda
e513c7272f Enforce gnu17 standard (#875)
Supported by both GCC and clang (https://clang.llvm.org/docs/UsersManual.html#extensions-supported-by-clang).

Currently, C23 cannot build this repo and apparently the consensus is to support C/gnu17 for the time being anyways.
2025-11-05 02:12:44 -05:00
someone2639
6589012fe5 Only run ROM extraction tools once on every make invocation (#902)
* add makefile util function to extract all assets

* indent

* start leveraging multiple-export functionality in extract_assets

* find-rom util; use the native hash library in detect-baseroms

* look back on my variable naming decisions with shame

* more docs; remove debug prints

* what if i just have detect_baseroms list the roms

* beef up usage string in extract_assets

* only one python invocation now; fix failure condition

* remove commented hashlib

* give it a last documentation pass

* warning fix that doesnt happen on my end

* long

---------

Co-authored-by: someone2639 <someone2639@gmail.com>
2025-11-02 19:39:34 -05:00
Christopher Dieringer
3af936f6de fix: more resilient toolchain detection (#901) 2025-11-01 04:26:49 -04:00
Anoliah
cbd0c05447 rework vanilla camera overrides (#873) 2025-10-31 15:20:47 +13:00
LuigiXHero
8f4b5b99c9 Stopgap readme fix (#871)
* Update README.md

Replaces the super out of date build instructions with a link to the wiki. As a stopgap before the readme rewrite.

* Restore UNFLoader section

Arctic said to

* Change rom requirements in readme
2025-10-30 11:24:00 +13:00
Gregory Heskett
94bfaff1ae Fix deflate warnings for the last time hopefully (#895)
Missed this one
2025-07-07 22:14:23 -04:00
someone2639
da18d323f4 fix armips compile error (#894)
* fix armips

* oops

---------

Co-authored-by: someone2639 <someone2639@gmail.com>
2025-07-04 01:04:59 -04:00
Denis Kopyrin
2dd4171fee Remove more gzip complaining lines (#893) 2025-07-03 13:20:08 -04:00
Denis Kopyrin
3c65ad1fed Fixed gzip to work with gcc15 & macOS ARM (#892) 2025-07-03 20:55:47 +08:00
Denis Kopyrin
39d0ccb412 Add new GZIP DEFLATE decompressor/compressor (#850) 2025-07-02 00:37:50 -04:00
Gregory Heskett
a334872dec Move all music samples to instruments folder and add instrument compatibility tables for legacy and Refresh 16 (#883)
Placing all music samples in the same folder allows for samples like Bowser organ and the course_select 'la' samples to be used among other samples (extended soundbank should be updated eventually to take advantage of this). Compatibility tables additionally allow for use of both legacy soundbanks and those designed around Refresh 16 (instruments folder only).
2025-07-01 02:42:58 -04:00
Gregory Heskett
e8e4210406 Fix uninitialized variable warning with GCC 14 (#884) 2025-07-01 02:40:25 -04:00
Denis Kopyrin
72f200653b Fixed gcc15 build (#891) 2025-07-01 02:39:47 -04:00
Gregory Heskett
e43749b254 Add debug asserts for exceeding GFX and audio pool sizes (#876) 2025-06-21 03:27:44 -04:00
Gregory Heskett
67ab8512b7 Switch to the ED header to support UNFLoader save type autodetection + newer flashcarts (#858)
* Force save type for UNFLoader

This fixes save type not being autodetected on SC64 with EEP4K due to the non-ED cartridge ID. Changing from SM to ED is a last resort, as emulators or other flashcarts have no means of autodetecting whether a ROM is an SM64 hack otherwise.

* Rely on ED header for UNFLoader autodetection of save type instead
2025-06-21 03:24:19 -04:00
Fallden4
2c15b0e642 Infinite stairs warp is disabled when UNLOCK_ALL is defined (#881)
* Make it so the infinite stairs warp is disabled when UNLOCK_ALL is defined

* match indentation

* Infinite stairs music is not played if UNLOCK_ALL is defined

* Address requested changes

---------

Co-authored-by: htauk <htauktechy@proton.me>
Co-authored-by: Gregory Heskett <gheskett@gmail.com>
2025-06-21 02:44:51 -04:00
Matt Pharoah
3edf4bc593 Add support for realtime clock (#889) 2025-06-20 14:09:07 -04:00
Matt Pharoah
48ecd1da98 Fixed make patch (#870) 2025-02-25 18:26:26 -05:00
arthurtilly
e1486216d7 Clean up and simplify emutest.c, and change instant input to a whitelist (#868)
* Simplify emutest.c

* add mupen check back

* change return type

* some more cleanup

* changed gEmulator to u8
2025-02-16 02:14:09 -05:00
LucretiaArc
50b773d9ed Fix chuckya grab escape 2025-02-05 00:31:27 -05:00
Gregory Heskett
a4f6c95360 Add support for variadic debug assertions (#857)
Additionally clean up some crash screen display issues and add automatic newlining to assertions when they run past the edge of the screen
2025-01-29 20:36:19 -05:00
LucretiaArc
dc212c24f7 Add geo command for cylindrical billboarding (#856)
* Add cylindrical billboard geo command

* oops

* add room for layers

* Make cylindrical billboarding part of GEO_CMD_NODE_BILLBOARD, remove node pos option

* use the correct billboarding type this time, formatting

* Rename GEO_BILLBOARD mode parameter, combine mtxf_billboard variants

* funny register

* Adjust comments to better explain cylindrical billboarding, debug assert to check axis when using it
2025-01-25 16:00:27 -05:00
Gregory Heskett
aef3252921 Bugfix (Vanilla): Warping to cake screen in area other than Area 1 crashes the game (#844)
This also simultaneously fixes same-area exit course crashes, although that has already been dealt with by enforcing level warps (which is probably the preferred solution anyway).
2025-01-19 18:16:30 -05:00
Gregory Heskett
d3a104ac39 Bugfix: Sign range half of what it was in vanilla (#855)
Also fix a compiler warning in lz4tpack.c
2025-01-19 18:16:02 -05:00
Denis Kopyrin
8281d4bc23 Remove use of math inline assembly that can be generated with fast math (#853) 2025-01-19 06:25:14 -05:00
Matt Pharoah
bb60f2d851 Update libpl1 (#851) 2025-01-19 06:19:38 -05:00
Fazana
3f579629c8 Add support for building on ARM64 MacOS (#854)
* preliminary attempt

* simplify a bit

* oops

* Move declaration

* error out if you try to make patch

* style fix

* Update Makefile

* I hate makefile

* Update Makefile
2025-01-19 06:17:45 -05:00
Denis Kopyrin
d43157c82c Added racing DMA LZ4 & LZ4T implementations (#824)
* compression: added racing DMA LZ4 & LZ4T implementations

* debug: added reworked level load time measurement

* Get rid of LZ4, updated LZ4T to latest version

* lz4t: remove LIKELY/UNLIKLELY use, optimized slow decompressor for size

* lz4t: remove pointless goto

* lz4t: remove function macros, use static inlines instead

* perf: rework measurements for level loads to be more accurate

* perf: avoid hardcoded constants in time calculations
2024-12-29 19:33:28 +08:00
Gregory Heskett
ff82298b31 Place stack canaries behind DEBUG_ASSERTIONS instead of DEBUG (#843) 2024-11-11 01:33:05 -05:00
LucretiaArc
c46fa2d090 Support pre word-swapped textures, fix puppyprint rendering for lowercase z and tilde, minor font fixes (#838)
* Fix puppyprint rendering lowercase z and tilde, minor font fixes

* Add support for generating pre word swapped textures

* Use image for fasttext font texture

* Adjustments to fasttext font and puppyprint outline font
2024-11-04 21:11:01 -05:00
Lila
c4c18b3d0e Check for opensuse's cross mips gcc package (#842)
Makes it possible to rely on the official repo.
Ideally the following instructions would also be added to the wiki for opensuse:
```
sudo zypper install cross-mips-binutils git capstone pkgconf python311 cross-mips-gcc14
# install packages under devel_basis, equivalent to build-essential in deb
sudo zypper install --type pattern devel_basis
```
2024-10-31 14:08:08 -04:00
thecozies
7298e94a1f reset adjacent rooms when loading a new area (#704) 2024-09-05 01:48:26 -04:00
Gregory Heskett
27d328f86a Dialogs in dialogs.h no longer have to be in order (#832) 2024-09-05 01:13:05 -04:00
Gregory Heskett
27372fe74a Merge pull request #795 from gheskett/develop/2.3.0_update-unf
Update to newest UNF (d5f2ad100b76e372036453f8d25f9b6fbbbd2d1a) (November 22, 2023)
2024-09-05 01:07:23 -04:00
Gregory Heskett
e3472e05cf Add option for .local/share/HackerSM64/UNFLoader-dir.txt
This allows referencing a custom UNFLoader path to be used, ideally for placing on the C drive for WSL instances. UNFLoader tends to hang for an unbearably long time when saved somewhere within the WSL directory structure, and simply using the Linux build isn't an option because it can't access Windows USB devices trivially.
2024-08-03 19:57:50 -04:00
Gregory Heskett
74cb8ce062 Update to newest UNF (d5f2ad100b76e372036453f8d25f9b6fbbbd2d1a) (November 22 2023) 2024-08-03 19:33:09 -04:00
561 changed files with 35466 additions and 35633 deletions

7
.gitignore vendored
View File

@@ -979,10 +979,6 @@ levels/wmotr/1.rgba16.png
levels/wmotr/2.rgba16.png
levels/wmotr/3.rgba16.png
levels/wmotr/4.rgba16.png
sound/samples/bowser_organ/00_organ_1.aiff
sound/samples/bowser_organ/01_organ_1_lq.aiff
sound/samples/bowser_organ/02_boys_choir.aiff
sound/samples/course_start/00_la.aiff
sound/samples/instruments/00.aiff
sound/samples/instruments/01_banjo_1.aiff
sound/samples/instruments/02.aiff
@@ -1059,7 +1055,6 @@ sound/samples/instruments/45b_la.aiff
sound/samples/instruments/46_pizzicato_strings_1.aiff
sound/samples/instruments/47_pizzicato_strings_2.aiff
sound/samples/instruments/48_steel_drum.aiff
sound/samples/piranha_music_box/00_music_box.aiff
sound/samples/sfx_1/00_twirl.aiff
sound/samples/sfx_1/01_brushing.aiff
sound/samples/sfx_1/02_hand_touch.aiff
@@ -1354,6 +1349,7 @@ textures/cave/hmc_textures.0A000.rgba16.png
textures/cave/hmc_textures.0A800.rgba16.png
textures/cave/hmc_textures.0B800.ia16.png
textures/cave/hmc_textures.0C000.ia16.png
textures/crash_screen/crash_screen_font.ia1.png
textures/effect/bubble.06048.rgba16.png
textures/effect/flower.00008.rgba16.png
textures/effect/flower.00808.rgba16.png
@@ -2151,3 +2147,4 @@ lib/libs2d_engine.a
# user-specific config file
include/config/config_local.h
.DS_Store

View File

@@ -27,8 +27,7 @@
"F3DEX_GBI_2=1",
"F3DZEX_NON_GBI_2=1",
"F3DEX_GBI_SHARED=1",
"LIBPL=1",
"UNF=1"
"LIBPL=1"
],
"compilerPath": "/usr/bin/mips-linux-gnu-gcc",
"cStandard": "gnu17",

270
Makefile

File diff suppressed because it is too large Load Diff

View File

@@ -243,11 +243,9 @@ $(BUILD_DIR)/bin/machine.elf: SEGMENT_ADDRESS := 0x09000000
$(BUILD_DIR)/bin/mountain.elf: SEGMENT_ADDRESS := 0x09000000
$(BUILD_DIR)/bin/grass.elf: SEGMENT_ADDRESS := 0x09000000
# EU segment 19 translations
$(BUILD_DIR)/bin/translation_de.elf: SEGMENT_ADDRESS := 0x19000000
$(BUILD_DIR)/bin/translation_en.elf: SEGMENT_ADDRESS := 0x19000000
$(BUILD_DIR)/bin/translation_fr.elf: SEGMENT_ADDRESS := 0x19000000
$(BUILD_DIR)/bin/translation_jp.elf: SEGMENT_ADDRESS := 0x19000000
$(BUILD_DIR)/bin/translation_es.elf: SEGMENT_ADDRESS := 0x19000000
$(BUILD_DIR)/bin/eu/translation_de.elf: SEGMENT_ADDRESS := 0x19000000
$(BUILD_DIR)/bin/eu/translation_en.elf: SEGMENT_ADDRESS := 0x19000000
$(BUILD_DIR)/bin/eu/translation_fr.elf: SEGMENT_ADDRESS := 0x19000000
# --------------------------------------
# Skybox Rules
@@ -264,11 +262,14 @@ $(BUILD_DIR)/bin/%_skybox.elf: SEGMENT_ADDRESS := 0x0A000000
# --------------------------------------
# intro and ipl3 textures are not compressed
INTRO_RAW_FILES := $(wildcard $(TEXTURE_DIR)/intro_raw/*.png)
INTRO_RAW_FILES := $(wildcard $(TEXTURE_DIR)/intro_raw/*.png)
$(BUILD_DIR)/src/goddard/renderer.o: $(addprefix $(BUILD_DIR)/,$(patsubst %.png,%.inc.c,$(INTRO_RAW_FILES)))
IPL3_TEXTURE_FILES := $(wildcard $(TEXTURE_DIR)/ipl3_raw/*.png)
IPL3_RAW_FILES := $(addprefix $(BUILD_DIR)/,$(patsubst %.png,%,$(IPL3_TEXTURE_FILES)))
CRASH_TEXTURE_FILES := $(wildcard $(TEXTURE_DIR)/crash_screen/*.png)
CRASH_TEXTURE_FILES := $(wildcard $(TEXTURE_DIR)/crash_custom/*.png)
CRASH_TEXTURE_C_FILES := $(addprefix $(BUILD_DIR)/,$(patsubst %.png,%.inc.c,$(CRASH_TEXTURE_FILES)))
FASTTEXT_TEXTURE_FILES := $(wildcard $(TEXTURE_DIR)/fasttext/*.png)
FASTTEXT_TEXTURE_C_FILES := $(addprefix $(BUILD_DIR)/,$(patsubst %.png,%.inc.c,$(FASTTEXT_TEXTURE_FILES)))

View File

@@ -4,9 +4,9 @@
HackerSM64 now has a discord server! https://discord.gg/brETAakcXr
This repo requires BOTH a US ROM and a JP ROM in order to build. Place baserom.us.z64 in the repo as usual and ALSO include baserom.jp.z64.
This repo requires a US ROM in order to build. JP/EU ROMs are optional for some assets.
This repo needs gcc in order to be able to build it. To install it, run `sudo apt install gcc-mips-linux-gnu`
[How to install everything needed and build HackerSM64](https://github.com/HackerN64/HackerSM64/wiki/Installing-HackerSM64)
This is a fork of the ultrasm64 repo by CrashOveride which includes the following commonly used patches (patches marked with `*` are toggleable in the config files):
@@ -17,11 +17,11 @@ This is a fork of the ultrasm64 repo by CrashOveride which includes the followin
- **MrComit**: General use object defines, JUMP_KICK_FIX
- **aglab2**: Bugfixes (particularly puppycam), refactor stuff
- **someone2639**: math.s and crash screen disam, stack trace, map packing, shiftable segments 2, S2DEX engine
- **Arthurtilly**: ASCII / UTF-8 support, Multilang, Platform Displacement 2
- **Arthurtilly**: Platform Displacement 2
- **Fazana**: PuppyLib, ucode swapping, audio load time optimisations (with Arctic), general hacker qol improvements, visual debug
- **Reonu**: Starting the project + widescreen, reonucam, various defines for hacker QoL, and a custom Spanish (Spain) translation of the game.
- **Reonu**: Starting the project/repo, widescreen, reonucam, various defines for hacker QoL
- **JoshDuMan**: Decomp guy, general assistance
- **Arceveti**: Naming unknown symbols, new crash screen, silhouette, shadow optimizations, breath meter, 4 controller support, implementations of rounded corners, slope fix, exposed ceiling fix, other bugfixes
- **Arceveti**: Silhouette, shadow optimisation, better hanging, breath meter, 4 controller support
- **axollyon**: Console testing, bugfixes, idea-guying, and had a hand in silhouettes
- **Wiseguy**: World scale reimplementation, silhouette, graph node optimisations, instant input patch, cake screen fix, segmented code support, and various optimizations/fixes
- **Kaze**: Graph node optimisations, automatic optimal collision distance
@@ -87,9 +87,9 @@ Thanks to Frame#5375 and AloXado320 for also helping with silhouette stuff
- You can set a test level in `config/config_debug.h` in order to boot straight into it, so you can quickly test the level you're working on. *
- Allow all surfaces in the game to have a `force` parameter. Activating this doesn't REQUIRE you to set `force` for every surface: If you don't set, it will default to 0x0000 rather than crashing. Increases RAM usage of collision. *
- The clown font includes the entire English alphabet.
- Colored ia4 text support. Format: `"@XXXXXX[YOUR TEXT]@--------"` (By Arthurtilly)
- Example Text: `"@FF0000RED @00FF00GREEN @0000FFBLUE @FFFFFFWHITE"`
- NOTE: Text will need to be recolored each time it scrolls in a dialog box, or the custom color will reset. The text will use gDialogTextAlpha as the alpha value when changing the color.
- Colored ia4 text support. Format: `"@XXXXXXXX[YOUR TEXT]@--------"` (By ArcticJaguar725)
- Example Text: `"@FF0000FFRED @00FF00FFGREEN @0000FFFFBLUE @FFFFFF00INVISIBLE @--------NORMAL"`
- NOTE: It is not mandatory to reset the text color with `"@--------"`, but text will need to be recolored each time it scrolls in a dialog box, or the custom color will reset.
- Toggle visiblity of collision surfaces and object hitboxes with Visual Surface Debug. `config/config_debug.h` has VISUAL_DEBUG which can be turned on to enable this feature.
- Workaround for infinite death loops caused by using the wrong warp type for death warps. Mario's HP will be restored when being warped to any warp if (and only if) he was warped while dead. *
@@ -118,7 +118,6 @@ Thanks to Frame#5375 and AloXado320 for also helping with silhouette stuff
- This repo supports a much better implementation of reverb over vanilla's fake echo reverb. Great for caves or eerie levels, as well as just a better audio experience in general. See `audio/synthesis.c` for more details and configuration info. (By ArcticJaguar725) *
- Fazana's "puppyprint" text engine. *
- Use `print_small_text` to print normal text. The two last params are aligment and how many characters to print (-1 means PRINT_ALL).
- Use `render_multi_image` to draw large texture rectangles consisting of multiple images on the screen.
- More info in `puppyprint.c`
- Wiseguy's Farcall TLB mapping allows to store executable code inside uncompressed segments, that can be loaded and ran as needed, instead of it having to be loaded at all times. See `farcall.h` in the include folder for instructions and details.
- Red Coin Stars now support up to 99 red coins! In addition, multi-area red coin missions can now be created by setting the 2nd behavior paramater of the red coin star to the number of reds required for the star to spawn.
@@ -139,14 +138,6 @@ Thanks to Frame#5375 and AloXado320 for also helping with silhouette stuff
- Separate defines for emulator and console black border height.
- Getting HVQM FMV support to work with the game is WIP.
Requirements are the same as regular SM64, however a GCC MIPS cross compiler is also required. If you're on Debian-like Linux, you can use the ``gcc-mips-linux-gnu`` package. The toolchain that comes with my SDK is also supported.
## Additional Prerequisites
BinPNG (the CI texture converter) requires some python3 dependencies. Use pip to install them.
``pip install pypng bitstring``
## UNFLoader support
The repository supports UNFLoader for debugging.
@@ -207,7 +198,3 @@ Thanks to "someone2639" for this hacky-ass idea
Q: Will this allow me to use FlashRAM/Transfer Pak/microcode swapping/Other Cool N64 Features?
A: Theoretically, all yes.
## Installation help
Go read the original SM64 repo README.md

View File

@@ -1,11 +1,17 @@
.include "macros.inc"
.section .data
.balign 16
glabel gMapSymbols
glabel gMapEntries
.incbin "bin/addr.bin"
glabel gMapSymbolsEnd
glabel gMapEntryEnd
.balign 16
glabel gMapStrings
.incbin "bin/name.bin"
glabel gMapStringsEnd
.balign 16
glabel gMapEntrySize
.word (gMapEntryEnd - gMapEntries) / 4
glabel gMapStringSize
.word (gMapStringsEnd - gMapStrings)

View File

@@ -1,11 +0,0 @@
// Detect if the emux emulator extension is supported
// https://hackmd.io/@rasky/r1k7na6Jn
.include "macros.inc"
.section .text, "ax"
.set noreorder
glabel emux_detect
or $v0, $0, $0
jr $ra
tne $v0, $v0, 0x0

View File

@@ -1,8 +1,6 @@
.include "macros.inc"
.section .data
glabel __n64Assert_Condition
.skip 4
glabel __n64Assert_Filename
.skip 4
glabel __n64Assert_LineNum
@@ -13,10 +11,9 @@ glabel __n64Assert_Message
.section .text
glabel __n64Assert
sw $a0, __n64Assert_Condition
sw $a1, __n64Assert_Filename
sw $a2, __n64Assert_LineNum
sw $a3, __n64Assert_Message
sw $a0, __n64Assert_Filename
sw $a1, __n64Assert_LineNum
sw $a2, __n64Assert_Message
syscall
nop

View File

@@ -1,16 +0,0 @@
// Used as part of emulator detection. The dynarec core of PJ64 4.0 only updates
// the COUNT register in between recompiled functions, so this will return 0 on
// PJ64 4.0 dynarec, but will instead return the count factor on other versions.
.include "macros.inc"
.section .text, "ax"
.set noreorder
.balign 32
glabel pj64_get_count_factor_asm
mfc0 $t0, $9 // $9 is the COUNT register
NOP
mfc0 $t1, $9
subu $v0, $t1, $t0
jr $ra
srl $v0, $v0, 1

View File

@@ -14,7 +14,7 @@
.word 0x00000000 /* Checksum 2 */
.word 0x00000000 /* Unknown */
.word 0x00000000 /* Unknown */
.ascii INTERNAL_ROM_NAME /* Internal ROM name */
.ascii INTERNAL_ROM_NAME /* Internal ROM name */
#if defined(EMU_DEFAULT_TO_GCN)
/* Advanced homebrew ROM header bytes: https://n64brew.dev/wiki/ROM_Header#Advanced_Homebrew_ROM_Header */
.word 0x82000000
@@ -22,11 +22,8 @@
.word 0x00000000 /* Unknown */
#endif
.word 0x0000004E /* Cartridge */
#if defined(EEP4K) && !defined(EMU_DEFAULT_TO_GCN)
.ascii "SM" /* Cartridge ID */
#else
.ascii "ED" /* Cartridge ID */
#endif
/* Region */
#if defined(VERSION_JP) || defined(VERSION_SH)
@@ -35,14 +32,21 @@
.ascii "E" /* NTSC-U (North America) */
#endif
#if defined(SRAM)
.byte 0x32 /* Version */
#elif defined(EEP16K)
.byte 0x22 /* Version */
#elif defined(SRAM768K)
.byte 0x42 /* Version */
#elif defined(FLASHRAM)
.byte 0x52 /* Version */
#if defined(USE_RTC)
#define RTC_BIT 0x1
#else
.byte 0x12 /* Version */
#define RTC_BIT 0x0
#endif
/* Savetype, region, and RTC */
#if defined(SRAM)
.byte 0x32 | RTC_BIT
#elif defined(EEP16K)
.byte 0x22 | RTC_BIT
#elif defined(SRAM768K)
.byte 0x42 | RTC_BIT
#elif defined(FLASHRAM)
.byte 0x52 | RTC_BIT
#else
.byte 0x12 | RTC_BIT
#endif

View File

@@ -1861,10 +1861,6 @@
"textures/water/jrb_textures.0A000.rgba16.png": [32,32,2048,{"jp":[3354832,40960],"us":[3361584,40960],"eu":[3235184,40960],"sh":[3209552,40960]}],
"textures/water/jrb_textures.0A800.rgba16.png": [64,32,4096,{"jp":[3354832,43008],"us":[3361584,43008],"eu":[3235184,43008],"sh":[3209552,43008]}],
"textures/water/jrb_textures.0B800.rgba16.png": [64,32,4096,{"jp":[3354832,47104],"us":[3361584,47104],"eu":[3235184,47104],"sh":[3209552,47104]}],
"sound/samples/bowser_organ/00_organ_1.aiff": [0,{"jp":["@sound",195],"us":["@sound",216],"eu":["@sound",216]}],
"sound/samples/bowser_organ/01_organ_1_lq.aiff": [0,{"jp":["@sound",196],"us":["@sound",217],"eu":["@sound",217]}],
"sound/samples/bowser_organ/02_boys_choir.aiff": [0,{"jp":["@sound",197],"us":["@sound",218],"eu":["@sound",218]}],
"sound/samples/course_start/00_la.aiff": [0,{"jp":["@sound",194],"us":["@sound",215],"eu":["@sound",215]}],
"sound/samples/instruments/00.aiff": [0,{"jp":["@sound",120],"us":["@sound",141],"eu":["@sound",141],"sh":["@sound",141]}],
"sound/samples/instruments/01_banjo_1.aiff": [0,{"jp":["@sound",121],"us":["@sound",142],"eu":["@sound",142],"sh":["@sound",142]}],
"sound/samples/instruments/02.aiff": [0,{"jp":["@sound",122],"us":["@sound",143],"eu":["@sound",143],"sh":["@sound",143]}],
@@ -1918,8 +1914,8 @@
"sound/samples/instruments/32_metal_rimshot.aiff": [0,{"jp":["@sound",170],"us":["@sound",191],"eu":["@sound",191],"sh":["@sound",191]}],
"sound/samples/instruments/33_kick_drum_2.aiff": [0,{"jp":["@sound",171],"us":["@sound",192],"eu":["@sound",192],"sh":["@sound",192]}],
"sound/samples/instruments/34_alto_flute.aiff": [0,{"jp":["@sound",172],"us":["@sound",193],"eu":["@sound",193],"sh":["@sound",193]}],
"sound/samples/instruments/34b_organ.aiff": [0,{"sh":["@sound",194]}],
"sound/samples/instruments/34c_organ_lq.aiff": [0,{"sh":["@sound",195]}],
"sound/samples/instruments/34b_organ.aiff": [0,{"jp":["@sound",195],"us":["@sound",216],"eu":["@sound",216],"sh":["@sound",194]}],
"sound/samples/instruments/34c_organ_lq.aiff": [0,{"jp":["@sound",196],"us":["@sound",217],"eu":["@sound",217],"sh":["@sound",195]}],
"sound/samples/instruments/35_gospel_organ.aiff": [0,{"jp":["@sound",173],"us":["@sound",194],"eu":["@sound",194],"sh":["@sound",196]}],
"sound/samples/instruments/36_sawtooth_synth.aiff": [0,{"jp":["@sound",174],"us":["@sound",195],"eu":["@sound",195],"sh":["@sound",197]}],
"sound/samples/instruments/37_square_synth.aiff": [0,{"jp":["@sound",175],"us":["@sound",196],"eu":["@sound",196],"sh":["@sound",198]}],
@@ -1937,11 +1933,10 @@
"sound/samples/instruments/43_harmonica.aiff": [0,{"jp":["@sound",187],"us":["@sound",208],"eu":["@sound",208],"sh":["@sound",210]}],
"sound/samples/instruments/44_grand_piano.aiff": [0,{"jp":["@sound",188],"us":["@sound",209],"eu":["@sound",209],"sh":["@sound",211]}],
"sound/samples/instruments/45_french_horns_lq.aiff": [0,{"jp":["@sound",189],"us":["@sound",210],"eu":["@sound",210],"sh":["@sound",212]}],
"sound/samples/instruments/45b_la.aiff": [0,{"sh":["@sound",213]}],
"sound/samples/instruments/45b_la.aiff": [0,{"jp":["@sound",194],"us":["@sound",215],"eu":["@sound",215],"sh":["@sound",213]}],
"sound/samples/instruments/46_pizzicato_strings_1.aiff": [0,{"jp":["@sound",190],"us":["@sound",211],"eu":["@sound",211],"sh":["@sound",214]}],
"sound/samples/instruments/47_pizzicato_strings_2.aiff": [0,{"jp":["@sound",191],"us":["@sound",212],"eu":["@sound",212],"sh":["@sound",215]}],
"sound/samples/instruments/48_steel_drum.aiff": [0,{"jp":["@sound",192],"us":["@sound",213],"eu":["@sound",213],"sh":["@sound",216]}],
"sound/samples/piranha_music_box/00_music_box.aiff": [0,{"jp":["@sound",193],"us":["@sound",214],"eu":["@sound",214]}],
"sound/samples/sfx_1/00_twirl.aiff": [0,{"jp":["@sound",0],"us":["@sound",0],"eu":["@sound",0],"sh":["@sound",0]}],
"sound/samples/sfx_1/01_brushing.aiff": [0,{"jp":["@sound",1],"us":["@sound",1],"eu":["@sound",1],"sh":["@sound",1]}],
"sound/samples/sfx_1/02_hand_touch.aiff": [0,{"jp":["@sound",2],"us":["@sound",2],"eu":["@sound",2],"sh":["@sound",2]}],

15
bin/eu/translation_de.c Normal file
View File

@@ -0,0 +1,15 @@
// SM64 (EU) Segment 19 - Deutsch
#include "macros.h"
#include "game/ingame_menu.h"
#include "make_const_nonconst.h"
// Include text/define_text.inc.c, preprocessed with -I text/de/ to get the
// right translation strings, with symbols renamed as below.
#define seg2_course_name_table course_name_table_eu_de
#define seg2_act_name_table act_name_table_eu_de
#define seg2_dialog_table dialog_table_eu_de
#include "text/de/define_text.inc.c"

15
bin/eu/translation_en.c Normal file
View File

@@ -0,0 +1,15 @@
// SM64 (EU) Segment 19 - English
#include "macros.h"
#include "game/ingame_menu.h"
#include "make_const_nonconst.h"
// Include text/define_text.inc.c, preprocessed with -I text/us/ to get the
// right translation strings, with symbols renamed as below.
#define seg2_course_name_table course_name_table_eu_en
#define seg2_act_name_table act_name_table_eu_en
#define seg2_dialog_table dialog_table_eu_en
#include "text/us/define_text.inc.c"

15
bin/eu/translation_fr.c Normal file
View File

@@ -0,0 +1,15 @@
// SM64 (EU) Segment 19 - Français
#include "macros.h"
#include "game/ingame_menu.h"
#include "make_const_nonconst.h"
// Include text/define_text.inc.c, preprocessed with -I text/fr/ to get the
// right translation strings, with symbols renamed as below.
#define seg2_course_name_table course_name_table_eu_fr
#define seg2_act_name_table act_name_table_eu_fr
#define seg2_dialog_table dialog_table_eu_fr
#include "text/fr/define_text.inc.c"

File diff suppressed because it is too large Load Diff

View File

@@ -1,17 +0,0 @@
// SM64 (EU) Segment 19 - Deutsch
#include "macros.h"
#include "game/ingame_menu.h"
#include "sounds.h"
#include "seq_ids.h"
#define COURSE_NAME_TABLE course_name_table_de
#define ACT_NAME_TABLE act_name_table_de
#define DIALOG_TABLE dialog_table_de
#define DIALOG_FILE "de/dialogs.h"
#define COURSE_FILE "de/courses.h"
#include "text/define_text.inc.c"
#undef DIALOG_FILE
#undef COURSE_FILE

View File

@@ -1,17 +0,0 @@
// SM64 (EU) Segment 19 - English
#include "macros.h"
#include "game/ingame_menu.h"
#include "sounds.h"
#include "seq_ids.h"
#define COURSE_NAME_TABLE course_name_table_en
#define ACT_NAME_TABLE act_name_table_en
#define DIALOG_TABLE dialog_table_en
#define DIALOG_FILE "us/dialogs.h"
#define COURSE_FILE "us/courses.h"
#include "text/define_text.inc.c"
#undef DIALOG_FILE
#undef COURSE_FILE

View File

@@ -1,17 +0,0 @@
// SM64 (EU) Segment 19 - Español (España) (Not vanilla: Translation created and added by Reonu)
#include "macros.h"
#include "game/ingame_menu.h"
#include "sounds.h"
#include "seq_ids.h"
#define COURSE_NAME_TABLE course_name_table_es
#define ACT_NAME_TABLE act_name_table_es
#define DIALOG_TABLE dialog_table_es
#define DIALOG_FILE "es/dialogs.h"
#define COURSE_FILE "es/courses.h"
#include "text/define_text.inc.c"
#undef DIALOG_FILE
#undef COURSE_FILE

View File

@@ -1,17 +0,0 @@
// SM64 (EU) Segment 19 - Français
#include "macros.h"
#include "game/ingame_menu.h"
#include "sounds.h"
#include "seq_ids.h"
#define COURSE_NAME_TABLE course_name_table_fr
#define ACT_NAME_TABLE act_name_table_fr
#define DIALOG_TABLE dialog_table_fr
#define DIALOG_FILE "fr/dialogs.h"
#define COURSE_FILE "fr/courses.h"
#include "text/define_text.inc.c"
#undef DIALOG_FILE
#undef COURSE_FILE

View File

@@ -1,17 +0,0 @@
// SM64 (EU) Segment 19 - 日本語 (Japanese)
#include "macros.h"
#include "game/ingame_menu.h"
#include "sounds.h"
#include "seq_ids.h"
#define COURSE_NAME_TABLE course_name_table_jp
#define ACT_NAME_TABLE act_name_table_jp
#define DIALOG_TABLE dialog_table_jp
#define DIALOG_FILE "jp/dialogs.h"
#define COURSE_FILE "jp/courses.h"
#include "text/define_text.inc.c"
#undef DIALOG_FILE
#undef COURSE_FILE

Some files were not shown because too many files have changed in this diff Show More