Game-Decompilation/2ship2harkinian
1
0
Fork 0
mirror of https://github.com/HarbourMasters/2ship2harkinian.git synced 2024-11-30 09:40:52 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
3,087 Commits 4 Branches 5 Tags 164 MiB
941b48b802
Commit Graph

446 Commits

Author SHA1 Message Date
inspectredc
743febba8c fierce deity anywhere for dpad (#358) 2024-05-22 09:05:04 -05:00
Archez
ffcedc147d Support hud editor overrides for kaleido equip animations (#238) 
* Support hud editor overrides for kaleido equip animations

* use mask style

* add missing unset

* update to support dpad equip animation
 2024-05-22 09:05:04 -05:00
Garrett Cox
820b628beb Fix malloc include on macos (#354) 2024-05-22 09:05:04 -05:00
louist103
b809d80b8f Fix ub (#352) 2024-05-22 09:05:04 -05:00
PurpleHato
524a2ebbe0 TWEAK: Restoration menu dupliacation (#350) 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
140b45c5c5 Fix various equip d-pad issues (#349) 2024-05-22 09:05:04 -05:00
Garrett Cox
2d0421797b Fix minislime interpolation. Closes #340 (#342) 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
Garrett Cox
1d5d9be069 Fix Wart interpolation. Closes #339 (#344) 2024-05-22 09:05:04 -05:00
Archez
a15cfa2fb2 Fix skel anime compares again (#347) 2024-05-22 09:05:04 -05:00
Garrett Cox
efe04c3d41 Fix hud editor preset changes not persisting. Closes #337 (#338) 2024-05-22 09:05:04 -05:00
Garrett Cox
527bd0bd93 Add missing include in raf (#343) 2024-05-22 09:05:04 -05:00
Garrett Cox
7bc6c58721 Replace some remaining soh branding with 2ship (#341) 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
inspectredc
ba16e12772 add reset to aliens (#329) 2024-05-22 09:05:04 -05:00
inspectredc
83be8b1180 [Enhancement] Power Crouch Stab (#273) 
* power crouch stab

* update gi enum

---------

Co-authored-by: Archez <Archez@users.noreply.github.com>
 2024-05-22 09:05:04 -05:00
Garrett Cox
63428cca5f Fix grass interpolation issue when culling. Closes #249 (#333) 2024-05-22 09:05:03 -05:00
Garrett Cox
c8ce60e2db Fix freezard interpolation (#331) 
* Fix freezard interpolation

* Update mm/src/overlays/actors/ovl_En_Fz/z_en_fz.c
 2024-05-22 09:05:03 -05:00
Garrett Cox
4d64945839 Fix some goht interpolation (#332) 2024-05-22 09:05:03 -05:00
Archez
d4fff4c5fb Add skip title opening and create save with debug inventory enhancements (#312) 
* add skip title opening and save with debug inv enhancements

* feedback
 2024-05-22 09:05:03 -05:00
Archez
a88609ef06 Fix animation morph detection (#327) 2024-05-22 09:05:03 -05:00
aMannus
f3924c2f83 [Enhancement] Enable Suns Song (#262) 
* Enable Suns Song

* Move Sun's Song to no longer check for save data at all

* Update description

* Address review comments

---------

Co-authored-by: Archez <Archez@users.noreply.github.com>
 2024-05-22 09:05:03 -05:00
louist103
6b73dab27b Consolidate array in z_en_fish2 (#320) 2024-05-22 09:05:03 -05:00
louist103
7620d69678 Interpolation and CPU modified textures. z_en_raf (#313) 
Fix interpolation and use texture mask for dissolve effect.
 2024-05-22 09:05:03 -05:00
Archez
fd0fc0ff46 Fix: bigslime VTX data use for windup punch/throw (#317) 2024-05-22 09:05:03 -05:00
aMannus
bda4845572 [Enhancement] Always Win Doggy Race (#256) 
* Always Win Doggy Race Hookified

* uint8_t -> bool

* Trailing comma

---------

Co-authored-by: Archez <Archez@users.noreply.github.com>
 2024-05-22 09:05:03 -05:00
aMannus
a994c13b49 [Enhancement] Unbreakable Razor Sword (#260) 
* Unbreakable Razor Sword

* Update mm/2s2h/Enhancements/GameInteractor/GameInteractor.h

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

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
 2024-05-22 09:05:03 -05:00
PurpleHato
c6178683b0 Tweak: Enhancements Alphabetical Ordering (#304) 2024-05-22 09:05:03 -05:00
Caladius
db223d8d95 Add Quest Status to Save Editor (#294) 
* Quest SaveEditor Progress

* Quest Status tab implementation.

* Updated Bombers Notebook, songs, and tooltips

* Give All and Remove All buttons.

* Fixes from Review

* Bump LUS and use nlohmann json from package manager (#254)

* Handling of FD Link Form for Sword updates.

* Update mm/2s2h/DeveloperTools/SaveEditor.cpp

* Update mm/2s2h/DeveloperTools/SaveEditor.cpp

* Oops, missed comments

* Comments

* Fix some ship references

---------

Co-authored-by: Archez <Archez@users.noreply.github.com>
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
 2024-05-22 09:05:03 -05:00
inspectredc
5fe3e350fa Fix Skulltula Counter Hud Editor (#308) 2024-05-22 09:05:03 -05:00
Archez
5a8989bdbe Pack and publish release builds (#300) 
* pack release builds

* changes

* test

* more

* different unzip

* different unzip 2

* add pr artifacts action

* mm hashes

* add gc rom

* update linux sh

* fix windows linking

* give windows release a console

* tweaks
 2024-05-22 09:05:03 -05:00
louist103
7e0b22935a Consolidate arrays. (#303) 2024-05-22 09:05:03 -05:00
Garrett Cox
60e6119af1 Fix debug warp not persisting file select, and Warp Point not saving warp point (#299) 2024-05-22 09:05:03 -05:00
aMannus
7f8ea385af [Enhancement] No Blast Mask Cooldown (#242) 
* No Blast Mask Cooldown

* Re-add empty line

* Change enum name
 2024-05-22 09:05:03 -05:00
Garrett Cox
be3f7f57ee Play as kafei (#298) 2024-05-22 09:05:03 -05:00
inspectredc
860de31e68 Fix UB in Goron Race (#293) 
* index properly

* add extra checkpoint

* add comment
 2024-05-22 09:05:03 -05:00
Archez
0916ba52f5 Fix: Write framebuffer data to CPU for Deku bubble (#236) 
* use framebuffer data for deku bubble

* review feedback
 2024-05-22 09:05:03 -05:00
Garrett Cox
ecf0f2a06f Add support for migrations and move save related stuff (#264) 
* Move SaveManager to its own file

* Add support for migration
 2024-05-22 09:05:03 -05:00
aMannus
655d82462e Recategorize current enhancements (#257) 2024-05-22 09:05:03 -05:00
Garrett Cox
1b6397eca9 Add fast mask transformation enhancement (#244) 2024-05-22 09:05:03 -05:00
Archez
d10dd13972 Rework cycle reset bottle logic to account for stolen bottles (#295) 
* handle stolen bottles in reset cycle keep bottles

* rework bottle reset logic
 2024-05-22 09:05:03 -05:00
PurpleHato
9c69f3ab4d FIX: Missing T for Do not (#297) 2024-05-22 09:05:03 -05:00
Archez
8cec7afa25 Bump lus with packages, new namespace, and global factories (#292) 
* imgui

* detangle zapdutils

* ship namespace

* register global factories

* readfb

* deps

* bump submodules

* keyframe

* bump modules
 2024-05-22 09:05:03 -05:00
inspectredc
44ded41793 [Enhancement] Un-patch side rolls (#290) 2024-05-22 09:05:03 -05:00
Archez
6fca358aa2 Bump LUS and use nlohmann json from package manager (#254) 2024-05-22 09:05:03 -05:00
Archez
727c87293c implement majora's wrath dissolve texture effect (#284) 2024-05-22 09:05:03 -05:00
PurpleHato
1e45e51884 ADD: Reset Cycle enhancements (#233) 
* ADD: Reset Cycle enhancements

TODO/ Using hooks

* FIX: Typo

* Convert to hooks

TODO: Complete Pictobox

* TWEAK: alignment style and whitespaces

* REM: Pictobox attempts

* FIX: oopsie on merge dev

* TWEAK: Review suggestion with memcpy

* Tweak typo

* loop fix

* Try: Fix linux compilation ??

* include 2
 2024-05-22 09:05:03 -05:00
Garrett Cox
8253bd27f7 Add warp developer tool (#283) 2024-05-22 09:05:03 -05:00
Garrett Cox
f4921d5b8e Add fix for ammo count color (#285) 2024-05-22 09:05:03 -05:00
Garrett Cox
7f08698d76 Add log level combo box (#286) 2024-05-22 09:05:03 -05:00
inspectredc
cdeb6eaa16 More Anim Comparison Fixes: Kafei Mask Reveal Cutscene (#288) 2024-05-22 09:05:03 -05:00
louist103
4ff6633cee Fix lava rock interpolation (#282) 2024-05-22 09:05:03 -05:00
Nicholas Estelami
000ab6f86a Fix curiosity shop crash (#281) 2024-05-22 09:05:03 -05:00
louist103
e96c7b4daf Fix song of soaring crash on linux. (#280) 
* Fix audio on linux

* Text hack
 2024-05-22 09:05:03 -05:00
Garrett Cox
62a398e24c Fix issue with flags editor and add clear/set buttons (#279) 2024-05-22 09:05:03 -05:00
Archez
6da4eee306 Add temple clears to save editor (#275) 
* Add temple clears to save editor

* for each
 2024-05-22 09:05:03 -05:00
Garrett Cox
144fa5cfaf Add flags tab to save editor (#276) 2024-05-22 09:05:03 -05:00
Archez
646cb3af37 fix DL indexing in draw code (#277) 2024-05-22 09:05:03 -05:00
Archez
0f0bca2a74 fix cross and circle for island jumping minigames (#274) 2024-05-22 09:05:03 -05:00
Archez
448237c606 fix woodfall temple wave vertex changes (#268) 2024-05-22 09:05:03 -05:00
Archez
1b9e49b52d reset milk bar door and race dog selected (#269) 2024-05-22 09:05:03 -05:00
inspectredc
0004a8c896 Fix Scarecrow Song (#271) 2024-05-22 09:05:03 -05:00
inspectredc
c2c359ceed Fix bigslime vtx load (#272) 2024-05-22 09:05:03 -05:00
Archez
5860f829db reset func for kafei (#255) 2024-05-22 09:05:02 -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
8f2d856519 Add ability to configure motion blur (#266) 2024-05-22 09:05:02 -05:00
aMannus
9311b51f46 Add missing reset to dograce (#258) 2024-05-22 09:05:02 -05:00
Archez
f81dc4f82e widescreen particles and effects (#241) 2024-05-22 09:05:02 -05:00
Archez
5a6027d0e0 fix beaver race rings not resetting (#251) 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
Archez
0da645e7e6 Fix actor inits happening too early (#248) 2024-05-22 09:05:02 -05:00
Garrett Cox
fc8f02a599 Small additions to save editor (#239) 2024-05-22 09:05:02 -05:00
louist103
e3c1d6672c Fix bug with object "loading" (#240) 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
PurpleHato
aac00dd71a ADD: 24 Hours Clock + .gitignore on the 2s2h.h (#229) 
* ADD: 24 Hours Clock

* TWEAK: gitignore
 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
briaguya
90cb488263 fd anywhere using hooks (plus splitting enhancements out into files) (#226) 
* fd anywhere using hooks (plus splitting enhancements out into files)

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

* add guards to headers

* Update mm/src/code/z_parameter.c

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

* clean

* macro magic

* Apply suggestions from code review

---------

Co-authored-by: aMannus <mannusmenting@gmail.com>
Co-authored-by: Archez <Archez@users.noreply.github.com>
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
 2024-05-22 09:05:01 -05:00
Garrett Cox
dfe0e1d6c2 Actor hooks (#135) 2024-05-22 09:05:01 -05:00
PurpleHato
9aca449eb9 ADD: Widescreen compatible sandstorm (#223) 
Co-authored-by: Archez <Archez@users.noreply.github.com>
 2024-05-22 09:05:01 -05:00
Archez
1415a71378 Add more time options to save editor (#198) 
* Add more time options to save editor

* todo the todo
 2024-05-22 09:05:01 -05:00
PurpleHato
33861d532f ADD: Transition widescre (#221) 2024-05-22 09:05:01 -05:00
PurpleHato
60982e5300 ADD: Widescreen Ocarina Effects (#219) 
* ADD: Widescreen Ocarina Effect

* TWEAK: remove unecessary reassignment

* TWEAK: better assignments

* TWEAK: forgot some vanilla value
 2024-05-22 09:05:01 -05:00
Garrett Cox
e0a1a430ae Collision viewer UI Pass (#212) 
* Initial Collision Viewer

Issues:
- UIWidget stuff was copied in to colViewer.cpp
- Pause screen still renders collision.
- Colour CVars are not working correctly.

* Move collision viewer files and small adjustments

* Redo collision viewer UI

* use identity mtx

* prevent draw collision on pause

---------

Co-authored-by: Kenix <kenixwhisperwind@gmail.com>
Co-authored-by: Adam Bird <archez39@me.com>
 2024-05-22 09:05:01 -05:00
louist103
17b698667f Fix order of gQuestItems (#224) 2024-05-22 09:05:01 -05:00
Archez
4e04d0d692 Fix control stick inputs getting maximized (#217) 2024-05-22 09:05:01 -05:00
louist103
d793d045c1 Fix song of soaring info panel text. (#208) 2024-05-22 09:05:01 -05:00
Archez
0a66c94d48 Correctly set final object entries count based on last slot index (#206) 2024-05-22 09:05:01 -05:00
Archez
edf4fdba8f Make clearFill rect fill ful height (#205) 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
d8c2361986 Fix song of time frustum (#204) 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
Archez
47f8fe055a fix draw clock texture bug for midnight (#199) 2024-05-22 09:05:01 -05:00
Garrett Cox
4f1521a678 Fix magic meter consume placement when moved by HUD editor (#178) 2024-05-22 09:05:01 -05:00
Archez
51bffb7144 add debug inventory editor check (#196) 2024-05-22 09:05:01 -05:00
PurpleHato
78f3a456a7 Fix audio cutoff issues (#195) 
This fix the audio cutoff issues when building in release mode

Explaination from @garrettjoecox
The result of osAiSetFrequency was being used later on to multiply the length an audio sequence would play. In debug mode this stub was returning 1, whereas in release mode this would return whatever was passed in as the freq argument.

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
 2024-05-22 09:05:01 -05:00
Archez
3b1d8dd1d0 fix ocarina effects (#197) 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
081577ae65 Interpolation fixes (#167) 
* hugebombiwa

* EnHanabi fireworks

* Clear tag - various non ss effects.

* Damage effects - sparks, fire, orbs, etc...
 2024-05-22 09:05:01 -05:00
Archez
63b6638e11 Restore telescope controls (#193) 2024-05-22 09:05:01 -05:00
Archez
ef7ba6df1b fix talk animation crash (#192) 2024-05-22 09:05:01 -05:00
Archez
1c4bd942d1 execute deinit flow (#191) 2024-05-22 09:05:01 -05:00
Archez
b4c7a8bd22 Implement picto box frame buffer and reading logic (#189) 2024-05-22 09:05:01 -05:00
louist103
1b0a6bbdea fix texture being too small (#185) 2024-05-22 09:05:01 -05:00
louist103
40a1c4f499 Fix guards not re appearing (#184) 2024-05-22 09:05:01 -05:00
Archez
19c3c3f5c1 Implement HIRES support and fix Bombers notebook (#181) 
* Implement HIRES support and fix Bombers notebook

* bump lus
 2024-05-22 09:05:01 -05:00
PurpleHato
36861dfbf7 ADD: More HUD Editor Widescreen Support (#179) 
* ADD: Key Counter, Skultula Counter

TODO: Check why SKulltula counter texture doesn't move, TextureBlock???

* ADD: Skulltula icon position

* Tweak: Whitespace

* TWEAK: Skulltula Y value

* FIX: Tatl
 2024-05-22 09:05:01 -05:00
louist103
3e0771e566 Fix powder keg crash by creating and using a larger texture. (#170) 2024-05-22 09:05:01 -05:00
Archez
c93ccc387f bump submodules and remove unused types (#175) 2024-05-22 09:05:01 -05:00
Archez
d75ad5aae2 Add cmake for bundling mac app and add mac icon (#177) 2024-05-22 09:05:01 -05:00
Archez
2c7c2d53f1 add windows icon and manifest definition (#176) 2024-05-22 09:05:01 -05:00
louist103
dbdbfc738d Add rupees to the save editor (#173) 
* Add rupee editor to save editor

* Remove static
 2024-05-22 09:05:01 -05:00
louist103
9bf84e306c Add noclip (#171) 2024-05-22 09:05:01 -05:00
Archez
eb78c76255 add 2ship icon to menu bar (#172) 2024-05-22 09:05:00 -05:00
Archez
9509c4b555 Add DebugConsole command handlers (#169) 
* add debug console command handlers

* soh to 2s2h
 2024-05-22 09:05:00 -05:00
Archez
ff809e061c maintain three-day clock scissor box size (#168) 2024-05-22 09:05:00 -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
Archez
5a258fecd4 add 2ship/lus logo and build info printing (#164) 2024-05-22 09:05:00 -05:00
Archez
cc9c14fc59 Fix: Handle nullptr for texture anim color change params (#162) 
* handle nullptr for texture anim color change params

* bump otrexporter

* oops
 2024-05-22 09:05:00 -05:00
inspectredc
4706f10633 asset headers (#154) 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
57a5ac8894 exclude debug file from json save (#156) 2024-05-22 09:05:00 -05:00
inspectredc
4e6e841fca fix intro cs size (#161) 2024-05-22 09:05:00 -05:00
inspectredc
0c92d32c26 Fix File Select Screen Wiggle (#160) 
* Copy what soh did for fileselect interpolation

* #region
 2024-05-22 09:05:00 -05:00
Archez
af05206f3f fix tha bar on speed meter (#157) 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
Archez
ad2bc10ed0 fix bombers message exclamation icon (#149) 2024-05-22 09:04:59 -05:00
Garrett Cox
fe1a486ae4 Fix juggler ball interpolation (#147) 2024-05-22 09:04:59 -05:00
Archez
c49c132b1a fix environment lighting (#145) 2024-05-22 09:04:59 -05:00
Archez
03c5a3bfe2 fix great bay storm effect (#148) 2024-05-22 09:04:59 -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
Archez
cfa9b050d2 replace more hardcoded allocs (#143) 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
f4aec1ed0a Implement VisMono with custom framebuffer effects (#136) 2024-05-22 09:04:59 -05:00
louist103
45bf29fade Fix order in item icon array. (#134) 2024-05-22 09:04:59 -05:00
Archez
5a7bb3fa76 Add authentic gfx patches (#131) 2024-05-22 09:04:59 -05:00
Archez
cc465fe043 Support loading credits text, take 2 (#133) 
* support loading credits tex

* code review feedback
 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
d962e4fa48 Framebuffer Effects 1.0 (#127) 
* Add framebuffer effects methods

* Implement motion blur effect

* Implement shrinking window framebuffer effect

* Implement pause render framebuffer effect

* update framebuffer gbi logic

* update lus ref
 2024-05-22 09:04:59 -05:00
Archez
d7b4bd8e73 fix snowhead pillar memcpy (#130) 2024-05-22 09:04:59 -05:00
Archez
676cfb7a55 fix gfx debugger with interpolation on (#128) 2024-05-22 09:04:59 -05:00
Archez
61c2764eef fix scene object unload (#129) 2024-05-22 09:04:59 -05:00
Ralphie Morell
a2ae88987a Actor Viewer (#123) 2024-05-22 09:04:59 -05:00
louist103
0652f6715f Fix timer digits. 2024-05-22 09:04:59 -05:00
louist103
bcb7dcf6d7 Copy the map data 2024-05-22 09:04:59 -05:00
louist103
5af9b7c77a Fix pause menu minimap drawing. 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
fb2f6fd67b fix vertex copies (#126) 2024-05-22 09:04:59 -05:00
louist103
a4a4264fc0 Implement CKeyframe importer and exporter (#121) 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
05bffcf897 V1 Hud Editor (#110) 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
aMannus
7703103b65 Debug-helpful cheats (#77) 
* Add infinite cheats

* Fix no clip in menu

* Update mm/2s2h/BenMenuBar.cpp

* Address bombchu capacity

* Magic number to define

* Fix debug mode tooltip

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
 2024-05-22 09:04:59 -05:00
Garrett Cox
07de3cb172 Support for hook unregistration (#109) 2024-05-22 09:04:59 -05:00
briaguya
782c51ccd8 fix: restore controller mapping window menu option (#112) 2024-05-22 09:04:59 -05:00
Rozelette
21e27a512b Fix several ocarina effects (#108) 2024-05-22 09:04:59 -05:00
Garrett Cox
6164a75d67 Move some files around (#107) 2024-05-22 09:04:59 -05:00
louist103
618b702d73 Call resource manager for self modifying resources 2024-05-22 09:04:59 -05:00
Garrett Cox
c377b07ef7 Fix en_mag pointer math (#105) 2024-05-22 09:04:59 -05:00
Archez
329ad7db6c add widescreen support for skybox stars (#100) 2024-05-22 09:04:59 -05:00
Garrett Cox
1ca56bffe3 Fix message item costs and next message ID misalignment (#96) 2024-05-22 09:04:59 -05:00
Archez
e2722c9b97 Remove DMA for grandmas story and add more wide screen fills (#94) 
* remove dma for grandmas story

* widescreen dawn of new day

* cover screen in black for wide screen stories
 2024-05-22 09:04:58 -05:00
Revo
2f94bce6c8 dump ovl_En_An MsgScripts (#92) 
* dump ovl_En_An MsgScripts

* fix wrong item macros in dumped An scripts
 2024-05-22 09:04:58 -05:00
Garrett Cox
434646559f Fix footprints and deku link spin attack blur (#93) 2024-05-22 09:04:58 -05:00
Garrett Cox
420c5e77de Handle animated texture cycle lists not being the same size as keyframes (#91) 2024-05-22 09:04:58 -05:00
louist103
91b2641ad1 Add FPS slider. 2024-05-22 09:04:58 -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
4e50afb407 missing images 
Fix cmake

e -> E
 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
b341e7bab0 Small fixes to save editor (#86) 2024-05-22 09:04:58 -05:00
louist103
f4cae758b5 Fix bombers code crash. 2024-05-22 09:04:58 -05:00
Garrett Cox
837ef4dde6 CI (#81) 2024-05-22 09:04:58 -05:00
Garrett Cox
b98106017a Fix incorrect cutscene write types (#76) 2024-05-22 09:04:58 -05:00
Garrett Cox
e0d9bd2493 Temporary fix for skull kid XLU crash (#74) 
* Temporary fix for skull kid XLU crash

* Update z_dm_stk.c

---------

Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
 2024-05-22 09:04:58 -05:00
Garrett Cox
bc72f251ed Add noclip cheat (#39) 2024-05-22 09:04:58 -05:00
Garrett Cox
bb35c8ae69 Fix alternate scene header handling (#69) 2024-05-22 09:04:58 -05:00
Garrett Cox
c24142402c Remove v1 UI Widgets (#62) 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
aMannus
dbbcd9b1b6 Re-order F1 menu (#65) 
* Re-order menus and add blast mask cooldown enhancement

* Remove blast mask enhancement, add empty cheats menu
 2024-05-22 09:04:58 -05:00
Archez
cb4cf93852 temporarily disable framebuffer effects for lens actors (#58) 2024-05-22 09:04:58 -05:00
inspectredc
7c4772efaa GameInteractor Base + Moon Jump (#40) 
* GameInteractor Base + Moon Jump

* readd checkbox post merge
 2024-05-22 09:04:58 -05:00
Garrett Cox
6d80f06d2b Extract Mtx definitions to headers (#68) 2024-05-22 09:04:58 -05:00
Garrett Cox
5133d29c01 Fix cycle animated textures (#57) 2024-05-22 09:04:58 -05:00
Garrett Cox
b84550e1df More z_message fixes (#55) 2024-05-22 09:04:58 -05:00
Archez
547fa938b2 add colon texture to timer display (#41) 2024-05-22 09:04:58 -05:00
Garrett Cox
ae257f15a2 Add support for json save files (#54) 2024-05-22 09:04:58 -05:00
inspectredc
f068674d77 Allocate correct memory size to dListBuf (#53) 2024-05-22 09:04:58 -05:00
Archez
dfcc980dba fix beating heart (#50) 2024-05-22 09:04:58 -05:00
Revo
d75e5c07f7 update c_keyframe (#52) 2024-05-22 09:04:58 -05:00
PurpleHato
24e83cecd2 Fix Windows compilation 
Windows building was failing due to the order of theses arguments
(They need to be in order)
 2024-05-22 09:04:58 -05:00
Garrett Cox
9d6c44fd25 Migrate all of menubar to new widgets, clean up dead code 2024-05-22 09:04:58 -05:00
Garrett Cox
d56128146c Rename some SoH files to Ben 2024-05-22 09:04:58 -05:00
louist103
ff8ba2cc10 Use libc functions for bcmp, bcpy, bzero, LibMemset, LibMemCmp. 2024-05-22 09:04:58 -05:00
Garrett Cox
1ad3317705 Add reg editor tab (#31) 2024-05-22 09:04:58 -05:00
Garrett Cox
1dc80ffc3a Fix the other things that used sunTex (#38) 2024-05-22 09:04:58 -05:00
Garrett Cox
9a21e23acd Fix getItem animation (#37) 2024-05-22 09:04:58 -05:00
inspectredc
3f9ddeeaa3 Fix SkinMatrix_MtxFToMtx (#36) 2024-05-22 09:04:57 -05:00
Garrett Cox
c0a04f6afc Stub AudioOcarina_SetInstrument to fix audio crash temporarily (#35) 2024-05-22 09:04:57 -05:00
Archez
103fd28ec3 move circle tex to assets and support wide screen (#34) 2024-05-22 09:04:57 -05:00
Archez
17866937a3 fix master dl overflows (#33) 2024-05-22 09:04:57 -05:00
louist103
cf7264f072 Fix faces for link. 2024-05-22 09:04:57 -05:00
louist103
59b355de5e Fix XLU 2024-05-22 09:04:57 -05:00
Archez
6e0cef8fa0 properly array bounds check the font table (#32) 2024-05-22 09:04:57 -05:00
Garrett Cox
248539479d Fix screen size issues, letterbox, fade, etc (#30) 2024-05-22 09:04:57 -05:00
Archez
e21208a457 fix billboard mtx segment values (#29) 2024-05-22 09:04:57 -05:00
inspectredc
ffedb7d352 correct Scene_CommandObjectList and Scene_CommandSpecialFiles implementations (#28) 2024-05-22 09:04:57 -05:00
inspectredc
713ac3495e abutton fix (#27) 2024-05-22 09:04:57 -05:00
inspectredc
09635bcdd5 Treat sun textures as 64x64 (#26) 
* Treat sun textures as 64x64

* commenting style

* leave original lines commented too
 2024-05-22 09:04:57 -05:00
Archez
c6a114e8d5 Fix Framebuffer and ZBuffer things (#25) 
* fix the framebuffers and zbuffers

* set some extra save context on load
 2024-05-22 09:04:57 -05:00
louist103
9f7414bd00 Fix (Un stub) minimaps 2024-05-22 09:04:57 -05:00
louist103
a47de3a972 Allow the bombers notebook to open, but you can't close it. 2024-05-22 09:04:57 -05:00
louist103
bba57b078e Fix (2) pointers cast as u32 2024-05-22 09:04:57 -05:00
louist103
c351a4a580 64 Bits 2024-05-22 09:04:57 -05:00
Garrett Cox
daca951818 Temporary fix for fanfares crashing until we get audio working (#21) 
* Temporary fix for fanfares crashing until we get audio working

* Update mm/src/audio/lib/load.c

* Update code_8019AF00.c

---------

Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
 2024-05-22 09:04:57 -05:00
Garrett Cox
76e325feb8 Add frame advance toggle (#23) 2024-05-22 09:04:57 -05:00
Garrett Cox
683a108194 Re-add bug fixes in z_parameter with comments (#22) 2024-05-22 09:04:57 -05:00
Garrett Cox
67f7882242 Go to map select @ boot when in debug mode or when pressing Z+L+R (#20) 
* Go to map select @ boot when in debug mode or when pressing Z+L+R

* Update mm/src/code/graph.c
 2024-05-22 09:04:57 -05:00
Revo
cefbee8e25 fix broken gamemode statement (fade fix) (#19) 2024-05-22 09:04:57 -05:00
Garrett Cox
8c3a59b7d1 Various fixes to text and textboxes (#18) 2024-05-22 09:04:57 -05:00
Archez
8c91bab60f Chore: Replace rest of segment 0x0E calculations with macro (#16) 
* replace rest of segment 0x0E calculations with macro

* switch to original gsp macro
 2024-05-22 09:04:57 -05:00
Garrett Cox
e392725058 Fix object dependency for objects loaded after scene init (#14) 2024-05-22 09:04:57 -05:00
Archez
6032142870 remove boost, we don't need it right now (#12) 2024-05-22 09:04:57 -05:00
Garrett Cox
dc8f90181b Fix masks not rendering (#13) 2024-05-22 09:04:57 -05:00
Archez
5eacc7e6a8 fix segment pointer truncation (#15) 2024-05-22 09:04:57 -05:00
Garrett Cox
c903b31fa6 Adjustments to changes made for mac (#11) 2024-05-22 09:04:57 -05:00
Archez
982b52653a Support builtin extraction and CMake target extraction (#9) 
* Support builtin extraction and CMake target extraction

* bump submodules

* add enum data
 2024-05-22 09:04:57 -05:00
Garrett Cox
e61a5eac9f First draft of save editor (#8) 2024-05-22 09:04:57 -05:00
Garrett Cox
d1cce09094 Adjustments to changes made for mac (#10) 2024-05-22 09:04:57 -05:00
louist103
d46b3bc2fa Fix splines 2024-05-22 09:04:57 -05:00
Garrett Cox
5e96bdeba5 Various changes/fixes to z_parameter (#7) 2024-05-22 09:04:57 -05:00
Adam Bird
2ecd1ead12 add macro to convert 0x0E segment values (#6) 2024-05-22 09:04:57 -05:00
Garrett Cox
1f69d643fc Changes to build on mac (#4) 2024-05-22 09:04:57 -05:00
Garrett Cox
13a369e871 Add gPlayState 2024-05-22 09:04:57 -05:00
louist103
fd7e53e7bf Fix climbing ledges. 2024-05-22 09:04:57 -05:00
Garrett Cox
2332f63f5a Initial commit for 2S2H 
Co-authored-by: Louis <35883445+louist103@users.noreply.github.com>
Co-authored-by: Nicholas Estelami <NEstelami@users.noreply.github.com>
Co-authored-by: Random06457 <28494085+Random06457@users.noreply.github.com>
 2024-05-22 09:04:51 -05:00
Garrett Cox
ea8c7de686 Delete irrelevant files from decomp 2024-01-05 18:00:59 -05:00
Garrett Cox
9be74e0026 Move source into subdirectory 2024-01-05 18:00:59 -05:00