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

A few updates

Browse source 
- Changes Bill's Garden to be a more fitting Overworld-tileset map

- Gives Cinnabar Volcano a unique palette, being a slightly less-bright version of the RedMon palette

- A few small changes/improvements to the Rival teams

- Reduced wild encounter levels in Silph Gauntlet a little

- Adds a 100% chance for a Magmar encounter when fishing in the Cinnabar Volcano lava

- Hides more 'secret' areas off the Pokedex area listing, namely Mt. Moon Crater and Faraway Island

- Improves Jabetta's sprite a little
This commit is contained in:
MementoMartha 2023-05-19 16:17:44 +01:00
parent 9a88543f19
commit b70e7b5fb5
29 changed files with 200 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/maps/headers/BillsGarden.asm
View file

@ -1,2 +1,2 @@
map_header BillsGarden, BILLS_GARDEN, FOREST, 0
map_header BillsGarden, BILLS_GARDEN, OVERWORLD, 0
end_map_header

2
data/maps/hide_show_data.asm
View file

@ -44,6 +44,7 @@ MapHSPointers:
dw BrunswickTrailHS
dw NoHS
dw NoHS
dw NoHS
dw BluesHouseHS
dw OaksLabHS
dw NoHS
@ -251,7 +252,6 @@ MapHSPointers:
dw NoHS
dw NoHS
dw NoHS
dw NoHS
dw GiovannisRoomHS
dw NoHS ; Battle Tent
dw NoHS ; Mt Moon Square

2
data/maps/map_header_banks.asm
View file

@ -40,6 +40,7 @@ MapHeaderBanks::
db BANK(Route24_h)
db BANK(Route25_h)
db BANK(BrunswickTrail_h) ; was cinnabar mart copy
db BANK(BillsGarden_h) ; UNUSED_MAP_F3, $11
db BANK(RedsHouse1F_h)
db BANK(RedsHouse2F_h)
db BANK(BluesHouse_h)
@ -245,7 +246,6 @@ MapHeaderBanks::
db BANK(Colosseum_h)
db BANK(CeladonUniversityInside_h) ; $11 UNUSED_MAP_F1
db BANK(CeladonUniversityPokecenter_h) ; UNUSED_MAP_F2
db BANK(BillsGarden_h) ; UNUSED_MAP_F3, $11
db BANK(LoreleisRoom_h)
db BANK(BrunosRoom_h)
db BANK(AgathasRoom_h)

2
data/maps/map_header_pointers.asm
View file

@ -40,6 +40,7 @@ MapHeaderPointers::
dw Route24_h
dw Route25_h
dw BrunswickTrail_h ; CINNABAR_MART_COPY
dw BillsGarden_h ; UNUSED_MAP_F3, used to use SilphCo2F_h
dw RedsHouse1F_h
dw RedsHouse2F_h
dw BluesHouse_h
@ -245,7 +246,6 @@ MapHeaderPointers::
dw Colosseum_h
dw CeladonUniversityInside_h ; UNUSED_MAP_F1
dw CeladonUniversityPokecenter_h ; UNUSED_MAP_F2
dw BillsGarden_h ; UNUSED_MAP_F3, used to use SilphCo2F_h
dw LoreleisRoom_h
dw BrunosRoom_h
dw AgathasRoom_h

6
data/maps/objects/BillsGarden.asm
View file

@ -1,9 +1,9 @@
BillsGarden_Object:
db $0 ; border block
db $2c ; border block
def_warp_events
warp_event 8, 19, BILLS_HOUSE, 1
warp_event 9, 19, BILLS_HOUSE, 1
warp_event 11, 17, BILLS_HOUSE, 3
warp_event 12, 17, BILLS_HOUSE, 3
def_bg_events

6
data/maps/objects/CinnabarVolcanoFloors.asm
View file

@ -8,9 +8,9 @@ CinnabarVolcanoFloors_Object:
warp_event 25, 3, CINNABAR_VOLCANO_FLOORS, 3
warp_event 27, 12, CINNABAR_VOLCANO_FLOORS, 6
warp_event 5, 13, CINNABAR_VOLCANO_FLOORS, 5
warp_event 3, 3, CINNABAR_VOLCANO_FLOORS, 8
warp_event 3, 25, CINNABAR_VOLCANO_FLOORS, 7
warp_event 15, 25, CINNABAR_VOLCANO, 1
warp_event 5, 3, CINNABAR_VOLCANO_FLOORS, 8
warp_event 5, 25, CINNABAR_VOLCANO_FLOORS, 7
warp_event 13, 25, CINNABAR_VOLCANO, 1
def_bg_events

2
data/maps/songs.asm
View file

