Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Z3DR
Submodule Z3DR updated 72 files
+31 −0 code/gen_sfx_categories.py
+1 −1 code/include/common/advanced_context.h
+6 −0 code/include/game/actor.h
+9 −7 code/include/game/common_data.h
+4 −4 code/include/game/weekeventreg.h
+14 −0 code/include/rnd/actors/en_akindonuts.h
+3 −3 code/include/rnd/actors/en_elforg.h
+2 −0 code/include/rnd/actors/en_giant.h
+72 −0 code/include/rnd/actors/en_girla.h
+12 −0 code/include/rnd/actors/en_in.h
+12 −0 code/include/rnd/actors/en_ms.h
+23 −0 code/include/rnd/actors/en_tab.h
+1 −0 code/include/rnd/custom_entrances.h
+3 −0 code/include/rnd/item_override.h
+1 −0 code/include/rnd/item_table.h
+2 −0 code/include/rnd/models.h
+17 −0 code/include/rnd/music.h
+6 −0 code/include/rnd/ocarina.h
+29 −2 code/include/rnd/savefile.h
+50 −7 code/include/rnd/settings.h
+13 −0 code/include/rnd/sfx.h
+151 −0 code/include/rnd/shops.h
+1 −0 code/include/rnd/spoiler_data.h
+202 −119 code/mm.ld
+1 −1 code/patch.py
+11 −0 code/source/asm/actors/en_akindonuts_hooks.s
+11 −0 code/source/asm/actors/en_akindonuts_patches.s
+16 −0 code/source/asm/actors/en_girla_hooks.s
+6 −0 code/source/asm/actors/en_girla_patches.s
+11 −0 code/source/asm/actors/en_in_hooks.s
+21 −0 code/source/asm/actors/en_in_patches.s
+22 −0 code/source/asm/actors/en_ms_hooks.s
+11 −0 code/source/asm/actors/en_ms_patches.s
+11 −0 code/source/asm/actors/en_tab_hooks.s
+6 −0 code/source/asm/actors/en_tab_patches.s
+12 −1 code/source/asm/en_giant_hooks.s
+6 −1 code/source/asm/en_giant_patches.s
+8 −19 code/source/asm/fairy_hooks.s
+4 −9 code/source/asm/fairy_patches.s
+24 −0 code/source/asm/music_hooks.s
+6 −0 code/source/asm/music_patches.s
+14 −1 code/source/asm/ocarina_hooks.s
+11 −1 code/source/asm/ocarina_patches.s
+6 −0 code/source/asm/patches.s
+106 −0 code/source/asm/sound_hooks.s
+36 −0 code/source/asm/sound_patches.s
+13 −1 code/source/asm/trade_item_hooks.s
+1 −1 code/source/asm/trade_item_patches.s
+1 −1 code/source/common/debug.cpp
+8 −14 code/source/lib/abi.c
+56 −18 code/source/main.cpp
+37 −0 code/source/rnd/actors/en_akindonuts.cpp
+24 −10 code/source/rnd/actors/en_box.cpp
+43 −43 code/source/rnd/actors/en_elforg.cpp
+25 −0 code/source/rnd/actors/en_giant.cpp
+251 −0 code/source/rnd/actors/en_girla.cpp
+22 −0 code/source/rnd/actors/en_in.cpp
+18 −0 code/source/rnd/actors/en_ms.cpp
+40 −0 code/source/rnd/actors/en_tab.cpp
+5 −1 code/source/rnd/custom_entrances.cpp
+34 −7 code/source/rnd/custom_messages.cpp
+126 −13 code/source/rnd/gfx.cpp
+5 −1 code/source/rnd/item_effect.cpp
+147 −28 code/source/rnd/item_override.cpp
+5 −4 code/source/rnd/item_table.cpp
+27 −17 code/source/rnd/link.cpp
+27 −1 code/source/rnd/models.cpp
+42 −0 code/source/rnd/music.cpp
+123 −69 code/source/rnd/ocarina.cpp
+58 −7 code/source/rnd/savefile.cpp
+256 −0 code/source/rnd/sfx.cpp
+131 −0 code/source/rnd/shops.cpp
2 changes: 1 addition & 1 deletion docs/release-notes/changelog-latest-nightly.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

- Fix shops potentially requiring one more wallet than needed
- Update Setting Descriptions for Beansanity, Zora Swimming and DPad Masks
- Fix oversight in Milk Bar Shop translations
- Fix oversight in Milk Bar Shop translations
Loading