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

Merge branch 'master' of https://github.com/PlagueVonKarma/kep-hack

Browse source
This commit is contained in:
Llinos Evans 2023-04-24 14:27:20 +01:00
commit 59a9bdb62e
13 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
data/maps/headers/BrunswickTrail.asm
View file

@ -1,2 +1,3 @@
map_header BrunswickTrail, BRUNSWICK_TRAIL, CITRINE, 0
map_header BrunswickTrail, BRUNSWICK_TRAIL, CITRINE, NORTH
connection north, CitrineCity, CITRINE_CITY, 18
end_map_header

3
data/maps/headers/CitrineCity.asm
View file

@ -1,2 +1,3 @@
map_header CitrineCity, CITRINE_CITY, CITRINE, 0
map_header CitrineCity, CITRINE_CITY, CITRINE, SOUTH
connection south, BrunswickTrail, BRUNSWICK_TRAIL, -18
end_map_header

1
data/maps/names.asm
View file

@ -56,4 +56,5 @@ CeruleanCaveName: db "CERULEAN CAVE@"
PowerPlantName: db "POWER PLANT@"
FarawayIslandName: db "FARAWAY ISLAND@"
UnderwaterTunnelName: db "UNDERWATER TUNNEL@"
BrunswickTrailName: db "BRUNSWICK TRAIL@"
CelesteHillName: db "CELESTE HILL@"

4
data/maps/objects/BrunswickTrail.asm
View file

@ -1,8 +1,8 @@
BrunswickTrail_Object:
db $0 ; border block
db $43 ; border block
def_warp_events
warp_event 24, 7, 0, REDS_HOUSE_2F
warp_event 24, 11, CELESTE_HILL, 1
def_bg_events

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

@ -2,7 +2,6 @@ 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

1
data/maps/town_map_entries.asm
View file

@ -98,6 +98,7 @@ InternalMapEntries:
internal_map FUCHSIA_GOOD_ROD_HOUSE, 8, 13, FuchsiaCityName
internal_map POKEMON_MANSION_1F, 2, 15, PokemonMansionName
internal_map CINNABAR_MART, 2, 15, CinnabarIslandName
internal_map BRUNSWICK_TRAIL, 7, 10, BrunswickTrailName
internal_map INDIGO_PLATEAU_LOBBY, 0, 2, IndigoPlateauName
internal_map MR_PSYCHICS_HOUSE, 10, 5, SaffronCityName
internal_map ROUTE_15_GATE_2F, 9, 13, Route15Name

1
data/maps/town_map_order.asm
View file

@ -50,6 +50,7 @@ TownMapOrder:
db VICTORY_ROAD_3F
db INDIGO_PLATEAU
db CITRINE_CITY
db BRUNSWICK_TRAIL
db CELESTE_HILL
db FARAWAY_ISLAND_OUTSIDE
TownMapOrderEnd: