Skip to content

Commit b24213b

Browse files
fenhlfenhl
committed
Merge 'Stick/Nut/Magic Upgrade Model Improvements' (#2313)
2 parents fd7466c + 8537e5d commit b24213b

14 files changed

Lines changed: 21795 additions & 21426 deletions

‎ASM/build/asm_symbols.txt‎

Lines changed: 574 additions & 569 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ASM/build/bundle.o‎

1.69 KB
Binary file not shown.

‎ASM/build/c_symbols.txt‎

Lines changed: 553 additions & 544 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ASM/c/item_draw_functions.c‎

Lines changed: 83 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include "z64.h"
44
#include "item_draw_table.h"
55
#include "sys_matrix.h"
6+
#include "rainbow.h"
67

78
typedef Gfx* (*append_setup_dl_fn)(Gfx* gfx, uint32_t dl_index);
89
typedef void (*append_setup_dl_26_to_opa_fn)(z64_gfx_t* gfx);
@@ -18,6 +19,7 @@ typedef Gfx* (*gen_double_tile_fn)(z64_gfx_t* gfx, int32_t tile1, uint32_t x1, u
1819
#define gen_double_tile ((gen_double_tile_fn)0x8007EB84)
1920

2021
extern z64_actor_t* curr_drawn_actor;
22+
extern Gfx sSetupDL[71][6];
2123

2224
void draw_gi_bombchu_and_masks(z64_game_t* game, uint32_t draw_id) {
2325
z64_gfx_t* gfx = game->common.gfx;
@@ -114,6 +116,13 @@ void draw_gi_silver_rupee_pouch(z64_game_t* game, uint32_t draw_id) {
114116
gSPDisplayList(gfx->poly_opa.p++, item_draw_table[draw_id].args[6].dlist); // gGiAdultWalletRupeeInnerColorDL
115117
gSPDisplayList(gfx->poly_opa.p++, item_draw_table[draw_id].args[7].dlist); // gGiWalletRupeeInnerDL
116118
}
119+
void draw_gi_various_xlu0(z64_game_t* game, uint32_t draw_id) {
120+
z64_gfx_t* gfx = game->common.gfx;
121+
122+
append_setup_dl_25_to_xlu(gfx);
123+
gSPMatrix(gfx->poly_xlu.p++, append_sys_matrix(gfx), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
124+
gSPDisplayList(gfx->poly_xlu.p++, item_draw_table[draw_id].args[0].dlist);
125+
}
117126

118127
void draw_gi_various_xlu01(z64_game_t* game, uint32_t draw_id) {
119128
z64_gfx_t* gfx = game->common.gfx;
@@ -365,7 +374,7 @@ void draw_gi_blue_fire_candle(z64_game_t* game, uint32_t draw_id) {
365374
1, game->common.state_frames * 1, -(game->common.state_frames * 8), 16, 32));
366375
duplicate_sys_matrix();
367376
translate_sys_matrix(-8.0f, -2.0f, 0.0f, 1);
368-
update_sys_matrix(game->mf_11DA0);
377+
update_sys_matrix(game->billboard_mtx);
369378
gSPMatrix(gfx->poly_xlu.p++, append_sys_matrix(gfx), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
370379
gSPDisplayList(gfx->poly_xlu.p++, item_draw_table[draw_id].args[1].dlist);
371380
pop_sys_matrix();
@@ -386,7 +395,7 @@ void draw_gi_fairy_lantern(z64_game_t* game, uint32_t draw_id) {
386395
0, 0, 0, 32, 32,
387396
1, game->common.state_frames, -(game->common.state_frames * 6), 32, 32));
388397
duplicate_sys_matrix();
389-
update_sys_matrix(game->mf_11DA0);
398+
update_sys_matrix(game->billboard_mtx);
390399
gSPMatrix(gfx->poly_xlu.p++, append_sys_matrix(gfx), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
391400
gSPDisplayList(gfx->poly_xlu.p++, item_draw_table[draw_id].args[2].dlist);
392401
pop_sys_matrix();
@@ -401,7 +410,7 @@ void draw_gi_fairy(z64_game_t* game, uint32_t draw_id) {
401410
0, 0, 0, 32, 32,
402411
1, game->common.state_frames, -(game->common.state_frames * 6), 32, 32));
403412
duplicate_sys_matrix();
404-
update_sys_matrix(game->mf_11DA0);
413+
update_sys_matrix(game->billboard_mtx);
405414
gSPMatrix(gfx->poly_xlu.p++, append_sys_matrix(gfx), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
406415
// Not sure how much of this is required but these are called from the bottle DL. Not including them causes it to draw weird
407416
gDPSetRenderMode(gfx->poly_xlu.p++, G_RM_PASS, G_RM_AA_ZB_XLU_SURF2);
@@ -428,7 +437,7 @@ void draw_gi_poe_bottles(z64_game_t* game, uint32_t draw_id) {
428437
0, 0, 0, 16, 32,
429438
1, game->common.state_frames * 1, -(game->common.state_frames * 6), 16, 32));
430439
duplicate_sys_matrix();
431-
update_sys_matrix(game->mf_11DA0);
440+
update_sys_matrix(game->billboard_mtx);
432441
gSPMatrix(gfx->poly_xlu.p++, append_sys_matrix(gfx), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
433442
gSPDisplayList(gfx->poly_xlu.p++, item_draw_table[draw_id].args[3].dlist);
434443
gSPDisplayList(gfx->poly_xlu.p++, item_draw_table[draw_id].args[2].dlist);
@@ -736,16 +745,31 @@ void draw_gi_magic_meter(z64_game_t* game, uint32_t draw_id) {
736745
}
737746
}
738747

748+
// Rainbow smoke effect
749+
colorRGBA8_t rainbow_color;
750+
rainbow_color.a = 0xFF;
751+
rainbow_color.color = get_rainbow_color(game->gameplay_frames, 10);
752+
//z64_xyzf_t translation = { .x = 0, .y = -35.0f, .z = -20.0f };
753+
z64_xyzf_t translation = { .x = 0.0, .y = -35.0f, .z = 0.0f };
754+
z64_xyzf_t scale = { .x = .0125f, .y = .0075f, .z = .01f };
755+
draw_gi_flame(&gfx->poly_xlu, game, rainbow_color, rainbow_color, translation, scale);
756+
// Parchment
757+
append_setup_dl_25_to_xlu(gfx);
758+
gSPMatrix(gfx->poly_xlu.p++, append_sys_matrix(gfx), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
759+
gSPDisplayList(gfx->poly_xlu.p++, item_draw_table[draw_id].args[3].dlist);
739760
// Writing
740761
append_setup_dl_25_to_xlu(gfx);
741762
gSPMatrix(gfx->poly_xlu.p++, append_sys_matrix(gfx), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
742763
gSPDisplayList(gfx->poly_xlu.p++, item_draw_table[draw_id].args[4].dlist);
764+
743765
// Shine
744-
append_setup_dl_25_to_xlu(gfx);
766+
/*append_setup_dl_25_to_xlu(gfx);
745767
gSPMatrix(gfx->poly_xlu.p++, append_sys_matrix(gfx), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
746768
gDPSetPrimColor(gfx->poly_xlu.p++, 0, 0x80, prim_color.r, prim_color.g, prim_color.b, alpha);
747769
gDPSetEnvColor(gfx->poly_xlu.p++, env_color.r, env_color.g, env_color.b, env_color.a);
748770
gSPDisplayList(gfx->poly_xlu.p++, item_draw_table[draw_id].args[2].dlist);
771+
*/
772+
749773
// Jar
750774
append_setup_dl_25_to_xlu(gfx);
751775
gSPMatrix(gfx->poly_xlu.p++, append_sys_matrix(gfx), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
@@ -756,8 +780,58 @@ void draw_gi_magic_meter(z64_game_t* game, uint32_t draw_id) {
756780
append_setup_dl_25_to_xlu(gfx);
757781
gSPMatrix(gfx->poly_xlu.p++, append_sys_matrix(gfx), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
758782
gSPDisplayList(gfx->poly_xlu.p++, item_draw_table[draw_id].args[1].dlist);
759-
// Parchment
760-
append_setup_dl_25_to_opa(gfx);
761-
gSPMatrix(gfx->poly_opa.p++, append_sys_matrix(gfx), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
762-
gSPDisplayList(gfx->poly_opa.p++, item_draw_table[draw_id].args[3].dlist);
783+
}
784+
785+
void draw_gi_flame(z64_disp_buf_t* dl, z64_game_t *game, colorRGBA8_t prim, colorRGBA8_t env, z64_xyzf_t translation, z64_xyzf_t scale) {
786+
z64_gfx_t *gfx = game->common.gfx;
787+
static const uint32_t kFlameDlist = 0x52a10; // Offset of gEffFire1DL in gameplay_keep
788+
duplicate_sys_matrix(); // Push the matrix stack. Do this so we can apply the smoke before the rest of the model
789+
update_sys_matrix(game->billboard_mtx); // Set the rotation to use the billboard matrix
790+
translate_sys_matrix(translation.x, translation.y, translation.z, 1); // Translate by the amount specified
791+
scale_sys_matrix(scale.x, scale.y, scale.z, 1); // Scale by the amount specified
792+
gSPMatrix(dl->p++, append_sys_matrix(gfx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); // Apply the matrix
793+
794+
// Draw the flame effect
795+
gSPDisplayList(dl->p++, sSetupDL[25]);
796+
gDPSetEnvColor(dl->p++, env.r, env.g, env.b, 0);
797+
gDPSetPrimColor(dl->p++, 0x0, 0x80, prim.r, prim.g, prim.b, 255);
798+
799+
gSPSegment(dl->p++, 0x08,
800+
gen_double_tile(gfx, G_TX_RENDERTILE, 0, 0, 0x20, 0x40, 1, 0,
801+
(-game->gameplay_frames & 0x7F) << 2, 0x20, 0x80));
802+
803+
gSPDisplayList(dl->p++, 0x04000000 | kFlameDlist);
804+
pop_sys_matrix(); // Pop the matrix stack
805+
}
806+
807+
/* void draw_gi_opa_with_rainbow_flame(z64_game_t* game, uint32_t draw_id) {
808+
draw_gi_various_xlu01(game, draw_id);
809+
colorRGBA8_t rainbow_color;
810+
rainbow_color.a = 0xFF;
811+
rainbow_color.color = get_rainbow_color(game->gameplay_frames, 10);
812+
813+
z64_xyzf_t translation = { .x = 0, .y = -35.0f, .z = -10.0f };
814+
z64_xyzf_t scale = { .x = .0125f, .y = .0075f, .z = .01f };
815+
draw_gi_flame(game, rainbow_color, rainbow_color, translation, scale);
816+
}
817+
*/
818+
819+
void draw_gi_xlu_with_flame(z64_game_t* game, uint32_t draw_id) {
820+
z64_gfx_t *gfx = game->common.gfx;
821+
822+
z64_xyzf_t translation = { .x = 0, .y = -35.0f, .z = 0.0f };
823+
z64_xyzf_t scale = { .x = .0125f, .y = .0075f, .z = .01f };
824+
draw_gi_flame(&gfx->poly_xlu, game, item_draw_table[draw_id].args[1].color, item_draw_table[draw_id].args[2].color, translation, scale);
825+
826+
draw_gi_various_xlu0(game, draw_id);
827+
}
828+
829+
void draw_gi_deku_nut_with_flame(z64_game_t* game, uint32_t draw_id) {
830+
z64_gfx_t *gfx = game->common.gfx;
831+
832+
z64_xyzf_t translation = { .x = 0, .y = -35.0f, .z = -10.0f };
833+
z64_xyzf_t scale = { .x = .0125f, .y = .0075f, .z = .01f };
834+
draw_gi_flame(&gfx->poly_xlu, game, item_draw_table[draw_id].args[1].color, item_draw_table[draw_id].args[2].color, translation, scale);
835+
836+
draw_gi_deku_nut(game, draw_id);
763837
}

‎ASM/c/item_draw_functions.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,8 @@ void draw_gi_nothing(z64_game_t* game, uint32_t draw_id);
5252
void draw_gi_medallions(z64_game_t* game, uint32_t draw_id);
5353
void draw_gi_stones(z64_game_t* game, uint32_t draw_id);
5454
void draw_gi_magic_meter(z64_game_t* game, uint32_t draw_id);
55+
void draw_gi_flame(z64_disp_buf_t* dl, z64_game_t *game, colorRGBA8_t prim, colorRGBA8_t env, z64_xyzf_t translation, z64_xyzf_t scale);
56+
void draw_gi_xlu_with_flame(z64_game_t *game, uint32_t draw_id);
57+
void draw_gi_deku_nut_with_flame(z64_game_t* game, uint32_t draw_id);
5558

5659
#endif

‎ASM/c/item_draw_table.c‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ item_draw_table_entry_t item_draw_table[] = {
4242
[0x1A] = { draw_gi_various_opa0, { 0x060004D0 } }, // Deku Stick
4343
[0x1B] = { draw_gi_various_opa0, { 0x060003C0 } }, // Map
4444
[0x1C] = { draw_gi_various_opa0, { 0x06000A50 } }, // Deku Shield
45-
[0x1D] = { draw_gi_various_opa0, { 0x06000580 } }, // Small Magic Jar
46-
[0x1E] = { draw_gi_various_opa0, { 0x06000EE0 } }, // Large Magic Jar
45+
[0x1D] = { draw_gi_various_opa0, { 0x06000580, 0xe0d4ffFF, 0xd4ffe2FF } }, // Small Magic Jar
46+
[0x1E] = { draw_gi_various_opa0, { 0x06000EE0, 0xe0d4ffFF, 0xd4ffe2FF } }, // Large Magic Jar
4747
[0x1F] = { draw_gi_various_opa0, { 0x060009A0 } }, // Bomb
4848
[0x20] = { draw_gi_various_opa0, { 0x06000B70 } }, // Stone of Agony
4949
[0x21] = { draw_gi_wallets, { 0x06001850, 0x06001750, 0x06001790, 0x060019A0, 0x060017B0, 0x06001A28, 0x060017D0, 0x06001AD8 } }, // Adult's Wallet
@@ -175,7 +175,9 @@ item_draw_table_entry_t item_draw_table[] = {
175175
[0x9D] = { draw_gi_fairy, { 0x06000EF0 } }, // Fairy (not in a bottle but uses the fairy from the bottle)
176176
[0x9E] = { draw_gi_nothing, {} },
177177
[0x9F] = { draw_gi_magic_meter, { 0x06000000, 0x060007B0, 0x06000FD8, 0x060009F8, 0x06001438, 0x286428FF, 0x000000FF } }, // Magic Meter Scroll
178-
};
178+
[0xA0] = { draw_gi_xlu_with_flame, { 0x060004D0, 0xC0C0C0FF, 0xC0C0C0FF } }, // Deku Stick Upgrade w/ Smoke Effect
179+
[0xA1] = { draw_gi_deku_nut_with_flame, { 0x06000E90, 0xC0C0C0FF, 0xC0C0C0FF } }, // Deku Nut Upgrade w/ Smoke Effect
180+
};
179181

180182
void base_draw_gi_model(z64_game_t* game, uint32_t draw_id) {
181183
item_draw_table[draw_id].draw_func(game, draw_id);

‎ASM/c/item_table.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,10 @@ item_row_t item_table[GI_RANDO_MAX] = {
149149
[GI_RUPEE_RED_LOSE] = ITEM_ROW(0x4D, BROWN_CHEST, 0x86, -1, 0x00F6, 0x017F, 0x6F, no_upgrade, no_effect, -1, -1, NULL), // Red Rupee (Chest Game)
150150
[GI_RUPEE_PURPLE_LOSE] = ITEM_ROW(0x4D, BROWN_CHEST, 0x87, -1, 0x00F7, 0x017F, 0x71, no_upgrade, no_effect, -1, -1, NULL), // Purple Rupee (Chest Game)
151151
[GI_HEART_PIECE_WIN] = ITEM_ROW(0x53, HEART_CHEST_SMALL, 0x7A, -1, 0x00FA, 0x00BD, 0x14, health_upgrade_cap, full_heal, -1, -1, NULL), // Piece of Heart (Chest Game)
152-
[GI_DEKU_STICK_UPGRADE_20] = ITEM_ROW(0x53, BROWN_CHEST, 0x98, -1, 0x0090, 0x00C7, 0x1B, no_upgrade, no_effect, -1, -1, NULL), // Deku Stick Upgrade (20)
153-
[GI_DEKU_STICK_UPGRADE_30] = ITEM_ROW(0x53, BROWN_CHEST, 0x99, -1, 0x0091, 0x00C7, 0x1B, no_upgrade, no_effect, -1, -1, NULL), // Deku Stick Upgrade (30)
154-
[GI_DEKU_NUT_UPGRADE_30] = ITEM_ROW(0x53, BROWN_CHEST, 0x9A, -1, 0x00A7, 0x00BB, 0x12, no_upgrade, no_effect, -1, -1, NULL), // Deku Nut Upgrade (30)
155-
[GI_DEKU_NUT_UPGRADE_40] = ITEM_ROW(0x53, BROWN_CHEST, 0x9B, -1, 0x00A8, 0x00BB, 0x12, no_upgrade, no_effect, -1, -1, NULL), // Deku Nut Upgrade (40)
152+
[GI_DEKU_STICK_UPGRADE_20] = ITEM_ROW(0x53, BROWN_CHEST, 0x98, -1, 0x0090, 0x00C7, 0xA1, no_upgrade, no_effect, -1, -1, NULL), // Deku Stick Upgrade (20)
153+
[GI_DEKU_STICK_UPGRADE_30] = ITEM_ROW(0x53, BROWN_CHEST, 0x99, -1, 0x0091, 0x00C7, 0xA1, no_upgrade, no_effect, -1, -1, NULL), // Deku Stick Upgrade (30)
154+
[GI_DEKU_NUT_UPGRADE_30] = ITEM_ROW(0x53, BROWN_CHEST, 0x9A, -1, 0x00A7, 0x00BB, 0xA2, no_upgrade, no_effect, -1, -1, NULL), // Deku Nut Upgrade (30)
155+
[GI_DEKU_NUT_UPGRADE_40] = ITEM_ROW(0x53, BROWN_CHEST, 0x9B, -1, 0x00A8, 0x00BB, 0xA2, no_upgrade, no_effect, -1, -1, NULL), // Deku Nut Upgrade (40)
156156
[GI_BULLET_BAG_50] = ITEM_ROW(0x53, GILDED_CHEST, 0x49, -1, 0x006C, 0x017B, 0x73, no_upgrade, no_effect, -1, -1, NULL), // Bullet Bag (50)
157157
[GI_ICE_TRAP] = ITEM_ROW(0x53, GILDED_CHEST, 0x41, -1, 0x9002, 0x0000, 0x00, no_upgrade, ice_trap_effect, -1, -1, NULL), // Ice Trap
158158

@@ -167,8 +167,8 @@ item_row_t item_table[GI_RANDO_MAX] = {
167167
[GI_PROGRESSIVE_SLINGSHOT] = ITEM_ROW( -1, GILDED_CHEST, -1, -1, -1, 0x00E7, 0x33, slingshot_upgrade, no_effect, -1, -1, NULL), // Progressive Slingshot
168168
[GI_PROGRESSIVE_WALLET] = ITEM_ROW( -1, GILDED_CHEST, -1, -1, -1, 0x00D1, 0x22, wallet_upgrade, no_effect, -1, -1, NULL), // Progressive Wallet
169169
[GI_PROGRESSIVE_SCALE] = ITEM_ROW( -1, GILDED_CHEST, -1, -1, -1, 0x00DB, 0x2A, scale_upgrade, no_effect, -1, -1, NULL), // Progressive Scale
170-
[GI_PROGRESSIVE_NUT_CAPACITY] = ITEM_ROW( -1, BROWN_CHEST, -1, -1, -1, 0x00BB, 0x12, nut_upgrade, no_effect, -1, -1, NULL), // Progressive Nut Capacity
171-
[GI_PROGRESSIVE_STICK_CAPACITY] = ITEM_ROW( -1, BROWN_CHEST, -1, -1, -1, 0x00C7, 0x1B, stick_upgrade, no_effect, -1, -1, NULL), // Progressive Stick Capacity
170+
[GI_PROGRESSIVE_NUT_CAPACITY] = ITEM_ROW( -1, BROWN_CHEST, -1, -1, -1, 0x00BB, 0xA2, nut_upgrade, no_effect, -1, -1, NULL), // Progressive Nut Capacity
171+
[GI_PROGRESSIVE_STICK_CAPACITY] = ITEM_ROW( -1, BROWN_CHEST, -1, -1, -1, 0x00C7, 0xA1, stick_upgrade, no_effect, -1, -1, NULL), // Progressive Stick Capacity
172172
[GI_PROGRESSIVE_BOMBCHUS] = ITEM_ROW( -1, GILDED_CHEST, -1, -1, -1, 0x00D9, 0x28, bombchu_upgrade, no_effect, -1, -1, NULL), // Progressive Bombchus
173173
[GI_PROGRESSIVE_MAGIC_METER] = ITEM_ROW( -1, GILDED_CHEST, -1, -1, -1, 0x00CD, 0x1E, magic_upgrade, no_effect, -1, -1, NULL), // Progressive Magic Meter
174174
[GI_PROGRESSIVE_OCARINA] = ITEM_ROW( -1, GILDED_CHEST, -1, -1, -1, 0x010E, 0x46, ocarina_upgrade, no_effect, -1, -1, NULL), // Progressive Ocarina

‎ASM/c/z64.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1468,7 +1468,7 @@ typedef struct {
14681468
char unk_16_[0x000B]; /* 0x11CBD */
14691469
void *room_ptr; /* 0x11CC8 */
14701470
char unk_17_[0x00D4]; /* 0x11CCC */
1471-
float mf_11DA0[4][4]; /* 0x11DA0 */
1471+
float billboard_mtx[4][4]; /* 0x11DA0 */
14721472
char unk_18_[0x0004]; /* 0x11DE0 */
14731473
uint32_t gameplay_frames; /* 0x11DE4 */
14741474
uint8_t link_age; /* 0x11DE8 */

‎ASM/ootSymbols.ld‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,4 @@ z64_sEquipAnimTimer = 0x8039EAB4;
3838
z64_sEquipMoveTimer = 0x8039EAB8;
3939
gActorOverlayTable = 0x800E8530;
4040
Message_CloseTextbox = 0x800d6218;
41+
sSetupDL = 0x800f7d50;

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
## Other Changes
4040
* Now supports custom music written for the Majora's Mask Randomizer.
4141
* New Magic Meter item model to allow magic drops to be shuffled in the future.
42+
* Add a smoke effect to Deku Stick Capacity and Deku Nut Capacity items to distinguish them from refills.
4243
* Seeds rolled on ootrandomizer.com display their ID in the top left corner of the file select screen.
4344
* The `Other` tab of the generator has been rearranged for better grouping of settings, and the `One Major Item per Dungeon` setting has been moved there since it was causing frequent failures with `Randomize Main Rule Settings`.
4445
* Biggoron's text after turning in the Eyedrops has been changed to avoid potential confusion.

0 commit comments

Comments
 (0)