* copy n64 pal 10 doing this so i can check diffs i make * transfer german->jp icon item * overlays, message data, icon item jpn, audio, code todo: title_static, gameplay keep * add kanji and fix title cards * title static * spell folder correctly * boss title cards, do action, icon item, item name, map name * headers for jpn stuff * gameplay_keep * Scenes, audio, jp text extraction, rom support, overlay fixes, sheik & darunia todo: test & disable darunia fix cvar for ntsc * msgptr init fix * icon item offsets * comment out title cards until zapd can fix itself (we extract these in a different file anyway) * compile and font implemented to get past title screen * file select * message, kaleido and everything else but rando * uintptr_t * rando and custom messages working! * ntsc-j 1.0 support * n64 logo? * copy ntsc 10 to 11 * ntsc 11 extraction * change title version names * copy ntsc 11 to 12 * ntsc 12 extraction * clean up some todos * re checkout submodules post merge * fix US filename * support cross-version filenames * add new versions to non-mq list * use correct message table init * Fix ntsc nes message table overriding pal nes message table * actual fix, allows extraction * fix file name using wrong font of file being hovered over * Fix barinade crash * re-add pal * better jabu fix and revert LUS * fix gerudo title cards * better better owl select * more owl fixes * build * fix some name decode issues * Switch Language Mid Text * Fix PAL displaying for JP filenames * Fix AskToEquip Crash * Disable Credits Timing Fix on NTSC * Fix JP Text positioning * basic language switching (BIG todo: file select, title screen) * Title Screen Hopefully working * add ntsc to linux appimage stuff, TODO: add .v64/.n64 support * Update OTRExporter * Fix pause to decide offset * Fix bomb item name crash * fix fire arrows and PoH * builds * update asset changes and fix menu language changing * fix name decode * Fix crashes and add rando/boss rush select stuff * Revive debug feature by setting language cvar too * Fix ocarina text speed softlock, and update jp text speed changes * Merge remote-tracking branch 'upstream/develop' into NTSC * Fix options menu and let pal use japanese fully * Resolve some suggestions * match up gTextSpeed changes to english (still broken!) * Fix text speed crash * Set default filename language on save init funcs * bump otrexporter * Display same correct info for n64 ntsc-j and ntsc-u * quicktext more closely aligned with decomp * linux appimage v64/n64 checksums * bump zapd * Credits Fix Tooltip Adjusted * update supported hashes json * update shasums to include JP n64
* location list + enums * add identity function * add new files + hook handlers + settings + crate struct * add dungeon struct + large crate locations * fix wasteland name + add overworld hints * add dungeon hints * add to item pool * opt desc + check tracker + overworld locs * add VB funcs + fix fire locs + dmc crate + shuffle crates not pots again * fix crate option def * fix gy crate area * add ow locs * context + more location_list * fix kak crate * add gv child crates + make exceptions for OOB GF crates + fix GF rht name * finish adding gv crates + align GF child crates + fix adult GF locs * fix VB draw + adjust color * begin logic * add child archery crate + overworld logic * deku + dc + rename dc locs * gtg + spirit * fire temple logic * start water temple + some renaming * finish water temple + renames * fix dmc crate * remove child GV + GF crates :( + simplify hints + french * fix dungeon hint + add french attempt * cleanup * smol crate loc list + enums * setup small crates * fix fire temple fairy hints * add logic * fix small crates + locs * align GF crates without moving * add child GV-GF crates for No Logic * convert to shipinit * whitespace * remove old comments * assets * proper cap * better comments on not-shuffled crates * update for context changes * update for rest of context changes * cleanup * fix shadow hint RHT * more cleanup * count to three * child gf logic * gv cow crate * loc list spacing * remove redundant small crates * remove left over vb funcs * split out location list * fix van spawns * move NL crates to new type * rm whitespace * more whitespacing * more more whitespace * update VB * restore support for custom models * prep dungeon for develop * update context for location changes * finish context post-develop merge * add heart crates to CSMC * update loc list + logic fix * update breakroom crates to adult only * newline to make github happy * revise vbshoulds * formatting sheesh * update vb info * BRACKET * whitespacent * ws finalfinal
* * fixes softlock when talking to Mido without Kokiri Emerald after killing Gohma * * moved scene check to hook * moved vanilla conditioon into GameInteractor_Should * * corrected hook condition * removed 'this' * * reverted GameInteractor and hook_handlers * changed actor to use existing hook * * updated kokiri emerald conditions * * missed parentheses * * Overworld pretty much done. * Known issue with Market Night + 2 bushes in KF * Known issue with Adult bush in ZR * * fixed locations post-merge * * renamed option and types to 'GRASSANITY' * changed grassnity to be a combobox option * added first 5 deku tree locations * * color is a sickly green when containing a check * added ZR 14 (adult only bush on the platform, not the same?) * * forgot to rename the files to grassanity * updated draw method to fix regrowing grass * Removed old WIP locacc files * * removed comments in bush actor * added rest of Deku Tree plus MQ * Added DC + MQ * Fixed DC incorrect pos value on 1 loc * JJB done minus after big octo * Added BotW + MQ locs * WIP grottos * Grottos done * Workaround to allow market grass during night * Seperated the 2 KF bushes into 4 checks * Hints and additional formatting * Slightly less ghastly color * Corrected the 2 JJB locs * * Renaming and removal of some locs. * Restructure in z_en_kusa.c to leave vanilla code alone. * Formatting. * * see previous (forgot to stage woops) * * Clear grassIdentity on item drop * Added check for RC on RandoDraw function Results in no extra dupe drops, and instantly correct the color of the grass when cut instead of on collecting the item. * * fixed dupe location spoiler names which caused occasional crash when writing spoiler log * * reverse should * * fixed faulty locations * * corrected KAK location names and some formatting * * Fixed market bushes by tree not working at night * * merged ZR near PoH grass into a single loc * * Changed to ShipInit (might be missing something?) * Corrected Should in z_en_kusa.c to use original draw func when setting is Off * * Renaming to Shuffle Grass * * minor fix * * keyboard fail lol * * suggestions * * removed unused function * * move grass locations into ShuffleGrass * move grass GameInteractor into GIVanillaBehavior * minor fixes * * pre-removed locs from dungeon.cpp * * pre-remove from context.cpp * * re-added Grass to context * * added Dana's amazing custom bush models * using CSMC to display flowers based on "contents" * * added Dana's grass models * refactor to lessen the clutter in the switch * * removed fairy case * Added back missing Deku Tree locations * formatting * Update soh/soh/Enhancements/randomizer/location_access/overworld/zoras_river.cpp Co-authored-by: Philip Dubé <serprex@users.noreply.github.com> * re-added suggestion from previous * removed wrong line >.> --------- Co-authored-by: Philip Dubé <serprex@users.noreply.github.com>
* Add menu files, hook menu up to window system. Temporarily rename new menu's UIWidgets to UIWidgets2 to allow both menu systems to coexist temporarily. * Finish implementing new menu. Rename 2ship UIWidgets to UIWidgets2 to complete facilitation of both menus working for now. * More preliminary setup * More prepwork, begin on settings options * Finish settings, add enhancements windows * Fix search function not looking past first columns. * Add dev tool windows * Finish dev tools * Add about window * Fully replace about window * Remove moved menu items from menubar, add more windows to new menu * Implement WindowButtonOptions. Add ability to not embed popout windows when not popped out. Add ability to hide the button for WindowButtons. Fix Entrance Tracker from showing when not enabled. * Fix entrance tracker settings embedded display. Fix entrance tracker settings window original size declaration. * Initial implementation of themed radio button widget. * Move "About" section to second column of general. Fix sidebar sections starting in second column. * Restore Entrance Tracker `Draw()` to allow for custom styling. * Fix combobox positioning formatting. Fix color picker end spacing. Convert everything in check tracker settings to UIWidgets2 (except color pickers and section headers). Make all tracker windows not embed. * Minor cleanup * Fix main volume defaults & mirror jitter fix removal on dev * Improve color picker with RGB/RGBA options. Not finished. * Finish creating CVarColorPicker and implement for Check Tracker background color. Fix tracker and network prefixes. * Finish check tracker settings and convert check tracker. * Port all Cheats menu except for Beta Quest * Port over Beta Quest to new menu * Remove old cheats menu * Port cutscene skips to modern menu * Port Timesaver Enhancements to new menu * Port the Items and Item Count Messages submenu * Port Difficulty Options to new Menu * Removes options that have been ported thus far. * Port "Reduced Clutter" options to new menu * Add forgotten callbacks to Hyper Enemies/Bosses * Copy StateButton to UIWidgets2, and implement custom padding for them in the tracker. * Ports some pause menu related settinga * Change tracker window active title color. Make state buttons smaller in tracker to get more info on screen. * Convert window title active theming to all windows. * Port the rest of Enhancements->Gameplay to new menu * Port the "Graphics" Enhancements to new menu * Ports Fixes over to the Modern Menu * Ported Restorations to Modern Menu * Ported Extra Modes to new menu * Port Autosave and Boot Sequence to modern menu * Cleans up some leftover data for ported buttons * Ports Enhancement Presets to new menu * Port Additional timers to new menu. Removes Enhancements from old menu * Cleans up some unused stuff * Ports Randomizer Enhancements to modern menu * Convert Item Tracker Settings. Something's wrong with the comboboxes in a second column of a table. * Fix combobox alignment and label position calculations. * Convert Entrance Tracker window. * Save Editor Info tab finished. Added `PushStyleInput` and `PushStyleTabs` for Info tab. Fixed some indentation in entrance tracker source. Added font push to tracker windows. * Increase size of all icons in save editor. * Convert flag groups to child windows for automatic sizing and border drawing. * Flags tab completed. Finished inventory tab. * Convert save editor help hover to UIWidgets2. * Various fixes and corrections * Start cosmetics editor, fix theme colors not updating * Cosmetics editor conversion progress * Remove Mac internal resolution restrictions. * Copy over advanced resolution partial and enable most options as a custom widget. * Add size to float sliders, more cosmetics editor progress * Fix incorrect cvar for notifications * Radio button & header color options, more cosmetics editor progress * Finish cosmetics editor conversion * Create and apply THEME_COLOR macro. Resides in SohGui for easy access to mSohMenu. * Move ResolutionEditor to SohGui directory. * Add labels to build info. Fix slider width calculations. * Fix some advanced resolution widget hiding. * Fully implement Advanced Resolution options. Fix graphics settings formatting. Improve slider label position calculations. Implement Clamp options on sliders. * Finish save editor. Convert save editor code to `using namespace UIWidgets2`. Fix search crashing on time splits window. Remove `SetLastItemHoverText` from `UIWidgets2`. * Unify cvar sectioning in time splits. * Add InputString and InputInt widgets, and corresponding CVar Widgets * Adds Widget Type for Inputs, not currently used. * Convert Sail to modern menu * Add Combobox that takes a vector of std::strings * Convert checkbox and combobx to new widgets * Add Tristate checkbox * Convert sliders and tristate checkboxes * Convert top half of Rando window * remove/replace remainder of UIWidgets usage in option.cpp * Converts tricks, locations, and removes old UIWidgets refs * Fix windows build errors * Remove Tri-State checkboxes * Use PushStyleInput instead of PushStyleSlider lol oops didn't realize it was a thing in Ship. * Rebase and address review comments * Convert Crowd Control to modern menu. * Fix build error * Audio editor progress * Re-add CVar SaveOnNextFrame calls to Resolution Editor. Remove old Resolution Editor files. * Convert TimeSplits to new menu. Fix a few enum warnings. * Decrease padding on Arrow Buttons * Audio editor + gameplay stats done * Give Randomizer Menu more screen real-estate * Port plandomizer menu * Fix slider width calculation and allow combobox LabelPosition::None * Fix None labelPos and slider width for inline labels * Fix all slider value label insertions. Convert Collision Viewer. * Minor Collision Viewer enum change. Convert Actor Viewer. * Theme/convert Message Viewer. * Add font to Message Viewer. Theme Value Viewer. * DL Viewer and SohModals themed. * Convert Input Viewer. * Missed some color settings in Input Viewer. Removed UIWidgets references from Controller Config, and restored SoH version. * Remove UIWidgets.hpp include from multiple files. * Completely remove old UIWidgets. Rename UIWidgets2 to UIWidgets. Move Accessibility and Language options to new menu. * Fix Gfx Debugger not showing up. Remove menubar registration. * Fix clearCvars references. * Fix passing std::string to const char* argument. * enum name spacing --------- Co-authored-by: aMannus <mannusmenting@gmail.com> Co-authored-by: Christopher Leggett <chris@leggett.dev>
* Clean up settings and add boss soul files * address reviews * didn't realise there was more * add comment for how to undummy stealth
* initial implementation of new models * fix typo * Add smaller skeleton key model and try to fix windows build * stupid windows, you made me look bad! * make DrawBombchuBag function work * small cleanups * OOGGA BOOGA BOO * fix post merge leftovers * post merge fix * Added Big Key Lighting override to show vanilla lighting when unchanged * rename CustomdLists into customIconDLs * post merge fixes * fix some tooltip issues * post merge cleanup and some small menu changes * post merge fix * post merge fix * add new boss soul model, colours broken * update boss soul model for env support * Add dungeon customise buttons to cosmetic editor * fix mac build? * keys don't support alpha * fix submodules * ring now draws * fix keyring colours * Add bombchu Bag RG, fix boss soul skull colour * address reviews
* Potsanity proof of concept * Hide pot item cutscenes for very frequent items * Add 1 new pot to the item pool * V1 custom pot model * V2 pot model * Pushing for help. lol * Format clean up on added hint_list entries. Removal of WriteIngameSpoilerLog call that was unneeded. * THREE_ACTOR_PARAMS -> TWO_ACTOR_PARAMS and hints in a loop * Lost woods pots logic * Realign Pot Checklist in Location_list.cpp * Correcting some values and adding Master Quest pots. * Remove vanilla placements * Re-order enums + start hints per region * Fix build * Break up shuffle pot options to dungeon/overworld/all * Fixes * Prepare default pot contents, fix/add dungeons * Fix dungeon/overworld only settings * Updates to Parameters and RHT information * Remove unused hints * Add proper check tracker entry exclusion * Tweak items to skip cutscenes for * Vanilla Drop List * Update magic to blue rupees * After merge fixes * Fix Ganondorf's Lair pots * Fix check tracker + minor stuff * Unlock early GBK door * Minor fixes * More minor stuff and start of logic entries * Fix TWO_ACTOR_PARAMS overlap between pots * De-dupe defines * Add missing water trial pot * Update to develop-rando * VBify pots progress * Cleanup and fixes * Overworld logic done * Cleanup and fix item00 queues * Implement skipping cutscenes for common items * Revert "Implement skipping cutscenes for common items" This reverts commit fe44916588dffbc6ccdc1899371c346e9d9eb1ef. * Ganons tower pot not spawning item fix + cleanup * Fix ganon's tower, barinade, water temple pots * VBify ganons key door * Lizalfos Pot addition (example) * Separate MQ pots in randomizerTypes.h * Fix build * Fix linux build (?) * DC/Jabu/Botw/ start of Forest Pots (NMQ) * Remaining Dungeon Non MQ Pot Location Logic * After merge fixes round 1 * Post merge fixes round 2 * Apply MQ pot logic * Re-align some stuff * Cleanup, more work on locationlist * Start of handling dungeon pots in item pool * Finish dungeon pots in item pool * GTG MQ Pots * Review comments round 1 & code cleanup * Fix ganon's lair pots being behind GBK in logic * Update soh/include/z64actor.h Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com> * Update soh/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com> * Address review comment * Fix logic for pots in Fire Temple * Fix GtG MQ pots, fix water temple pot logic * Review Comments * Logic review part 1 * Logic comments part 2 --------- Co-authored-by: Caladius <Caladius@users.noreply.github.com> Co-authored-by: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com> Co-authored-by: Pepe20129 <72659707+Pepe20129@users.noreply.github.com>
* Add new timer window and display options * Fix overflow spacing * Icons for Timers * Swap Labels for Icons. * Additional Timers * Navi Timer Icon * Clean up unused Defines. * Code clean up and double check. Ready for Review * Update from Suggestions * Update magic numbers, correct indentations hopefully * One moooooore thing * Undo z_param change * Updates