From baa94d76ae629e77458fe57247755d655127d733 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Tue, 4 Jul 2023 12:59:54 +0100 Subject: [PATCH] Functioning Galarian Moltres - Moltres now functions correctly, seeing you like a normal trainer would. - Slightly tidied up Brunswick Trail and Celeste Hill Outside's maps - Celeste Hill Outside and Cave now play Digda01 as a music track --- data/maps/objects/BrunswickTrail.asm | 3 +- data/maps/objects/GarnetCavernB1F.asm | 6 ++-- data/maps/songs.asm | 4 +-- gfx/blocksets/citrine.bst | 4 +-- maps/BrunswickTrail.blk | Bin 448 -> 448 bytes maps/CelesteHillOutside.blk | Bin 360 -> 360 bytes scripts/CelesteHill.asm | 45 +++----------------------- 7 files changed, 12 insertions(+), 50 deletions(-) diff --git a/data/maps/objects/BrunswickTrail.asm b/data/maps/objects/BrunswickTrail.asm index f0a651f5..ff75b668 100644 --- a/data/maps/objects/BrunswickTrail.asm +++ b/data/maps/objects/BrunswickTrail.asm @@ -4,13 +4,12 @@ BrunswickTrail_Object: def_warp_events warp_event 12, 9, GARNET_CAVERN_1F, 1 warp_event 40, 5, BRUNSWICK_GROTTO, 1 - warp_event 41, 5, BRUNSWICK_GROTTO, 1 def_bg_events def_object_events object_event 23, 11, SPRITE_FAKE_TREE, STAY, NONE, 1, CACTUS, 60 | OW_POKEMON ; person object_event 37, 23, SPRITE_BRUNETTE_GIRL, STAY, DOWN, 2 ; person - object_event 50, 16, SPRITE_BIRD, WALK, LEFT_RIGHT, 3 ; person + object_event 54, 9, SPRITE_BIRD, STAY, DOWN, 3 ; person def_warps_to BRUNSWICK_TRAIL diff --git a/data/maps/objects/GarnetCavernB1F.asm b/data/maps/objects/GarnetCavernB1F.asm index 976a9ada..f0ef0475 100644 --- a/data/maps/objects/GarnetCavernB1F.asm +++ b/data/maps/objects/GarnetCavernB1F.asm @@ -7,10 +7,10 @@ GarnetCavernB1F_Object: def_bg_events def_object_events - object_event 5, 11, SPRITE_BIRD, STAY, DOWN, 1, ARTICUNO_G, 70 | OW_POKEMON ; person + object_event 5, 11, SPRITE_BIRD, STAY, RIGHT, 1, ARTICUNO_G, 70 | OW_POKEMON ; person object_event 24, 1, SPRITE_POKE_BALL, STAY, DOWN, 2, MAX_REVIVE object_event 19, 2, SPRITE_POKE_BALL, STAY, DOWN, 3, ESCAPE_ROPE - object_event 22, 10, SPRITE_BIRD, STAY, DOWN, 4 ; cuno copy 1 - object_event 14, 1, SPRITE_BIRD, STAY, DOWN, 5 ; cuno copy 2 + object_event 9, 1, SPRITE_BIRD, STAY, DOWN, 4 ; cuno copy 1 + object_event 19, 7, SPRITE_BIRD, STAY, LEFT, 5 ; cuno copy 2 def_warps_to GARNET_CAVERN_B1F diff --git a/data/maps/songs.asm b/data/maps/songs.asm index c49c89db..be78dbe4 100644 --- a/data/maps/songs.asm +++ b/data/maps/songs.asm @@ -254,6 +254,6 @@ MapSongBanks:: db MUSIC_GYM, 0 ; BATTLE_TENT db MUSIC_VICTORY4, 0 ; MT_MOON_SQUARE db MUSIC_VICTORY4, 0 ; MT_MOON_SQUARE_HOUSE - db MUSIC_SILPH_CO, 0 ; CELESTE_HILL_CAVE - db MUSIC_SILPH_CO, 0 ; CELESTE_HILL_OUTSIDE + db MUSIC_DIGDA01, 0 ; CELESTE_HILL_CAVE + db MUSIC_DIGDA01, 0 ; CELESTE_HILL_OUTSIDE assert_table_length NUM_MAPS diff --git a/gfx/blocksets/citrine.bst b/gfx/blocksets/citrine.bst index c9ce2d9f..62263df4 100644 --- a/gfx/blocksets/citrine.bst +++ b/gfx/blocksets/citrine.bst @@ -27,7 +27,7 @@ KKKK 9$$$$$[[[[%& -KKKK [[[[[[*+,,:;,,,,,,,,,, +KKKK [[[[[[@A@APQPQ@A@PQ[P ()KKKKKKR,,@A,,PQ,,@A74PQ##!######! !######## ![[[[[[[[[[ !######!##! ########![[[[[[[[[[,,,,,,,,@A,,PQ,,,,*+,,:;,,*+,,:;*+,,:;,,*+,,:;,,,,*+,,:;*+*+:;:;*+,,:;,,*+*+:;:;*+*+:;:;,,,,,,,,,,,,,,,,*+*+:;:;,,*+,,:;,,,,,,,,<<<<<<<<<<<<<<<<[[[[[[,,,,,,,,,,FG,,VW77777777',,,',,,',,,',,,,,$,,$,,$,,$ @@ -75,4 +75,4 @@ KKKK -KKKK@A@APQPQHI@AXYPQ \ No newline at end of file +KKKK@A@APQPQHIAXYQ[ \ No newline at end of file diff --git a/maps/BrunswickTrail.blk b/maps/BrunswickTrail.blk index 164d4e003195a374a2501ed9dfb400b206059a3e..3781463b0a47c42f67420a33ff45e8da315e7bf5 100644 GIT binary patch delta 95 zcmX@We1LgEu$)5!KNv6oNv{-s4ILdFO^67HoLDHWBE_w!z^%xiTapJ7QHWOrk~Z@4 h@^V~UW)H`c_9EaAJZ22j{jXjh1#-S66$4m=jZ5N-%-vqm8p06AS