Commit Graph

66 Commits

Author SHA1 Message Date
Garrett Cox
c474a82a94
Mirror Mode (#535)
* Mirror mode initial version

* Update mm/src/code/z_actor.c

Co-authored-by: Archez <Archez@users.noreply.github.com>

* mirror mode support for minimaps and dungeon pause map

* mirror mode support overworld pause map and song of soaring

* mirror mode support for various remaining things

* mirror mode support pause warp enhancement

* Add searchable menu item

---------

Co-authored-by: Archez <Archez@users.noreply.github.com>
Co-authored-by: Archez <archez39@me.com>
2024-10-02 23:44:36 -04:00
Archez
0c2a51c9f4
Various custom asset support (#756)
* use asset paths for better custom asset support

* fix keyframe animation timings

* display title cards as a full texture

* asset support for gfxprint

* support pause menu overworld map

* fix more resources that need to be loaded

* pr feedback
2024-08-23 17:19:41 -04:00
Garrett Cox
53faf37dc1
Add persistent bunny mask enhancement (#537) 2024-08-18 11:41:17 -04:00
mckinlee
0ec23b34ba
[Enhancement] Pause Owl Warp (#620)
* Add Pause Owl Warp Enhancement

- **mm/2s2h/BenGui/BenMenuBar.cpp**: Updated menu to include new enhancement options.
- **mm/2s2h/Enhancements/Enhancements.cpp**: Registered the new Pause Owl Warp enhancement.
- **mm/2s2h/Enhancements/Enhancements.h**: Declared functions for the new enhancement.
- **mm/2s2h/Enhancements/Songs/PauseOwlWarp.cpp**: Implemented the Pause Owl Warp functionality.
- **mm/2s2h/Enhancements/Songs/PauseOwlWarp.h**: Header file for the Pause Owl Warp implementation.
- **mm/include/functions.h**: Added function declarations related to the new enhancement.
- **mm/src/overlays/kaleido_scope/ovl_kaleido_map.c**: Modified to support the new enhancement.
- **mm/src/overlays/kaleido_scope/ovl_kaleido_scope_NES.c**: Modified to support the new enhancement.

* ran clang-format script

* Additional logic and bug fixes

* Fix PauseOwlWarp cursor logic triggering on dungeon map
-Added a check to ensure PauseOwlWarp's cursor logic is only triggered when not in a dungeon.

* Add Song of Soaring check
- To make it more in line with vanilla, you are now required to have the Song of Soaring to use this enhancement.

* bug fix and ran clang-format script
-My previous commit had a extra condition that wasn't needed that caused a bug where the world map points locations pointed to activated owl statues.

* added more checks

* Simplified complex conditional statements

* possibly fix macos build issue?

* index warping logic added

* implement feedback from Archez

* shot in the dark macos build fix?

* how bout now?

* revert back to previous commit

* if this fixed the macos build issue it'll be thanks to cclark25... let's pray

* add debugeditor check - thanks archez!

* Moved debugEditor check to prevent triggering ALL pauseOwlWarp logic. wtf was I thinking earlier
2024-08-05 15:18:52 -04:00
Archez
24d8d47ab2 Merge remote-tracking branch 'origin/develop' into merge-develop-rika 2024-07-11 22:05:15 -04:00
Archez
03a33628cb
fix skybox textures not reloading (#719) 2024-06-26 17:45:50 -04:00
Garrett Cox
2e4710c6c2
Tweaks to warp point (#666)
* Tweaks to warp point

* wait for console logo exit

---------

Co-authored-by: Archez <Archez@users.noreply.github.com>
2024-06-25 00:16:10 -04:00
Garrett Cox
f8f00e6d9b
Add draw distance enhancements for actors and scene geometry (#539) 2024-06-02 23:15:33 -05:00
Caladius
26321c9a17
Adds Dungeon Items to the Save Editor (#585)
* Adds Dungeon Items to the Save Editor

* clang'd up

* Update mm/include/z64save.h

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>

* Move a few static arrays

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-06-02 21:18:17 -05:00
inspectredc
a3add6092b
Fix Dpad Ocarina L Btn & GI Dpad Stuff (#578) 2024-05-31 19:21:57 -05:00
briaguya
65870f3c07
update to latest lus main (#614)
* update to latest lus main

* upstream otrexporter and zapdtr submodules

* upstream LUS submodule
2024-05-30 23:30:05 -04:00
Garrett Cox
464c55fcbb
Tweaks to autosaves and pause saves to always persist them, along with preventing saves when it's too early or late in the game (#616) 2024-05-30 23:20:29 -04:00
aMannus
cb3237c645
Persistent Owl Saves & Autosaves (#458)
* Persistent Owl Saves & Autosaves

* Better entrance handling

* clang format happy now pls?
2024-05-24 13:01:48 -05:00
Garrett Cox
904c3641d9
Add support for dropping various save formats into the game window (#404) 2024-05-23 21:31:50 -05:00
PurpleHato
c46a6637fe ADD: Text Based Clock enhancement (#246)
* ADD: dirty simplier clock enhancement

* ADD: Crash timer + combobox

* ADD: Hook (not working yet)

* TWEAK: z_parameter formatting like original

* TWEAK: z_parameter formatting like original again

* TWEAK: z_parameter formatting like original part3

* TWEAK: Add back the gi in z_parameter

* TWEAK: recommendation + missing include

* Pointer to .

* Tweak include

* TWEAK: better naming for 24 hours texture name

* Tweak: line space

* TWEAK: Adressed review

* TWEAK: TwentyFourHours

* comma

* TWEAK: Accounted Reviews

* TWEAK: review enums

* ADD: Macro

* whitespace

* move macros and center clock text

---------

Co-authored-by: Adam Bird <archez39@me.com>
2024-05-22 09:05:05 -05:00
Garrett Cox
4cb34b2153 Add our own field for storing last entrance and other tweaks (#373) 2024-05-22 09:05:04 -05:00
inspectredc
04d56e8fbd 'Free/Debug' Camera & Free Look Camera (#323)
* Remove BenPort.h from functions.h

* use specific z64 includes

* free cam

* this -> thisx

* fl newline

* whitespace

* remove debugging stuff

* min and max cam heights. use correct func_800CBFA4 arg

* document and re-organise free cam

* fix linux building

* Custom Camera VB

* remove redundant section in header

* fix hook and re-organise menu

* Free Cam

* fix control flipping and some speed tweaks

* Fix Player flags not being reset

* Fix movement under roll: todo fix rotation under roll

* six degrees of freedom

* Multiple camera mode options, remove black bars, start with focal point by eye

* update free look

* cvar rename, menu disabling

* remove player state flag change

* renaming and remove some camera jumpiness

* remove scam comment

* remove port selection

* correct debugcam at initialised position

* fix focal point for non roll
2024-05-22 09:05:04 -05:00
Archez
df1976cd36 bump latest lus; window changes; header updates (#345) 2024-05-22 09:05:04 -05:00
inspectredc
ad478cfc59 DPad Items (#228)
* Initial Dpad

* remove old hud stuff

* and comment

* s..

* add dpad equip macro back in

* fix inputs

* fix equipping (hopefully all)

* finish some todos

* add 2s2h asset header

* check dpad macro

* remove 2s2h_assets

* re-add empty texture

* use correct struct for default dpad equips

* dpad save stuff

* fix item offering, use correct equip offset values

* finally figure out unk_154 and fix mask equipping

* avoid ugly code

* add necessary condition

* correct save names for dpad items/slots

* remove todos and sort out suggestions and rename cvar

* func standardise renaming

* Add dpad to hud presets

* dpad save migration
2024-05-22 09:05:04 -05:00
louist103
9554f79e26 Header and cmake cleanup. (#310) 2024-05-22 09:05:04 -05:00
inspectredc
292acc5ecd Remove BenPort.h from functions.h (#309)
* Remove BenPort.h from functions.h

* use specific z64 includes

* this -> thisx
2024-05-22 09:05:04 -05:00
Archez
bbb0e2a4e0 Fix interpolation crashes due to unclosed records (#263)
* Fix interpolation crashes due to unclosed records

* rework en_mnk drawface to avoid return in open/close disps pair [still matching]

* fix placement of close_disps in en_osn draw

* replace returns with goto to follow other decomp patterns
2024-05-22 09:05:02 -05:00
Garrett Cox
16e4ccf9af Add Event Log and more hooks (#247) 2024-05-22 09:05:02 -05:00
inspectredc
c897fc2399 Gamecube NTSC US Support (#155)
* initial asset xml split

* move otrexporter back

* update exporter

* update xml progress

* update xmls -- todo: rename actor.xml

* use latest otrexporter

* cherry pick over gc support changes

* zapdtr gc support

* fix title screen

* fix jumpslash

* add gc file list

* add additional asset header

* Update OTRExporter

* Update ZAPDTR

* Update libultraship

* Update OTRExporter

* submodule

* attempt 3 at submodules

* add gPowderKegFuseVtx to gc xml

* lus main

* for pr

* zapdtr rebased

* move game versions to benport

* update xml for PRs

* move audio, todo: add to GC

* gc audio

* explain commented assets

* zapdtr

* pull and update zapdtr

* Update OTRExporter
2024-05-22 09:05:02 -05:00
louist103
3ad053807e Fix cremia text crash. (#235) 2024-05-22 09:05:01 -05:00
Archez
ab19d6417d Fix save corruption from non null-terminated cstrings (variation) (#230)
* verify save slots better; allow global.sav to work again

* fix save corruption and restore global.sav

* add comments
2024-05-22 09:05:01 -05:00
Garrett Cox
dfe0e1d6c2 Actor hooks (#135) 2024-05-22 09:05:01 -05:00
Archez
25864d1a92 Add volume slider support (#201)
* Add volume slider support

* extern fix?
2024-05-22 09:05:01 -05:00
Archez
0a08986176 Fix song of double time camera spline data (#203) 2024-05-22 09:05:01 -05:00
Kenix3
912d46761b Audio Works (#180)
* initial audio work

* Implements caching and fixes a ton of issues with audio

* Uses correct memory sizes in mixer.c

* Resets mixer values

* Actually correct dmem buff values in mixer.c

* Remove breakpoints

* Fix sequences not playing

* The forbidden type.

* Forbidden TYPES?!

* Thanks Louis

* Thanks Louis Part 2

* Fix garbled audio

* Fixed ADSR bugs

* Fixes ASAN crash in loading samples.

This code is causing the game to attempt to read sample data beyond the actual sample data.

* Comments out the sample clamping since we aren't affecting the rest of the calculations in the function.

* Fixes crashing while loading audio samples.

Additionally, lowers the log level for audio commands.

* Textbox SFX UB Fix

* Decreases priority of more debug messages

* Fixed a couple uintptr_t issues

* Adds context to Jack's hack of shortcutting later loading sequences.

* Audio corruption fix

* Few uintptr_t fixes

* Fix build on linux

* Fix build on mac

* call audio exit

* fix sfx in dialog

* unstub more audio funcs

---------

Co-authored-by: Random06457 <28494085+Random06457@users.noreply.github.com>
Co-authored-by: Nicholas Estelami <NEstelami@users.noreply.github.com>
Co-authored-by: louis <35883445+louist103@users.noreply.github.com>
Co-authored-by: Adam Bird <archez39@me.com>
2024-05-22 09:05:01 -05:00
louist103
27b70f03c1 Track LUS changes for LUS refactor. (#163)
* Track LUS changes. So far implemented:
- Moving the big switch into unordered maps.
- Dynamically switching between different ucodes. So far tested switching between f3dex2 and s2dex.

* track LUS changes

* LUS Bump
2024-05-22 09:05:00 -05:00
louist103
904bf60b36 Changes for new LUS resources (#151)
* Changes for new LUS resources

* fix factory issues and bump modules

* add build version, custom assets folder, and fix extraction

* add missing custom assets

* fix build .h

* libzip in the workflows

* apt-deps

* Fixes to importers to work with upstream Resource Manager.
Also remove duplicated structs.

* Bump LUS

* bump LUS

* Bump LUS

* bump lus

* point back to louist103/mm

---------

Co-authored-by: Adam Bird <archez39@me.com>
2024-05-22 09:05:00 -05:00
Garrett Cox
9da273a8ea Add fast text enhancement (#150)
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
2024-05-22 09:05:00 -05:00
Archez
82cf1a4885 Add cvar methods to global functions header and cleanup includes (#152)
* add cvar methods to global functions header and cleanup includes

* fix z_lib.c

* tweak includes
2024-05-22 09:05:00 -05:00
Garrett Cox
cacf0d000a Sort better map select entries (#138) 2024-05-22 09:04:59 -05:00
Archez
a035554cbc increase audio seq cmd queue (#144) 2024-05-22 09:04:59 -05:00
Garrett Cox
87e7c24c7b 2 Fix 2 Owl Saves (#142) 2024-05-22 09:04:59 -05:00
Garrett Cox
683820632a Fix owl save crash by adjusting save buffer size (#141) 2024-05-22 09:04:59 -05:00
Archez
48f197c049 Better GFX debugging control and fix accidental opcode overwrites (#132)
* implement better gfx command debugging

* revert xlu crash fix back to source
2024-05-22 09:04:59 -05:00
Archez
32caecabfc read proper depth values from the renderer (#124) 2024-05-22 09:04:59 -05:00
Archez
d479a7db37 Add ActorResetFunc for variable cleanup (#98)
* add actor reset func handling

* reset func for day transitions

* reset func for deku playground

* reset func for dog race

* reset func for grass

* reset func for goron shrine chandelier

* reset func for lost woods intro sparkles

* reset func for deku palace patrol guards

* reset func for dampe

* reset func for beaver race rings

* reset func for butler race doors

* reset funcs for deep sea python

* reset func for dogs

* reset func for deku curse mad scrubs

* reset func for keaton grass

* reset func for marine lab fish

* reset func for shooting gallery scrubs

* reset func for Stone Tower FloorSwitch

* reset func for ice platforms

* reset func for punchable pillar

* reset func for blue warps

* reset func for odolwa

* reset func for twinmold

* reset func for gyorg

* reset func for wart

* reset func for igos window

* reset func for majora

* reset func for snow head central pillar
2024-05-22 09:04:59 -05:00
Garrett Cox
2bce365364 Add humanName to actor table (#71) 2024-05-22 09:04:59 -05:00
Garrett Cox
8894215a4b Add/adjust some 2S2H comments (#116) 2024-05-22 09:04:59 -05:00
inspectredc
745e554d3a Fix Various Player Anim Checks (#89)
* Fix Player Anim Checks

* strcmp everything

* missed a couple

* use macro

* update comment
2024-05-22 09:04:58 -05:00
louist103
ce17d97ac4 Frame interpolation (#78)
* Initial. Only enough to get it running. Missing changes to effects and actors.

* Add frame interp calls to most files in `code`

* Fix bubbles (The ones that look like bubbles)

* Fix kankyo and takkuri.

* Fix obj_grass interpolation

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-05-22 09:04:58 -05:00
Garrett Cox
7573a9378c Double DList buffer size (#88) 2024-05-22 09:04:58 -05:00
briaguya
23d749b296 i got a dupe def error without this (#84)
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
2024-05-22 09:04:58 -05:00
Garrett Cox
508f8378de Better map select (#85)
* Add human readable name and entrance scene ID to scene table

* Add better map select
2024-05-22 09:04:58 -05:00
Garrett Cox
837ef4dde6 CI (#81) 2024-05-22 09:04:58 -05:00
inspectredc
63f7d07b39 Fix DoActions on B (mac) (#66)
* fix doaction on B mac

* add comment
2024-05-22 09:04:58 -05:00