Make AP items into Zelda's Letter, with custom text and proper sfx for advancement

This commit is contained in:
espeon65536 2021-09-10 10:04:56 -05:00 committed by Fabian Dill
parent 2d27665369
commit 9c09d84c71
4 changed files with 2150 additions and 2132 deletions

View File

@ -274,6 +274,8 @@ ITEM_MESSAGES = {
0x00F2: "\x08You got a \x05\x46Huge Rupee\x05\x40!\x01This Rupee is worth a whopping\x01\x05\x46two hundred Rupees\x05\x40!",
0x00F9: "\x08\x13\x1EYou put a \x05\x41Big Poe \x05\x40in a bottle!\x01Let's sell it at the \x05\x41Ghost Shop\x05\x40!\x01Something good might happen!",
0x9003: "\x08You found a piece of the \x05\x41Triforce\x05\x40!",
0x9097: "\x08You got an \x05\x41Archipelago item\x05\x40!\x01It seems \x05\x41important\x05\x40!",
0x9098: "\x08You got an \x05\x43Archipelago item\x05\x40!\x01Doesn't seem like it's needed.",
}
KEYSANITY_MESSAGES = {

View File

@ -1808,8 +1808,11 @@ def get_override_entry(location):
player_id = location.item.player
if location.item.game != 'Ocarina of Time':
# This is an AP sendable. It's guaranteed to not be None.
item_id = 0x0C # Ocarina of Time item, otherwise unused
looks_like_item_id = 0
if location.item.advancement:
item_id = 0xCB
else:
item_id = 0xCC
else:
item_id = location.item.index
if None in [scene, default, item_id]:
@ -2057,7 +2060,10 @@ def place_shop_items(rom, world, shop_items, messages, locations, init_shop_id=F
else:
if location.item.game != "Ocarina of Time":
item_display = location.item
item_display.index = 0x0C # Ocarina of Time item
if location.item.advancement:
item_display.index = 0xEF
else:
item_display.index = 0xEF # these will be different later
item_display.special = {}
elif location.item.looks_like_item is not None:
item_display = location.item.looks_like_item

File diff suppressed because it is too large Load Diff

View File

@ -5,7 +5,7 @@
"AUDIO_THREAD_INFO": "03482FAC",
"AUDIO_THREAD_INFO_MEM_SIZE": "03482FCC",
"AUDIO_THREAD_INFO_MEM_START": "03482FC8",
"AUDIO_THREAD_MEM_START": "0348EF10",
"AUDIO_THREAD_MEM_START": "0348EF40",
"BOMBCHUS_IN_LOGIC": "03480CBC",
"CFG_A_BUTTON_COLOR": "03480854",
"CFG_A_NOTE_COLOR": "03480872",
@ -38,7 +38,7 @@
"CFG_TEXT_CURSOR_COLOR": "03480866",
"CHAIN_HBA_REWARDS": "03483940",
"CHEST_SIZE_MATCH_CONTENTS": "034826DC",
"COMPLETE_MASK_QUEST": "0348B191",
"COMPLETE_MASK_QUEST": "0348B1B9",
"COOP_CONTEXT": "03480020",
"COOP_VERSION": "03480020",
"COSMETIC_CONTEXT": "03480844",
@ -46,13 +46,13 @@
"CURRENT_GROTTO_ID": "03482E6E",
"DEBUG_OFFSET": "0348288C",
"DISABLE_TIMERS": "03480CDC",
"DPAD_TEXTURE": "0348D710",
"DPAD_TEXTURE": "0348D738",
"DUNGEONS_SHUFFLED": "03480CDE",
"EXTENDED_OBJECT_TABLE": "03480C9C",
"EXTERN_DAMAGE_MULTIPLYER": "03482C9D",
"FAST_BUNNY_HOOD_ENABLED": "03480CE0",
"FAST_CHESTS": "03480CD6",
"FONT_TEXTURE": "0348C248",
"FONT_TEXTURE": "0348C270",
"FREE_SCARECROW_ENABLED": "03480CCC",
"GET_CHEST_OVERRIDE_COLOR_WRAPPER": "0348270C",
"GET_CHEST_OVERRIDE_SIZE_WRAPPER": "034826E0",
@ -68,17 +68,17 @@
"LACS_CONDITION_COUNT": "03480CD2",
"MALON_GAVE_ICETRAP": "0348367C",
"MALON_TEXT_ID": "03480CDB",
"MAX_RUPEES": "0348B193",
"MAX_RUPEES": "0348B1BB",
"MOVED_ADULT_KING_ZORA": "03482FEC",
"NO_ESCAPE_SEQUENCE": "0348B15C",
"NO_ESCAPE_SEQUENCE": "0348B184",
"NO_FOG_STATE": "03480CDD",
"OCARINAS_SHUFFLED": "03480CD5",
"OPEN_KAKARIKO": "0348B192",
"OPEN_KAKARIKO": "0348B1BA",
"OUTGOING_ITEM": "03480030",
"OUTGOING_KEY": "0348002C",
"OUTGOING_PLAYER": "03480032",
"OVERWORLD_SHUFFLED": "03480CDF",
"PAYLOAD_END": "0348EF10",
"PAYLOAD_END": "0348EF40",
"PAYLOAD_START": "03480000",
"PLAYED_WARP_SONG": "034811FC",
"PLAYER_ID": "03480024",
@ -96,88 +96,88 @@
"SPEED_MULTIPLIER": "0348274C",
"START_TWINROVA_FIGHT": "0348306C",
"TIME_TRAVEL_SAVED_EQUIPS": "03481A50",
"TRIFORCE_ICON_TEXTURE": "0348DF10",
"TRIFORCE_ICON_TEXTURE": "0348DF38",
"TWINROVA_ACTION_TIMER": "03483070",
"WINDMILL_SONG_ID": "03480CD9",
"WINDMILL_TEXT_ID": "03480CDA",
"a_button": "0348B120",
"a_note_b": "0348B10C",
"a_note_font_glow_base": "0348B0F4",
"a_note_font_glow_max": "0348B0F0",
"a_note_g": "0348B110",
"a_note_glow_base": "0348B0FC",
"a_note_glow_max": "0348B0F8",
"a_note_r": "0348B114",
"active_item_action_id": "0348B174",
"active_item_fast_chest": "0348B164",
"active_item_graphic_id": "0348B168",
"active_item_object_id": "0348B16C",
"active_item_row": "0348B178",
"active_item_text_id": "0348B170",
"active_override": "0348B180",
"active_override_is_outgoing": "0348B17C",
"b_button": "0348B11C",
"beating_dd": "0348B128",
"beating_no_dd": "0348B130",
"c_button": "0348B118",
"c_note_b": "0348B100",
"c_note_font_glow_base": "0348B0E4",
"c_note_font_glow_max": "0348B0E0",
"c_note_g": "0348B104",
"c_note_glow_base": "0348B0EC",
"c_note_glow_max": "0348B0E8",
"c_note_r": "0348B108",
"cfg_dungeon_info_enable": "0348B0AC",
"cfg_dungeon_info_mq_enable": "0348B150",
"cfg_dungeon_info_mq_need_map": "0348B14C",
"cfg_dungeon_info_reward_enable": "0348B0A8",
"cfg_dungeon_info_reward_need_altar": "0348B144",
"cfg_dungeon_info_reward_need_compass": "0348B148",
"cfg_dungeon_is_mq": "0348B1B0",
"a_button": "0348B148",
"a_note_b": "0348B134",
"a_note_font_glow_base": "0348B11C",
"a_note_font_glow_max": "0348B118",
"a_note_g": "0348B138",
"a_note_glow_base": "0348B124",
"a_note_glow_max": "0348B120",
"a_note_r": "0348B13C",
"active_item_action_id": "0348B19C",
"active_item_fast_chest": "0348B18C",
"active_item_graphic_id": "0348B190",
"active_item_object_id": "0348B194",
"active_item_row": "0348B1A0",
"active_item_text_id": "0348B198",
"active_override": "0348B1A8",
"active_override_is_outgoing": "0348B1A4",
"b_button": "0348B144",
"beating_dd": "0348B150",
"beating_no_dd": "0348B158",
"c_button": "0348B140",
"c_note_b": "0348B128",
"c_note_font_glow_base": "0348B10C",
"c_note_font_glow_max": "0348B108",
"c_note_g": "0348B12C",
"c_note_glow_base": "0348B114",
"c_note_glow_max": "0348B110",
"c_note_r": "0348B130",
"cfg_dungeon_info_enable": "0348B0D4",
"cfg_dungeon_info_mq_enable": "0348B178",
"cfg_dungeon_info_mq_need_map": "0348B174",
"cfg_dungeon_info_reward_enable": "0348B0D0",
"cfg_dungeon_info_reward_need_altar": "0348B16C",
"cfg_dungeon_info_reward_need_compass": "0348B170",
"cfg_dungeon_is_mq": "0348B1D8",
"cfg_dungeon_rewards": "03489ECC",
"cfg_file_select_hash": "0348B158",
"cfg_item_overrides": "0348B204",
"defaultDDHeart": "0348B134",
"defaultHeart": "0348B13C",
"cfg_file_select_hash": "0348B180",
"cfg_item_overrides": "0348B22C",
"defaultDDHeart": "0348B15C",
"defaultHeart": "0348B164",
"dpad_sprite": "0348A040",
"dummy_actor": "0348B188",
"dungeon_count": "0348B0B0",
"dummy_actor": "0348B1B0",
"dungeon_count": "0348B0D8",
"dungeons": "03489EF0",
"empty_dlist": "0348B0C8",
"empty_dlist": "0348B0F0",
"extern_ctxt": "03489F8C",
"font_sprite": "0348A050",
"freecam_modes": "03489C4C",
"hash_sprites": "0348B0BC",
"hash_sprites": "0348B0E4",
"hash_symbols": "03489FA0",
"heap_next": "0348B1AC",
"heap_next": "0348B1D4",
"heart_sprite": "03489FE0",
"icon_sprites": "03489E10",
"item_digit_sprite": "0348A000",
"item_overrides_count": "0348B18C",
"item_overrides_count": "0348B1B4",
"item_table": "0348A0C8",
"items_sprite": "0348A070",
"key_rupee_clock_sprite": "0348A010",
"last_fog_distance": "0348B0B4",
"last_fog_distance": "0348B0DC",
"linkhead_skull_sprite": "03489FF0",
"medal_colors": "03489EDC",
"medals_sprite": "0348A080",
"normal_dd": "0348B124",
"normal_no_dd": "0348B12C",
"object_slots": "0348C204",
"pending_freezes": "0348B190",
"pending_item_queue": "0348B1EC",
"normal_dd": "0348B14C",
"normal_no_dd": "0348B154",
"object_slots": "0348C22C",
"pending_freezes": "0348B1B8",
"pending_item_queue": "0348B214",
"quest_items_sprite": "0348A060",
"rupee_colors": "03489E1C",
"satisified_pending_frames": "0348B160",
"scene_fog_distance": "0348B0B8",
"satisified_pending_frames": "0348B188",
"scene_fog_distance": "0348B0E0",
"setup_db": "0348A0A0",
"song_note_sprite": "0348A020",
"stones_sprite": "0348A090",
"text_cursor_border_base": "0348B0D4",
"text_cursor_border_max": "0348B0D0",
"text_cursor_inner_base": "0348B0DC",
"text_cursor_inner_max": "0348B0D8",
"triforce_hunt_enabled": "0348B1A0",
"triforce_pieces_requied": "0348B142",
"text_cursor_border_base": "0348B0FC",
"text_cursor_border_max": "0348B0F8",
"text_cursor_inner_base": "0348B104",
"text_cursor_inner_max": "0348B100",
"triforce_hunt_enabled": "0348B1C8",
"triforce_pieces_requied": "0348B16A",
"triforce_sprite": "0348A030"
}