From 8b9927bc6f80a2b33432078a346d0e8a53a2b113 Mon Sep 17 00:00:00 2001 From: Zeta_Null Date: Sat, 12 Oct 2024 17:52:52 -0400 Subject: [PATCH] Three Island and properly implement nihon region check for the trainer battle theme (double check this doesnt accidentally also effect sevii) --- constants/map_constants.asm | 4 ++-- data/maps/attributes.asm | 6 ++++-- data/maps/blocks.asm | 4 ++-- data/maps/maps.asm | 6 +++--- data/tilesets/sevii_attributes.bin | Bin 1920 -> 2048 bytes data/tilesets/sevii_collision.asm | 8 ++++++++ data/tilesets/sevii_metatiles.bin | Bin 1920 -> 2048 bytes engine/battle/start_battle.asm | 9 ++++++++- maps/DebugRoom.asm | 2 +- maps/ThreeIsland.ablk | Bin 100 -> 180 bytes maps/ThreeIslandPort.ablk | Bin 100 -> 180 bytes maps/ThreeIslandPort.asm | 2 ++ 12 files changed, 30 insertions(+), 11 deletions(-) diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 323748d..6761871 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -577,8 +577,8 @@ ENDM endgroup newgroup THREE_ISLAND ; 30 - map_const THREE_ISLAND_PORT, 10, 10 ; 1 - map_const THREE_ISLAND, 10, 10 ; 2 + map_const THREE_ISLAND_PORT, 20, 9 ; 1 + map_const THREE_ISLAND, 10, 18 ; 2 map_const BOND_BRIDGE, 10, 10 ; 3 map_const BERRY_FOREST, 17, 15 ; 4 endgroup diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index b2fed0b..d6958e3 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -771,8 +771,10 @@ ENDM map_attributes TwoIsland, TWO_ISLAND, $00, 0 ; Bank 2 map_attributes CapeBrink, CAPE_BRINK, $00, 0 ; Bank 2 - map_attributes ThreeIslandPort, THREE_ISLAND_PORT, $00, 0 ; Bank 2 - map_attributes ThreeIsland, THREE_ISLAND, $00, 0 ; Bank 3 + map_attributes ThreeIslandPort, THREE_ISLAND_PORT, $02, NORTH ; Bank 2 + connection north, ThreeIsland, THREE_ISLAND, 0 + map_attributes ThreeIsland, THREE_ISLAND, $03, SOUTH ; Bank 3 + connection south, ThreeIslandPort, THREE_ISLAND_PORT, 0 map_attributes BondBridge, BOND_BRIDGE, $00, 0 ; Bank 3 map_attributes BerryForest, BERRY_FOREST, $00, 0 ; Bank 3 diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index b61201c..08ec49a 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -1206,6 +1206,8 @@ AlteringCave_Blocks: ThreeIslandPort_Blocks: INCBIN "maps/ThreeIslandPort.ablk" +SECTION "Map Blocks 4", ROMX + SinjohRuinsExterior_Blocks: INCBIN "maps/SinjohRuinsExterior.ablk" @@ -1239,8 +1241,6 @@ HoneyGrandmasHouse_Blocks: SepiaSchool_Blocks: INCBIN "maps/SepiaSchool.ablk" -SECTION "Map Blocks 4", ROMX - WhiteCity_Blocks: INCBIN "maps/WhiteCity.ablk" diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 21e9f29..2585084 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -631,9 +631,9 @@ MapGroup_TwoIsland: ; 29 MapGroup_ThreeIsland: ; 30 table_width MAP_LENGTH, MapGroup_ThreeIsland - map ThreeIslandPort, TILESET_GATE, GATE, LANDMARK_THREE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map ThreeIsland, TILESET_CAVE, TOWN, LANDMARK_THREE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map BondBridge, TILESET_CAVE, ROUTE, LANDMARK_THREE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map ThreeIslandPort, TILESET_SEVII, ROUTE, LANDMARK_THREE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map ThreeIsland, TILESET_SEVII, TOWN, LANDMARK_THREE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map BondBridge, TILESET_SEVII, ROUTE, LANDMARK_THREE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map BerryForest, TILESET_FOREST_KANTO, CAVE, LANDMARK_THREE_ISLAND, MUSIC_ROUTE_3, TRUE, PALETTE_NITE, FISHGROUP_POND assert_table_length NUM_THREE_ISLAND_MAPS diff --git a/data/tilesets/sevii_attributes.bin b/data/tilesets/sevii_attributes.bin index 5026e336c05f30366d0809f1c6ad6cb607f40ea7..938f914798b35f1e8f833ab2b8c5526f1fb59c32 100644 GIT binary patch delta 11 ScmZqRZxGnfz&`mQO9KEHiv&*q delta 7 OcmZn=XyD(_zzzTjx&l`K diff --git a/data/tilesets/sevii_collision.asm b/data/tilesets/sevii_collision.asm index 3e5f85f..7e06ce9 100644 --- a/data/tilesets/sevii_collision.asm +++ b/data/tilesets/sevii_collision.asm @@ -118,3 +118,11 @@ tilecoll WATER, WALL, WALL, WALL ; 75 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 76 tilecoll WALL, FLOOR, FLOOR, FLOOR ; 77 + tilecoll WALL, WALL, WALL, FLOOR ; 78 + tilecoll WALL, WALL, FLOOR, WALL ; 79 + tilecoll WALL, WALL, FLOOR, FLOOR ; 7a + tilecoll FLOOR, FLOOR, WALL, WALL ; 7b + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 7c + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 7d + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 7e + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 7f diff --git a/data/tilesets/sevii_metatiles.bin b/data/tilesets/sevii_metatiles.bin index 55b5d135160b16f890fda10610bdc8b75c584057..57ee8ecf494f6d0550f4042c815423051a231c71 100644 GIT binary patch delta 137 zcmZqRZxGnfz+SHe1ZqH_q$Dq|rY0{Bcz1)z(=^dl6(^h3-=7l-m06eM==flez*j z0Z?FmX4>~nOI_aC_~^Vlp!HgYQrF)>TVz@2u+eFVDS2;sNpxp#MA$|Z7k7QwvUnq< Nm{?e@_s_%n%zw^e9JBxc literal 100 LcmZQzpgjNp0Av6G diff --git a/maps/ThreeIslandPort.ablk b/maps/ThreeIslandPort.ablk index eeb576070df6ab6d3f9dfdf278414e6c3f3ca6b7..632eac3742e2c4426b6c4b5bbea2831b44b442f2 100644 GIT binary patch literal 180 zcmYMsO$)*>41i%8+vHPUojP7&ndhK>DrbxjUuDg zdarVoc^z^#?k0IpnR-Y~2b=U#{(I&*zb>pDctJzzlU#a$vbgbR3_$&;Dz