diff --git a/src/mars_patcher/constants/minimap_tiles.py b/src/mars_patcher/constants/minimap_tiles.py index f3034a7..2d86b50 100644 --- a/src/mars_patcher/constants/minimap_tiles.py +++ b/src/mars_patcher/constants/minimap_tiles.py @@ -150,12 +150,12 @@ class Content(Enum): DATA = "D" ITEM = "I" OBTAINED_ITEM = "O" - BOSS_RIGHT_DOWNLOADED = "B-R-D" # Serris skeleton - BOSS_BOTTOM_LEFT_EXPLORED = "B-BL-E" # Serris - BOSS_TOP_LEFT_DOWNLOADED = "B-TL-D" # BOX 1 - BOSS_LEFT_EXPLORED = "B-L-E" # Mega-X + BOSS_RIGHT_DOWNLOADED = "B-R-D" # Serris skeleton, unused in rando + BOSS_BOTTOM_LEFT_BOTH = "B-BL-B" # Serris, in vanilla its _EXPLORED + BOSS_TOP_LEFT_BOTH = "B-TL-B" # BOX 1, in vanilla its _DOWNLOADED + BOSS_LEFT_BOTH = "B-L-B" # Mega-X, in vanilla its _EXPLORED BOSS_TOP_RIGHT_BOTH = "B-TR-B" # Nightmare - BOSS_TOP_RIGHT_EXPLORED = "B-TR-E" # BOX 2 + BOSS_TOP_RIGHT_EXPLORED = "B-TR-E" # BOX 2, unused in rando in favour of _BOTH GUNSHIP = "G" GUNSHIP_EDGE = "P" SECURITY = "K" @@ -188,9 +188,9 @@ def can_v_flip(self) -> bool: Content.RECHARGE, Content.HIDDEN_RECHARGE, Content.BOSS_RIGHT_DOWNLOADED, - Content.BOSS_BOTTOM_LEFT_EXPLORED, - Content.BOSS_TOP_LEFT_DOWNLOADED, - Content.BOSS_LEFT_EXPLORED, + Content.BOSS_BOTTOM_LEFT_BOTH, + Content.BOSS_TOP_LEFT_BOTH, + Content.BOSS_LEFT_BOTH, Content.BOSS_TOP_RIGHT_BOTH, Content.BOSS_TOP_RIGHT_EXPLORED, Content.GUNSHIP, diff --git a/src/mars_patcher/mf/constants/minimap_tiles.py b/src/mars_patcher/mf/constants/minimap_tiles.py index 9ca1cbe..4cbcfbb 100644 --- a/src/mars_patcher/mf/constants/minimap_tiles.py +++ b/src/mars_patcher/mf/constants/minimap_tiles.py @@ -243,8 +243,8 @@ 0x102: MapTile.from_str("DDxx_xxxC_x"), 0x104: MapTile.from_str("WDxx_xxxC_x"), 0x105: MapTile.from_str("xDxx_xCxx_x"), - 0x109: MapTile.from_str("WDxW_xxxx_B-R-D"), - 0x10D: MapTile.from_str("xxDx_xxxx_B-L-E"), + 0x109: MapTile.from_str("WDxW_xxxx_x"), + 0x10D: MapTile.from_str("xxDx_xxxx_B-L-B"), 0x10F: MapTile.from_str("xDxW_xxxx_B-TR-B"), 0x120: MapTile.from_str("DDWW_xxxx_x"), 0x121: MapTile.from_str("DDDW_xxxx_x"), @@ -314,9 +314,9 @@ 0x1AB: MapTile.from_str("DDWW_xxxx_O"), # New Tiles 0x0A4: MapTile.from_str("WDSW_xxxx_T"), - 0x108: MapTile.from_str("xxDW_Cxxx_B-TL-D"), - 0x10A: MapTile.from_str("WxDx_xxxx_B-BL-E"), - 0x10C: MapTile.from_str("xDxW_xCxx_B-TR-E"), + 0x108: MapTile.from_str("xxDW_Cxxx_B-TL-B"), + 0x10A: MapTile.from_str("WxDx_xxxx_B-BL-B"), + 0x10C: MapTile.from_str("xDxW_xCxx_B-TR-B"), 0x170: MapTile.from_str("WWDx_xxxx_w"), 0x172: MapTile.from_str("WDDW_xxxx_Y"), } diff --git a/src/mars_patcher/minimap_tile_creator.py b/src/mars_patcher/minimap_tile_creator.py index 165f8da..f0d120f 100644 --- a/src/mars_patcher/minimap_tile_creator.py +++ b/src/mars_patcher/minimap_tile_creator.py @@ -251,12 +251,12 @@ def create_tile(tile: MapTile) -> bytearray: draw_obtained_tank(gfx) case Content.BOSS_RIGHT_DOWNLOADED: draw_boss_room(gfx, COLOR_CONNECTION_BG, 2, 1) - case Content.BOSS_BOTTOM_LEFT_EXPLORED: - draw_boss_room(gfx, COLOR_WHITE_ITEM, 0, 2) - case Content.BOSS_TOP_LEFT_DOWNLOADED: - draw_boss_room(gfx, COLOR_CONNECTION_BG, 0, 0) - case Content.BOSS_LEFT_EXPLORED: - draw_boss_room(gfx, COLOR_WHITE_ITEM, 0, 1) + case Content.BOSS_BOTTOM_LEFT_BOTH: + draw_boss_room(gfx, COLOR_WHITE_OUTLINE, 0, 2) + case Content.BOSS_TOP_LEFT_BOTH: + draw_boss_room(gfx, COLOR_WHITE_OUTLINE, 0, 0) + case Content.BOSS_LEFT_BOTH: + draw_boss_room(gfx, COLOR_WHITE_OUTLINE, 0, 1) case Content.BOSS_TOP_RIGHT_BOTH: draw_boss_room(gfx, COLOR_WHITE_OUTLINE, 2, 0) case Content.BOSS_TOP_RIGHT_EXPLORED: