thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2026-02-06 16:15:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/ZetaNull/jep-hack

Browse source 
# Conflicts:
#	data/tilesets/nihon_old_attributes.bin
#	data/tilesets/nihon_old_metatiles.bin
#	maps/OldCity.ablk

Just going to redo what I did after this whoops
This commit is contained in:
Zeta_Null 2024-07-23 15:17:46 -04:00
commit 930573db0f
22 changed files with 720 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

3
data/maps/attributes.asm
View file

@ -829,6 +829,9 @@ ENDM
map_attributes OldCityPokecenter1F, OLD_CITY_POKECENTER_1F, $00, 0
map_attributes OldMart, OLD_MART, $00, 0
map_attributes HoneyGrandmasHouse, HONEY_GRANDMAS_HOUSE, $00, 0
map_attributes OldCityEarlsHouse, OLD_CITY_EARLS_HOUSE, $00, 0
map_attributes OldCityFamilyHouse, OLD_CITY_FAMILY_HOUSE, $00, 0
map_attributes SepiaSchool, SEPIA_SCHOOL, $00, 0
map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.

5
data/maps/blocks.asm
View file

@ -415,6 +415,8 @@ EcruteakLugiaSpeechHouse_Blocks:
EcruteakItemfinderHouse_Blocks:
VioletNicknameSpeechHouse_Blocks:
VioletKylesHouse_Blocks:
OldCityEarlsHouse_Blocks:
OldCityFamilyHouse_Blocks:
INCBIN "maps/House2.ablk"
UnionCaveB1F_Blocks:
@ -1230,3 +1232,6 @@ OldCity_Blocks:
HoneyGrandmasHouse_Blocks:
INCBIN "maps/HoneyGrandmasHouse.ablk"
SepiaSchool_Blocks:
INCBIN "maps/SepiaSchool.ablk"

3
data/maps/landmarks.asm
View file

@ -249,5 +249,6 @@ UnknownName: db "?????@"
Route66Name: db "ROUTE 66@"
Route49Name: db "ROUTE 49@"
QuietCaveName: db "QUIET¯CAVE@"
OldCityName: db "OLD CITY@" ; I've considered the name "Archaic City", whereas "High Tech" will be "Vogue City". Thoughts? Archaic is considered a little snarly in modern day, so I haven't put it in yet.
OldCityName: db "SEPIA¯CITY@"
; High Tech will be called "Vogue City"
BlueForestName: db "BLUE¯FOREST@"

3
data/maps/maps.asm
View file

@ -699,6 +699,9 @@ MapGroup_OldCity:
map OldCityPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_OLD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_NONE
map OldMart, TILESET_NIHON_MART, INDOOR, LANDMARK_OLD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_NONE
map HoneyGrandmasHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
map OldCityEarlsHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
map OldCityFamilyHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
map SepiaSchool, TILESET_LAB, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
assert_table_length NUM_OLD_CITY_MAPS
MapGroup_BlueForest:

3
data/maps/scripts.asm
View file

@ -582,6 +582,9 @@ INCLUDE "maps/OldCity.asm"
INCLUDE "maps/OldCityPokecenter1F.asm"
INCLUDE "maps/OldMart.asm"
INCLUDE "maps/HoneyGrandmasHouse.asm"
INCLUDE "maps/OldCityEarlsHouse.asm"
INCLUDE "maps/OldCityFamilyHouse.asm"
INCLUDE "maps/SepiaSchool.asm"
SECTION "Map Scripts 30", ROMX ; spillover
INCLUDE "maps/TanobyRuins.asm"