diff --git a/constants/palette_constants.asm b/constants/palette_constants.asm index b62036d0..a60e9423 100644 --- a/constants/palette_constants.asm +++ b/constants/palette_constants.asm @@ -73,5 +73,6 @@ DEF SET_PAL_DEFAULT EQU $ff const PAL_CAVE ; $25 const PAL_GAMEFREAK ; $26 const PAL_CELESTE ; $27 - const PAL_CITRINECAVE ; $28 + const PAL_GARNET ; $28 + const PAL_BRUNSWICK ; $29 DEF NUM_SGB_PALS EQU const_value diff --git a/crysaudio/music/RBY/field06.asm b/crysaudio/music/RBY/field06.asm index 5473f0f1..d9796024 100644 --- a/crysaudio/music/RBY/field06.asm +++ b/crysaudio/music/RBY/field06.asm @@ -3,7 +3,7 @@ Music_Field06:: - channel_count 3 + channel_count 4 channel 1, Music_Field06_Ch1 channel 2, Music_Field06_Ch2 channel 3, Music_Field06_Ch3 @@ -186,6 +186,7 @@ Music_Field06_Ch3: Music_Field06_Ch4: ;;---------------------------------------- + toggle_noise 1 drum_speed 6 .loop40 @@ -205,45 +206,45 @@ Music_Field06_Ch4: .sub41 - drum_note 17, 4 - drum_note 18, 4 - drum_note 19, 4 - drum_note 18, 4 - drum_note 17, 4 - drum_note 18, 4 - drum_note 19, 4 - drum_note 19, 2 - drum_note 18, 2 + drum_note 10, 4 + drum_note 11, 4 + drum_note 12, 4 + drum_note 11, 4 + drum_note 10, 4 + drum_note 11, 4 + drum_note 12, 4 + drum_note 12, 2 + drum_note 11, 2 sound_ret .sub42 - drum_note 17, 4 - drum_note 18, 4 - drum_note 19, 4 - drum_note 18, 4 - drum_note 17, 4 - drum_note 18, 4 - drum_note 19, 4 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 + drum_note 10, 4 + drum_note 11, 4 + drum_note 12, 4 + drum_note 11, 4 + drum_note 10, 4 + drum_note 11, 4 + drum_note 12, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 sound_ret .sub43 - drum_note 17, 4 - drum_note 18, 4 - drum_note 17, 4 - drum_note 18, 4 - drum_note 17, 4 - drum_note 17, 4 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 18, 1 + drum_note 10, 4 + drum_note 11, 4 + drum_note 10, 4 + drum_note 11, 4 + drum_note 10, 4 + drum_note 10, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 12, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 sound_ret diff --git a/data/sgb/sgb_palettes.asm b/data/sgb/sgb_palettes.asm index ca119bf3..5db74c6b 100644 --- a/data/sgb/sgb_palettes.asm +++ b/data/sgb/sgb_palettes.asm @@ -41,5 +41,6 @@ SuperPalettes: RGB 31,31,31, 23,08,00, 17,14,11, 03,03,03 ; PAL_CAVE RGB 31,31,31, 31,19,00, 19,19,00, 03,03,03 ; PAL_GAMEFREAK RGB 31,31,31, 01,30,31, 11,23,31, 03,03,03 ; PAL_CELESTE - RGB 31,31,31, 31,04,04, 06,06,26, 03,03,03 ; PAL_CITRINECAVE + RGB 31,31,31, 31,06,08, 18,04,06, 03,03,03 ; PAL_GARNET + RGB 31,31,31, 01,20,03, 11,23,31, 03,03,03 ; PAL_BRUNSWICK assert_table_length NUM_SGB_PALS diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm index 394c35cf..00b0ac69 100644 --- a/engine/gfx/palettes.asm +++ b/engine/gfx/palettes.asm @@ -155,6 +155,8 @@ SetPal_Overworld: jr z, .Lorelei cp CELESTE_HILL jr z, .celeste + cp BRUNSWICK_TRAIL + jr z, .brunswick cp BRUNOS_ROOM jr z, .caveOrBruno .normalDungeonOrBuilding @@ -171,6 +173,9 @@ SetPal_Overworld: ld a, SET_PAL_OVERWORLD ld [wDefaultPaletteCommand], a ret +.brunswick + ld a, PAL_BRUNSWICK - 1 + jr .town .PokemonTowerOrAgatha ld a, PAL_GREYMON - 1 jr .town diff --git a/maps/BrunswickTrail.blk b/maps/BrunswickTrail.blk index fb1677e3..6cdef4cd 100644 Binary files a/maps/BrunswickTrail.blk and b/maps/BrunswickTrail.blk differ diff --git a/maps/CitrineCity.blk b/maps/CitrineCity.blk index 9eada3e2..48acf045 100644 --- a/maps/CitrineCity.blk +++ b/maps/CitrineCity.blk @@ -20,12 +20,17 @@ t eC>>>>>>>gTG>>>>>>>>> \ No newline at end of file +n'meCTTTTTF-1eCxxxxxxc>>>>>>>1>>>>>>>> \ No newline at end of file