thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2026-02-07 08:35:23 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Savoy, Ruddy, and Coral houses

Browse source
This commit is contained in:
Llinos Evans 2024-12-30 16:31:54 +00:00
parent 288ca6e58f
commit e27b9c6200
25 changed files with 527 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
data/maps/attributes.asm
View file

@ -893,9 +893,15 @@ ENDM
map_attributes SavoyCity, SAVOY_CITY, $15, 0
map_attributes Route50SavoyCityGate, ROUTE_50_SAVOY_CITY_GATE, $00, 0
map_attributes SavoyCityBigHouse1, SAVOY_CITY_BIG_HOUSE_1, $00, 0
map_attributes SavoyCityBigHouse2, SAVOY_CITY_BIG_HOUSE_2, $00, 0
map_attributes SavoyCityRockedBlockedHouse, SAVOY_CITY_ROCKET_BLOCKED_HOUSE, $00, 0
map_attributes CoralCity, CORAL_CITY, $04, WEST
connection west, Route51, ROUTE_51, 0
map_attributes CoralCityOakHouse, CORAL_CITY_OAK_HOUSE, $00, 0
map_attributes CoralCityFishingGuruHouse, CORAL_CITY_FISHING_GURU_HOUSE, $00, 0
map_attributes CoralCitySailorHouse, CORAL_CITY_SAILOR_HOUSE, $00, 0
map_attributes SavoyCityPokecenter1F, SAVOY_CITY_POKECENTER_1F, $00, 0
map_attributes CoralCityPokecenter1F, CORAL_CITY_POKECENTER_1F, $00, 0

11
data/maps/blocks.asm
View file

@ -1344,3 +1344,14 @@ SunglowCity_Blocks:
AventurineCity_Blocks:
INCBIN "maps/AventurineCity.ablk"
; Nihon Big Houses. Dimensions 5 x 4.
SavoyCityBigHouse1_Blocks:
SavoyCityBigHouse2_Blocks:
CoralCityFishingGuruHouse_Blocks:
CoralCitySailorHouse_Blocks:
INCBIN "maps/NihonBigHouse.ablk"
SavoyCityRocketBlockedHouse_Blocks:
CoralCityOakHouse_Blocks:
INCBIN "maps/SavoyCityRocketBlockedHouse.ablk"

6
data/maps/maps.asm
View file

@ -738,6 +738,9 @@ MapGroup_SavoyCity:
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
map SavoyCityPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_SAVOY_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_NONE
map SavoyCityBigHouse1, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SAVOY_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
map SavoyCityBigHouse2, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SAVOY_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
map SavoyCityRocketBlockedHouse, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SAVOY_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
assert_table_length NUM_SAVOY_CITY_MAPS
MapGroup_CoralCity:
@ -745,6 +748,9 @@ MapGroup_CoralCity:
map CoralCity, TILESET_NIHON_HIGHTECH, TOWN, LANDMARK_CORAL_CITY, MUSIC_CORALCITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map CoralCityPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_CORAL_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_NONE
map CoralMart, TILESET_NIHON_MART, INDOOR, LANDMARK_CORAL_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_NONE
map CoralCityOakHouse, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_CORAL_CITY, MUSIC_CORALCITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
map CoralCityFishingGuruHouse, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_CORAL_CITY, MUSIC_CORALCITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
map CoralCitySailorHouse, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_CORAL_CITY, MUSIC_CORALCITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
map Route51, TILESET_NIHON_HIGHTECH, ROUTE, LANDMARK_ROUTE_51, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map Route52, TILESET_NIHON_HIGHTECH, ROUTE, LANDMARK_ROUTE_52, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
assert_table_length NUM_CORAL_CITY_MAPS

6
data/maps/scripts.asm
View file

@ -614,6 +614,12 @@ INCLUDE "maps/CoralCityPokecenter1F.asm"
INCLUDE "maps/RuddyTownPokecenter1F.asm"
INCLUDE "maps/CoralMart.asm"
INCLUDE "maps/RuddyMart.asm"
INCLUDE "maps/SavoyCityBigHouse1.asm"
INCLUDE "maps/SavoyCityBigHouse2.asm"
INCLUDE "maps/SavoyCityRocketBlockedHouse.asm"
INCLUDE "maps/CoralCityOakHouse.asm"
INCLUDE "maps/CoralCityFishingGuruHouse.asm"
INCLUDE "maps/CoralCitySailorHouse.asm"
SECTION "Map Scripts 31", ROMX ; spillover
INCLUDE "maps/TanobyRuins.asm"

BIN
data/tilesets/players_house_attributes.bin
View file

Binary file not shown.

2
data/tilesets/players_house_collision.asm
View file

@ -39,7 +39,7 @@
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26
tilecoll WALL, WALL, FLOOR, FLOOR ; 27
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29
tilecoll TV, FLOOR, WALL, FLOOR ; 29
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c

BIN
data/tilesets/players_house_metatiles.bin
View file

Binary file not shown.