thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2026-02-07 08:35:23 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Three Island and properly implement nihon region check for the trainer battle theme (double check this doesnt accidentally also effect sevii)

Browse source
This commit is contained in:
Zeta_Null 2024-10-12 17:52:52 -04:00
parent 59787cbecb
commit 8b9927bc6f
12 changed files with 30 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
data/maps/attributes.asm
View file

@ -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

4
data/maps/blocks.asm
View file

@ -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"

6
data/maps/maps.asm
View file

@ -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