30 Commits

Author SHA1 Message Date
inspectredc
e2dc6a3fc7 @bug sweep (#449)
* bug sweep round 1

* player anim frame bug already handled

* format

* stick tex and div by 0

* deku stick n64 and nicer swlift fix
2024-05-25 09:53:55 -05:00
inspectredc
0ee3af6640 baguel (#470) 2024-05-24 14:38:57 +01:00
inspectredc
07287357c8 change back mtoride xmls (#468) 2024-05-24 13:35:21 +01:00
inspectredc
ad298b3140 gc specific diffs (#461) 2024-05-23 21:13:22 -04:00
inspectredc
568060cd4a Fix GC US Options Screen (#442) 2024-05-22 09:05:05 -05:00
louist103
e7e87f4215 Add extra days to file choose owl saves (#431)
* Add extra days

* New textures from purple

Co-authored-by: PurpleHato <47987542+PurpleHato@users.noreply.github.com>

* Move strings to header.

* More new textures from purple

Co-authored-by: PurpleHato <47987542+PurpleHato@users.noreply.github.com>

---------

Co-authored-by: PurpleHato <47987542+PurpleHato@users.noreply.github.com>
2024-05-22 09:05:05 -05:00
louist103
bfa363204c Fix XMLs (#429) 2024-05-22 09:05:05 -05:00
louist103
d68545ccdf Fix vertex extraction (#423) 2024-05-22 09:05:05 -05:00
Garrett Cox
1eb665bd28 Pause Save = Owl Save (#278)
* Pause Save = Owl Save PoC

* Changes from inspect's decomp

* pause save cvared and with textures. also game over (#2)

* Fix bug where it would try to save on debug file

* Put function back

* Put function back 2

* Hide gameover option from menu for now

---------

Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com>
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
7bc6c58721 Replace some remaining soh branding with 2ship (#341) 2024-05-22 09:05:04 -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
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
louist103
17b698667f Fix order of gQuestItems (#224) 2024-05-22 09:05:01 -05:00
Archez
d8c2361986 Fix song of time frustum (#204) 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
1b0a6bbdea fix texture being too small (#185) 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
eb78c76255 add 2ship icon to menu bar (#172) 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
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
louist103
a4a4264fc0 Implement CKeyframe importer and exporter (#121) 2024-05-22 09:04:59 -05:00
Garrett Cox
1dc80ffc3a Fix the other things that used sunTex (#38) 2024-05-22 09:04:58 -05:00
Archez
103fd28ec3 move circle tex to assets and support wide screen (#34) 2024-05-22 09:04:57 -05:00