From 21b3f0f5a7e5a5e8a5f57d600b8dd376fe64c66b Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Sat, 15 Jul 2023 00:07:05 +0100 Subject: [PATCH] More bug fixes! - The Zapdos in Brunswick Glade now vanish correctly, due to fixing a desync in the hide/show data - Brunswick Glade's palette displays correctly - Improved Citrine City's theme a little - Changed palettes for Cryithan's line to reflect their upcoming redesign - Updated Cryithan's sprite --- constants/hide_show_constants.asm | 17 +- crysaudio/music/RBY/citrine.asm | 407 ++++++++++------------- data/maps/hide_show_data.asm | 27 +- data/maps/names.asm | 2 +- data/maps/objects/BrunswickGlade.asm | 10 +- data/maps/objects/BrunswickGrotto.asm | 2 +- data/maps/objects/CelesteHill.asm | 2 +- data/maps/objects/CelesteHillOutside.asm | 2 +- data/maps/town_map_entries.asm | 3 +- data/pokemon/palettes.asm | 6 +- engine/gfx/palettes.asm | 22 +- gfx/pokemon/front/cryithan.png | Bin 701 -> 984 bytes maps/BrunswickGlade.blk | 3 +- 13 files changed, 207 insertions(+), 296 deletions(-) diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index 66883321..38e75020 100644 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -21,7 +21,7 @@ DEF SHOW EQU $15 const HS_CERULEAN_GUARD_1 ; 07 const HS_CERULEAN_CAVE_GUY ; 08 const HS_CERULEAN_GUARD_2 ; 09 - const HS_VERMILION_JENNY ; FC + const HS_VERMILION_JENNY const HS_SAFFRON_CITY_1 ; 0A const HS_SAFFRON_CITY_2 ; 0B const HS_SAFFRON_CITY_3 ; 0C @@ -38,6 +38,7 @@ DEF SHOW EQU $15 const HS_SAFFRON_CITY_E ; 17 const HS_SAFFRON_CITY_F ; 18 const HS_SAFFRON_CITY_UP_GRADE ; 19 + const HS_ROUTE_1_OAK ; F0 const HS_ROUTE_2_ITEM_1 ; 1A X const HS_ROUTE_2_ITEM_2 ; 1B X const HS_ROUTE_4_ITEM ; 1C X @@ -51,7 +52,7 @@ DEF SHOW EQU $15 const HS_ROUTE_22_RIVAL_2 ; 24 const HS_NUGGET_BRIDGE_GUY ; 25 const HS_ROUTE_24_ITEM ; 26 X - const HS_DAMIEN ; FC + const HS_DAMIEN const HS_ROUTE_25_ITEM ; 27 X const HS_CACTUS ; 28 const HS_BRUNSWICK_ZAPDOS_G_1 ; 29 @@ -89,7 +90,7 @@ DEF SHOW EQU $15 const HS_POKEMON_MANSION_1F_ITEM_2 ; 4B X const HS_FIGHTING_DOJO_GIFT_1 ; 4C const HS_FIGHTING_DOJO_GIFT_2 ; 4D - const HS_FIGHTING_DOJO_GIFT_3 ; 4E + const HS_FIGHTING_DOJO_GIFT_3 ; 4E const HS_SILPH_CO_1F_RECEPTIONIST ; 4F const HS_VOLTORB_1 ; 50 X const HS_VOLTORB_2 ; 51 X @@ -158,9 +159,9 @@ DEF SHOW EQU $15 const HS_ROCKET_HIDEOUT_B4F_ITEM_4 ; 90 const HS_ROCKET_HIDEOUT_B4F_ITEM_5 ; 91 const HS_GARNET_ARTICUNO_G ; 92 - const HS_GARNET_ITEM_1 ; 93 + const HS_GARNET_ITEM_1 ; 93 const HS_GARNET_ITEM_2 ; 94 - const HS_ARTICUNO_G_COPY_1 ; 95 + const HS_ARTICUNO_G_COPY_1 ; 95 const HS_ARTICUNO_G_COPY_2 ; 96 const HS_SILPH_CO_3F_1 ; 97 const HS_SILPH_CO_3F_2 ; 98 @@ -190,9 +191,6 @@ DEF SHOW EQU $15 const HS_SILPH_CO_7F_RIVAL ; B1 const HS_SILPH_CO_7F_ITEM_1 ; B2 X const HS_SILPH_CO_7F_ITEM_2 ; B3 X - ;const HS_SILPH_CO_8F_1 ; B4 - ;const HS_SILPH_CO_8F_2 ; B5 - ;const HS_SILPH_CO_8F_3 ; B6 const HS_SILPH_CO_10F_1 ; B7 const HS_SILPH_CO_10F_2 ; B8 const HS_SILPH_CO_10F_ITEM_1 ; B9 X @@ -251,7 +249,6 @@ DEF SHOW EQU $15 const HS_MEW ; ED const HS_POKEMON_MANSION_B2F_ITEM_1 ; EE const HS_POKEMON_MANSION_B2F_ITEM_2 ; EF - const HS_ROUTE_1_OAK ; F0 const HS_MT_MOON_CRATER_ITEM_1 ; F1 const HS_MT_MOON_CRATER_ITEM_2 ; F2 const HS_MT_MOON_CRATER_ITEM_3 ; F3 @@ -262,7 +259,7 @@ DEF SHOW EQU $15 const HS_ROCK_TUNNEL_B1F_AMBER ; F8 const HS_ROCK_TUNNEL_B1F_WING ; F9 const HS_MT_MOON_CRATER_GUARD ; FA - const HS_DAYCARE_BULBASAUR ; FB should be FD + const HS_DAYCARE_BULBASAUR ; FB should be FD const HS_GLADE_GZAP_1 const HS_GLADE_GZAP_2 const HS_GLADE_GZAP_3 ; we're at 250 diff --git a/crysaudio/music/RBY/citrine.asm b/crysaudio/music/RBY/citrine.asm index 1326b832..f9ef6eeb 100644 --- a/crysaudio/music/RBY/citrine.asm +++ b/crysaudio/music/RBY/citrine.asm @@ -1,10 +1,3 @@ -;Coverted using MIDI2ASM -;Code by TriteHexagon -;Version 5.2.0 (16-Nov-2022) -;Visit github.com/TriteHexagon/Midi2ASM-Converter for up-to-date versions. - -; ============================================================================================================ - Music_Citrine: channel_count 4 channel 1, Music_Citrine_Ch1 @@ -12,178 +5,15 @@ Music_Citrine: channel 3, Music_Citrine_Ch3 channel 4, Music_Citrine_Ch4 -Music_Citrine_Ch1: ; a913 (2:6913) - ;; P2-1 +Music_Citrine_Ch1: tempo 144 volume 7, 7 - note_type 12, 13, 3 + vibrato 5, 1, 6 +Music_Citrine_branch_a91b: + note_type 12, 1, 8 octave 4 - note E_, 1 - rest 1 - note G#, 1 - rest 1 - note F#, 1 - rest 1 - note A_, 1 - note G#, 1 - rest 8 -;; P2-2 - note D#, 1 - rest 1 - note F#, 1 - rest 1 - note E_, 1 - rest 1 - note G#, 1 - note F#, 1 - rest 4 - octave 3 - note B_, 2 - rest 2 -;; P2-3 - octave 4 - note C#, 1 - rest 1 - note D#, 1 - rest 1 - note E_, 1 - note F#, 1 - rest 2 - note C#, 1 - rest 1 - note D#, 1 - rest 1 - note E_, 1 - note F#, 1 - rest 2 -;; P2-4 - note F#, 4 - note E_, 4 - note F#, 1 - note G#, 1 - rest 1 - note F#, 1 - rest 1 - note D#, 2 - rest 1 -;; P2-5 - note E_, 1 - rest 1 - note G#, 1 - rest 1 - note F#, 1 - rest 1 - note A_, 1 - note G#, 1 - rest 4 - note E_, 2 - rest 2 -;; P2-6 - note D#, 1 - rest 1 - note F#, 1 - rest 1 - note E_, 1 - rest 1 - note G#, 1 - note F#, 1 - rest 8 -;; P2-7 - note C#, 1 - rest 1 - note D#, 1 - rest 1 - note E_, 1 - note F#, 1 - rest 2 - note C#, 1 - rest 1 - note D#, 1 - rest 1 - note E_, 1 - note F#, 1 - rest 2 -;; P2-8 - note F#, 4 - note E_, 4 - note F#, 1 - note G#, 1 - rest 1 - note B_, 1 - rest 1 - note F#, 2 - rest 1 -;; P2-9 - note C#, 2 - rest 2 - note D#, 2 - rest 2 - note E_, 2 - rest 2 - note G#, 2 - rest 2 -;; P2-10 - note D#, 8 - rest 2 - note E_, 2 - note D#, 2 - note C#, 2 -;; P2-11 - octave 3 - note B_, 2 - rest 2 - octave 4 - note C#, 2 - rest 2 - note D#, 2 - rest 2 - note F#, 2 - rest 2 -;; P2-12 - note C#, 8 - rest 2 - note D#, 2 - note C#, 2 - octave 3 - note B_, 2 -;; P2-13 - note A_, 2 - note G#, 2 - note A_, 2 - note G#, 1 - note F#, 1 - rest 8 -;; P2-14 - note B_, 2 - note A#, 2 - note B_, 2 - note A_, 1 - note G#, 1 - rest 4 - note G#, 2 - rest 2 -;; P2-15 - note F#, 2 - note F_, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note E_, 2 - note C#, 2 - note E_, 2 -;; P2-16 - note F#, 2 - rest 6 - note D#, 2 - rest 6 - sound_loop 0, Music_Citrine_Ch1 - sound_ret - - -Music_Citrine_Ch2: ; a9cf (2:69cf) - note_type 12, 1, 0 volume_envelope 7, 7 - octave 4 + vibrato 3, 1, 6 note E_, 1 rest 1 octave 3 @@ -199,7 +29,6 @@ Music_Citrine_Ch2: ; a9cf (2:69cf) rest 4 note E_, 2 rest 2 -;; P3-2 note D#, 1 rest 1 octave 3 @@ -213,7 +42,6 @@ Music_Citrine_Ch2: ; a9cf (2:69cf) octave 4 note D#, 1 rest 8 -;; P3-3 note C#, 1 rest 1 note D#, 1 @@ -231,7 +59,6 @@ Music_Citrine_Ch2: ; a9cf (2:69cf) octave 3 note B_, 1 rest 2 -;; P3-4 octave 4 note D#, 4 note C#, 4 @@ -243,7 +70,6 @@ Music_Citrine_Ch2: ; a9cf (2:69cf) octave 3 note B_, 2 rest 1 -;; P3-5 octave 4 note E_, 1 rest 1 @@ -258,7 +84,6 @@ Music_Citrine_Ch2: ; a9cf (2:69cf) octave 4 note E_, 1 rest 8 -;; P3-6 note D#, 1 rest 1 octave 3 @@ -275,7 +100,6 @@ Music_Citrine_Ch2: ; a9cf (2:69cf) octave 3 note B_, 2 rest 2 -;; P3-7 octave 4 note C#, 1 rest 1 @@ -293,7 +117,6 @@ Music_Citrine_Ch2: ; a9cf (2:69cf) note E_, 1 note F#, 1 rest 2 -;; P3-8 note F#, 4 note E_, 4 note F#, 1 @@ -303,7 +126,6 @@ Music_Citrine_Ch2: ; a9cf (2:69cf) rest 1 note D#, 2 rest 3 -;; P3-9 --- tied octave 3 note A_, 2 rest 2 @@ -313,14 +135,12 @@ Music_Citrine_Ch2: ; a9cf (2:69cf) note C#, 2 rest 2 note E_, 2 -;; P3-10 note F#, 8 rest 2 note E_, 2 note D#, 2 note C#, 2 rest 2 -;; P3-11 --- tied octave 3 note G#, 2 rest 2 @@ -330,13 +150,11 @@ Music_Citrine_Ch2: ; a9cf (2:69cf) rest 2 octave 4 note D#, 2 -;; P3-12 note E_, 8 rest 2 note D#, 2 note C#, 2 note D#, 2 -;; P3-13 octave 3 note A_, 2 note G#, 2 @@ -346,7 +164,6 @@ Music_Citrine_Ch2: ; a9cf (2:69cf) rest 4 note F#, 2 rest 2 -;; P3-14 note B_, 2 note A#, 2 note B_, 2 @@ -354,7 +171,6 @@ Music_Citrine_Ch2: ; a9cf (2:69cf) note C_, 1 note C#, 1 rest 8 -;; P3-15 octave 3 note F#, 2 note F_, 2 @@ -365,23 +181,170 @@ Music_Citrine_Ch2: ; a9cf (2:69cf) note E_, 2 note D#, 2 note C#, 2 -;; P3-16 octave 3 note B_, 2 rest 6 note B_, 2 rest 6 - sound_loop 0, Music_Citrine_Ch2 + sound_loop 0, Music_Citrine_branch_a91b - sound_ret - -; ============================================================================================================ +Music_Citrine_Ch2: + volume 7, 7 + toggle_perfect_pitch + vibrato 6, 1, 5 +Music_Citrine_branch_a9d8: + note_type 12, 1, 8 + octave 4 + volume_envelope 7, 7 + vibrato 4, 1, 5 + note E_, 1 + rest 1 + note G#, 1 + rest 1 + note F#, 1 + rest 1 + note A_, 1 + note G#, 1 + rest 8 + note D#, 1 + rest 1 + note F#, 1 + rest 1 + note E_, 1 + rest 1 + note G#, 1 + note F#, 1 + rest 4 + octave 3 + note B_, 2 + rest 2 + octave 4 + note C#, 1 + rest 1 + note D#, 1 + rest 1 + note E_, 1 + note F#, 1 + rest 2 + note C#, 1 + rest 1 + note D#, 1 + rest 1 + note E_, 1 + note F#, 1 + rest 2 + note F#, 4 + note E_, 4 + note F#, 1 + note G#, 1 + rest 1 + note F#, 1 + rest 1 + note D#, 2 + rest 1 + note E_, 1 + rest 1 + note G#, 1 + rest 1 + note F#, 1 + rest 1 + note A_, 1 + note G#, 1 + rest 4 + note E_, 2 + rest 2 + note D#, 1 + rest 1 + note F#, 1 + rest 1 + note E_, 1 + rest 1 + note G#, 1 + note F#, 1 + rest 8 + note C#, 1 + rest 1 + note D#, 1 + rest 1 + note E_, 1 + note F#, 1 + rest 2 + note C#, 1 + rest 1 + note D#, 1 + rest 1 + note E_, 1 + note F#, 1 + rest 2 + note F#, 4 + note E_, 4 + note F#, 1 + note G#, 1 + rest 1 + note B_, 1 + rest 1 + note F#, 2 + rest 1 + note C#, 2 + rest 2 + note D#, 2 + rest 2 + note E_, 2 + rest 2 + note G#, 2 + rest 2 + note D#, 8 + rest 2 + note E_, 2 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + rest 2 + octave 4 + note C#, 2 + rest 2 + note D#, 2 + rest 2 + note F#, 2 + rest 2 + note C#, 8 + rest 2 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note G#, 1 + note F#, 1 + rest 8 + note B_, 2 + note A#, 2 + note B_, 2 + note A_, 1 + note G#, 1 + rest 4 + note G#, 2 + rest 2 + note F#, 2 + note F_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note E_, 2 + note C#, 2 + note E_, 2 + note F#, 2 + rest 6 + note D#, 2 + rest 6 + sound_loop 0, Music_Citrine_branch_a9d8 Music_Citrine_Ch3: note_type 4, 1, 0 -;Bar 1 octave 4 - volume_envelope 2, 0 note E_, 6 rest 6 octave 3 @@ -392,7 +355,6 @@ Music_Citrine_Ch3: note E_, 6 note G#, 6 note E_, 6 -;Bar 2 note D#, 6 rest 6 octave 3 @@ -403,7 +365,6 @@ Music_Citrine_Ch3: note D#, 6 note G#, 6 note D#, 6 -;Bar 3 note C#, 6 rest 6 octave 3 @@ -417,7 +378,6 @@ Music_Citrine_Ch3: note C#, 6 octave 3 note A_, 6 -;Bar 4 octave 4 note D#, 12 note C#, 6 @@ -427,7 +387,6 @@ Music_Citrine_Ch3: octave 4 note C#, 6 note D#, 6 -;Bar 5 note E_, 6 rest 6 octave 3 @@ -438,7 +397,6 @@ Music_Citrine_Ch3: note E_, 6 note G#, 6 note E_, 6 -;Bar 6 note D#, 6 rest 6 octave 3 @@ -449,7 +407,6 @@ Music_Citrine_Ch3: note D#, 6 note G#, 6 note D#, 6 -;Bar 7 note C#, 6 rest 6 octave 3 @@ -463,7 +420,6 @@ Music_Citrine_Ch3: note C#, 6 octave 3 note A_, 6 -;Bar 8 octave 4 note D#, 12 note C#, 12 @@ -474,33 +430,28 @@ Music_Citrine_Ch3: rest 3 note C#, 6 rest 3 -;Bar 9 note C#, 12 note D#, 12 note E_, 12 note G#, 12 -;Bar 10 note F#, 12 rest 6 note F#, 12 note E_, 6 note D#, 6 note E_, 6 -;Bar 11 octave 3 note B_, 12 octave 4 note C#, 12 note D#, 12 note F#, 12 -;Bar 12 note E_, 12 rest 6 note E_, 12 note E_, 6 note D#, 6 note C#, 6 -;Bar 13 note E_, 6 note D#, 6 note E_, 6 @@ -509,7 +460,6 @@ Music_Citrine_Ch3: rest 12 note D#, 6 rest 6 -;Bar 14 note F#, 6 note D#, 6 note F#, 6 @@ -518,19 +468,16 @@ Music_Citrine_Ch3: rest 12 note E_, 6 rest 6 -;Bar 15 note A_, 16 note A_, 16 note A_, 4 note G#, 12 -;Bar 16 note F#, 6 rest 16 rest 2 note D#, 6 rest 16 rest 2 -;Bar 17 note E_, 6 rest 6 octave 3 @@ -541,7 +488,6 @@ Music_Citrine_Ch3: note E_, 6 note G#, 6 note E_, 6 -;Bar 18 note D#, 6 rest 6 octave 3 @@ -552,7 +498,6 @@ Music_Citrine_Ch3: note D#, 6 note G#, 6 note D#, 6 -;Bar 19 note C#, 6 rest 6 octave 3 @@ -566,7 +511,6 @@ Music_Citrine_Ch3: note C#, 6 octave 3 note A_, 6 -;Bar 20 octave 4 note D#, 12 note C#, 6 @@ -576,7 +520,6 @@ Music_Citrine_Ch3: octave 4 note C#, 6 note D#, 6 -;Bar 21 note E_, 6 rest 6 octave 3 @@ -587,7 +530,6 @@ Music_Citrine_Ch3: note E_, 6 note G#, 6 note E_, 6 -;Bar 22 note D#, 6 rest 6 octave 3 @@ -598,7 +540,6 @@ Music_Citrine_Ch3: note D#, 6 note G#, 6 note D#, 6 -;Bar 23 note C#, 6 rest 6 octave 3 @@ -612,7 +553,6 @@ Music_Citrine_Ch3: note C#, 6 octave 3 note A_, 6 -;Bar 24 octave 4 note D#, 12 note C#, 12 @@ -623,33 +563,28 @@ Music_Citrine_Ch3: rest 3 note C#, 6 rest 3 -;Bar 25 note C#, 12 note D#, 12 note E_, 12 note G#, 12 -;Bar 26 note F#, 12 rest 6 note F#, 12 note E_, 6 note D#, 6 note E_, 6 -;Bar 27 octave 3 note B_, 12 octave 4 note C#, 12 note D#, 12 note F#, 12 -;Bar 28 note E_, 12 rest 6 note E_, 12 note E_, 6 note D#, 6 note C#, 6 -;Bar 29 note E_, 6 note D#, 6 note E_, 6 @@ -658,7 +593,6 @@ Music_Citrine_Ch3: rest 12 note D#, 6 rest 6 -;Bar 30 note F#, 6 note D#, 6 note F#, 6 @@ -667,12 +601,10 @@ Music_Citrine_Ch3: rest 12 note E_, 6 rest 6 -;Bar 31 note A_, 16 note A_, 16 note A_, 4 note G#, 12 -;Bar 32 note F#, 6 rest 16 rest 2 @@ -680,15 +612,13 @@ Music_Citrine_Ch3: rest 16 rest 2 sound_loop 0, Music_Citrine_Ch3 - sound_ret -Music_Citrine_Ch4:: +Music_Citrine_Ch4: toggle_noise 0 -Music_Citrine_Ch4_MainLoop:: +Music_Citrine_Ch4_MainLoop: drum_speed 12 sound_call Music_Citrine_branch_ad36 - -Music_Citrine_branch_acf3:: +Music_Citrine_branch_acf3: sound_call Music_Citrine_branch_ad36 sound_call Music_Citrine_branch_ad45 sound_call Music_Citrine_branch_ad45 @@ -716,7 +646,7 @@ Music_Citrine_branch_acf3:: drum_note 8, 4 sound_loop 0, Music_Citrine_Ch4_MainLoop -Music_Citrine_branch_ad36:: +Music_Citrine_branch_ad36: drum_note 8, 6 drum_note 8, 6 drum_note 8, 4 @@ -726,7 +656,7 @@ Music_Citrine_branch_ad36:: drum_note 8, 2 sound_ret -Music_Citrine_branch_ad45:: +Music_Citrine_branch_ad45: drum_note 8, 6 drum_note 8, 6 drum_note 8, 4 @@ -735,7 +665,7 @@ Music_Citrine_branch_ad45:: drum_note 8, 4 sound_ret -Music_Citrine_branch_ad52:: +Music_Citrine_branch_ad52: drum_note 6, 6 drum_note 6, 6 drum_note 7, 4 @@ -744,7 +674,7 @@ Music_Citrine_branch_ad52:: drum_note 7, 4 sound_ret -Music_Citrine_branch_ad5f:: +Music_Citrine_branch_ad5f: drum_note 6, 6 drum_note 6, 6 drum_note 7, 4 @@ -754,12 +684,9 @@ Music_Citrine_branch_ad5f:: drum_note 6, 2 sound_ret -Music_Citrine_branch_ad6e:: +Music_Citrine_branch_ad6e: drum_note 6, 6 drum_note 6, 6 drum_note 7, 2 drum_note 7, 2 sound_ret - -; ============================================================================================================ - diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index 6d74adf7..0227d388 100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -286,7 +286,7 @@ CeruleanCityHS: db CERULEAN_CITY, $0A, SHOW ; HS_CERULEAN_CAVE_GUY db CERULEAN_CITY, $0B, SHOW ; HS_CERULEAN_GUARD_2 VermilionCityHS: - db VERMILION_CITY, $07, HIDE ; HS_VERMILION_JENNY + db VERMILION_CITY, $07, HIDE ; HS_VERMILION_JENNY SaffronCityHS: db SAFFRON_CITY, $01, SHOW ; HS_SAFFRON_CITY_1 db SAFFRON_CITY, $02, SHOW ; HS_SAFFRON_CITY_2 @@ -304,6 +304,8 @@ SaffronCityHS: db SAFFRON_CITY, $0E, SHOW ; HS_SAFFRON_CITY_E db SAFFRON_CITY, $0F, HIDE ; HS_SAFFRON_CITY_F db SAFFRON_CITY, $1A, HIDE ; HS_SAFFRON_CITY_UP_GRADE +Route1HS: + db ROUTE_1, $03, HIDE ; HS_ROUTE_1_OAK Route2HS: db ROUTE_2, $01, SHOW ; HS_ROUTE_2_ITEM_1 db ROUTE_2, $02, SHOW ; HS_ROUTE_2_ITEM_2 @@ -325,7 +327,7 @@ Route22HS: Route24HS: db ROUTE_24, $01, SHOW ; HS_NUGGET_BRIDGE_GUY db ROUTE_24, $08, SHOW ; HS_ROUTE_24_ITEM - db ROUTE_24, $09, HIDE ; HS_DAMIEN + db ROUTE_24, $09, HIDE ; HS_DAMIEN Route25HS: db ROUTE_25, $0A, SHOW ; HS_ROUTE_25_ITEM BrunswickTrailHS: @@ -474,7 +476,7 @@ RocketHideoutB4FHS: db ROCKET_HIDEOUT_B4F, $08, HIDE ; HS_ROCKET_HIDEOUT_B4F_ITEM_4 db ROCKET_HIDEOUT_B4F, $09, HIDE ; HS_ROCKET_HIDEOUT_B4F_ITEM_5 GarnetCavernB1FHS: - db GARNET_CAVERN_B1F, $01, SHOW ; HS_GARNET_ARTICUNO_G, SHOW for testing reasons + db GARNET_CAVERN_B1F, $01, SHOW ; HS_GARNET_ARTICUNO_G db GARNET_CAVERN_B1F, $02, SHOW ; HS_GARNET_ITEM_1 db GARNET_CAVERN_B1F, $03, SHOW ; HS_GARNET_ITEM_2 db GARNET_CAVERN_B1F, $04, SHOW ; HS_ARTICUNO_G_COPY_1 @@ -512,10 +514,6 @@ SilphCo7FHS: db SILPH_CO_7F, $09, SHOW ; HS_SILPH_CO_7F_RIVAL db SILPH_CO_7F, $0A, SHOW ; HS_SILPH_CO_7F_ITEM_1 db SILPH_CO_7F, $0B, SHOW ; HS_SILPH_CO_7F_ITEM_2 -;SilphCo8FHS: -; db SILPH_CO_8F, $02, SHOW ; HS_SILPH_CO_8F_1 -; db SILPH_CO_8F, $03, SHOW ; HS_SILPH_CO_8F_2 -; db SILPH_CO_8F, $04, SHOW ; HS_SILPH_CO_8F_3 SilphCo10FHS: db SILPH_CO_10F, $01, SHOW ; HS_SILPH_CO_10F_1 db SILPH_CO_10F, $02, SHOW ; HS_SILPH_CO_10F_2 @@ -596,27 +594,24 @@ FarawayIslandInsideHS: PokemonMansionB2FHS: db POKEMON_MANSION_B2F, $03, SHOW ; HS_POKEMON_MANSION_B2F_ITEM_1 db POKEMON_MANSION_B2F, $04, SHOW ; HS_POKEMON_MANSION_B2F_ITEM_2 -Route1HS: - db ROUTE_1, $03, HIDE ; HS_ROUTE_1_OAK MtMoonCraterHS: db MT_MOON_CRATER, $01, SHOW ; HS_MT_MOON_CRATER_ITEM_1 db MT_MOON_CRATER, $02, SHOW ; HS_MT_MOON_CRATER_ITEM_2 db MT_MOON_CRATER, $03, SHOW ; HS_MT_MOON_CRATER_ITEM_3 - db MT_MOON_CRATER, $04, SHOW ; HS_MT_MOON_CRATER_ITEM_4 GiovannisRoomHS: db GIOVANNIS_ROOM, $05, SHOW ; HS_GIOVANNIS_ROOM_ITEM_1 db GIOVANNIS_ROOM, $06, SHOW ; HS_GIOVANNIS_ROOM_ITEM_2 RockTunnelB1FHS: - db ROCK_TUNNEL_B1F, $0A, SHOW ; HS_ROCK_TUNNEL_B1F_DOME - db ROCK_TUNNEL_B1F, $0B, SHOW ; HS_ROCK_TUNNEL_B1F_HELIX - db ROCK_TUNNEL_B1F, $0C, SHOW ; HS_ROCK_TUNNEL_B1F_AMBER - db ROCK_TUNNEL_B1F, $0D, SHOW ; HS_ROCK_TUNNEL_B1F_WING + db ROCK_TUNNEL_B1F, $0A, SHOW ; HS_ROCK_TUNNEL_B1F_DOME + db ROCK_TUNNEL_B1F, $0B, SHOW ; HS_ROCK_TUNNEL_B1F_HELIX + db ROCK_TUNNEL_B1F, $0C, SHOW ; HS_ROCK_TUNNEL_B1F_AMBER + db ROCK_TUNNEL_B1F, $0D, SHOW ; HS_ROCK_TUNNEL_B1F_WING MtMoonSquareHS: db MT_MOON_SQUARE, $04, SHOW ; HS_MT_MOON_CRATER_GUARD DaycareHS: - db DAYCARE, $03, SHOW ; HS_DAYCARE_BULBASAUR + db DAYCARE, $03, SHOW ; HS_DAYCARE_BULBASAUR BrunswickGladeHS: db BRUNSWICK_GLADE, $01, HIDE ; HS_GLADE_GZAP_1 db BRUNSWICK_GLADE, $02, HIDE ; HS_GLADE_GZAP_2 db BRUNSWICK_GLADE, $03, HIDE ; HS_GLADE_GZAP_3 - assert_table_length NUM_HS_OBJECTS + 1 + assert_table_length NUM_HS_OBJECTS diff --git a/data/maps/names.asm b/data/maps/names.asm index 69b302b4..707a5492 100644 --- a/data/maps/names.asm +++ b/data/maps/names.asm @@ -57,6 +57,6 @@ PowerPlantName: db "POWER PLANT@" FarawayIslandName: db "FARAWAY ISLAND@" UnderwaterTunnelName: db "UNDERWATER TUNNEL@" BrunswickTrailName: db "BRUNSWICK TRAIL@" -BrunswickGrottoName: db "BRUNSWICK GROTTO@" +BrunswickGladeName: db "BRUNSWICK GLADE@" GarnetCavernName: db "GARNET CAVERN@" CelesteHillName: db "CELESTE HILL@" diff --git a/data/maps/objects/BrunswickGlade.asm b/data/maps/objects/BrunswickGlade.asm index c24539c3..96dc0d6c 100644 --- a/data/maps/objects/BrunswickGlade.asm +++ b/data/maps/objects/BrunswickGlade.asm @@ -1,18 +1,18 @@ BrunswickGlade_Object: - db $3 ; border block + db $2 ; border block def_warp_events - warp_event 19, 39, BRUNSWICK_TRAIL, 2 warp_event 18, 39, BRUNSWICK_TRAIL, 2 - warp_event 9, 0, BRUNSWICK_GROTTO, 2 + warp_event 19, 39, BRUNSWICK_TRAIL, 2 warp_event 8, 0, BRUNSWICK_GROTTO, 1 + warp_event 9, 0, BRUNSWICK_GROTTO, 2 def_bg_events bg_event 14, 24, 4 def_object_events object_event 32, 25, SPRITE_BIRD, STAY, DOWN, 1 - object_event 15, 8, SPRITE_BIRD, STAY, RIGHT, 2 - object_event 19, 18, SPRITE_BIRD, STAY, RIGHT, 3 + object_event 20, 18, SPRITE_BIRD, STAY, RIGHT, 2 + object_event 14, 8, SPRITE_BIRD, STAY, RIGHT, 3 def_warps_to BRUNSWICK_GLADE \ No newline at end of file diff --git a/data/maps/objects/BrunswickGrotto.asm b/data/maps/objects/BrunswickGrotto.asm index dbcbbb33..7ab22a29 100644 --- a/data/maps/objects/BrunswickGrotto.asm +++ b/data/maps/objects/BrunswickGrotto.asm @@ -1,5 +1,5 @@ BrunswickGrotto_Object: - db $3 ; border block + db $2 ; border block def_warp_events warp_event 24, 23, BRUNSWICK_GLADE, 3 diff --git a/data/maps/objects/CelesteHill.asm b/data/maps/objects/CelesteHill.asm index 76d95cd4..be7a53dc 100644 --- a/data/maps/objects/CelesteHill.asm +++ b/data/maps/objects/CelesteHill.asm @@ -1,5 +1,5 @@ CelesteHill_Object: - db $0 ; border block + db $2 ; border block def_warp_events warp_event 10, 21, CELESTE_HILL_OUTSIDE, 7 diff --git a/data/maps/objects/CelesteHillOutside.asm b/data/maps/objects/CelesteHillOutside.asm index 4c3f0260..d9bea2d2 100644 --- a/data/maps/objects/CelesteHillOutside.asm +++ b/data/maps/objects/CelesteHillOutside.asm @@ -1,5 +1,5 @@ CelesteHillOutside_Object: - db $3 ; border block + db $2 ; border block def_warp_events warp_event 18, 35, CITRINE_CITY, 5 diff --git a/data/maps/town_map_entries.asm b/data/maps/town_map_entries.asm index 1aa29015..b333c0d9 100644 --- a/data/maps/town_map_entries.asm +++ b/data/maps/town_map_entries.asm @@ -95,7 +95,7 @@ InternalMapEntries: internal_map CELADON_HOTEL, 7, 5, CeladonCityName internal_map LAVENDER_POKECENTER, 14, 5, LavenderTownName internal_map POKEMON_TOWER_2F, 15, 5, PokemonTowerName - internal_map BRUNSWICK_GROTTO, 6, 10, BrunswickGrottoName + internal_map BRUNSWICK_GROTTO, 6, 10, BrunswickGladeName internal_map POKEMON_TOWER_7F, 15, 5, PokemonTowerName internal_map LAVENDER_CUBONE_HOUSE, 14, 5, LavenderTownName internal_map WARDENS_HOUSE, 8, 13, FuchsiaCityName @@ -138,4 +138,5 @@ InternalMapEntries: internal_map BATTLE_TENT, 7, 9, CitrineCityName internal_map MT_MOON_SQUARE_HOUSE, 6, 1, MountMoonName internal_map CELESTE_HILL_OUTSIDE, 7, 9, CelesteHillName + internal_map BRUNSWICK_GLADE, 6, 10, BrunswickGladeName db -1 ; end diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 9d9b90fd..bc9087f6 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -215,9 +215,9 @@ MonsterPalettes: db PAL_REDMON ; TAUROS_PB db PAL_PINKMON ; CHANSEY db PAL_PINKMON ; BLISSEY - db PAL_CYANMON ; SKIMPER - db PAL_CYANMON ; BAWLIGUA - db PAL_CYANMON ; CRYITHAN + db PAL_GREENMON ; SKIMPER + db PAL_GREENMON ; BAWLIGUA + db PAL_GREENMON ; CRYITHAN db PAL_REDBAR ; JYNX db PAL_BLUEMON ; BUU db PAL_YELLOWMON ; ELECTABUZZ diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm index 2e622268..bcae9fd6 100644 --- a/engine/gfx/palettes.asm +++ b/engine/gfx/palettes.asm @@ -144,17 +144,17 @@ SetPal_Overworld: jr z, .PokemonTowerOrAgatha cp CAVERN jr z, .caveOrBruno - cp FOREST - jr z, .forest ld a, [wCurMap] cp BRUNSWICK_TRAIL jr z, .brunswick - cp BRUNSWICK_GROTTO - jr z, .brunswick cp FIRST_INDOOR_MAP jr c, .townOrRoute cp POWER_PLANT jr z, .powerPlant + cp BRUNSWICK_GLADE + jr z, .brunswick + cp BRUNSWICK_GROTTO + jr z, .brunswick cp SILPH_GAUNTLET_3F jr z, .ship cp GAME_CORNER @@ -165,6 +165,8 @@ SetPal_Overworld: jr z, .celeste cp CELESTE_HILL jr z, .celeste + cp SILPH_GAUNTLET_5F + jr z, .trans cp CERULEAN_CAVE_2F jr c, .normalDungeonOrBuilding cp LORELEIS_ROOM @@ -214,16 +216,6 @@ SetPal_Overworld: .brunswick ld a, PAL_BRUNSWICK - 1 jr .town -.forest - ld a, [wCurMap] - cp SILPH_GAUNTLET_1F + 1 - jr c, .faraway - cp SILPH_GAUNTLET_5F - jr z, .forestDefault - cp MT_MOON_CRATER + 1 - jr c, .faraway - cp SAFARI_ZONE_CENTER + 1 - jr c, .forestDefault .powerPlant ld a, PAL_YELLOWMON - 1 jr .town @@ -251,7 +243,7 @@ SetPal_Overworld: .volcano ld a, PAL_VOLCANO - 1 jr .town -.forestDefault +.trans ld a, PAL_FUCHSIA - 1 jr .town diff --git a/gfx/pokemon/front/cryithan.png b/gfx/pokemon/front/cryithan.png index 1fb4ef026b72110b96f32c2c38ec4ccb799eea6c..4bd8dd1937cb7358c3fcadc4d00225a061af542a 100644 GIT binary patch literal 984 zcmeAS@N?(olHy`uVBq!ia0vp^79h+7Bp8mz)+7TdmUKs7M+SzC{oH>NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Hf|~E0P;8s zJR*x382FBWFymBhK53vJdx@v7EBkYHE^%4Sef$4p1BDp#i~K?u&o3&U1>~rfxJHzu zB$lLFB^RXvDF!10BV%0yb6rD&5F=wNBTFk2Lu~^CD+2?iIa}tSXvob^$xN%nts(dz zj{;CbRBD80ny)W|7Ld)sz{)7Zzzk$D0wDvV6a&c1Ko)}+qcofy#HayP0}Lo8VT5|1 zIuP&xVvrs%Eg$sV1gI*))5S4FZC_o~iewqg0h&v_p4M;EO**JAUN);`aTIZ>~)j zDPk7LX6jDO`6u3wJgkkmAbgApl9U7WoIYMOZat4j;Aa$)%DSa zyXIT%B|b2iPVD+CwQD2C7Jvb3*qKeGUL+!sH$HMmdp)ay!!OO7vjEnFde({4+>esjgLgKx9cXx0Kkb~s&b%|rn4_Fyt&ZQ>q-S09 zbcWXEJk3cl1|?gJ4xV_`y+ujf!r=+iE4IHAxgSq@;K=k-qCm_3?o;(=QhtXs6+`aH zNEUyQOTTKWd6?ODM)kbUPd=@wGQVN^Px#3{Xr|MgRZ*s;a70 zRaF2000A>wGynhsPf0{UR7l62mI-piFbD*J`Tw6|E(wsl*~F=GZEUrH;gEnEPTPRv{vR!n~{ zkiPE8aY+Qj2SZ4$!Aatid%oSDQCc$2Ji?Vjx7WBw08x{Jb1{2i#nKGURc-U6Vb*hIY3>n4P`-OcPqvfM1s<~P*80-#!U+76WOX-XmT&p z2}((%#uu26{KySRVt&D1z({}ZC$3j! z}@F;^@jBirKYt&bZa&5rMw;>D4)!6U|EsdtSu`!CF(jN#|6xVPzXj+i4zf zj)UH}KIP1Y?R}g=oYQ19ydO$pE4nFPjEt=#KvWF($u;(+nA(&h0(c#H7cx}Qy65*% ziQCxaFgX&~Mr^MEa}Wy@=7WEIIvoQ;m+xF@Z+)hJ947l_5hkTb&9b0z!h4o|00Q`QS|6<7x2UHAG;l>UQ0000007*qo IM6N<$f?<#{B>(^b diff --git a/maps/BrunswickGlade.blk b/maps/BrunswickGlade.blk index 47d90c87..56e15721 100644 --- a/maps/BrunswickGlade.blk +++ b/maps/BrunswickGlade.blk @@ -1,3 +1,2 @@ X(( ,(nHI((((/ -78g. ((((,( 77)gg) (( - :7 (((((I( g,,_(gg_)Ug_./ZU,_}}}}I_UgU(_;_(U._8_(Ug7 .L8_(U_6/g,(gY \ No newline at end of file +78. ((((,( 77g) ((:7 (((((I( g,,_(gg_)#g_./ZU,_}}}}I_UgU(_;_(U._8_(Ug7 .L8_(U_6/g,(gY \ No newline at end of file