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 pull request #1 from LadyMisticus/master

Browse source 
Maps & ASM Batches 1+2!
This commit is contained in:
ZetaNull 2023-10-20 17:00:42 -04:00 • committed by GitHub
commit db9bde9c89
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
61 changed files with 2195 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
data/maps/attributes.asm
View file

@ -695,4 +695,14 @@ ENDM
map_attributes Route30BerryHouse, ROUTE_30_BERRY_HOUSE, $00, 0
map_attributes MrPokemonsHouse, MR_POKEMONS_HOUSE, $00, 0
map_attributes Route31VioletGate, ROUTE_31_VIOLET_GATE, $00, 0
map_attributes BellchimeTrail, BELLCHIME_TRAIL, $5, 0
map_attributes PewterMuseumOfScience1F, PEWTER_MUSEUM_OF_SCIENCE_1F, $0, 0
map_attributes PewterMuseumOfScience2F, PEWTER_MUSEUM_OF_SCIENCE_2F, $0, 0
map_attributes ViridianForest, VIRIDIAN_FOREST, $45, 0
map_attributes ViridianForestViridianGate, VIRIDIAN_FOREST_VIRIDIAN_GATE, $0, 0
map_attributes ViridianForestPewterGate, VIRIDIAN_FOREST_PEWTER_GATE, $0, 0
map_attributes Route1ViridianGate, ROUTE_1_VIRIDIAN_GATE, $0, 0
map_attributes CeruleanCave1F, CERULEAN_CAVE_1F, $9, 0
map_attributes CeruleanCave2F, CERULEAN_CAVE_2F, $9, 0
map_attributes CeruleanCaveB1F, CERULEAN_CAVE_B1F, $9, 0
map_attributes SilentHills, SILENT_HILLS, $00, 0 ; this is on its own for now. add connections to mt. silver later.

23
data/maps/blocks.asm
View file

@ -212,6 +212,8 @@ Route40BattleTowerGate_Blocks:
Route2Gate_Blocks:
Route29Route46Gate_Blocks:
Route5SaffronGate_Blocks:
ViridianForestViridianGate_Blocks:
ViridianForestPewterGate_Blocks:
INCBIN "maps/NorthSouthGate.ablk"
BetaEcruteakCity_Blocks: ; unreferenced
@ -1046,5 +1048,26 @@ BetaBlank_Blocks: ; unreferenced
GoldenrodDeptStoreRoof_Blocks:
INCBIN "maps/GoldenrodDeptStoreRoof.ablk"
BellchimeTrail_Blocks
INCBIN "maps/BellchimeTrail.ablk"
ViridianForest_Blocks:
INCBIN "maps/ViridianForest.ablk"
PewterCityMuseumOfScience1F_Blocks:
INCBIN "maps/PewterCityMuseumOfScience1F.ablk"
PewterCityMuseumOfScience2F_Blocks:
INCBIN "maps/PewterCityMuseumOfScience2F.ablk"
CeruleanCave1F_Blocks:
INCBIN "maps/CeruleanCave1F.ablk"
CeruleanCave2F_Blocks:
INCBIN "maps/CeruleanCave2F.ablk"
CeruleanCaveB1F_Blocks:
INCBIN "maps/CeruleanCaveB1F.ablk"
SilentHills_Blocks:
INCBIN "maps/SilentHills.ablk"

7
data/maps/landmarks.asm
View file

@ -30,6 +30,7 @@ Landmarks:
landmark 64, 60, Route36Name
landmark 68, 52, Route37Name
landmark 68, 44, EcruteakCityName
landmark 77, 58, BellchimeTrailName
landmark 70, 42, TinTowerName
landmark 66, 42, BurnedTowerName
landmark 52, 44, Route38Name
@ -59,11 +60,13 @@ Landmarks:
landmark 52, 92, Route1Name
landmark 52, 76, ViridianCityName
landmark 52, 64, Route2Name
landmark 60, 76, ViridianForestName
landmark 52, 52, PewterCityName
landmark 64, 52, Route3Name
landmark 76, 52, MtMoonName
landmark 88, 52, Route4Name
landmark 100, 52, CeruleanCityName
landmark 108, 52, CeruleanCaveName
landmark 100, 44, Route24Name
landmark 108, 36, Route25Name
landmark 100, 60, Route5Name
@ -127,6 +130,7 @@ SlowpokeWellName: db "SLOWPOKE¯WELL@"
RadioTowerName: db "RADIO TOWER@"
PowerPlantName: db "POWER PLANT@"
NationalParkName: db "NATIONAL¯PARK@"
BellchimeTrailName: db "BELLCHIME¯TRAIL@"
TinTowerName: db "TIN TOWER@"
LighthouseName: db "LIGHTHOUSE@"
WhirlIslandsName: db "WHIRL¯ISLANDS@"
@ -146,6 +150,7 @@ FuchsiaCityName: db "FUCHSIA¯CITY@"
CinnabarIslandName: db "CINNABAR¯ISLAND@"
IndigoPlateauName: db "INDIGO¯PLATEAU@"
VictoryRoadName: db "VICTORY¯ROAD@"
ViridianForestName: db "VIRIDIAN¯FOREST@"
MtMoonName: db "MT.MOON@"
RockTunnelName: db "ROCK TUNNEL@"
LavRadioTowerName: db "LAV¯RADIO TOWER@"
@ -153,7 +158,7 @@ SilphCoName: db "SILPH CO.@" ; unreferenced
SafariZoneName: db "SAFARI ZONE@" ; unreferenced
SeafoamIslandsName: db "SEAFOAM¯ISLANDS@"
PokemonMansionName: db "#MON¯MANSION@" ; unreferenced
CeruleanCaveName: db "CERULEAN¯CAVE@" ; unreferenced
CeruleanCaveName: db "CERULEAN¯CAVE@"
Route1Name: db "ROUTE 1@"
Route2Name: db "ROUTE 2@"
Route3Name: db "ROUTE 3@"

