diff --git a/constants/event_flags.asm b/constants/event_flags.asm index a028c0865..60437ede5 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -364,6 +364,7 @@ const EVENT_HIDE_OW_OBJECTS_PURPLE const EVENT_HIDE_OW_OBJECTS_TEAL const EVENT_HIDE_OW_OBJECTS_BROWN + const EVENT_HIDE_OW_OBJECTS_BLUE const EVENT_EVENTIDE_GYM_RED_SWITCH const EVENT_EVENTIDE_GYM_BLUE_SWITCH const EVENT_EVENTIDE_GYM_YELLOW_SWITCH @@ -816,6 +817,5 @@ const EVENT_UNUSED_5 const EVENT_UNUSED_6 const EVENT_UNUSED_7 - const EVENT_UNUSED_8 NUM_EVENTS EQU const_value diff --git a/engine/color.asm b/engine/color.asm index bd706ad5e..3fa188fb0 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -1507,6 +1507,18 @@ LoadMapPals:: ld bc, 8 palettes ld a, $5 ; BANK(UnknOBPals) call FarCopyWRAM + + ld a, [wPlayerPalette] + cp 1 + jr nz, .tunnelcont + ld bc, 17 palettes + ld hl, MapObjectPals + call AddNTimes + ld de, wUnknOBPals + 5 palettes + ld bc, 1 palettes + ld a, $5 ; BANK(UnknOBPals) + call FarCopyWRAM +.tunnelcont ld a, [wMapNumber] cp MAP_BAR_BACK_ALLEY jr z, .alley diff --git a/maps/BrilloGameCorner.asm b/maps/BrilloGameCorner.asm index d9b51740f..da37ac913 100644 --- a/maps/BrilloGameCorner.asm +++ b/maps/BrilloGameCorner.asm @@ -51,11 +51,13 @@ BrilloGameCornerCallback: setevent EVENT_HIDE_OW_OBJECTS_TEAL clearevent EVENT_HIDE_OW_OBJECTS_BROWN clearevent EVENT_HIDE_OW_OBJECTS_PURPLE + clearevent EVENT_HIDE_OW_OBJECTS_BLUE return .brown setevent EVENT_HIDE_OW_OBJECTS_BROWN clearevent EVENT_HIDE_OW_OBJECTS_TEAL clearevent EVENT_HIDE_OW_OBJECTS_PURPLE + clearevent EVENT_HIDE_OW_OBJECTS_BLUE return BrilloGameCornerSign: diff --git a/maps/Route10East.asm b/maps/Route10East.asm index c21534e45..0e3321073 100644 --- a/maps/Route10East.asm +++ b/maps/Route10East.asm @@ -62,11 +62,13 @@ Route10EastCallback: setevent EVENT_HIDE_OW_OBJECTS_TEAL clearevent EVENT_HIDE_OW_OBJECTS_BROWN clearevent EVENT_HIDE_OW_OBJECTS_PURPLE + clearevent EVENT_HIDE_OW_OBJECTS_BLUE return .brown setevent EVENT_HIDE_OW_OBJECTS_BROWN clearevent EVENT_HIDE_OW_OBJECTS_TEAL clearevent EVENT_HIDE_OW_OBJECTS_PURPLE + clearevent EVENT_HIDE_OW_OBJECTS_BLUE return Route10EastWood: diff --git a/maps/Route17North.asm b/maps/Route17North.asm index bd31f452c..c58fbe837 100644 --- a/maps/Route17North.asm +++ b/maps/Route17North.asm @@ -63,11 +63,13 @@ Route17NorthCallback: setevent EVENT_HIDE_OW_OBJECTS_TEAL clearevent EVENT_HIDE_OW_OBJECTS_BROWN clearevent EVENT_HIDE_OW_OBJECTS_PURPLE + clearevent EVENT_HIDE_OW_OBJECTS_BLUE jump .cont .brown setevent EVENT_HIDE_OW_OBJECTS_BROWN clearevent EVENT_HIDE_OW_OBJECTS_TEAL clearevent EVENT_HIDE_OW_OBJECTS_PURPLE + clearevent EVENT_HIDE_OW_OBJECTS_BLUE .cont checktime 1<