diff --git a/ASM/build/asm_symbols.txt b/ASM/build/asm_symbols.txt index 4da973712..4fa98269c 100644 --- a/ASM/build/asm_symbols.txt +++ b/ASM/build/asm_symbols.txt @@ -399,45 +399,45 @@ 80401321 CUSTOM_KEY_MODELS 80401322 .byt:0001 80401322 SHUFFLE_OCARINA_BUTTONS -80401324 .dbl:0004 -80401324 AUTO_TRACKER_CONTEXT -80401324 AUTO_TRACKER_VERSION +80401323 .wrd:0002 +80401323 EPONAS_SONG_NOTES 80401328 .dbl:0004 -80401328 CFG_DUNGEON_INFO_ENABLE +80401328 AUTO_TRACKER_CONTEXT +80401328 AUTO_TRACKER_VERSION 8040132C .dbl:0004 -8040132C CFG_DUNGEON_INFO_MQ_ENABLE +8040132C CFG_DUNGEON_INFO_ENABLE 80401330 .dbl:0004 -80401330 CFG_DUNGEON_INFO_MQ_NEED_MAP +80401330 CFG_DUNGEON_INFO_MQ_ENABLE 80401334 .dbl:0004 -80401334 CFG_DUNGEON_INFO_REWARD_ENABLE +80401334 CFG_DUNGEON_INFO_MQ_NEED_MAP 80401338 .dbl:0004 -80401338 CFG_DUNGEON_INFO_REWARD_NEED_COMPASS +80401338 CFG_DUNGEON_INFO_REWARD_ENABLE 8040133C .dbl:0004 -8040133C CFG_DUNGEON_INFO_REWARD_NEED_ALTAR +8040133C CFG_DUNGEON_INFO_REWARD_NEED_COMPASS 80401340 .dbl:0004 -80401340 CFG_DUNGEON_INFO_REWARD_SUMMARY_ENABLE -80401344 .byt:000E -80401344 CFG_DUNGEON_REWARDS -80401352 .byt:000E -80401352 CFG_DUNGEON_IS_MQ -80401360 .dbl:0004 -80401360 RAINBOW_BRIDGE_CONDITION +80401340 CFG_DUNGEON_INFO_REWARD_NEED_ALTAR +80401344 .dbl:0004 +80401344 CFG_DUNGEON_INFO_REWARD_SUMMARY_ENABLE +80401348 .byt:000E +80401348 CFG_DUNGEON_REWARDS +80401356 .byt:000E +80401356 CFG_DUNGEON_IS_MQ 80401364 .dbl:0004 -80401364 LACS_CONDITION -80401368 .wrd:0002 -80401368 RAINBOW_BRIDGE_COUNT -8040136A .wrd:0002 -8040136A LACS_CONDITION_COUNT +80401364 RAINBOW_BRIDGE_CONDITION +80401368 .dbl:0004 +80401368 LACS_CONDITION 8040136C .wrd:0002 -8040136C TRIFORCE_HUNT_ENABLED +8040136C RAINBOW_BRIDGE_COUNT 8040136E .wrd:0002 -8040136E TRIFORCE_PIECES_REQUIRED +8040136E LACS_CONDITION_COUNT 80401370 .wrd:0002 -80401370 EPONAS_SONG_NOTES -80401372 .byt:0008 -80401372 SPECIAL_DEAL_COUNTS -8040137A .byt:00CF -8040137A CFG_DUNGEON_REWARD_AREAS +80401370 TRIFORCE_HUNT_ENABLED +80401372 .wrd:0002 +80401372 TRIFORCE_PIECES_REQUIRED +80401374 .byt:0008 +80401374 SPECIAL_DEAL_COUNTS +8040137C .byt:00CF +8040137C CFG_DUNGEON_REWARD_AREAS 8040144C init 80401480 Static_ctxt_Init 80401490 inventory_check diff --git a/ASM/src/config.asm b/ASM/src/config.asm index 50c3a2e81..8eca9da49 100644 --- a/ASM/src/config.asm +++ b/ASM/src/config.asm @@ -196,6 +196,8 @@ CUSTOM_KEY_MODELS: .byte 0x00 SHUFFLE_OCARINA_BUTTONS: .byte 0x00 +EPONAS_SONG_NOTES: +.halfword 0x0000 .align 4 ; These configuration values are given fixed addresses to aid auto-trackers. @@ -256,9 +258,6 @@ TRIFORCE_HUNT_ENABLED: TRIFORCE_PIECES_REQUIRED: .halfword 0xffff -EPONAS_SONG_NOTES: -.halfword 0x0000 - .area 8, 0x00 SPECIAL_DEAL_COUNTS: .endarea diff --git a/data/generated/rom_patch.txt b/data/generated/rom_patch.txt index 6e4d02eb1..b8e9a7ad4 100644 --- a/data/generated/rom_patch.txt +++ b/data/generated/rom_patch.txt @@ -1561,7 +1561,7 @@ fec1fc,9000000 3480000,80400020 3480004,80400c3c 3480008,8041a874 -348000c,80401324 +348000c,80401328 3480020,5 3480034,dfdfdfdf 3480038,dfdfdfdf @@ -2095,15 +2095,14 @@ fec1fc,9000000 3480c90,10000 3480ca0,80404120 348130c,1 -3481324,4 -3481340,1 -3481344,ffffffff +3481328,4 +3481344,1 3481348,ffffffff 348134c,ffffffff -3481350,ffff0000 -3481368,640000 -348136c,ffff -3481378,2020 +3481350,ffffffff +3481354,ffff0000 +348136c,640000 +3481370,ffff 348137c,20202020 3481380,20202020 3481384,20202020 @@ -2155,7 +2154,7 @@ fec1fc,9000000 348143c,20202020 3481440,20202020 3481444,20202020 -3481448,20000000 +3481448,20202000 348144c,27bdffe8 3481450,afbf0010 3481454,c1050e8 @@ -3686,7 +3685,7 @@ fec1fc,9000000 3482edc,3e00008 3482ee0,3c0100ff 3482ee4,3c0a8040 -3482ee8,8d4a1360 +3482ee8,8d4a1364 3482eec,1140000c 3482ef0,34010001 3482ef4,1141000d @@ -3781,7 +3780,7 @@ fec1fc,9000000 34830b0,84ef002e 34830b4,34010000 34830b8,3c188040 -34830bc,87181368 +34830bc,8718136c 34830c0,3e00008 34830c4,1f8502a 34830c8,34010018 @@ -3794,7 +3793,7 @@ fec1fc,9000000 34830ec,3e00008 34830f0,415024 34830f4,3c098040 -34830f8,8d291364 +34830f8,8d291368 34830fc,340a0001 3483100,112a0010 3483104,340a0002 @@ -3889,7 +3888,7 @@ fec1fc,9000000 34832c8,860c002e 34832cc,34010000 34832d0,3c0b8040 -34832d4,856b136a +34832d4,856b136e 34832d8,18b602a 34832dc,15800002 34832e0,34030000 @@ -6534,7 +6533,7 @@ fec1fc,9000000 3486998,a5040 348699c,1425021 34869a0,3c188040 -34869a4,27181352 +34869a4,27181356 34869a8,240e00ff 34869ac,3c0d8042 34869b0,25adc018 @@ -7239,7 +7238,7 @@ fec1fc,9000000 34874d0,14400144 34874d4,8fb10020 34874d8,3c028040 -34874dc,8c431328 +34874dc,8c43132c 34874e0,10600019 34874e4,3c028011 34874e8,24020006 @@ -7564,7 +7563,7 @@ fec1fc,9000000 34879e8,3e00008 34879ec,27bd0030 34879f0,3c028040 -34879f4,8c421328 +34879f4,8c42132c 34879f8,10400018 34879fc,3c028011 3487a00,3c02801c @@ -8140,7 +8139,7 @@ fec1fc,9000000 34882f4,c103c92 34882f8,2402025 34882fc,3c028040 -3488300,8c441328 +3488300,8c44132c 3488304,1080004b 3488308,3c02801d 348830c,3c02801c @@ -8423,7 +8422,7 @@ fec1fc,9000000 3488760,5440001d 3488764,8e0402b0 3488768,3c028040 -348876c,8c421328 +348876c,8c42132c 3488770,10400008 3488774,3c02801c 3488778,344284a0 @@ -8543,7 +8542,7 @@ fec1fc,9000000 3488940,5440002a 3488944,8e0402b0 3488948,3c028040 -348894c,8c421328 +348894c,8c42132c 3488950,10400008 3488954,3c02801c 3488958,344284a0 @@ -8767,7 +8766,7 @@ fec1fc,9000000 3488cc8,10a00006 3488ccc,24820002 3488cd0,3c028040 -3488cd4,90421353 +3488cd4,90421357 3488cd8,50400002 3488cdc,24820002 3488ce0,24820001 @@ -8779,7 +8778,7 @@ fec1fc,9000000 3488cfc,50a00005 3488d00,24420001 3488d04,3c038040 -3488d08,9063135b +3488d08,9063135f 3488d0c,54600001 3488d10,24420001 3488d14,3e00008 @@ -8907,7 +8906,7 @@ fec1fc,9000000 3488f00,2610a740 3488f04,9025 3488f08,3c1e8040 -3488f0c,27de1352 +3488f0c,27de1356 3488f10,3c138042 3488f14,2673c018 3488f18,3c028042 @@ -9081,7 +9080,7 @@ fec1fc,9000000 34891bc,344284a0 34891c0,94430014 34891c4,3c028040 -34891c8,8c421328 +34891c8,8c42132c 34891cc,104007f5 34891d0,3c02801c 34891d4,27bdff80 @@ -9164,28 +9163,28 @@ fec1fc,9000000 3489308,3442a5d0 348930c,94430f2e 3489310,3c028040 -3489314,8c421334 +3489314,8c421338 3489318,10400018 348931c,2025 3489320,3c028040 -3489324,8c42133c +3489324,8c421340 3489328,10400005 348932c,3c028040 3489330,30620001 3489334,10400005 3489338,3c028040 348933c,3c028040 -3489340,8c421340 +3489340,8c421344 3489344,14400769 3489348,3c028040 -348934c,8c42133c +348934c,8c421340 3489350,10400004 3489354,2025 3489358,30630002 348935c,5060000c 3489360,afa00044 3489364,3c028040 -3489368,8c421340 +3489368,8c421344 348936c,50400008 3489370,afa00044 3489374,10000003 @@ -9196,7 +9195,7 @@ fec1fc,9000000 3489388,afa20044 348938c,afa20044 3489390,3c028040 -3489394,8c43132c +3489394,8c431330 3489398,afa30050 348939c,3c028040 34893a0,90425f80 @@ -9316,14 +9315,14 @@ fec1fc,9000000 3489568,2636011e 348956c,3c158040 3489570,3c1e8040 -3489574,27de1344 +3489574,27de1348 3489578,3c028042 348957c,2442a728 3489580,afa20048 3489584,3c028042 3489588,2442ab00 348958c,afa2004c -3489590,8ea21338 +3489590,8ea2133c 3489594,5040000b 3489598,92220000 348959c,92230000 @@ -9412,11 +9411,11 @@ fec1fc,9000000 34896e8,2636011e 34896ec,3c158040 34896f0,3c1e8040 -34896f4,27de1344 +34896f4,27de1348 34896f8,3c028042 34896fc,2442ab10 3489700,afa20040 -3489704,8ea21338 +3489704,8ea2133c 3489708,5040000b 348970c,92220000 3489710,92230000 @@ -9754,14 +9753,14 @@ fec1fc,9000000 3489c40,2c08825 3489c44,3c148040 3489c48,3c128040 -3489c4c,26521352 +3489c4c,26521356 3489c50,3c028042 3489c54,2442a674 3489c58,afa2003c 3489c5c,3c028042 3489c60,2442a678 3489c64,afa20040 -3489c68,8e821330 +3489c68,8e821334 3489c6c,5040000f 3489c70,92620000 3489c74,92620001 @@ -9813,7 +9812,7 @@ fec1fc,9000000 3489d2c,3c118042 3489d30,2631a752 3489d34,3c158040 -3489d38,26b51352 +3489d38,26b51356 3489d3c,241300ff 3489d40,3c128042 3489d44,26524b00 @@ -9858,7 +9857,7 @@ fec1fc,9000000 3489de0,2652a752 3489de4,b825 3489de8,3c028040 -3489dec,24421352 +3489dec,24421356 3489df0,afa20038 3489df4,3c148042 3489df8,26944b00 @@ -10002,18 +10001,18 @@ fec1fc,9000000 348a020,3442a5d0 348a024,94430f2e 348a028,3c028040 -348a02c,8c421334 +348a02c,8c421338 348a030,10400012 348a034,a825 348a038,3c028040 -348a03c,8c42133c +348a03c,8c421340 348a040,10400010 348a044,24150001 348a048,30620001 348a04c,54400006 348a050,30630002 348a054,3c028040 -348a058,8c42133c +348a058,8c421340 348a05c,1040000c 348a060,a825 348a064,30630002 @@ -10105,7 +10104,7 @@ fec1fc,9000000 348a1bc,24420012 348a1c0,afa20038 348a1c4,3c138040 -348a1c8,2673137a +348a1c8,2673137c 348a1cc,24120001 348a1d0,8825 348a1d4,3c168042 @@ -10115,7 +10114,7 @@ fec1fc,9000000 348a1e4,3c028042 348a1e8,afa20040 348a1ec,3c148040 -348a1f0,26941344 +348a1f0,26941348 348a1f4,2442a740 348a1f8,afa20044 348a1fc,2a230003 @@ -10130,7 +10129,7 @@ fec1fc,9000000 348a220,2a420009 348a224,2d11821 348a228,90650000 -348a22c,8fc31338 +348a22c,8fc3133c 348a230,10770005 348a234,24040002 348a238,10640019 @@ -10217,11 +10216,11 @@ fec1fc,9000000 348a37c,24420020 348a380,e23821 348a384,3c028040 -348a388,90421353 +348a388,90421357 348a38c,2102b 348a390,2a2a821 348a394,3c028040 -348a398,9042135b +348a398,9042135f 348a39c,2c420001 348a3a0,2a2a821 348a3a4,151100 @@ -10478,7 +10477,7 @@ fec1fc,9000000 348a790,3c178042 348a794,26f7a740 348a798,3c1e8040 -348a79c,27de1352 +348a79c,27de1356 348a7a0,241500ff 348a7a4,3c138042 348a7a8,26734b00 @@ -10540,7 +10539,7 @@ fec1fc,9000000 348a888,2442a740 348a88c,afa20040 348a890,3c028040 -348a894,24421352 +348a894,24421356 348a898,afa20038 348a89c,3c178042 348a8a0,26f74b00 @@ -10702,7 +10701,7 @@ fec1fc,9000000 348ab10,26940011 348ab14,1000014c 348ab18,8e020008 -348ab1c,8c57132c +348ab1c,8c571330 348ab20,12e00007 348ab24,2e01025 348ab28,3c028042 @@ -10927,13 +10926,13 @@ fec1fc,9000000 348ae94,3c138042 348ae98,2673a740 348ae9c,3c168040 -348aea0,26d61352 +348aea0,26d61356 348aea4,3c158042 348aea8,26b5a674 348aeac,3c1e8042 348aeb0,2a23000a 348aeb4,38630001 -348aeb8,8ee21330 +348aeb8,8ee21334 348aebc,10400019 348aec0,711821 348aec4,31040 @@ -11074,7 +11073,7 @@ fec1fc,9000000 348b0e0,2002025 348b0e4,1000fddb 348b0e8,26220001 -348b0ec,8c42133c +348b0ec,8c421340 348b0f0,1440f899 348b0f4,24040001 348b0f8,1000f8a4 @@ -11477,7 +11476,7 @@ fec1fc,9000000 348b788,afb10018 348b78c,afb00014 348b790,3c028040 -348b794,9451136c +348b794,94511370 348b798,1220001c 348b79c,808025 348b7a0,3c028042 @@ -11794,7 +11793,7 @@ fec1fc,9000000 348bc7c,c102d8b 348bc80,2484e539 348bc84,3c028040 -348bc88,8451136e +348bc88,84511372 348bc8c,1000ffbe 348bc90,2405ffff 348bc94,2602825 @@ -11802,7 +11801,7 @@ fec1fc,9000000 348bc9c,c102d8b 348bca0,2484e539 348bca4,3c028040 -348bca8,8445136e +348bca8,84451372 348bcac,1000ffb6 348bcb0,a08825 348bcb4,1000ff69 @@ -12005,7 +12004,7 @@ fec1fc,9000000 348bfc8,431025 348bfcc,ac820004 348bfd0,8fa20034 -348bfd4,9442136c +348bfd4,94421370 348bfd8,1040001b 348bfdc,8fa20038 348bfe0,2404001a @@ -12428,7 +12427,7 @@ fec1fc,9000000 348c664,c103c92 348c668,2002025 348c66c,3c028040 -348c670,9442136c +348c670,94421370 348c674,50400024 348c678,8e020008 348c67c,3c028042 @@ -12494,7 +12493,7 @@ fec1fc,9000000 348c76c,24020003 348c770,16620087 348c774,8fa2003c -348c778,9442136c +348c778,94421370 348c77c,10400085 348c780,133080 348c784,afa00020 @@ -19228,7 +19227,7 @@ fec1fc,9000000 3493154,c1065f7 3493158,ac8208c4 349315c,3c028040 -3493160,9442136e +3493160,94421372 3493164,8e0308c4 3493168,1462001e 349316c,8fbf001c @@ -19314,7 +19313,7 @@ fec1fc,9000000 34932b4,8c4700e4 34932b8,804300e5 34932bc,3c028040 -34932c0,24421352 +34932c0,24421356 34932c4,451021 34932c8,90480000 34932cc,51040 @@ -19337,7 +19336,7 @@ fec1fc,9000000 3493310,3e00008 3493318,853021 349331c,3c028040 -3493320,24421352 +3493320,24421356 3493324,a21021 3493328,90470000 349332c,51040 @@ -19371,7 +19370,7 @@ fec1fc,9000000 349339c,31880 34933a0,831821 34933a4,3c068040 -34933a8,24c61352 +34933a8,24c61356 34933ac,c53021 34933b0,90c80000 34933b4,53040 @@ -19386,7 +19385,7 @@ fec1fc,9000000 34933d8,3e00008 34933dc,ac6200e4 34933e0,3c028040 -34933e4,24421352 +34933e4,24421356 34933e8,451021 34933ec,90470000 34933f0,3c038042 @@ -19446,7 +19445,7 @@ fec1fc,9000000 34934c8,3e00008 34934cc,ac6200d8 34934d0,3c028040 -34934d4,24421352 +34934d4,24421356 34934d8,a21021 34934dc,90430000 34934e0,31040 @@ -19489,7 +19488,7 @@ fec1fc,9000000 349357c,a08825 3493580,c08025 3493584,3c028040 -3493588,24421352 +3493588,24421356 349358c,a21021 3493590,90430000 3493594,31040 @@ -19671,7 +19670,7 @@ fec1fc,9000000 3493868,84830012 349386c,84820010 3493870,3c058040 -3493874,24a51352 +3493874,24a51356 3493878,451021 349387c,90460000 3493880,61040 @@ -19713,7 +19712,7 @@ fec1fc,9000000 3493914,3c038040 3493918,84860012 349391c,84820010 -3493920,24631352 +3493920,24631356 3493924,431021 3493928,90470000 349392c,3c038042 @@ -19756,7 +19755,7 @@ fec1fc,9000000 34939c0,651821 34939c4,806600e5 34939c8,3c038040 -34939cc,24631352 +34939cc,24631356 34939d0,431821 34939d4,90670000 34939d8,21840 @@ -22684,7 +22683,7 @@ fec1fc,9000000 34968e0,1440001e 34968e4,3c028040 34968e8,3c028040 -34968ec,9442136e +34968ec,94421372 34968f0,2442ffff 34968f4,3c038011 34968f8,3463a5d0 @@ -23326,7 +23325,7 @@ fec1fc,9000000 3497318,afbf0014 349731c,c105cae 3497324,3c038040 -3497328,84631370 +3497328,84631323 349732c,621024 3497330,2c420001 3497334,8fbf0014 @@ -25650,7 +25649,7 @@ fec1fc,9000000 3499828,afb00024 349982c,3a0f025 3499830,3c028040 -3499834,9442136c +3499834,94421370 3499838,10400127 349983c,3a0a825 3499840,3c02801d @@ -25764,7 +25763,7 @@ fec1fc,9000000 34999f0,240a0001 34999f4,240a0001 34999f8,3c028040 -34999fc,9445136e +34999fc,94451372 3499a00,18a00010 3499a04,a01025 3499a08,3c066666 diff --git a/data/generated/symbols.json b/data/generated/symbols.json index 6f11eb533..ac6344a85 100644 --- a/data/generated/symbols.json +++ b/data/generated/symbols.json @@ -8,8 +8,8 @@ "AUDIO_THREAD_INFO_MEM_SIZE": "0348411C", "AUDIO_THREAD_INFO_MEM_START": "03484118", "AUDIO_THREAD_MEM_START": "034A77E0", - "AUTO_TRACKER_CONTEXT": "03481324", - "AUTO_TRACKER_VERSION": "03481324", + "AUTO_TRACKER_CONTEXT": "03481328", + "AUTO_TRACKER_VERSION": "03481328", "BONK_LAST_FRAME": "03483C88", "CFG_ADULT_TRADE_SHUFFLE": "0348552C", "CFG_AUDIOBANK_TABLE_EXTENDED_ADDR": "03480CA0", @@ -32,17 +32,17 @@ "CFG_DISPLAY_DPAD": "03480C82", "CFG_DPAD_DUNGEON_INFO_ENABLE": "03480C91", "CFG_DPAD_ON_THE_LEFT": "03480CA6", - "CFG_DUNGEON_INFO_ENABLE": "03481328", - "CFG_DUNGEON_INFO_MQ_ENABLE": "0348132C", - "CFG_DUNGEON_INFO_MQ_NEED_MAP": "03481330", - "CFG_DUNGEON_INFO_REWARD_ENABLE": "03481334", - "CFG_DUNGEON_INFO_REWARD_NEED_ALTAR": "0348133C", - "CFG_DUNGEON_INFO_REWARD_NEED_COMPASS": "03481338", - "CFG_DUNGEON_INFO_REWARD_SUMMARY_ENABLE": "03481340", + "CFG_DUNGEON_INFO_ENABLE": "0348132C", + "CFG_DUNGEON_INFO_MQ_ENABLE": "03481330", + "CFG_DUNGEON_INFO_MQ_NEED_MAP": "03481334", + "CFG_DUNGEON_INFO_REWARD_ENABLE": "03481338", + "CFG_DUNGEON_INFO_REWARD_NEED_ALTAR": "03481340", + "CFG_DUNGEON_INFO_REWARD_NEED_COMPASS": "0348133C", + "CFG_DUNGEON_INFO_REWARD_SUMMARY_ENABLE": "03481344", "CFG_DUNGEON_INFO_SILVER_RUPEES": "03481320", - "CFG_DUNGEON_IS_MQ": "03481352", - "CFG_DUNGEON_REWARDS": "03481344", - "CFG_DUNGEON_REWARD_AREAS": "0348137A", + "CFG_DUNGEON_IS_MQ": "03481356", + "CFG_DUNGEON_REWARDS": "03481348", + "CFG_DUNGEON_REWARD_AREAS": "0348137C", "CFG_FILE_SELECT_HASH": "03480834", "CFG_HEART_COLOR": "03480C46", "CFG_MAGIC_COLOR": "03480C40", @@ -89,7 +89,7 @@ "DISABLE_TIMERS": "03481315", "DPAD_TEXTURE": "034A5FE0", "DUNGEONS_SHUFFLED": "03481316", - "EPONAS_SONG_NOTES": "03481370", + "EPONAS_SONG_NOTES": "03481323", "EXTENDED_INITIAL_SAVE_DATA": "03481140", "EXTENDED_OBJECT_TABLE": "03481240", "EXTERN_DAMAGE_MULTIPLYER": "03483C15", @@ -118,8 +118,8 @@ "KAKARIKO_WEATHER_FORECAST": "0349E510", "KEYRING_BOSSKEY_CONDITION": "0348131E", "KING_DODONGO_BONKS": "03483DE8", - "LACS_CONDITION": "03481364", - "LACS_CONDITION_COUNT": "0348136A", + "LACS_CONDITION": "03481368", + "LACS_CONDITION_COUNT": "0348136E", "MALON_GAVE_ICETRAP": "03485060", "MALON_TEXT_ID": "03481314", "MAX_RUPEES": "0349E4E2", @@ -142,8 +142,8 @@ "PLAYER_NAMES": "03480034", "PLAYER_NAME_ID": "03480025", "POTCRATE_TEXTURES_MATCH_CONTENTS": "0348131D", - "RAINBOW_BRIDGE_CONDITION": "03481360", - "RAINBOW_BRIDGE_COUNT": "03481368", + "RAINBOW_BRIDGE_CONDITION": "03481364", + "RAINBOW_BRIDGE_COUNT": "0348136C", "RANDOMIZER_RNG_SEED": "0349E4F4", "RANDO_CONTEXT": "03480000", "RNG_SEED_INT": "0349E484", @@ -159,16 +159,16 @@ "SHUFFLE_SILVER_RUPEES": "0348131F", "SONGS_AS_ITEMS": "03481311", "SOS_ITEM_GIVEN": "03481F00", - "SPECIAL_DEAL_COUNTS": "03481372", + "SPECIAL_DEAL_COUNTS": "03481374", "SPEED_MULTIPLIER": "034836C0", "SPOILER_AVAILABLE": "0348131B", "START_TWINROVA_FIGHT": "03484A50", "Sram_InitNewSave": "0349E488", "TIME_STRING_TXT": "03480D1C", "TIME_TRAVEL_SAVED_EQUIPS": "0348267C", - "TRIFORCE_HUNT_ENABLED": "0348136C", + "TRIFORCE_HUNT_ENABLED": "03481370", "TRIFORCE_ICON_TEXTURE": "034A67E0", - "TRIFORCE_PIECES_REQUIRED": "0348136E", + "TRIFORCE_PIECES_REQUIRED": "03481372", "TWINROVA_ACTION_TIMER": "03484A54", "VERSION_STRING_TXT": "03480CE8", "WINDMILL_SONG_ID": "03481312",