@ -39,6 +39,7 @@ MapSongBanks::
db MUSIC_ROUTES2, 0 ; ROUTE_24
db MUSIC_ROUTES2, 0 ; ROUTE_25
db MUSIC_FIELD06, 0 ; BRUNSWICK_TRAIL, was CINNABAR_MART_COPY
db MUSIC_ROUTES2, 0 ; UNUSED_MAP_F3 / Bill's Garden
db MUSIC_PALLET_TOWN, 0 ; REDS_HOUSE_1F
db MUSIC_PALLET_TOWN, 0 ; REDS_HOUSE_2F
db MUSIC_PALLET_TOWN, 0 ; BLUES_HOUSE
@ -244,7 +245,6 @@ MapSongBanks::
db MUSIC_CELADON, 0 ; COLOSSEUM
db MUSIC_OAKS_LAB, 0 ; UNUSED_MAP_F1 / Celadon University Outside
db MUSIC_POKECENTER, 0 ; UNUSED_MAP_F2 / Celadon University Pokecenter
db MUSIC_ROUTES2, 0 ; UNUSED_MAP_F3 / Bill's Garden
db MUSIC_GYM, 0 ; LORELEIS_ROOM
db MUSIC_DUNGEON1, 0 ; BRUNOS_ROOM
db MUSIC_POKEMON_TOWER, 0 ; AGATHAS_ROOM

1
data/maps/sprite_sets.asm
View file

@ -41,6 +41,7 @@ MapSpriteSets:
db SPRITESET_PEWTER_CERULEAN ; ROUTE_24
db SPRITESET_PEWTER_CERULEAN ; ROUTE_25
db SPRITESET_CITRINE ; BRUNSWICK_TRAIL
db SPRITESET_PEWTER_CERULEAN ; BILLS_GARDEN
assert_table_length FIRST_INDOOR_MAP
; Format:

22
data/maps/town_map_entries.asm
View file

@ -46,6 +46,7 @@ ExternalMapEntries:
external_map 10, 1, Route24Name
external_map 11, 0, Route25Name
external_map 7, 10, BrunswickTrailName
external_map 12, 0, SeaCottageName
assert_table_length FIRST_INDOOR_MAP
@ -66,10 +67,10 @@ InternalMapEntries:
internal_map MT_MOON_B2F, 6, 2, MountMoonName
internal_map CERULEAN_MART, 10, 2, CeruleanCityName
internal_map MT_MOON_POKECENTER, 5, 2, Route4Name
internal_map VIRIDIAN_PRE_GYM, 10, 2, ViridianCityName
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_6, 10, 8, Route6Name
internal_map CELESTE_HILL, 6, 10, CelesteHillName
internal_map UNDERGROUND_PATH_ROUTE_8, 11, 5, Route8Name
internal_map ROCK_TUNNEL_1F, 14, 3, RockTunnelName
internal_map POWER_PLANT, 15, 4, PowerPlantName
@ -81,9 +82,10 @@ InternalMapEntries:
internal_map SILPH_GAUNTLET_3F, 10, 5, SilphCoName
internal_map VICTORY_ROAD_1F, 0, 4, VictoryRoadName
internal_map SILPH_GAUNTLET_7F, 10, 5, SilphCoName
internal_map LANCES_ROOM, 0, 2, PokemonLeagueName
internal_map FARAWAY_ISLAND_INSIDE, 15, 15, FarawayIslandName
internal_map POKEMON_MANSION_B2F, 2, 15, PokemonMansionName
internal_map LANCES_ROOM, 0, 2, PokemonLeagueName
internal_map FARAWAY_ISLAND_INSIDE, 15, 15, FarawayIslandName
internal_map POKEMON_MANSION_B2F, 2, 15, PokemonMansionName
internal_map MT_MOON_CRATER, 6, 1, MountMoonName
internal_map HALL_OF_FAME, 0, 2, PokemonLeagueName
internal_map UNDERGROUND_PATH_NORTH_SOUTH, 10, 5, UndergroundPathName
internal_map CHAMPIONS_ROOM, 0, 2, PokemonLeagueName
@ -97,7 +99,7 @@ InternalMapEntries:
internal_map FUCHSIA_MEETING_ROOM, 8, 13, FuchsiaCityName
internal_map SEAFOAM_ISLANDS_B4F, 5, 15, SeafoamIslandsName
internal_map POKEMON_MANSION_1F, 2, 15, PokemonMansionName
internal_map CINNABAR_MART, 2, 15, CinnabarIslandName
internal_map CINNABAR_MART, 2, 15, CinnabarIslandName
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
@ -118,13 +120,13 @@ InternalMapEntries:
internal_map CERULEAN_CAVE_1F, 9, 1, CeruleanCaveName
internal_map NAME_RATERS_HOUSE, 14, 5, LavenderTownName
internal_map CERULEAN_BADGE_HOUSE, 10, 2, CeruleanCityName
internal_map CINNABAR_VOLCANO_FLOORS, 3, 14, CinnabarVolcanoName
internal_map CINNABAR_VOLCANO_FLOORS, 3, 14, CinnabarVolcanoName
internal_map SILPH_CO_ELEVATOR, 10, 5, SilphCoName
internal_map UNDERWATER_TUNNEL, 14, 1, UnderwaterTunnelName
internal_map CELADON_UNIVERSITY_POKECENTER, 7, 4, CeladonUniversityName
internal_map BILLS_GARDEN, 12, 0, SeaCottageName
internal_map AGATHAS_ROOM, 0, 2, PokemonLeagueName
internal_map ROCK_TUNNEL_B1F, 14, 3, RockTunnelName
internal_map GIOVANNIS_ROOM, 2, 8, ViridianCityName
internal_map BATTLE_TENT, 7, 9, CitrineCityName
internal_map BATTLE_TENT, 7, 9, CitrineCityName
internal_map MT_MOON_SQUARE_HOUSE, 6, 1, MountMoonName
db -1 ; end