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

Hey do you like this new gate. What do you mean it's 3 in the morning.

Browse source
This commit is contained in:
Zeta_Null 2024-07-25 02:58:36 -04:00
parent 0161dc096d
commit 6c2a1d2707
12 changed files with 35 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
constants/map_constants.asm
View file

@ -651,6 +651,7 @@ ENDM
newgroup WHITE_CITY ; 38 newgroup WHITE_CITY ; 38
map_const WHITE_CITY, 30, 27 ; 1 map_const WHITE_CITY, 30, 27 ; 1
map_const ROUTE_66_WHITE_CITY_GATE, 5, 4 ; 2
endgroup endgroup
DEF NUM_MAP_GROUPS EQU const_value ; 38 DEF NUM_MAP_GROUPS EQU const_value ; 38

1
data/maps/attributes.asm
View file

@ -836,6 +836,7 @@ ENDM
map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later. map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.
map_attributes WhiteCity, WHITE_CITY, $01, 0 ; this is on its own for now. add connections later. map_attributes WhiteCity, WHITE_CITY, $01, 0 ; this is on its own for now. add connections later.
map_attributes Route66WhiteCityGate, ROUTE_66_WHITE_CITY_GATE, $00, 0
map_attributes SinjohRuinsExterior, SINJOH_RUINS_EXTERIOR, $00, 0 map_attributes SinjohRuinsExterior, SINJOH_RUINS_EXTERIOR, $00, 0
map_attributes SinjohRuinsInterior, SINJOH_RUINS_EXTERIOR, $00, 0 map_attributes SinjohRuinsInterior, SINJOH_RUINS_EXTERIOR, $00, 0

6
data/maps/blocks.asm
View file

@ -1224,9 +1224,6 @@ Route49OldCityGate1F_Blocks:
Route49OldCityGate2F_Blocks: Route49OldCityGate2F_Blocks:
INCBIN "maps/NihonGate2F.ablk" ; 4, 3 INCBIN "maps/NihonGate2F.ablk" ; 4, 3
;InsertGateNameHere_Blocks:
; INCBIN "maps/NihonGateWestEast.ablk"
OldCity_Blocks: OldCity_Blocks:
INCBIN "maps/OldCity.ablk" INCBIN "maps/OldCity.ablk"
@ -1240,3 +1237,6 @@ SECTION "Map Blocks 4", ROMX
WhiteCity_Blocks: WhiteCity_Blocks:
INCBIN "maps/WhiteCity.ablk" INCBIN "maps/WhiteCity.ablk"
Route66WhiteCityGate_Blocks:
INCBIN "maps/NihonGateEastWest.ablk"

1
data/maps/maps.asm
View file

@ -713,5 +713,6 @@ MapGroup_BlueForest:
MapGroup_WhiteCity: MapGroup_WhiteCity:
table_width MAP_LENGTH, MapGroup_WhiteCity table_width MAP_LENGTH, MapGroup_WhiteCity
map WhiteCity, TILESET_NIHON_WHITECITY, TOWN, LANDMARK_WHITE_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map WhiteCity, TILESET_NIHON_WHITECITY, TOWN, LANDMARK_WHITE_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map Route66WhiteCityGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_66, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_NONE
assert_table_length NUM_WHITE_CITY_MAPS assert_table_length NUM_WHITE_CITY_MAPS

1
data/maps/scripts.asm
View file

@ -586,6 +586,7 @@ INCLUDE "maps/OldCityEarlsHouse.asm"
INCLUDE "maps/OldCityFamilyHouse.asm" INCLUDE "maps/OldCityFamilyHouse.asm"
INCLUDE "maps/SepiaSchool.asm" INCLUDE "maps/SepiaSchool.asm"
INCLUDE "maps/WhiteCity.asm" INCLUDE "maps/WhiteCity.asm"
INCLUDE "maps/Route66WhiteCityGate.asm"
SECTION "Map Scripts 30", ROMX ; spillover SECTION "Map Scripts 30", ROMX ; spillover

BIN
data/tilesets/nihongate_attributes.bin
View file

Binary file not shown.

3
data/tilesets/nihongate_collision.asm
View file

@ -12,3 +12,6 @@
tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0b tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0b
tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 0c tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 0c
tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 0d tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 0d
tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 0e
tilecoll WALL, WALL, COUNTER, FLOOR ; 0f
tilecoll WALL, WALL, FLOOR, COUNTER ; 10

BIN
data/tilesets/nihongate_metatiles.bin
View file

Binary file not shown.

2
maps/NihonGateEastWest.ablk Normal file
View file

@ -0,0 +1,2 @@
 


2
maps/Route66.asm
View file

@ -123,7 +123,7 @@ Route66_MapEvents:
db 0, 0 ; filler db 0, 0 ; filler
def_warp_events def_warp_events
warp_event 57, 9, WHITE_CITY, 1 ; Placeholder until route gate is set up warp_event 57, 9, ROUTE_66_WHITE_CITY_GATE, 1
def_coord_events def_coord_events

21
maps/Route66WhiteCityGate.asm Normal file
View file

@ -0,0 +1,21 @@
object_const_def
Route66WhiteCityGate_MapScripts:
def_scene_scripts
def_callbacks
Route66WhiteCityGate_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 0, 7, ROUTE_66, 1
warp_event 1, 7, ROUTE_66, 1
warp_event 8, 7, WHITE_CITY, 1
warp_event 9, 7, WHITE_CITY, 1
def_coord_events
def_bg_events
def_object_events

2
maps/WhiteCity.asm
View file

@ -9,7 +9,7 @@ WhiteCity_MapEvents:
db 0, 0 ; filler db 0, 0 ; filler
def_warp_events def_warp_events
warp_event 6, 27, ROUTE_66, 1 warp_event 6, 27, ROUTE_66_WHITE_CITY_GATE, 3
def_coord_events def_coord_events