thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-20 22:28:41 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

progress is progress

Browse source 
Bug fixes and new sprites mostly, just trying to do what I can, when I can.
This commit is contained in:
Martha Schilling 2023-11-28 12:33:01 +00:00
parent 6504863b28
commit f6b1c94c0c
28 changed files with 70 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,2 +1,2 @@
map_header CitrineFerryDock, CITRINE_FERRY_DOCK, SHIP_PORT, 0
map_header CitrineFerryDock, CITRINE_FERRY_DOCK, SEAGALLOPPORT, 0
end_map_header

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

@ -0,0 +1,2 @@
map_header FarawayFerryDock, FARAWAY_FERRY_DOCK, SEAGALLOPPORT, 0
end_map_header

4
data/maps/hide_show_data.asm
View file

@ -115,7 +115,7 @@ MapHSPointers:
dw NoHS
dw NoHS
dw VictoryRoad1FHS
dw NoHS
dw BrunswickGrottoHS
dw NoHS
dw NoHS
dw NoHS
@ -150,7 +150,7 @@ MapHSPointers:
dw NoHS
dw NoHS
dw PokemonTower2FHS
dw BrunswickGrottoHS
dw NoHS
dw NoHS
dw PokemonTower5FHS
dw PokemonTower6FHS

6
data/maps/map_header_banks.asm
View file

@ -113,7 +113,7 @@ MapHeaderBanks::
db BANK(SilphGauntlet2F_h)
db BANK(SilphGauntlet3F_h)
db BANK(VictoryRoad1F_h)
db BANK(SilphGauntlet4F_h)
db BANK(BrunswickGrotto_h)
db BANK(SilphGauntlet5F_h)
db BANK(SilphGauntlet6F_h)
db BANK(SilphGauntlet7F_h)
@ -148,7 +148,7 @@ MapHeaderBanks::
db BANK(LavenderPokecenter_h)
db BANK(PokemonTower1F_h)
db BANK(PokemonTower2F_h)
db BANK(BrunswickGrotto_h)
db BANK(SilphGauntlet4F_h)
db BANK(CelesteHillGate_h) ; was pokemon tower 4f
db BANK(PokemonTower5F_h)
db BANK(PokemonTower6F_h)
@ -238,7 +238,7 @@ MapHeaderBanks::
db BANK(SilphCo9F_h)
db BANK(SilphCo10F_h)
db BANK(SilphCo11F_h)
db BANK(SilphCoElevator_h)
db BANK(FarawayFerryDock_h)
db BANK(GarnetCavern2F_h) ; was UNUSED_MAP_ED
db BANK(UnderwaterTunnel_h) ; UNUSED_MAP_EE
db BANK(TradeCenter_h)

6
data/maps/map_header_pointers.asm
View file

@ -113,7 +113,7 @@ MapHeaderPointers::
dw SilphGauntlet2F_h
dw SilphGauntlet3F_h
dw VictoryRoad1F_h
dw SilphGauntlet4F_h
dw BrunswickGrotto_h
dw SilphGauntlet5F_h
dw SilphGauntlet6F_h
dw SilphGauntlet7F_h
@ -148,7 +148,7 @@ MapHeaderPointers::
dw LavenderPokecenter_h
dw PokemonTower1F_h
dw PokemonTower2F_h
dw BrunswickGrotto_h
dw SilphGauntlet4F_h
dw CelesteHillGate_h ; was pokemon tower 4f
dw PokemonTower5F_h
dw PokemonTower6F_h
@ -238,7 +238,7 @@ MapHeaderPointers::
dw SilphCo9F_h
dw SilphCo10F_h
dw SilphCo11F_h
dw SilphCoElevator_h
dw FarawayFerryDock_h
dw GarnetCavern2F_h ; UNUSED_MAP_ED, used silph 2f
dw UnderwaterTunnel_h ; UNUSED_MAP_EE
dw TradeCenter_h

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

@ -1,9 +1,9 @@
CitrineFerryDock_Object:
db $f ; border block
db $15 ; border block
def_warp_events
warp_event 14, 0, CITRINE_CITY, 7
warp_event 14, 2, SEAGALLOP_FERRY, 1
warp_event 14, 5, SEAGALLOP_FERRY, 1
def_bg_events

12
data/maps/objects/FarawayFerryDock.asm Normal file
View file

@ -0,0 +1,12 @@
FarawayFerryDock_Object:
db $15 ; border block
def_warp_events
warp_event 14, 0, FARAWAY_ISLAND_OUTSIDE, 1
warp_event 14, 5, SEAGALLOP_FERRY, 1
def_bg_events
def_object_events
def_warps_to FARAWAY_FERRY_DOCK

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

@ -2,8 +2,8 @@ FarawayIslandOutside_Object:
db $2d ; border block
def_warp_events
warp_event 6, 35, SEAGALLOP_FERRY, 1
warp_event 7, 35, SEAGALLOP_FERRY, 1
warp_event 6, 35, FARAWAY_FERRY_DOCK, 1
warp_event 7, 35, FARAWAY_FERRY_DOCK, 1
warp_event 18, 8, FARAWAY_ISLAND_INSIDE, 1
warp_event 19, 8, FARAWAY_ISLAND_INSIDE, 2

