forked from Roman971/OoT-Randomizer
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add Freestanding/Pot/Crate/Beehive Shuffle. Pot/Crate textures match …
…contents Code style review for pots branch (Roman971#49) Make pots/crates shuffle their vanilla items (Roman971#50) Fix alt_hint for ganondorf only. Fix Ganon's tower filter tags Resolve c compiler warnings Adjust item_give_collectible for MW_SEND_OWN_ITEMS (Roman971#51) Add Vanilla and Master Quest tags to Ganon's Tower pots (Roman971#52) Change new settings' display names from “X Shuffle” to “Shuffle X” (Roman971#53) Fix version.py ItemPool.py Cleanup Removed the no longer in use function `get_new_junk` as well as `is_freestanding_or_potcrate_or_beehive_location` which was only used in places where it does not matter due to those locations already being handled earlier in the elif chain. Use location.type instead of location.filter_tags for new Locations. Cleanup and fix typo Typo Make small key and piece of heart drops work without requiring new type
- Loading branch information
Showing
104 changed files
with
35,105 additions
and
25,342 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
Binary file not shown.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
#include "z64.h" | ||
|
||
#define BG_HAKA_TUBO 0x00BB | ||
#define BG_SPOT18_BASKET 0x015C | ||
#define OBJ_COMB 0x19E | ||
#define OBJ_MURE3 0x1AB | ||
|
||
void Actor_SetWorldToHome_End(z64_actor_t *actor) { | ||
// Reset z rotation to 0 for any actors that we use it as flag space | ||
// bg_haka_tubo 0xBB | ||
// bg_spot18_basket 0x15C | ||
// obj_comb 0x19E | ||
// obj_mure3 0x1AB | ||
if (actor->actor_id == BG_HAKA_TUBO || | ||
actor->actor_id == BG_SPOT18_BASKET || | ||
actor->actor_id == OBJ_COMB || | ||
actor->actor_id == OBJ_MURE3) | ||
{ | ||
actor->rot_world.z = 0; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.