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

Polishing Celeste Hill a bit

Browse source 
Also added a small house on Route 1 which we can use for testing maps
This commit is contained in:
MementoMartha 2023-04-19 10:19:20 +01:00
parent 91d47bef0e
commit 8ce4472f7d
17 changed files with 75 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/maps/names.asm
View file

@ -10,7 +10,7 @@ CinnabarIslandName: db "CINNABAR ISLAND@"
IndigoPlateauName: db "INDIGO PLATEAU@"
SaffronCityName: db "SAFFRON CITY@"
CitrineCityName: db "CITRINE CITY@"
CeladonUniversityName: db "CELADON UNIVERSITY@"
CeladonUniversityName: db "CELADON UNI.@"
Route1Name: db "ROUTE 1@"
Route2Name: db "ROUTE 2@"
Route3Name: db "ROUTE 3@"

3
data/maps/objects/CelesteHill.asm
View file

@ -2,7 +2,8 @@ CelesteHill_Object:
db $0 ; border block
def_warp_events
warp_event 4, 11, 0, REDS_HOUSE_2F
warp_event 13, 23, ROUTE_1, 1
warp_event 12, 23, ROUTE_1, 1
def_bg_events

1
data/maps/objects/Route1.asm
View file

@ -2,6 +2,7 @@ Route1_Object:
db $b ; border block
def_warp_events
warp_event 5, 3, CELESTE_HILL, 1
def_bg_events
bg_event 9, 27, 3 ; Route1Text3

2
data/maps/songs.asm
View file

@ -76,7 +76,7 @@ MapSongBanks::
db MUSIC_CITIES1, BANK(Music_Cities1) ; DAYCARE
db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_6_GATE
db MUSIC_CITIES1, BANK(Music_Cities1) ; UNDERGROUND_PATH_ROUTE_6
db MUSIC_VERMILION, BANK(Music_Vermilion) ; UNDERGROUND_PATH_ROUTE_6_COPY
db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; CELESTE_HILL, was UNDERGROUND_PATH_ROUTE_6_COPY
db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_7_GATE
db MUSIC_CITIES1, BANK(Music_Cities1) ; UNDERGROUND_PATH_ROUTE_7
db MUSIC_CELADON, BANK(Music_Celadon) ; UNDERGROUND_PATH_ROUTE_7_COPY

6
data/maps/town_map_entries.asm
View file

@ -67,6 +67,8 @@ InternalMapEntries:
internal_map MT_MOON_POKECENTER, 5, 2, Route4Name
internal_map VIRIDIAN_PRE_GYM, 10, 2, ViridianCityName
internal_map DAYCARE, 10, 4, Route5Name
internal_map UNDERGROUND_PATH_ROUTE_6, 10, 8, Route6Name
internal_map CELESTE_HILL, 6, 10, CelesteHillName
internal_map UNDERGROUND_PATH_ROUTE_7_COPY, 9, 5, Route7Name
internal_map UNDERGROUND_PATH_ROUTE_8, 11, 5, Route8Name
internal_map ROCK_TUNNEL_1F, 14, 3, RockTunnelName
@ -123,7 +125,7 @@ InternalMapEntries:
internal_map ROCK_TUNNEL_B1F, 14, 3, RockTunnelName
internal_map SILPH_CO_ELEVATOR, 10, 5, SilphCoName
internal_map UNDERWATER_TUNNEL, 14, 1, UnderwaterTunnelName
internal_map CELADON_UNIVERSITY_POKECENTER, 7, 4, CeladonCityName
internal_map CELADON_UNIVERSITY_POKECENTER, 7, 4, CeladonUniversityName
internal_map BILLS_GARDEN, 12, 0, SeaCottageName
internal_map AGATHAS_ROOM, 0, 2, PokemonLeagueName
internal_map CELESTE_HILL, 9, 9, CelesteHillName
db -1 ; end

3
data/maps/town_map_order.asm
View file