9
data/maps/maps.asm
View file

@ -181,6 +181,7 @@ MapGroup_Ecruteak:
map EcruteakGym, TILESET_TOWER, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map EcruteakItemfinderHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map EcruteakCity, TILESET_JOHTO, TOWN, LANDMARK_ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND
map BellchimeTrail, TILESET_JOHTO, TOWN, LANDMARK_BELLCHIME_TRAIL, MUSIC_ECRUTEAK_CITY, PALETTE_AUTO, FISHGROUP_SHORE
assert_table_length NUM_ECRUTEAK_MAPS
MapGroup_Blackthorn:
@ -228,6 +229,9 @@ MapGroup_Cerulean:
map Route24, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_24, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
map Route25, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_25, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
map CeruleanCity, TILESET_KANTO, TOWN, LANDMARK_CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_NONE
map CeruleanCave1F, TILESET_CAVE, CAVE, LANDMARK_CERULEAN_CAVE, MUSIC_RBY_CERULEAN_CAVE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map CeruleanCave2F, TILESET_CAVE, CAVE, LANDMARK_CERULEAN_CAVE, MUSIC_RBY_CERULEAN_CAVE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map CeruleanCaveB1F, TILESET_CAVE, CAVE, LANDMARK_CERULEAN_CAVE, MUSIC_RBY_CERULEAN_CAVE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
assert_table_length NUM_CERULEAN_MAPS
MapGroup_Azalea:
@ -337,6 +341,8 @@ MapGroup_Pewter:
map PewterPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_PEWTER_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map PewterPokecenter2FBeta, TILESET_POKECENTER, INDOOR, LANDMARK_PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map PewterSnoozeSpeechHouse, TILESET_HOUSE, INDOOR, LANDMARK_PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map PewterMuseumOfScience1F, TILESET_MUSEUM, INDOOR, LANDMARK_PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map PewterMuseumOfScience2F, TILESET_MUSEUM, INDOOR, LANDMARK_PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
assert_table_length NUM_PEWTER_MAPS
MapGroup_FastShip:
@ -485,6 +491,9 @@ MapGroup_Viridian:
map Route2NuggetHouse, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_2, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map Route2Gate, TILESET_GATE, GATE, LANDMARK_ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map VictoryRoadGate, TILESET_GATE, GATE, LANDMARK_ROUTE_26, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map ViridianForest, TILESET_FOREST, CAVE, LANDMARK_VIRIDIAN_FOREST, MUSIC_RBY_VIRIDIAN_FOREST, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map ViridianForestViridianGate, TILESET_GATE, GATE, LANDMARK_ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map ViridianForestPewterGate, TILESET_GATE, GATE, LANDMARK_ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE
assert_table_length NUM_VIRIDIAN_MAPS
MapGroup_NewBark:

9
data/maps/scripts.asm
View file

@ -484,4 +484,13 @@ SECTION "Map Scripts 25", ROMX
INCLUDE "maps/SilverCaveOutside.asm"
INCLUDE "maps/Route10North.asm"
INCLUDE "maps/BellchimeTrail.asm"
INCLUDE "maps/ViridianForest.asm"
INCLUDE "maps/ViridianForestViridianGate.asm"
INCLUDE "maps/ViridianForestPewterGate.asm"
INCLUDE "maps/PewterMuseumOfScience1F.asm"
INCLUDE "maps/PewterMuseumOfScience2F.asm"
INCLUDE "maps/CeruleanCave1F.asm"
INCLUDE "maps/CeruleanCave2F.asm"
INCLUDE "maps/CeruleanCaveB1F.asm"
INCLUDE "maps/SilentHills.asm"