Skip to content

Commit

Permalink
Add Freestanding/Pot/Crate/Beehive Shuffle. Pot/Crate textures match …
Browse files Browse the repository at this point in the history
…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
rrealmuto authored and mracsys committed Oct 10, 2022
1 parent 55cf868 commit ed64148
Show file tree
Hide file tree
Showing 104 changed files with 35,105 additions and 25,342 deletions.
1,925 changes: 1,022 additions & 903 deletions ASM/build/asm_symbols.txt

Large diffs are not rendered by default.

Binary file modified ASM/build/bundle.o
Binary file not shown.
507 changes: 284 additions & 223 deletions ASM/build/c_symbols.txt

Large diffs are not rendered by default.

21 changes: 21 additions & 0 deletions ASM/c/actor.c
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;
}
}
2 changes: 1 addition & 1 deletion ASM/c/file_icons.c
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ void draw_file_icons(z64_disp_buf_t* db, const z64_menudata_t* menu_data) {
if ((menu_data->menu_transition == 0x00 && menu_data->menu_depth == 0x02)
|| menu_data->alt_transition == 0x05
|| menu_data->alt_transition == 0x16) {
read_file_data(&menu_data->sram_buffer->primary_saves[menu_data->selected_file]);
read_file_data(&menu_data->sram_buffer->primary_saves[menu_data->selected_file].original_save);
return;
}
}
Expand Down
Loading

0 comments on commit ed64148

Please sign in to comment.