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

Basic four island stuff. Get to unused routes later

Browse source
This commit is contained in:
Zeta_Null 2024-10-15 21:26:07 -04:00
parent 541c3dcdff
commit fc56ea0fda
10 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
constants/map_constants.asm
View file

@ -584,7 +584,7 @@ ENDM
endgroup endgroup
newgroup FOUR_ISLAND ; 31 newgroup FOUR_ISLAND ; 31
map_const FOUR_ISLAND, 10, 10 ; 1 map_const FOUR_ISLAND, 25, 20 ; 1
map_const ICEFALL_CAVE_ENTRANCE, 10, 10 ; 2 map_const ICEFALL_CAVE_ENTRANCE, 10, 10 ; 2
map_const ICEFALL_CAVE_1F, 10, 10 ; 3 map_const ICEFALL_CAVE_1F, 10, 10 ; 3
map_const ICEFALL_CAVE_B1F, 10, 10 ; 4 map_const ICEFALL_CAVE_B1F, 10, 10 ; 4

2
data/maps/attributes.asm
View file

@ -782,7 +782,7 @@ ENDM
connection east, ThreeIsland, THREE_ISLAND, 3 connection east, ThreeIsland, THREE_ISLAND, 3
map_attributes BerryForest, BERRY_FOREST, $05, 0 ; Bank 3 map_attributes BerryForest, BERRY_FOREST, $05, 0 ; Bank 3
map_attributes FourIsland, FOUR_ISLAND, $00, 0 ; Bank 3 map_attributes FourIsland, FOUR_ISLAND, $02, 0 ; Bank 3
map_attributes IcefallCaveEntrance, ICEFALL_CAVE_ENTRANCE, $00, 0 ; Bank 3 map_attributes IcefallCaveEntrance, ICEFALL_CAVE_ENTRANCE, $00, 0 ; Bank 3
map_attributes IcefallCave1F, ICEFALL_CAVE_1F, $00, 0 ; Bank 3 map_attributes IcefallCave1F, ICEFALL_CAVE_1F, $00, 0 ; Bank 3
map_attributes IcefallCaveB1F, ICEFALL_CAVE_B1F, $00, 0 ; Bank 3 map_attributes IcefallCaveB1F, ICEFALL_CAVE_B1F, $00, 0 ; Bank 3

2
data/maps/maps.asm
View file

@ -639,7 +639,7 @@ MapGroup_ThreeIsland: ; 30
MapGroup_FourIsland: ; 31 MapGroup_FourIsland: ; 31
table_width MAP_LENGTH, MapGroup_FourIsland table_width MAP_LENGTH, MapGroup_FourIsland
map FourIsland, TILESET_CAVE, TOWN, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map FourIsland, TILESET_SEVII, TOWN, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map IcefallCaveEntrance, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE map IcefallCaveEntrance, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map IcefallCave1F, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE map IcefallCave1F, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map IcefallCaveB1F, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE map IcefallCaveB1F, TILESET_CAVE, CAVE, LANDMARK_FOUR_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE

BIN
data/tilesets/sevii_attributes.bin
View file

Binary file not shown.

2
data/tilesets/sevii_collision.asm
View file

@ -134,4 +134,4 @@
tilecoll WALL, WALL, WALL, WALL ; 85 tilecoll WALL, WALL, WALL, WALL ; 85
tilecoll WALL, WALL, WALL, WALL ; 86 tilecoll WALL, WALL, WALL, WALL ; 86
tilecoll WALL, WALL, WALL, WALL ; 87 tilecoll WALL, WALL, WALL, WALL ; 87
tilecoll WALL, WALL, WALL, WALL ; 88 tilecoll FLOOR, FLOOR, WALL, WALL ; 88

BIN
data/tilesets/sevii_metatiles.bin
View file

Binary file not shown.

BIN
gfx/pokegear/sevii1.bin
View file

Binary file not shown.

2
maps/DebugRoom.asm
View file

@ -404,7 +404,7 @@ DebugRoom_MapEvents:
warp_event 35, 17, OLD_CITY, 1 ; east warp warp_event 35, 17, OLD_CITY, 1 ; east warp
warp_event 5, 35, LAVENDER_TOWN, 1 ; southwest warp warp_event 5, 35, LAVENDER_TOWN, 1 ; southwest warp
warp_event 19, 34, SAFARI_ZONE_FUCHSIA_GATE_BETA, 3 ; southern warp warp_event 19, 34, SAFARI_ZONE_FUCHSIA_GATE_BETA, 3 ; southern warp
warp_event 33, 33, TWO_ISLAND, 1 ; southeast warp warp_event 33, 33, FOUR_ISLAND, 1 ; southeast warp
warp_event 5, 3, HAUNTED_HOUSE_FOYER, 1 warp_event 5, 3, HAUNTED_HOUSE_FOYER, 1
warp_event 34, 11, WINNERS_PATH, 3 warp_event 34, 11, WINNERS_PATH, 3

BIN
maps/FourIsland.ablk
View file

Binary file not shown.

3
maps/FourIsland.asm
View file

@ -14,7 +14,8 @@ FourIsland_MapEvents:
db 0, 0 ; filler db 0, 0 ; filler
def_warp_events def_warp_events
warp_event 12, 29, DEBUG_ROOM, 1
warp_event 13, 29, DEBUG_ROOM, 1
def_coord_events def_coord_events
def_bg_events def_bg_events