2
data/maps/objects/VermilionFerryDock.asm
View file

@ -1,5 +1,5 @@
VermilionFerryDock_Object:
db $13 ; border block
db $15 ; border block
def_warp_events
warp_event 14, 0, LAST_MAP, 9

6
data/maps/songs.asm
View file

@ -112,7 +112,7 @@ MapSongBanks::
db MUSIC_DUNGEON3, 0 ; SILPH_GAUNTLET_2F
db MUSIC_SS_ANNE, 0 ; SILPH_GAUNTLET_3F
db MUSIC_DUNGEON3, 0 ; VICTORY_ROAD_1F
db MUSIC_POKEMON_TOWER, 0 ; SILPH_GAUNTLET_4F
db MUSIC_KINCHOU01, 0 ; BRUNSWICK_GROTTO
db MUSIC_SAFARI_ZONE, 0 ; SILPH_GAUNTLET_5F
db MUSIC_SILPH_CO, 0 ; SILPH_GAUNTLET_6F
db MUSIC_SILPH_CO, 0 ; SILPH_GAUNTLET_7F
@ -147,7 +147,7 @@ MapSongBanks::
db MUSIC_POKECENTER, 0 ; LAVENDER_POKECENTER
db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_1F
db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_2F
db MUSIC_KINCHOU01, 0 ; BRUNSWICK_GROTTO
db MUSIC_POKEMON_TOWER, 0 ; BRUNSWICK_GROTTO
db MUSIC_FIELD06, 0 ; CELESTE_HILL_GATE
db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_5F
db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_6F
@ -237,7 +237,7 @@ MapSongBanks::
db MUSIC_SILPH_CO, 0 ; SILPH_CO_9F
db MUSIC_SILPH_CO, 0 ; SILPH_CO_10F
db MUSIC_SILPH_CO, 0 ; SILPH_CO_11F
db MUSIC_SILPH_CO, 0 ; SILPH_CO_ELEVATOR
db MUSIC_DUNGEON2, 0 ; FARAWAY_FERRY_DOCK
db MUSIC_DUNGEON1, 0 ; GARNET_CAVERN_2F
db MUSIC_DUNGEON2, 0 ; UNDERWATER_TUNNEL
db MUSIC_CITRINE, 0 ; TRADE_CENTER

7
data/maps/town_map_entries.asm
View file

@ -83,6 +83,7 @@ InternalMapEntries:
internal_map SS_ANNE_B1F_ROOMS, 9, 10, SSAnneName
internal_map SILPH_GAUNTLET_3F, 10, 5, SilphCoName
internal_map VICTORY_ROAD_1F, 0, 4, VictoryRoadName
internal_map BRUNSWICK_GROTTO, 6, 10, BrunswickGladeName
internal_map SILPH_GAUNTLET_7F, 10, 5, SilphCoName
internal_map LANCES_ROOM, 0, 2, PokemonLeagueName
internal_map FARAWAY_ISLAND_INSIDE, 15, 15, FarawayIslandName
@ -95,7 +96,8 @@ InternalMapEntries:
internal_map CELADON_HOTEL, 7, 5, CeladonCityName
internal_map LAVENDER_POKECENTER, 14, 5, LavenderTownName
internal_map POKEMON_TOWER_2F, 15, 5, PokemonTowerName
internal_map BRUNSWICK_GROTTO, 6, 10, BrunswickGladeName
internal_map SILPH_GAUNTLET_4F, 10, 5, SilphCoName
internal_map CELESTE_HILL_GATE, 7, 9, CelesteHillName
internal_map POKEMON_TOWER_7F, 15, 5, PokemonTowerName
internal_map LAVENDER_CUBONE_HOUSE, 14, 5, LavenderTownName
internal_map WARDENS_HOUSE, 8, 13, FuchsiaCityName
@ -133,7 +135,8 @@ InternalMapEntries:
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 SILPH_CO_ELEVATOR, 10, 5, SilphCoName
internal_map SILPH_CO_11F, 10, 5, SilphCoName
internal_map FARAWAY_FERRY_DOCK, 15, 15, FarawayIslandName
internal_map GARNET_CAVERN_2F, 6, 10, GarnetCavernName
internal_map UNDERWATER_TUNNEL, 14, 1, UnderwaterTunnelName
internal_map CELADON_UNIVERSITY_POKECENTER, 7, 4, CeladonUniversityName

4
data/wild/grass_water.asm
View file

@ -112,7 +112,7 @@ WildDataPointers:
dw Gauntlet2FWildMons
dw Gauntlet3FWildMons
dw VictoryRoad1FWildMons
dw Gauntlet4FWildMons
dw BrunswickGrottoWildMons
dw Gauntlet5FWildMons
dw Gauntlet6FWildMons
dw NothingWildMons
@ -147,7 +147,7 @@ WildDataPointers:
dw NothingWildMons
dw PokemonTower1FWildMons
dw PokemonTower2FWildMons
dw BrunswickGrottoWildMons
dw Gauntlet4FWildMons
dw NothingWildMons
dw PokemonTower5FWildMons
dw PokemonTower6FWildMons