From b4b08d061204cacdd28f7ef824f5bd14a2cffbfd Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Mon, 24 Apr 2023 00:43:05 +0100 Subject: [PATCH] Brunswick Trail To-Do List for Brunswick Trail: - Galarian Zapdos event (give hide/show data) - Tunnel to Celeste Hill (tileset moment) - Couple by the sea - Fake Tree (Cactus, may need a spriteset) - Wild data (needs doing) - Maybe a few trainers? --- constants/map_constants.asm | 2 +- data/maps/headers/BrunswickTrail.asm | 2 ++ data/maps/map_header_banks.asm | 2 +- data/maps/map_header_pointers.asm | 2 +- data/maps/objects/BrunswickTrail.asm | 11 +++++++++++ data/maps/songs.asm | 2 +- gfx/blocksets/celeste.bst | Bin 2192 -> 2224 bytes gfx/blocksets/citrine.bst | 10 ++-------- maps.asm | 6 +++++- maps/BrunswickTrail.blk | Bin 0 -> 372 bytes scripts/BrunswickTrail.asm | 6 ++++++ text.asm | 1 + text/BrunswickTrail.asm | 0 13 files changed, 31 insertions(+), 13 deletions(-) create mode 100644 data/maps/headers/BrunswickTrail.asm create mode 100644 data/maps/objects/BrunswickTrail.asm create mode 100644 maps/BrunswickTrail.blk create mode 100644 scripts/BrunswickTrail.asm create mode 100644 text/BrunswickTrail.asm diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 9321dcbf..de7b143f 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -193,7 +193,7 @@ DEF FIRST_INDOOR_MAP EQU const_value map_const CINNABAR_LAB_FOSSIL_ROOM, 4, 4 ; $AB map_const CINNABAR_POKECENTER, 7, 4 ; $AC map_const CINNABAR_MART, 4, 4 ; $AD - map_const CINNABAR_MART_COPY, 4, 4 ; $AE - Unused + map_const BRUNSWICK_TRAIL, 30, 9 ; $AE - was unused Cinnabar Mart copy map_const INDIGO_PLATEAU_LOBBY, 8, 6 ; $AF map_const COPYCATS_HOUSE_1F, 4, 4 ; $B0 map_const COPYCATS_HOUSE_2F, 4, 4 ; $B1 diff --git a/data/maps/headers/BrunswickTrail.asm b/data/maps/headers/BrunswickTrail.asm new file mode 100644 index 00000000..7b1cbc55 --- /dev/null +++ b/data/maps/headers/BrunswickTrail.asm @@ -0,0 +1,2 @@ + map_header BrunswickTrail, BRUNSWICK_TRAIL, CELESTE, 0 + end_map_header diff --git a/data/maps/map_header_banks.asm b/data/maps/map_header_banks.asm index 9d97d256..f39d82f6 100644 --- a/data/maps/map_header_banks.asm +++ b/data/maps/map_header_banks.asm @@ -175,7 +175,7 @@ MapHeaderBanks:: db BANK(CinnabarLabFossilRoom_h) db BANK(CinnabarPokecenter_h) db BANK(CinnabarMart_h) - db BANK(CinnabarMart_h) + db BANK(BrunswickTrail_h) ; was cinnabar mart copy db BANK(IndigoPlateauLobby_h) db BANK(CopycatsHouse1F_h) db BANK(CopycatsHouse2F_h) diff --git a/data/maps/map_header_pointers.asm b/data/maps/map_header_pointers.asm index 6dd4431e..ca3a7042 100644 --- a/data/maps/map_header_pointers.asm +++ b/data/maps/map_header_pointers.asm @@ -175,7 +175,7 @@ MapHeaderPointers:: dw CinnabarLabFossilRoom_h dw CinnabarPokecenter_h dw CinnabarMart_h - dw CinnabarMart_h ; CINNABAR_MART_COPY + dw BrunswickTrail_h ; CINNABAR_MART_COPY dw IndigoPlateauLobby_h dw CopycatsHouse1F_h dw CopycatsHouse2F_h diff --git a/data/maps/objects/BrunswickTrail.asm b/data/maps/objects/BrunswickTrail.asm new file mode 100644 index 00000000..ecf1f334 --- /dev/null +++ b/data/maps/objects/BrunswickTrail.asm @@ -0,0 +1,11 @@ +BrunswickTrail_Object: + db $0 ; border block + + def_warp_events + warp_event 24, 7, 0, REDS_HOUSE_2F + + def_bg_events + + def_object_events + + def_warps_to BRUNSWICK_TRAIL diff --git a/data/maps/songs.asm b/data/maps/songs.asm index 37bca722..d427d52b 100644 --- a/data/maps/songs.asm +++ b/data/maps/songs.asm @@ -174,7 +174,7 @@ MapSongBanks:: db MUSIC_CINNABAR, 0 ; CINNABAR_LAB_FOSSIL_ROOM db MUSIC_POKECENTER, 0 ; CINNABAR_POKECENTER db MUSIC_POKECENTER, 0 ; CINNABAR_MART - db MUSIC_CINNABAR, 0 ; CINNABAR_MART_COPY + db MUSIC_FIELD06, 0 ; BRUNSWICK_TRAIL, was CINNABAR_MART_COPY db MUSIC_INDIGO_PLATEAU, 0 ; INDIGO_PLATEAU_LOBBY db MUSIC_CITIES1, 0 ; COPYCATS_HOUSE_1F db MUSIC_CITIES1, 0 ; COPYCATS_HOUSE_2F diff --git a/gfx/blocksets/celeste.bst b/gfx/blocksets/celeste.bst index a5360ad63d830fca0379ddc1c1f60d50c4776ba9..59a90bfc595d5659655c6f31e6d2a4d4fb4dc93c 100644 GIT binary patch delta 179 zcmbOrxIu730+T{qTu5kKTv&J<6rl3r;wCpRDF7A00ID>MxA_3m115ox(2&ru@UUQdFL_|cqHa}q7z^GsV V1rCmOb|4J1GcHa;GcL};5&%oaPToGw&XXIM6u^ogf(8ZbCgmQ3(g-b|I-oP3l;3*>FC4z(}3$Q7%xwyKyySY!cU|Y-z NloJuz{D5r(BLKH69+dz9 diff --git a/gfx/blocksets/citrine.bst b/gfx/blocksets/citrine.bst index d495f071..f3f279c9 100644 --- a/gfx/blocksets/citrine.bst +++ b/gfx/blocksets/citrine.bst @@ -1,9 +1,4 @@ - - -()KKK - - -O####9#########9#%&   +9999999999999999####9#########9#%&   ()R*+:;<<<<<<<<<<<<<<HI77XY77,,,,,,,,,,,,77779999999999FG99VW# @@ -23,8 +18,7 @@  ()""" -R*+*+:;:;*+*+:;:;LM,,\],,,,,,,,,,,,NO,,^_,,,,,,,,,,LM,,\],,,,,,,,LM,\],,,,,*+*+:;:;,,,,/U/U??@A@APQPQ@A@APQPQ@A,,PQ,,/U/U??@A/UPQ?####9###@A@APQPQ33332223333TTT3333LSSSZZ\SSSMZZ]!########!## ######## '''''6776777$$$$774$7774##!########!########''''''''$$$$$$$$7'57$533,,,,,,,,,,,,74<<%& -"N9999999999999999@A-.PQ=>@A,,PQ,,@A@APQPQ,,-.,,=>-.,,=>,,@A@APQPQ,,-.,,=>@A,,PQ,,@A@APQPQ,,@A,,PQ +R*+*+:;:;*+*+:;:;LM,,\],,,,,,,,,,,,NO,,^_,,,,,,,,,,LM,,\],,,,,,,,LM,\],,,,,*+*+:;:;,,,,/U/U??@A@APQPQ@A@APQPQ@A,,PQ,,/U/U??@A/UPQ?####9###@A@APQPQ33332223333TTT3333@A@APQPQ@A/UPQ?@A@APQPQ/U@A?PQ!########!## ######## '''''6776777$$$$774$7774##!########!########''''''''$$$$$$$$7'57$533,,,,,,,,,,,,74<<@A,,PQ,,@A@APQPQ9999999999999999@A-.PQ=>@A,,PQ,,@A@APQPQ,,-.,,=>-.,,=>,,@A@APQPQ,,-.,,=>@A,,PQ,,@A@APQPQ,,@A,,PQ KKKKKK ,,,,,,,,,,,,,,,,  diff --git a/maps.asm b/maps.asm index d37b0af0..68d6ee71 100644 --- a/maps.asm +++ b/maps.asm @@ -1318,6 +1318,10 @@ CitrineCity_Blocks: INCBIN "maps/CitrineCity.blk" INCLUDE "data/maps/headers/CelesteHill.asm" INCLUDE "scripts/CelesteHill.asm" INCLUDE "data/maps/objects/CelesteHill.asm" +INCLUDE "data/maps/headers/BrunswickTrail.asm" +INCLUDE "scripts/BrunswickTrail.asm" +INCLUDE "data/maps/objects/BrunswickTrail.asm" +BrunswickTrail_Blocks: CelesteHill_Blocks: INCBIN "maps/CelesteHill.blk" INCLUDE "data/maps/headers/CitrineRocketHouse.asm" @@ -1329,4 +1333,4 @@ INCLUDE "data/maps/headers/CitrineTradebackHouse.asm" INCLUDE "scripts/CitrineTradebackHouse.asm" INCLUDE "data/maps/objects/CitrineTradebackHouse.asm" INCLUDE "scripts/tradeback_move_tutor.asm" -CitrineTradebackHouse_Blocks: INCBIN "maps/CitrineTradebackHouse.blk" \ No newline at end of file +CitrineTradebackHouse_Blocks: INCBIN "maps/CitrineTradebackHouse.blk" diff --git a/maps/BrunswickTrail.blk b/maps/BrunswickTrail.blk new file mode 100644 index 0000000000000000000000000000000000000000..2f1dd05d51457be462c1ad752eaa7e5522b97883 GIT binary patch literal 372 zcmZ{gy$-@K41_Z=*u%{f6&k5X{Iz20$WjR;cnB88mWlTlXD2Namm!Y6^Vv$@Ct-Io z?eWu-Wu`sq1L<*FL=;1;Gy;M6c1apKa#GPaLLopEXt{d3P+h$+sybq<-hc+pSR@3I z56=LsG@h4ip72Z96K0WfC~58{w#=+x8zq{;o3)L0huu>Q?P+$iq1;m@XTF${Hs|{8 YX+5cI{b569od3r_>$OqbAAjT&Uvbtl!T