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

Citrine time!

Browse source 
Added map data for Citrine City, including wild spawns, as well as a fly location. Also fixed an issue where Bill's Garden couldn't spawn wild Pokemon. Citrine is also green for some reason.
This commit is contained in:
MementoMartha 2023-04-11 12:52:53 +01:00
parent 3c9e343f99
commit 0cd8cafc58
22 changed files with 136 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/maps/headers/CitrineCity.asm Normal file
View file

@ -0,0 +1,2 @@
map_header CitrineCity, CITRINE_CITY, OVERWORLD, 0
end_map_header

2
data/maps/map_header_banks.asm
View file

@ -12,7 +12,7 @@ MapHeaderBanks::
db BANK(CinnabarIsland_h)
db BANK(IndigoPlateau_h)
db BANK(SaffronCity_h)
db $01 ; TODO BANK(CitrineCity_h)
db BANK(CitrineCity_h)
db BANK(CeladonUniversityOutside_h)
db BANK(Route1_h)
db BANK(Route2_h)

2
data/maps/map_header_pointers.asm
View file

@ -12,7 +12,7 @@ MapHeaderPointers::
dw CinnabarIsland_h
dw IndigoPlateau_h
dw SaffronCity_h
dw SaffronCity_h ; TODO CitrineCity_h
dw CitrineCity_h
dw CeladonUniversityOutside_h
dw Route1_h
dw Route2_h

10
data/maps/objects/CitrineCity.asm Normal file
View file

@ -0,0 +1,10 @@
CitrineCity_Object:
db $43 ; border block
def_warp_events
def_bg_events
def_object_events
def_warps_to CITRINE_CITY

4
data/maps/special_warps.asm
View file

@ -73,6 +73,8 @@ FlyWarpDataPtr:
fly_warp_spec CINNABAR_ISLAND, .CinnabarIsland
fly_warp_spec INDIGO_PLATEAU, .IndigoPlateau
fly_warp_spec SAFFRON_CITY, .SaffronCity
fly_warp_spec CITRINE_CITY, .CitrineCity
fly_warp_spec CELADON_UNIVERSITY_OUTSIDE, .CeladonUniversityOutside
fly_warp_spec ROUTE_4, .Route4
fly_warp_spec ROUTE_10, .Route10
@ -87,5 +89,7 @@ FlyWarpDataPtr:
.CinnabarIsland: fly_warp CINNABAR_ISLAND, 15, 18
.IndigoPlateau: fly_warp INDIGO_PLATEAU, 9, 6
.SaffronCity: fly_warp SAFFRON_CITY, 9, 30
.CitrineCity: fly_warp CITRINE_CITY, 15, 18
.CeladonUniversityOutside: fly_warp CELADON_UNIVERSITY_OUTSIDE, 15, 26
.Route4: fly_warp ROUTE_4, 11, 6
.Route10: fly_warp ROUTE_10, 11, 20

2
data/maps/town_map_entries.asm
View file

@ -18,7 +18,7 @@ ExternalMapEntries:
external_map 2, 15, CinnabarIslandName
external_map 0, 2, IndigoPlateauName
external_map 10, 5, SaffronCityName
external_map 7, 10, CitrineCityName
external_map 7, 9, CitrineCityName
external_map 7, 4, CeladonUniversityName
external_map 2, 10, Route1Name
external_map 2, 6, Route2Name

1
data/maps/town_map_order.asm
View file

@ -49,5 +49,6 @@ TownMapOrder:
db ROUTE_23
db VICTORY_ROAD_3F
db INDIGO_PLATEAU
db CITRINE_CITY
db FARAWAY_ISLAND_OUTSIDE
TownMapOrderEnd: