diff --git a/data/tilesets/sevii_collision.asm b/data/tilesets/sevii_collision.asm index 81ae908..ea023f5 100644 --- a/data/tilesets/sevii_collision.asm +++ b/data/tilesets/sevii_collision.asm @@ -77,7 +77,7 @@ tilecoll WATER, WATER, WATER, WATER ; 4c tilecoll WATER, WATER, WATER, WATER ; 4d tilecoll WALL, WALL, FLOOR, WALL ; 4e - tilecoll WALL, WALL, FLOOR, WALL ; 4f + tilecoll WALL, WALL, WALL, FLOOR ; 4f tilecoll FLOOR, FLOOR, FLOOR, WALL ; 50 tilecoll FLOOR, FLOOR, WALL, WALL ; 51 tilecoll WALL, WALL, FLOOR, FLOOR ; 52 diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm index c91faf9..3eea777 100644 --- a/engine/gfx/cgb_layouts.asm +++ b/engine/gfx/cgb_layouts.asm @@ -570,12 +570,17 @@ _CGB_MapPals: ret .LoadHLBGPaletteIntoDE: -; morn/day: shades 0, 1, 2, 3 -> 0, 1, 2, 3 -; nite: shades 0, 1, 2, 3 -> 1, 2, 2, 3 +; morn: shades 0, 1, 2, 3 -> 0, 1, 2, 3 +; day: shades 0, 1, 2, 3 -> 0, 2, 2, 3 +; nite: shades 0, 1, 2, 3 -> 1, 2, 2, 3 +; darkness: shades 0, 1, 2, 3 -> 1, 3, 3, 3 push hl ld a, [wTimeOfDayPal] cp NITE_F jr c, .bg_morn_day + ld a, [wTimeOfDayPal] + cp DARKNESS_F + jr nc, .bg_darkness inc hl inc hl call .LoadHLColorIntoDE @@ -588,7 +593,34 @@ _CGB_MapPals: pop hl ret +.bg_darkness + inc hl + inc hl + call .LoadHLColorIntoDE + inc hl + inc hl + call .LoadHLColorIntoDE + dec hl + dec hl + call .LoadHLColorIntoDE + dec hl + dec hl + call .LoadHLColorIntoDE + jr .bg_done .bg_morn_day + ld a, [wTimeOfDayPal] + cp MORN_F + jr nz, .bg_day + call .LoadHLColorIntoDE + inc hl + inc hl + call .LoadHLColorIntoDE + dec hl + dec hl + call .LoadHLColorIntoDE + call .LoadHLColorIntoDE + jr .bg_done +.bg_day call LoadHLPaletteIntoDE jr .bg_done diff --git a/engine/menus/start_menu.asm b/engine/menus/start_menu.asm index 3fe9084..cf76263 100644 --- a/engine/menus/start_menu.asm +++ b/engine/menus/start_menu.asm @@ -363,15 +363,15 @@ endr jp ._DrawMenuAccount .PrintMenuAccount: - call .IsMenuAccountOn - ret z +; call .IsMenuAccountOn +; ret z call ._DrawMenuAccount decoord 0, 14 jp .MenuDesc ._DrawMenuAccount: - call .IsMenuAccountOn - ret z +; call .IsMenuAccountOn +; ret z hlcoord 0, 13 lb bc, 5, 10 call ClearBox @@ -380,10 +380,10 @@ endr ld c, 8 jp TextboxPalette -.IsMenuAccountOn: +;.IsMenuAccountOn: ; ld a, [wOptions2] ; and 1 << MENU_ACCOUNT - ret +; ret .DrawBugContestStatusBox: ld hl, wStatusFlags2 diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm index ed2e5ae..5f7989e 100644 --- a/maps/DebugRoom.asm +++ b/maps/DebugRoom.asm @@ -181,6 +181,7 @@ DebugItemScript: giveitem HM_CUT, 1 giveitem HM_FLY, 1 giveitem HM_SURF, 1 + giveitem HM_FLASH, 1 giveitem HM_STRENGTH, 1 giveitem HM_WHIRLPOOL, 1 giveitem HM_WATERFALL, 1 diff --git a/maps/MtEmberExterior.ablk b/maps/MtEmberExterior.ablk index 69c9f2e..0212df2 100644 --- a/maps/MtEmberExterior.ablk +++ b/maps/MtEmberExterior.ablk @@ -1 +1 @@ -@D@@@ki   @D=A@@ki @HQF@=A=h  =AD=A@i   A@HF@fjjjQQjjFi   LA@=AD@HQQjjjQQUg  80@=A@D@APQI 89@@@D=fQjjjQQI  LM9@@@HF^6676  89@@@D\ecccc ^_ 89@@=ADHQQQQgXY  89=A=A@DUA6Y  830@@@D fjjjj`]  89@@f\W[72789=A@HQQQF6X27 LM9@@67HQWhh 89@fW[76667ORRR? (89(@X666\[66667D  89(@\`a6\``ecccdU 89(=Ab666\[7Y7Z] 89(@\``[\W]Z](830(=AX777Y(89(((OORRNjjjjORRNNLM30OOONNOORNNN89ODDRNEPjjFDOEEE89DODEEEDDDENN89DDOPIEN((ODHFNEE8 \ No newline at end of file +@D@@@ki   @D=A@@ki   @HQF@=A=h =AD=A@i  A@HF@fjjjQQjjFi   LA@=AD@HQQjjjQQUg  80@=A@D@APQI 89@@@D=fQjjjQQI  LM9@@@HF^6676  89@@@D\ecccc ^_ 89@@=ADHQQQQgXY  89=A=A@DUA6Y  830@@@D fjjjj`]  89@@f\W[72789=A@HQQQF6X27 LM9@@67HQWhh 89@fW[76667ORRR? (89(@X666\[66667D  89(@\`a6\``ecccdU 89(=Ab666\[7Y7Z] 89(@\``[\W]Z](830(=AX777Y(89(((OORRNjjjjORRNNLM30OOONNOORNNN89ODDRNEPjjFDOEEE89DODEEEDDDENN89DDOPIEN((ODHFNEE8 \ No newline at end of file