thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-09-16 18:20:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Gate.

Browse source
This commit is contained in:
Zeta_Null 2024-10-23 02:51:43 -04:00
parent eb10621ac6
commit c00670604d
9 changed files with 35 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
constants/map_constants.asm
View file

@ -670,6 +670,7 @@ ENDM
newgroup SAVOY_CITY ; 37
map_const SAVOY_CITY, 20, 18 ; 1
map_const ROUTE_50_SAVOY_CITY_GATE, 5, 4 ; 2
endgroup
newgroup BLUE_FOREST ; 38

1
data/maps/attributes.asm
View file

@ -892,6 +892,7 @@ ENDM
connection east, KantoSafariZoneCenter, KANTO_SAFARI_ZONE_CENTER, 2
map_attributes SavoyCity, SAVOY_CITY, $15, 0
map_attributes Route50SavoyCityGate, ROUTE_50_SAVOY_CITY_GATE, $00, 0
map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.

1
data/maps/blocks.asm
View file

@ -1245,6 +1245,7 @@ WhiteCity_Blocks:
INCBIN "maps/WhiteCity.ablk"
Route66WhiteCityGate_Blocks:
Route50SavoyCityGate_Blocks:
INCBIN "maps/NihonGateEastWest.ablk"
OldCityGym_Blocks:

5
data/maps/maps.asm
View file

@ -731,12 +731,13 @@ MapGroup_OldCity:
MapGroup_SavoyCity:
table_width MAP_LENGTH, MapGroup_SavoyCity
map SavoyCity, TILESET_NIHON_WEST, TOWN, LANDMARK_SAVOY_CITY, MUSIC_VERMILION_CITY, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
map SavoyCity, TILESET_NIHON_WEST, TOWN, LANDMARK_SAVOY_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map Route50SavoyCityGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_50, MUSIC_PEACEFULTHEME, FALSE, PALETTE_DAY, FISHGROUP_NONE
assert_table_length NUM_SAVOY_CITY_MAPS
MapGroup_BlueForest:
table_width MAP_LENGTH, MapGroup_BlueForest
map BlueForest, TILESET_NIHON_SNOWY, TOWN, LANDMARK_BLUE_FOREST, MUSIC_SINJOH_RUINS, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
map BlueForest, TILESET_NIHON_SNOWY, TOWN, LANDMARK_BLUE_FOREST, MUSIC_SINJOH_RUINS, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
assert_table_length NUM_BLUE_FOREST_MAPS
MapGroup_WhiteCity:

1
data/maps/scripts.asm
View file

@ -634,3 +634,4 @@ INCLUDE "maps/KantoSafariZoneArea2East.asm"
INCLUDE "maps/KantoSafariZoneArea2West.asm"
INCLUDE "maps/KantoSafariZoneArea3.asm"
INCLUDE "maps/SavoyCity.asm"
INCLUDE "maps/Route50SavoyCityGate.asm"

4
data/tilesets/nihon_west_collision.asm
View file

@ -21,7 +21,7 @@
tilecoll WATER, WATER, WATER, WATER ; 14
tilecoll WATER, WATER, WATER, WATER ; 15
tilecoll WATER, WATER, WATER, WATER ; 16
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17
tilecoll WALL, WALL, WALL, WALL ; 17
tilecoll WALL, WALL, WALL, WALL ; 18
tilecoll WALL, WALL, DOOR, DOOR ; 19
tilecoll WALL, WALL, WALL, WALL ; 1a
@ -66,7 +66,7 @@
tilecoll WALL, WALL, WALL, WALL ; 41
tilecoll WALL, WALL, WALL, WALL ; 42
tilecoll WALL, WALL, FLOOR, FLOOR ; 43
tilecoll WALL, WALL, WALL, WALL ; 44
tilecoll WALL, WALL, WALL, DOOR ; 44
tilecoll WALL, WALL, DOOR, WALL ; 45
tilecoll WALL, WALL, WALL, WALL ; 46
tilecoll WATER, WALL, WATER, WALL ; 47

2
maps/Route50.asm
View file

@ -117,7 +117,7 @@ Route50_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 6, 5, SAVOY_CITY, 1 ; West Gate
warp_event 6, 5, ROUTE_50_SAVOY_CITY_GATE, 3 ; West Gate
warp_event 15, 4, JACKYS_HOUSE, 1 ; Game House
def_coord_events

21
maps/Route50SavoyCityGate.asm Normal file
View file

@ -0,0 +1,21 @@
object_const_def
Route50SavoyCityGate_MapScripts:
def_scene_scripts
def_callbacks
Route50SavoyCityGate_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 0, 7, SAVOY_CITY, 1
warp_event 1, 7, SAVOY_CITY, 1
warp_event 8, 7, ROUTE_50, 1
warp_event 9, 7, ROUTE_50, 1
def_coord_events
def_bg_events
def_object_events

2
maps/SavoyCity.asm
View file

@ -9,7 +9,7 @@ SavoyCity_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 33, 15, ROUTE_50, 1 ;east gate
warp_event 33, 15, ROUTE_50_SAVOY_CITY_GATE, 1 ;east gate
warp_event 22, 5, DEBUG_ROOM, 1 ;north gate, left
warp_event 23, 5, DEBUG_ROOM, 1 ;north gate, right