thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-11-05 13:20:59 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Three Island layouts

Browse source
This commit is contained in:
Zeta_Null 2024-10-14 16:12:59 -04:00
parent 8b9927bc6f
commit 1dc596e162
16 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
constants/map_constants.asm
View file

@ -579,7 +579,7 @@ ENDM
newgroup THREE_ISLAND ; 30 newgroup THREE_ISLAND ; 30
map_const THREE_ISLAND_PORT, 20, 9 ; 1 map_const THREE_ISLAND_PORT, 20, 9 ; 1
map_const THREE_ISLAND, 10, 18 ; 2 map_const THREE_ISLAND, 10, 18 ; 2
map_const BOND_BRIDGE, 10, 10 ; 3 map_const BOND_BRIDGE, 50, 16 ; 3
map_const BERRY_FOREST, 17, 15 ; 4 map_const BERRY_FOREST, 17, 15 ; 4
endgroup endgroup

10
data/maps/attributes.asm
View file

@ -704,7 +704,7 @@ ENDM
map_attributes BellchimeTrail, BELLCHIME_TRAIL, $00, 0 map_attributes BellchimeTrail, BELLCHIME_TRAIL, $00, 0
map_attributes PewterMuseumOfScience1F, PEWTER_MUSEUM_OF_SCIENCE_1F, $00, 0 map_attributes PewterMuseumOfScience1F, PEWTER_MUSEUM_OF_SCIENCE_1F, $00, 0
map_attributes PewterMuseumOfScience2F, PEWTER_MUSEUM_OF_SCIENCE_2F, $00, 0 map_attributes PewterMuseumOfScience2F, PEWTER_MUSEUM_OF_SCIENCE_2F, $00, 0
map_attributes ViridianForest, VIRIDIAN_FOREST, $00, 0 map_attributes ViridianForest, VIRIDIAN_FOREST, $4D, 0
map_attributes ViridianForestViridianGate, VIRIDIAN_FOREST_VIRIDIAN_GATE, $00, 0 map_attributes ViridianForestViridianGate, VIRIDIAN_FOREST_VIRIDIAN_GATE, $00, 0
map_attributes ViridianForestPewterGate, VIRIDIAN_FOREST_PEWTER_GATE, $00, 0 map_attributes ViridianForestPewterGate, VIRIDIAN_FOREST_PEWTER_GATE, $00, 0
map_attributes CeruleanCave1F, CERULEAN_CAVE_1F, $00, 0 map_attributes CeruleanCave1F, CERULEAN_CAVE_1F, $00, 0
@ -773,10 +773,12 @@ ENDM
map_attributes ThreeIslandPort, THREE_ISLAND_PORT, $02, NORTH ; Bank 2 map_attributes ThreeIslandPort, THREE_ISLAND_PORT, $02, NORTH ; Bank 2
connection north, ThreeIsland, THREE_ISLAND, 0 connection north, ThreeIsland, THREE_ISLAND, 0
map_attributes ThreeIsland, THREE_ISLAND, $03, SOUTH ; Bank 3 map_attributes ThreeIsland, THREE_ISLAND, $03, SOUTH | WEST ; Bank 3
connection south, ThreeIslandPort, THREE_ISLAND_PORT, 0 connection south, ThreeIslandPort, THREE_ISLAND_PORT, 0
map_attributes BondBridge, BOND_BRIDGE, $00, 0 ; Bank 3 connection west, BondBridge, BOND_BRIDGE, -3
map_attributes BerryForest, BERRY_FOREST, $00, 0 ; Bank 3 map_attributes BondBridge, BOND_BRIDGE, $02, EAST ; Bank 3
connection east, ThreeIsland, THREE_ISLAND, 3
map_attributes BerryForest, BERRY_FOREST, $05, 0 ; Bank 3
map_attributes FourIsland, FOUR_ISLAND, $00, 0 ; Bank 3 map_attributes FourIsland, FOUR_ISLAND, $00, 0 ; Bank 3
map_attributes IcefallCaveEntrance, ICEFALL_CAVE_ENTRANCE, $00, 0 ; Bank 3 map_attributes IcefallCaveEntrance, ICEFALL_CAVE_ENTRANCE, $00, 0 ; Bank 3

