Skip to content

Commit b493209

Browse files
committed
Remove FTA vars
1 parent a23a6f1 commit b493209

File tree

3 files changed

+1
-23
lines changed

3 files changed

+1
-23
lines changed

base-hack/include/common_structs.h

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1787,17 +1787,6 @@ typedef struct ItemRequirement {
17871787
/* 0x001 */ unsigned char count;
17881788
} ItemRequirement;
17891789

1790-
typedef struct FreeTradeAgreement {
1791-
unsigned char major_items : 1; // 0x80
1792-
unsigned char blueprints : 1; // 0x40
1793-
unsigned char coins_cbs : 1; // 0x20
1794-
unsigned char balloons : 1; // 0x10
1795-
unsigned char unk4 : 1; // 0x08
1796-
unsigned char unk5 : 1; // 0x04
1797-
unsigned char unk6 : 1; // 0x02
1798-
unsigned char unk7 : 1; // 0x01
1799-
} FreeTradeAgreement;
1800-
18011790
typedef struct LocationVisuals {
18021791
unsigned char crowns : 1; // 0x80
18031792
unsigned char boss_doors : 1; // 0x40

base-hack/include/variable_space_structs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ typedef struct varspace {
7777
/* 0x110 */ unsigned char arcade_reward; // Reward Index for R2 of Arcade
7878
/* 0x111 */ unsigned char jetpac_reward; // Reward Index for Jetpac 5000 Pts
7979
/* 0x112 */ char rainbow_ammo;
80-
/* 0x113 */ FreeTradeAgreement any_kong_items;
80+
/* 0x113 */ char unk_113;
8181
/* 0x114 */ char fix_lanky_tiny_prod;
8282
/* 0x115 */ unsigned char progressive_hint_gb_cap; // 0 = Off, 1 or more = Hints are rewarded for collecting GBs, rather than hint doors, 35th hint is unlocked at x
8383
/* 0x116 */ char cutscene_skip_setting; // 0 = Off, 1 = On Button Press, 2 = Automatic

randomizer/Patching/ApplyRandomizer.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -296,17 +296,6 @@ def patching_response(spoiler):
296296
ROM_COPY.seek(sav + 0xD5 + offset)
297297
ROM_COPY.writeMultipleBytes(value, 1)
298298

299-
# Free Trade Agreement
300-
if spoiler.settings.free_trade_items:
301-
ROM_COPY.seek(sav + 0x113)
302-
old = int.from_bytes(ROM_COPY.readBytes(1), "big")
303-
ROM_COPY.seek(sav + 0x113)
304-
ROM_COPY.write(old | 0x80)
305-
if spoiler.settings.free_trade_blueprints:
306-
ROM_COPY.seek(sav + 0x113)
307-
old = int.from_bytes(ROM_COPY.readBytes(1), "big")
308-
ROM_COPY.seek(sav + 0x113)
309-
ROM_COPY.write(old | 0x40)
310299
writeMultiselector(
311300
spoiler.settings.misc_changes_selected,
312301
QoLSelector,

0 commit comments

Comments
 (0)