Skip to content

Commit

Permalink
Ice Cavern silver rupee logic fixes and more descriptive location nam…
Browse files Browse the repository at this point in the history 
…es (#26)

* Rename Ice Cavern Spinning Blade locations to Spinning Scythe for consistency with the skulltula

* Rename Ice Cavern Push Block locations for consistency; Split Ice Cavern logic into rooms; More descriptive names for Ice Cavern silver rupees
  • Loading branch information
@fenhl
fenhl authored May 17, 2022
1 parent b71495c commit a1ca6ef
Show file tree
Hide file tree
Showing 5 changed files with 94 additions and 63 deletions.
4 changes: 2 additions & 2 deletions ASM/c/item_table.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ item_row_t item_table[] = {
[0xD3] = ITEM_ROW(0x53, SILVER_CHEST, 0x41, 0, 0x9018, 0x00AA, 0x02, no_upgrade, give_small_key_ring, CASTLE_ID, -1), // Ganon's Castle Small Key Ring

[0xD4] = ITEM_ROW(0x4D, SILVER_CHEST, 0x85, 0, 0x9019, 0x0195, 0x72, no_upgrade, give_silver_rupee, DODONGO_ID, 0x00), // Silver Rupee (Dodongos Cavern Staircase)
[0xD5] = ITEM_ROW(0x4D, SILVER_CHEST, 0x85, 0, 0x901A, 0x0195, 0x72, no_upgrade, give_silver_rupee, ICE_ID, 0x01), // Silver Rupee (Ice Cavern Spinning Blade)
[0xD5] = ITEM_ROW(0x4D, SILVER_CHEST, 0x85, 0, 0x901A, 0x0195, 0x72, no_upgrade, give_silver_rupee, ICE_ID, 0x01), // Silver Rupee (Ice Cavern Spinning Scythe)
[0xD6] = ITEM_ROW(0x4D, SILVER_CHEST, 0x85, 0, 0x901B, 0x0195, 0x72, no_upgrade, give_silver_rupee, ICE_ID, 0x02), // Silver Rupee (Ice Cavern Push Block)
[0xD7] = ITEM_ROW(0x4D, SILVER_CHEST, 0x85, 0, 0x901C, 0x0195, 0x72, no_upgrade, give_silver_rupee, BOTW_ID, 0x03), // Silver Rupee (Bottom of the Well Basement)
[0xD8] = ITEM_ROW(0x4D, SILVER_CHEST, 0x85, 0, 0x901D, 0x0195, 0x72, no_upgrade, give_silver_rupee, SHADOW_ID, 0x04), // Silver Rupee (Shadow Temple Scythe Shortcut)
Expand All @@ -268,7 +268,7 @@ item_row_t item_table[] = {
[0xE9] = ITEM_ROW(0x4D, SILVER_CHEST, 0x85, 0, 0x902E, 0x0195, 0x72, no_upgrade, give_silver_rupee, CASTLE_ID, 0x15), // Silver Rupee (Ganons Castle Forest Trial)

[0xEA] = ITEM_ROW(0x4D, SILVER_CHEST, 0x86, 0, 0x902F, 0x0195, 0x72, no_upgrade, give_silver_rupee_pouch, DODONGO_ID, 0x00), // Silver Rupee Pouch (Dodongos Cavern Staircase)
[0xEB] = ITEM_ROW(0x4D, SILVER_CHEST, 0x86, 0, 0x9030, 0x0195, 0x72, no_upgrade, give_silver_rupee_pouch, ICE_ID, 0x01), // Silver Rupee Pouch (Ice Cavern Spinning Blade)
[0xEB] = ITEM_ROW(0x4D, SILVER_CHEST, 0x86, 0, 0x9030, 0x0195, 0x72, no_upgrade, give_silver_rupee_pouch, ICE_ID, 0x01), // Silver Rupee Pouch (Ice Cavern Spinning Scythe)
[0xEC] = ITEM_ROW(0x4D, SILVER_CHEST, 0x86, 0, 0x9031, 0x0195, 0x72, no_upgrade, give_silver_rupee_pouch, ICE_ID, 0x02), // Silver Rupee Pouch (Ice Cavern Push Block)
[0xED] = ITEM_ROW(0x4D, SILVER_CHEST, 0x86, 0, 0x9032, 0x0195, 0x72, no_upgrade, give_silver_rupee_pouch, BOTW_ID, 0x03), // Silver Rupee Pouch (Bottom of the Well Basement)
[0xEE] = ITEM_ROW(0x4D, SILVER_CHEST, 0x86, 0, 0x9033, 0x0195, 0x72, no_upgrade, give_silver_rupee_pouch, SHADOW_ID, 0x04), // Silver Rupee Pouch (Shadow Temple Scythe Shortcut)
Expand Down
2 changes: 1 addition & 1 deletion HintList.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ def tokens_required_by_settings(world):
'Small Key Ring (Ganons Castle)': (["a toolbox for unlocking a conquered citadel", "a dungeon season pass for a conquered citadel", "a jingling ring for a conquered citadel", "a skeleton key for a conquered citadel"], "a Ganon's Castle Small Key Ring", 'item'),
'Small Key Ring (Thieves Hideout)': (["a deck of get out of jail free cards"], "a Jail Key Ring", 'item'),
'Silver Rupee (Dodongos Cavern Staircase)': (["an entry fee for an immense cavern", "a priced artifact from an immense cavern"], "a Silver Rupee for Dodongo's Cavern", 'item'),
'Silver Rupee (Ice Cavern Spinning Blade)': (["an entry fee for a frozen maze", "a priced artifact from a frozen maze"], "a Silver Rupee for the Ice Cavern", 'item'),
'Silver Rupee (Ice Cavern Spinning Scythe)': (["an entry fee for a frozen maze", "a priced artifact from a frozen maze"], "a Silver Rupee for the Ice Cavern", 'item'),
'Silver Rupee (Ice Cavern Push Block)': (["an entry fee for a frozen maze", "a priced artifact from a frozen maze"], "a Silver Rupee for the Ice Cavern", 'item'),
'Silver Rupee (Bottom of the Well Basement)': (["an entry fee for a shadow's prison", "a priced artifact from a shadow's prison"], "a Silver Rupee for the Bottom of the Well", 'item'),
'Silver Rupee (Shadow Temple Scythe Shortcut)': (["an entry fee for the house of the dead", "a priced artifact from the house of the dead"], "a Silver Rupee for the Shadow Temple", 'item'),
Expand Down
4 changes: 2 additions & 2 deletions ItemList.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
'Small Key Ring (Ganons Castle)': ('SmallKey', True, 0xD3, {'alias': ('Small Key (Ganons Castle)', 10), 'progressive': float('Inf')}),

'Silver Rupee (Dodongos Cavern Staircase)': ('Item', True, 0xD4, {'progressive': 5}),
'Silver Rupee (Ice Cavern Spinning Blade)': ('Item', True, 0xD5, {'progressive': 5}),
'Silver Rupee (Ice Cavern Spinning Scythe)': ('Item', True, 0xD5, {'progressive': 5}),
'Silver Rupee (Ice Cavern Push Block)': ('Item', True, 0xD6, {'progressive': 5}),
'Silver Rupee (Bottom of the Well Basement)': ('Item', True, 0xD7, {'progressive': 5}),
'Silver Rupee (Shadow Temple Scythe Shortcut)': ('Item', True, 0xD8, {'progressive': 5}),
Expand All @@ -178,7 +178,7 @@
'Silver Rupee (Ganons Castle Forest Trial)': ('Item', True, 0xE9, {'progressive': 5}),

'Silver Rupee Pouch (Dodongos Cavern Staircase)': ('Item', True, 0xEA, {'alias': ('Silver Rupee (Dodongos Cavern Staircase)', 10), 'progressive': 1}),
'Silver Rupee Pouch (Ice Cavern Spinning Blade)': ('Item', True, 0xEB, {'alias': ('Silver Rupee (Ice Cavern Spinning Blade)', 10), 'progressive': 1}),
'Silver Rupee Pouch (Ice Cavern Spinning Scythe)': ('Item', True, 0xEB, {'alias': ('Silver Rupee (Ice Cavern Spinning Scythe)', 10), 'progressive': 1}),
'Silver Rupee Pouch (Ice Cavern Push Block)': ('Item', True, 0xEC, {'alias': ('Silver Rupee (Ice Cavern Push Block)', 10), 'progressive': 1}),
'Silver Rupee Pouch (Bottom of the Well Basement)': ('Item', True, 0xED, {'alias': ('Silver Rupee (Bottom of the Well Basement)', 10), 'progressive': 1}),
'Silver Rupee Pouch (Shadow Temple Scythe Shortcut)': ('Item', True, 0xEE, {'alias': ('Silver Rupee (Shadow Temple Scythe Shortcut)', 10), 'progressive': 1}),
Expand Down
38 changes: 19 additions & 19 deletions LocationList.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1729,37 +1729,37 @@ def shop_address(shop_id, shelf_id):
("Ice Cavern Map Room Recovery Heart 1", ("Collectable", 0x09, 0x22, None, 'Recovery Heart', ("Ice Cavern", "Vanilla","Freestanding"))),
("Ice Cavern Map Room Recovery Heart 2", ("Collectable", 0x09, 0x23, None, 'Recovery Heart', ("Ice Cavern", "Vanilla","Freestanding"))),
("Ice Cavern Map Room Recovery Heart 3", ("Collectable", 0x09, 0x24, None, 'Recovery Heart', ("Ice Cavern", "Vanilla","Freestanding"))),
("Ice Cavern Block Room Red Rupee 1", ("Collectable", 0x09, 0x2E, None, 'Rupees (20)', ("Ice Cavern", "Vanilla","Freestanding"))),
("Ice Cavern Block Room Red Rupee 2", ("Collectable", 0x09, 0x2F, None, 'Rupees (20)', ("Ice Cavern", "Vanilla","Freestanding"))),
("Ice Cavern Block Room Red Rupee 3", ("Collectable", 0x09, 0x30, None, 'Rupees (20)', ("Ice Cavern", "Vanilla","Freestanding"))),
("Ice Cavern Push Block Room Red Rupee 1", ("Collectable", 0x09, 0x2E, None, 'Rupees (20)', ("Ice Cavern", "Vanilla","Freestanding"))),
("Ice Cavern Push Block Room Red Rupee 2", ("Collectable", 0x09, 0x2F, None, 'Rupees (20)', ("Ice Cavern", "Vanilla","Freestanding"))),
("Ice Cavern Push Block Room Red Rupee 3", ("Collectable", 0x09, 0x30, None, 'Rupees (20)', ("Ice Cavern", "Vanilla","Freestanding"))),
("Ice Cavern Freestanding PoH", ("Collectable", 0x09, 0x01, None, 'Piece of Heart', ("Ice Cavern", "Vanilla",))),
("Ice Cavern Iron Boots Chest", ("Chest", 0x09, 0x02, None, 'Iron Boots', ("Ice Cavern", "Vanilla",))),
("Ice Cavern GS Spinning Scythe Room", ("GS Token", 0x09, 0x02, None, 'Gold Skulltula Token', ("Ice Cavern", "Vanilla", "Skulltulas",))),
("Ice Cavern GS Heart Piece Room", ("GS Token", 0x09, 0x04, None, 'Gold Skulltula Token', ("Ice Cavern", "Vanilla", "Skulltulas",))),
("Ice Cavern GS Push Block Room", ("GS Token", 0x09, 0x01, None, 'Gold Skulltula Token', ("Ice Cavern", "Vanilla", "Skulltulas",))),

#Ice Cavern Silver Rupees
("Ice Cavern Spinning Blade Silver Rupee 1", ("Collectable", 0x09, 0x40, ([0x2C19084], None), 'Silver Rupee (Ice Cavern Spinning Blade)', ("Ice Cavern", "Vanilla", "Silver Rupee"))),
("Ice Cavern Spinning Blade Silver Rupee 2", ("Collectable", 0x09, 0x41, ([0x2C19094], None), 'Silver Rupee (Ice Cavern Spinning Blade)', ("Ice Cavern", "Vanilla", "Silver Rupee"))),
("Ice Cavern Spinning Blade Silver Rupee 3", ("Collectable", 0x09, 0x42, ([0x2C190A4], None), 'Silver Rupee (Ice Cavern Spinning Blade)', ("Ice Cavern", "Vanilla", "Silver Rupee"))),
("Ice Cavern Spinning Blade Silver Rupee 4", ("Collectable", 0x09, 0x43, ([0x2C190B4], None), 'Silver Rupee (Ice Cavern Spinning Blade)', ("Ice Cavern", "Vanilla", "Silver Rupee"))),
("Ice Cavern Spinning Blade Silver Rupee 5", ("Collectable", 0x09, 0x44, ([0x2C190C4], None), 'Silver Rupee (Ice Cavern Spinning Blade)', ("Ice Cavern", "Vanilla", "Silver Rupee"))),
("Ice Cavern Block Push Silver Rupee 1", ("Collectable", 0x09, 0x45, ([0x2C2A108], None), 'Silver Rupee (Ice Cavern Push Block)', ("Ice Cavern", "Vanilla", "Silver Rupee"))),
("Ice Cavern Block Push Silver Rupee 2", ("Collectable", 0x09, 0x46, ([0x2C2A118], None), 'Silver Rupee (Ice Cavern Push Block)', ("Ice Cavern", "Vanilla", "Silver Rupee"))),
("Ice Cavern Block Push Silver Rupee 3", ("Collectable", 0x09, 0x47, ([0x2C2A128], None), 'Silver Rupee (Ice Cavern Push Block)', ("Ice Cavern", "Vanilla", "Silver Rupee"))),
("Ice Cavern Block Push Silver Rupee 4", ("Collectable", 0x09, 0x48, ([0x2C2A138], None), 'Silver Rupee (Ice Cavern Push Block)', ("Ice Cavern", "Vanilla", "Silver Rupee"))),
("Ice Cavern Block Push Silver Rupee 5", ("Collectable", 0x09, 0x49, ([0x2C2A148], None), 'Silver Rupee (Ice Cavern Push Block)', ("Ice Cavern", "Vanilla", "Silver Rupee"))),
("Ice Cavern Spinning Scythe Silver Rupee Icicles", ("Collectable", 0x09, 0x40, ([0x2C19084], None), 'Silver Rupee (Ice Cavern Spinning Scythe)', ("Ice Cavern", "Vanilla", "Silver Rupee"))),
("Ice Cavern Spinning Scythe Silver Rupee Center Left", ("Collectable", 0x09, 0x41, ([0x2C19094], None), 'Silver Rupee (Ice Cavern Spinning Scythe)', ("Ice Cavern", "Vanilla", "Silver Rupee"))),
("Ice Cavern Spinning Scythe Silver Rupee Center Back", ("Collectable", 0x09, 0x42, ([0x2C190A4], None), 'Silver Rupee (Ice Cavern Spinning Scythe)', ("Ice Cavern", "Vanilla", "Silver Rupee"))),
("Ice Cavern Spinning Scythe Silver Rupee Center Right", ("Collectable", 0x09, 0x43, ([0x2C190B4], None), 'Silver Rupee (Ice Cavern Spinning Scythe)', ("Ice Cavern", "Vanilla", "Silver Rupee"))),
("Ice Cavern Spinning Scythe Silver Rupee Ledge", ("Collectable", 0x09, 0x44, ([0x2C190C4], None), 'Silver Rupee (Ice Cavern Spinning Scythe)', ("Ice Cavern", "Vanilla", "Silver Rupee"))),

("Ice Cavern Push Block Silver Rupee Back Left", ("Collectable", 0x09, 0x45, ([0x2C2A108], None), 'Silver Rupee (Ice Cavern Push Block)', ("Ice Cavern", "Vanilla", "Silver Rupee"))),
("Ice Cavern Push Block Silver Rupee Back Center", ("Collectable", 0x09, 0x46, ([0x2C2A118], None), 'Silver Rupee (Ice Cavern Push Block)', ("Ice Cavern", "Vanilla", "Silver Rupee"))),
("Ice Cavern Push Block Silver Rupee Front Center", ("Collectable", 0x09, 0x47, ([0x2C2A128], None), 'Silver Rupee (Ice Cavern Push Block)', ("Ice Cavern", "Vanilla", "Silver Rupee"))),
("Ice Cavern Push Block Silver Rupee Red Ice", ("Collectable", 0x09, 0x48, ([0x2C2A138], None), 'Silver Rupee (Ice Cavern Push Block)', ("Ice Cavern", "Vanilla", "Silver Rupee"))),
("Ice Cavern Push Block Silver Rupee Front Left", ("Collectable", 0x09, 0x49, ([0x2C2A148], None), 'Silver Rupee (Ice Cavern Push Block)', ("Ice Cavern", "Vanilla", "Silver Rupee"))),
#Ice Cavern Vanilla Pots
("Ice Cavern Hall Pot 1", ("Collectable", 0x09, 0x25, None, 'Recovery Heart', ("Ice Cavern", "Vanilla", "Pot"))),
("Ice Cavern Hall Pot 2", ("Collectable", 0x09, 0x26, None, 'Recovery Heart', ("Ice Cavern", "Vanilla", "Pot"))),
("Ice Cavern Spinning Blade Pot 1", ("Collectable", 0x09, 0x27, None, 'Recovery Heart', ("Ice Cavern", "Vanilla", "Pot"))),
("Ice Cavern Spinning Blade Pot 2", ("Collectable", 0x09, 0x28, None, 'Recovery Heart', ("Ice Cavern", "Vanilla", "Pot"))),
("Ice Cavern Spinning Blade Pot 3", ("Collectable", 0x09, 0x29, None, 'Recovery Heart', ("Ice Cavern", "Vanilla", "Pot"))),
("Ice Cavern Spinning Scythe Pot 1", ("Collectable", 0x09, 0x27, None, 'Recovery Heart', ("Ice Cavern", "Vanilla", "Pot"))),
("Ice Cavern Spinning Scythe Pot 2", ("Collectable", 0x09, 0x28, None, 'Recovery Heart', ("Ice Cavern", "Vanilla", "Pot"))),
("Ice Cavern Spinning Scythe Pot 3", ("Collectable", 0x09, 0x29, None, 'Recovery Heart', ("Ice Cavern", "Vanilla", "Pot"))),
("Ice Cavern Near End Pot 1", ("Collectable", 0x09, 0x2A, None, 'Recovery Heart', ("Ice Cavern", "Vanilla", "Pot"))),
("Ice Cavern Near End Pot 2", ("Collectable", 0x09, 0x2B, None, 'Recovery Heart', ("Ice Cavern", "Vanilla", "Pot"))),
("Ice Cavern Frozen Pot", ("Collectable", 0x09, 0x2D, None, 'Recovery Heart', ("Ice Cavern", "Vanilla", "Pot"))),
("Ice Cavern Spinning Blade Flying Pot", ("Collectable", 0x9, 0x2C, None, 'Recovery Heart', ("Ice Cavern", "Vanilla", "FlyingPot"))),
("Ice Cavern Spinning Scythe Flying Pot", ("Collectable", 0x9, 0x2C, None, 'Recovery Heart', ("Ice Cavern", "Vanilla", "FlyingPot"))),

# Ice Cavern MQ
("Ice Cavern MQ Map Chest", ("Chest", 0x09, 0x01, None, 'Map (Ice Cavern)', ("Ice Cavern", "Master Quest",))),
Expand Down
Loading

0 comments on commit a1ca6ef

Please sign in to comment.