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

Hot Savoy In Your Area (#55)

Browse source 
* Deep in the Crater

Here it is.

I'm probably taking a small break after this one, I'm sure you understand!

* Hot Savoys In Your Area

How...?

Just accept this FREE pull request

* Savoy City + small fixes

Savoy uses the Savoy music now, also fixed a mistake I made with Sepia where the theme would only play on the overworld
This commit is contained in:
Luisa Karlson 2025-01-25 13:03:38 +01:00 committed by GitHub
parent c3f9e786fe
commit 9c27542c28
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 1122 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
audio.asm
View file

@ -168,6 +168,7 @@ INCLUDE "audio/music/mart.asm"
INCLUDE "audio/music/SepiaCity.asm" INCLUDE "audio/music/SepiaCity.asm"
INCLUDE "audio/music/CoralCity.asm" INCLUDE "audio/music/CoralCity.asm"
INCLUDE "audio/music/CrystalCrater.asm" INCLUDE "audio/music/CrystalCrater.asm"
INCLUDE "audio/music/SavoyCity.asm"
SECTION "Sound Effects", ROMX SECTION "Sound Effects", ROMX

1110
audio/music/SavoyCity.asm Normal file
View file

File diff suppressed because it is too large Load diff

1
audio/music_pointers.asm
View file

@ -123,4 +123,5 @@ Music:
dba Music_CoralCity dba Music_CoralCity
dba Music_SepiaCity dba Music_SepiaCity
dba Music_CrystalCrater dba Music_CrystalCrater
dba Music_SavoyCity
assert_table_length NUM_MUSIC_SONGS assert_table_length NUM_MUSIC_SONGS

1
constants/music_constants.asm
View file

@ -121,6 +121,7 @@
const MUSIC_CORALCITY ; 74 const MUSIC_CORALCITY ; 74
const MUSIC_SEPIACITY ; 75 const MUSIC_SEPIACITY ; 75
const MUSIC_CRYSTALCRATER ; 76 const MUSIC_CRYSTALCRATER ; 76
const MUSIC_SAVOYCITY ; 77
DEF NUM_MUSIC_SONGS EQU const_value DEF NUM_MUSIC_SONGS EQU const_value
; GetMapMusic picks music for this value (see home/map.asm) ; GetMapMusic picks music for this value (see home/map.asm)

18
data/maps/maps.asm
View file

@ -718,28 +718,28 @@ MapGroup_OldCity:
map OldCity, TILESET_NIHON_OLD, TOWN, LANDMARK_OLD_CITY, MUSIC_SEPIACITY, TRUE, PALETTE_AUTO, FISHGROUP_POND map OldCity, TILESET_NIHON_OLD, TOWN, LANDMARK_OLD_CITY, MUSIC_SEPIACITY, TRUE, PALETTE_AUTO, FISHGROUP_POND
map OldCityPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_OLD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_NONE 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_MART, FALSE, PALETTE_DAY, FISHGROUP_NONE map OldMart, TILESET_NIHON_MART, INDOOR, LANDMARK_OLD_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_NONE
map HoneyGrandmasHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE map HoneyGrandmasHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_OLD_CITY, MUSIC_SEPIACITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
map OldCityEarlsHouse, 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_SEPIACITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
map OldCityFamilyHouse, 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_SEPIACITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
map SepiaSchool, TILESET_LAB, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE map SepiaSchool, TILESET_LAB, INDOOR, LANDMARK_OLD_CITY, MUSIC_SEPIACITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
map OldCityGym, TILESET_TOWER, INDOOR, LANDMARK_OLD_CITY, MUSIC_GYM, FALSE, PALETTE_DAY, FISHGROUP_NONE map OldCityGym, TILESET_TOWER, INDOOR, LANDMARK_OLD_CITY, MUSIC_GYM, FALSE, PALETTE_DAY, FISHGROUP_NONE
map OldCityMuseum, TILESET_TOWER, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE map OldCityMuseum, TILESET_TOWER, INDOOR, LANDMARK_OLD_CITY, MUSIC_SEPIACITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
map PokemonPagoda1F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE map PokemonPagoda1F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE
map PokemonPagoda2F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE map PokemonPagoda2F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE
map PokemonPagoda3F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE map PokemonPagoda3F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE
map PokemonPagoda4F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE map PokemonPagoda4F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE
map PokemonPagoda5F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE map PokemonPagoda5F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE
map Route50, TILESET_NIHON_OLD, ROUTE, LANDMARK_ROUTE_50, MUSIC_PEACEFULTHEME, TRUE, PALETTE_AUTO, FISHGROUP_NONE map Route50, TILESET_NIHON_OLD, ROUTE, LANDMARK_ROUTE_50, MUSIC_PEACEFULTHEME, TRUE, PALETTE_AUTO, FISHGROUP_NONE
map JackysHouse, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_50, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE map JackysHouse, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_50, MUSIC_SEPIACITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
assert_table_length NUM_OLD_CITY_MAPS assert_table_length NUM_OLD_CITY_MAPS
MapGroup_SavoyCity: MapGroup_SavoyCity:
table_width MAP_LENGTH, MapGroup_SavoyCity table_width MAP_LENGTH, MapGroup_SavoyCity
map SavoyCity, TILESET_NIHON_WEST, TOWN, LANDMARK_SAVOY_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map SavoyCity, TILESET_NIHON_WEST, TOWN, LANDMARK_SAVOY_CITY, MUSIC_SAVOYCITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map Route50SavoyCityGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_50, MUSIC_PEACEFULTHEME, FALSE, PALETTE_DAY, FISHGROUP_NONE 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 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 SavoyCityBigHouse1, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SAVOY_CITY, MUSIC_SAVOYCITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
map SavoyCityBigHouse2, 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_SAVOYCITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
map SavoyCityRocketBlockedHouse, 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 assert_table_length NUM_SAVOY_CITY_MAPS