mirror of
https://github.com/HarbourMasters/Shipwright
synced 2026-05-12 17:38:09 +00:00
dd81af17bb
* * 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> |
||
|---|---|---|
| .. | ||
| flower_bosskey_tex.rgba16 | ||
| flower_bronze_tex.rgba16 | ||
| flower_fairy_tex.rgba16 | ||
| flower_gold_tex.rgba16 | ||
| flower_heart_tex.rgba16 | ||
| flower_mask_tex.rgba16 | ||
| flower_random_tex.rgba16 | ||
| flower_silver_tex.rgba16 | ||
| flower_token_tex.rgba16 | ||
| gGrassBunchTex.rgba16 | ||
| gRandoCuttableGrassBossKeyDL | ||
| gRandoCuttableGrassBossKeyDL_tri_0 | ||
| gRandoCuttableGrassBossKeyDL_tri_1 | ||
| gRandoCuttableGrassBossKeyDL_tri_2 | ||
| gRandoCuttableGrassBossKeyDL_tri_3 | ||
| gRandoCuttableGrassBossKeyDL_vtx_0 | ||
| gRandoCuttableGrassBossKeyDL_vtx_1 | ||
| gRandoCuttableGrassBossKeyDL_vtx_2 | ||
| gRandoCuttableGrassBossKeyDL_vtx_3 | ||
| gRandoCuttableGrassBossKeyDL_vtx_cull | ||
| gRandoCuttableGrassFairyDL | ||
| gRandoCuttableGrassFairyDL_tri_0 | ||
| gRandoCuttableGrassFairyDL_tri_1 | ||
| gRandoCuttableGrassFairyDL_tri_2 | ||
| gRandoCuttableGrassFairyDL_tri_3 | ||
| gRandoCuttableGrassFairyDL_vtx_0 | ||
| gRandoCuttableGrassFairyDL_vtx_1 | ||
| gRandoCuttableGrassFairyDL_vtx_2 | ||
| gRandoCuttableGrassFairyDL_vtx_3 | ||
| gRandoCuttableGrassFairyDL_vtx_cull | ||
| gRandoCuttableGrassHeartDL | ||
| gRandoCuttableGrassHeartDL_tri_0 | ||
| gRandoCuttableGrassHeartDL_tri_1 | ||
| gRandoCuttableGrassHeartDL_tri_2 | ||
| gRandoCuttableGrassHeartDL_tri_3 | ||
| gRandoCuttableGrassHeartDL_vtx_0 | ||
| gRandoCuttableGrassHeartDL_vtx_1 | ||
| gRandoCuttableGrassHeartDL_vtx_2 | ||
| gRandoCuttableGrassHeartDL_vtx_3 | ||
| gRandoCuttableGrassHeartDL_vtx_cull | ||
| gRandoCuttableGrassJunkDL | ||
| gRandoCuttableGrassJunkDL_tri_0 | ||
| gRandoCuttableGrassJunkDL_vtx_0 | ||
| gRandoCuttableGrassJunkDL_vtx_cull | ||
| gRandoCuttableGrassMajorDL | ||
| gRandoCuttableGrassMajorDL_tri_0 | ||
| gRandoCuttableGrassMajorDL_tri_1 | ||
| gRandoCuttableGrassMajorDL_tri_2 | ||
| gRandoCuttableGrassMajorDL_tri_3 | ||
| gRandoCuttableGrassMajorDL_vtx_0 | ||
| gRandoCuttableGrassMajorDL_vtx_1 | ||
| gRandoCuttableGrassMajorDL_vtx_2 | ||
| gRandoCuttableGrassMajorDL_vtx_3 | ||
| gRandoCuttableGrassMajorDL_vtx_cull | ||
| gRandoCuttableGrassMaskDL | ||
| gRandoCuttableGrassMaskDL_tri_0 | ||
| gRandoCuttableGrassMaskDL_tri_1 | ||
| gRandoCuttableGrassMaskDL_tri_2 | ||
| gRandoCuttableGrassMaskDL_tri_3 | ||
| gRandoCuttableGrassMaskDL_vtx_0 | ||
| gRandoCuttableGrassMaskDL_vtx_1 | ||
| gRandoCuttableGrassMaskDL_vtx_2 | ||
| gRandoCuttableGrassMaskDL_vtx_3 | ||
| gRandoCuttableGrassMaskDL_vtx_cull | ||
| gRandoCuttableGrassMinorDL | ||
| gRandoCuttableGrassMinorDL_tri_0 | ||
| gRandoCuttableGrassMinorDL_tri_1 | ||
| gRandoCuttableGrassMinorDL_tri_2 | ||
| gRandoCuttableGrassMinorDL_tri_3 | ||
| gRandoCuttableGrassMinorDL_vtx_0 | ||
| gRandoCuttableGrassMinorDL_vtx_1 | ||
| gRandoCuttableGrassMinorDL_vtx_2 | ||
| gRandoCuttableGrassMinorDL_vtx_3 | ||
| gRandoCuttableGrassMinorDL_vtx_cull | ||
| gRandoCuttableGrassRandomDL | ||
| gRandoCuttableGrassRandomDL_tri_0 | ||
| gRandoCuttableGrassRandomDL_tri_1 | ||
| gRandoCuttableGrassRandomDL_tri_2 | ||
| gRandoCuttableGrassRandomDL_tri_3 | ||
| gRandoCuttableGrassRandomDL_vtx_0 | ||
| gRandoCuttableGrassRandomDL_vtx_1 | ||
| gRandoCuttableGrassRandomDL_vtx_2 | ||
| gRandoCuttableGrassRandomDL_vtx_3 | ||
| gRandoCuttableGrassRandomDL_vtx_cull | ||
| gRandoCuttableGrassSmallKeyDL | ||
| gRandoCuttableGrassSmallKeyDL_tri_0 | ||
| gRandoCuttableGrassSmallKeyDL_tri_1 | ||
| gRandoCuttableGrassSmallKeyDL_tri_2 | ||
| gRandoCuttableGrassSmallKeyDL_tri_3 | ||
| gRandoCuttableGrassSmallKeyDL_vtx_0 | ||
| gRandoCuttableGrassSmallKeyDL_vtx_1 | ||
| gRandoCuttableGrassSmallKeyDL_vtx_2 | ||
| gRandoCuttableGrassSmallKeyDL_vtx_3 | ||
| gRandoCuttableGrassSmallKeyDL_vtx_cull | ||
| gRandoCuttableGrassTokenDL | ||
| gRandoCuttableGrassTokenDL_tri_0 | ||
| gRandoCuttableGrassTokenDL_tri_1 | ||
| gRandoCuttableGrassTokenDL_tri_2 | ||
| gRandoCuttableGrassTokenDL_tri_3 | ||
| gRandoCuttableGrassTokenDL_vtx_0 | ||
| gRandoCuttableGrassTokenDL_vtx_1 | ||
| gRandoCuttableGrassTokenDL_vtx_2 | ||
| gRandoCuttableGrassTokenDL_vtx_3 | ||
| gRandoCuttableGrassTokenDL_vtx_cull | ||
| LeafTex.rgba16 | ||
| mat_gRandoCuttableGrassBossKeyDL_f3dlite_flower_bosskey | ||
| mat_gRandoCuttableGrassBossKeyDL_f3dlite_Grass | ||
| mat_gRandoCuttableGrassBossKeyDL_f3dlite_leaf | ||
| mat_gRandoCuttableGrassBossKeyDL_f3dlite_material | ||
| mat_gRandoCuttableGrassFairyDL_f3dlite_flower_fairy | ||
| mat_gRandoCuttableGrassFairyDL_f3dlite_Grass | ||
| mat_gRandoCuttableGrassFairyDL_f3dlite_leaf | ||
| mat_gRandoCuttableGrassFairyDL_f3dlite_material | ||
| mat_gRandoCuttableGrassHeartDL_f3dlite_flower_heart | ||
| mat_gRandoCuttableGrassHeartDL_f3dlite_Grass | ||
| mat_gRandoCuttableGrassHeartDL_f3dlite_leaf | ||
| mat_gRandoCuttableGrassHeartDL_f3dlite_material | ||
| mat_gRandoCuttableGrassJunkDL_f3dlite_Grass | ||
| mat_gRandoCuttableGrassMajorDL_f3dlite_flower_gold | ||
| mat_gRandoCuttableGrassMajorDL_f3dlite_Grass | ||
| mat_gRandoCuttableGrassMajorDL_f3dlite_leaf | ||
| mat_gRandoCuttableGrassMajorDL_f3dlite_material | ||
| mat_gRandoCuttableGrassMaskDL_f3dlite_flower_mask | ||
| mat_gRandoCuttableGrassMaskDL_f3dlite_Grass | ||
| mat_gRandoCuttableGrassMaskDL_f3dlite_leaf | ||
| mat_gRandoCuttableGrassMaskDL_f3dlite_material | ||
| mat_gRandoCuttableGrassMinorDL_f3dlite_flower_bronze | ||
| mat_gRandoCuttableGrassMinorDL_f3dlite_Grass | ||
| mat_gRandoCuttableGrassMinorDL_f3dlite_leaf | ||
| mat_gRandoCuttableGrassMinorDL_f3dlite_material | ||
| mat_gRandoCuttableGrassRandomDL_f3dlite_flower_random | ||
| mat_gRandoCuttableGrassRandomDL_f3dlite_Grass | ||
| mat_gRandoCuttableGrassRandomDL_f3dlite_leaf | ||
| mat_gRandoCuttableGrassRandomDL_f3dlite_material | ||
| mat_gRandoCuttableGrassSmallKeyDL_f3dlite_flower_silver | ||
| mat_gRandoCuttableGrassSmallKeyDL_f3dlite_Grass | ||
| mat_gRandoCuttableGrassSmallKeyDL_f3dlite_leaf | ||
| mat_gRandoCuttableGrassSmallKeyDL_f3dlite_material | ||
| mat_gRandoCuttableGrassTokenDL_f3dlite_flower_token | ||
| mat_gRandoCuttableGrassTokenDL_f3dlite_Grass | ||
| mat_gRandoCuttableGrassTokenDL_f3dlite_leaf | ||
| mat_gRandoCuttableGrassTokenDL_f3dlite_material | ||
| model.xml | ||
| StemTex.rgba16 | ||