Skip to content

Commit 204ff5b

Browse files
committed
Fix no map textbox update case and solve preset conflict on dev
1 parent 71c342e commit 204ff5b

File tree

8 files changed

+10732
-86349
lines changed

8 files changed

+10732
-86349
lines changed

ASM/build/asm_symbols.txt

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

ASM/build/bundle.o

28.9 KB
Binary file not shown.

ASM/build/c_symbols.txt

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

Messages.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1509,7 +1509,8 @@ def update_map_compass_messages(messages: list[Message], world: World):
15091509
map_message = f"\x13\x76\x08You found the \x05\x41Map\x05\x40 for {COLOR_MAP['Red'] + 'masterful' if world.dungeon_mq[dungeon.name] else COLOR_MAP['Green'] + 'ordinary'}\x01{dungeon_name}\x05\x40!\x01In this dungeon, {boss_textboxes[boss_room]}\x05\x40\x01lurks within!\x05\x40\x09"
15101510
else:
15111511
map_message = f"\x13\x76\x08You found the \x05\x41Map\x05\x40 for\x01{dungeon_name}\x05\x40!\x01In this dungeon, {boss_textboxes[boss_room]}\x05\x40\x01lurks within!\x05\x40\x09"
1512+
update_message_by_id(messages, map_id, map_message, allow_duplicates=True)
15121513
else:
15131514
if 'map_mq' in world.settings.enhance_map_compass and (world.settings.mq_dungeons_mode == 'random' or world.settings.mq_dungeons_count != 0 and world.settings.mq_dungeons_count != 12):
15141515
map_message = f"\x13\x76\x08You found the \x05\x41Map\x05\x40 for\x01{dungeon_name}\x05\x40!\x01It\'s {COLOR_MAP['Red'] + 'masterful' if world.dungeon_mq[dungeon.name] else COLOR_MAP['Green'] + 'ordinary'}!\x09"
1515-
update_message_by_id(messages, map_id, map_message, allow_duplicates=True)
1516+
update_message_by_id(messages, map_id, map_message, allow_duplicates=True)

data/generated/patch_symbols.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)