4
data/maps/maps.asm
View file

@ -631,10 +631,10 @@ MapGroup_TwoIsland: ; 29
MapGroup_ThreeIsland: ; 30 MapGroup_ThreeIsland: ; 30
table_width MAP_LENGTH, MapGroup_ThreeIsland table_width MAP_LENGTH, MapGroup_ThreeIsland
map ThreeIslandPort, TILESET_SEVII, ROUTE, LANDMARK_THREE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE map ThreeIslandPort, TILESET_SEVII, TOWN, LANDMARK_THREE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map ThreeIsland, TILESET_SEVII, TOWN, LANDMARK_THREE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, 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 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 map BerryForest, TILESET_FOREST_KANTO, ROUTE, LANDMARK_THREE_ISLAND, MUSIC_ROUTE_3, TRUE, PALETTE_AUTO, FISHGROUP_POND
assert_table_length NUM_THREE_ISLAND_MAPS assert_table_length NUM_THREE_ISLAND_MAPS
MapGroup_FourIsland: ; 31 MapGroup_FourIsland: ; 31

BIN
data/tilesets/forest_kanto_attributes.bin
View file

Binary file not shown.

1
data/tilesets/forest_kanto_collision.asm
View file

@ -75,3 +75,4 @@
tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 4a tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 4a
tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 4b tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 4b
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 4c tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 4c
tilecoll WALL, WALL, WALL, WALL ; 4d

BIN
data/tilesets/forest_kanto_metatiles.bin
View file

Binary file not shown.

BIN
data/tilesets/sevii_attributes.bin
View file

Binary file not shown.

1
data/tilesets/sevii_collision.asm
View file

@ -126,3 +126,4 @@
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 7d tilecoll FLOOR, FLOOR, FLOOR, WALL ; 7d
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 7e tilecoll WALL, FLOOR, FLOOR, FLOOR ; 7e
tilecoll FLOOR, WALL, FLOOR, FLOOR ; 7f tilecoll FLOOR, WALL, FLOOR, FLOOR ; 7f
tilecoll WARP_CARPET_UP, WARP_CARPET_UP, FLOOR, FLOOR ; 80

BIN
data/tilesets/sevii_metatiles.bin
View file

Binary file not shown.

BIN
gfx/tilesets/forest_kanto.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
maps/BerryForest.ablk
View file

Binary file not shown.

4
maps/BerryForest.asm
View file

@ -9,8 +9,8 @@ BerryForest_MapEvents:
db 0, 0 ; filler db 0, 0 ; filler
def_warp_events def_warp_events
warp_event 27, 29, DEBUG_ROOM, 1 ; BOND_BRIDGE warp_event 27, 29, BOND_BRIDGE, 1 ; BOND_BRIDGE
warp_event 26, 29, DEBUG_ROOM, 1 ; BOND_BRIDGE warp_event 26, 29, BOND_BRIDGE, 2 ; BOND_BRIDGE
def_coord_events def_coord_events

BIN
maps/BondBridge.ablk
View file

Binary file not shown.

2
maps/BondBridge.asm
View file

@ -9,6 +9,8 @@ BondBridge_MapEvents:
db 0, 0 ; filler db 0, 0 ; filler
def_warp_events def_warp_events
warp_event 9, 8, BERRY_FOREST, 1 ; BOND_BRIDGE
warp_event 8, 8, BERRY_FOREST, 2 ; BOND_BRIDGE
def_coord_events def_coord_events

2
maps/ThreeIsland.ablk
View file

@ -1,4 +1,4 @@
{stst((((((7k(mnkzzy(stprki(((((ki(7ki(stx~i((((ki(77ki(l:<<i(pq:<i(((( {stst(((((7k(mnkzzy(stprki(((((ki(7ki(stx~i((((ki(77ki(l:<<i(pq:<i((((
st( ( st( (
(((((( ((((((
:;(:< :;(:<

BIN
maps/ViridianForest.ablk
View file

Binary file not shown.