From c3763c2ed94770448af7be59a1d9086afec739a1 Mon Sep 17 00:00:00 2001 From: Unagii Date: Tue, 10 Sep 2024 19:34:35 -0500 Subject: [PATCH] Kaga Castle Exterior - added Kaga Castle Exterior map, temp cave connection to Mt. Kaga --- constants/map_constants.asm | 1 + data/maps/attributes.asm | 6 +++++- data/maps/blocks.asm | 5 ++++- data/maps/maps.asm | 1 + data/maps/scripts.asm | 1 + data/tilesets/kagawa_attributes.bin | Bin 2512 -> 2560 bytes data/tilesets/kagawa_collision.asm | 3 +++ data/tilesets/kagawa_metatiles.bin | Bin 2512 -> 2560 bytes maps/KagaCastle.ablk | 1 + maps/KagaCastle.asm | 19 +++++++++++++++++++ maps/MtKaga.asm | 1 + 11 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 maps/KagaCastle.ablk create mode 100644 maps/KagaCastle.asm diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 9cc1e35a2ff..eb2bd86f9c1 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -512,6 +512,7 @@ ENDM map_const RAMEN_SHOP, 8, 6 ; 8 map_const KAGA_FISHING_SHOP, 5, 6 ; 9 map_const KAGA_CAMP, 18, 22 ; 10 + map_const KAGA_CASTLE, 14, 12 ; 11 endgroup DEF NUM_MAP_GROUPS EQU const_value ; 27 diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index a8628630dc5..57856271e80 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -399,12 +399,16 @@ ENDM connection north, KagaPond, KAGA_POND, 8 connection south, LakeFuchu, LAKE_FUCHU, 0 - map_attributes KagaPond, KAGA_POND, $2c, SOUTH + map_attributes KagaPond, KAGA_POND, $2c, EAST | SOUTH + connection east, KagaCastle, KAGA_CASTLE, 12 connection south, MtKaga, MT_KAGA, -8 map_attributes KagaCamp, KAGA_CAMP, $2c, SOUTH connection south, MineyamaPark, MINEYAMA_PARK, -4 + map_attributes KagaCastle, KAGA_CASTLE, $2c, WEST + connection west, KagaPond, KAGA_POND, -12 + map_attributes RamenShop, RAMEN_SHOP, $00, 0 map_attributes KagaFishingShop, KAGA_FISHING_SHOP, $00, 0 map_attributes Route23, ROUTE_23, $0f, 0 diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index 00d457924f6..0a23207c6a0 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -1080,4 +1080,7 @@ KagaFishingShop_Blocks: INCBIN "maps/KagaFishingShop.ablk" KagaCamp_Blocks: - INCBIN "maps/MineyamaCamp.ablk" \ No newline at end of file + INCBIN "maps/MineyamaCamp.ablk" + +KagaCastle_Blocks: + INCBIN "maps/KagaCastle.ablk" \ No newline at end of file diff --git a/data/maps/maps.asm b/data/maps/maps.asm index aa66c4451b1..673da0fe627 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -551,4 +551,5 @@ MapGroup_Kagawa: map RamenShop, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_30, MUSIC_DANCING_HALL, FALSE, PALETTE_DAY, FISHGROUP_SHORE, KELPGROUP_KRABBY map KagaFishingShop, TILESET_HOUSE, ROUTE, LANDMARK_ROUTE_30, MUSIC_DANCING_HALL, FALSE, PALETTE_AUTO, FISHGROUP_SHORE, KELPGROUP_KRABBY map KagaCamp, TILESET_KAGAWA, ROUTE, LANDMARK_ROUTE_30, MUSIC_DANCING_HALL, FALSE, PALETTE_AUTO, FISHGROUP_SHORE, KELPGROUP_KRABBY + map KagaCastle, TILESET_KAGAWA, ROUTE, LANDMARK_ROUTE_30, MUSIC_DANCING_HALL, FALSE, PALETTE_AUTO, FISHGROUP_SHORE, KELPGROUP_KRABBY assert_table_length NUM_KAGAWA_MAPS \ No newline at end of file diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index e0c2d45eae9..a42aa2b1648 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -494,5 +494,6 @@ INCLUDE "maps/KagaPond.asm" INCLUDE "maps/RamenShop.asm" INCLUDE "maps/KagaFishingShop.asm" INCLUDE "maps/MineyamaCamp.asm" +INCLUDE "maps/KagaCastle.asm" ENDSECTION diff --git a/data/tilesets/kagawa_attributes.bin b/data/tilesets/kagawa_attributes.bin index 346ed45324c9327d47f31d10aabd1ddc805a7263..92de09672c15d74bff4ff8cadedacca404a6ee04 100644 GIT binary patch delta 56 jcmca0+#s^y0;d5lFE0ZSg8+nPfO4TUgDzN(7e)gB+{XoZ delta 7 OcmZn=xgfmZ0w(|r6axVO diff --git a/data/tilesets/kagawa_collision.asm b/data/tilesets/kagawa_collision.asm index 7480a897edc..2df0c15256e 100644 --- a/data/tilesets/kagawa_collision.asm +++ b/data/tilesets/kagawa_collision.asm @@ -155,3 +155,6 @@ tilecoll FLOOR, FLOOR, WALL, FLOOR ; 9a tilecoll WALL, WALL, FLOOR, FLOOR ; 9b tilecoll WALL, WALL, WALL, WALL ; 9c + tilecoll WALL, WALL, WALL, WALL ; 9d + tilecoll WALL, WALL, DOOR, DOOR ; 9e + tilecoll WALL, WALL, WALL, WALL ; 9f diff --git a/data/tilesets/kagawa_metatiles.bin b/data/tilesets/kagawa_metatiles.bin index d204cceadc6179c9cdec2254e538bb06a577f318..2f538594be495c2c0c31453e77ec7f23469de003 100644 GIT binary patch delta 56 qcmca0+#s^y0;hq2VUVqZqmvVi4zjfkaRLGuZ5w1_>g43&3ZntjG7ohC delta 7 OcmZn=xgfmZ0w(|r6axVO diff --git a/maps/KagaCastle.ablk b/maps/KagaCastle.ablk new file mode 100644 index 00000000000..ead3cdffe67 --- /dev/null +++ b/maps/KagaCastle.ablk @@ -0,0 +1 @@ +IJKVMNO!!!!!! \ No newline at end of file diff --git a/maps/KagaCastle.asm b/maps/KagaCastle.asm new file mode 100644 index 00000000000..b623200992a --- /dev/null +++ b/maps/KagaCastle.asm @@ -0,0 +1,19 @@ + object_const_def + +KagaCastle_MapScripts: + def_scene_scripts + + def_callbacks + +KagaCastle_MapEvents: + db 0, 0 ; filler + + def_warp_events + warp_event 8, 9, MT_KAGA, 1 + + def_coord_events + + def_bg_events + + def_object_events + diff --git a/maps/MtKaga.asm b/maps/MtKaga.asm index 5648d69c394..b61e3ab231d 100644 --- a/maps/MtKaga.asm +++ b/maps/MtKaga.asm @@ -10,6 +10,7 @@ MtKaga_MapEvents: db 0, 0 ; filler def_warp_events + warp_event 52, 7, KAGA_CASTLE, 1 def_coord_events