@ -27,7 +27,7 @@ TownMapOrder:
db ROUTE_8
db ROUTE_7
db CELADON_CITY
; db CELADON_UNIVERSITY_OUTSIDE ; erosunica: uncomment this line to add it to the Town Map
db CELADON_UNIVERSITY_OUTSIDE
db SAFFRON_CITY
db ROUTE_11
db ROUTE_12
@ -50,5 +50,6 @@ TownMapOrder:
db VICTORY_ROAD_3F
db INDIGO_PLATEAU
db CITRINE_CITY
db CELESTE_HILL
db FARAWAY_ISLAND_OUTSIDE
TownMapOrderEnd:

3
data/sgb/sgb_palettes.asm
View file

@ -14,6 +14,7 @@ SuperPalettes:
RGB 31,31,31, 11,08,31, 11,23,31, 03,03,03 ; PAL_INDIGO
RGB 31,31,31, 31,31,00, 11,23,31, 03,03,03 ; PAL_SAFFRON
RGB 31,31,31, 30,26,01, 11,23,31, 03,03,03 ; PAL_CITRINE
RGB 31,31,31, 05,31,05, 11,23,31, 03,03,03 ; PAL_CELADONUNI
RGB 31,31,31, 00,21,31, 10,28,00, 01,01,01 ; PAL_TOWNMAP
RGB 31,31,31, 31,31,00, 25,10,31, 19,00,23 ; PAL_LOGO1
RGB 31,31,31, 31,31,00, 07,07,25, 00,00,17 ; PAL_LOGO2
@ -39,4 +40,6 @@ SuperPalettes:
RGB 31,31,31, 03,11,06, 03,17,11, 03,03,03 ; PAL_BADGE
RGB 31,31,31, 23,08,00, 17,14,11, 03,03,03 ; PAL_CAVE
RGB 31,31,31, 31,19,00, 19,19,00, 03,03,03 ; PAL_GAMEFREAK
RGB 31,31,31, 01,30,31, 11,23,31, 03,03,03 ; PAL_CELESTE
RGB 31,31,31, 31,04,04, 06,06,26, 03,03,03 ; PAL_CITRINECAVE
assert_table_length NUM_SGB_PALS

2
data/tilesets/collision_tile_ids.asm
View file

@ -73,7 +73,7 @@ PreGym_Coll::
coll_tiles $0B, $0E, $1E, $1F
Citrine_Coll::
coll_tiles $2C, $31, $3F, $55, $0E, $2F, $23, $20, $10, $03, $1C, $1B, $0B, $0C, $21
coll_tiles $2C, $31, $3F, $55, $0E, $2F, $23, $20, $10, $03, $1C, $1B, $0B, $0C, $21, $39, $3C, $48, $49, $58, $59
Celeste_Coll::
coll_tiles $1e, $20, $2e, $30, $34, $37, $39, $3a, $40, $51, $52, $5a, $5c, $5e, $5f, $09, $08, $18, $19

5
data/wild/grass_water.asm
View file

@ -76,7 +76,7 @@ WildDataPointers:
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw CelesteHillWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
@ -332,4 +332,5 @@ INCLUDE "data/wild/maps/SilphGauntlet6F.asm"
INCLUDE "data/wild/maps/FarawayIslandInside.asm"
INCLUDE "data/wild/maps/MtMoonCrater.asm"
INCLUDE "data/wild/maps/UnderwaterTunnel.asm"
INCLUDE "data/wild/maps/BillsGarden.asm"
INCLUDE "data/wild/maps/BillsGarden.asm"
INCLUDE "data/wild/maps/CelesteHill.asm"

16
data/wild/maps/CelesteHill.asm Normal file
View file

@ -0,0 +1,16 @@
CelesteHillWildMons:
def_grass_wildmons 10 ; encounter rate
db 55, FEAROW
db 55, PIDGEOT
db 56, MADAAMU
db 56, FEAROW
db 57, SCYTHER
db 57, MADAAMU
db 70, ARTICUNO_G ; currently placeholders before static encounters are added
db 70, ZAPDOS_G
db 70, MOLTRES_G
db 70, MOLTRES_G
end_grass_wildmons
def_water_wildmons 0 ; encounter rate
end_water_wildmons