thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-04-08 11:31:55 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

A few things

Browse source 
- Added a gate between the two halves of Route 10 on the right side of Rock Tunnel that contains the Graveler trade NPC.

- Improved Faraway's encounter table.

- Made the music go silent before battling both of the postgame bosses for suspense reasons. It also sounds cool.

- Minor text fixes
This commit is contained in:
Martha Schilling 2023-12-31 12:22:36 +00:00
parent 4c0dfdfedd
commit caa8076bcd
29 changed files with 185 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

6
data/events/card_key_coords.asm
View file

@ -7,10 +7,6 @@
CardKeyTable1:
db SILPH_CO_7F, $06, $0A, 4
db SILPH_CO_7F, $06, $0B, 5
db SILPH_CO_9F, $04, $12, 6
db SILPH_CO_9F, $04, $13, 7
db SILPH_CO_10F, $08, $0A, 8
db SILPH_CO_10F, $08, $0B, 9
db -1 ; end
CardKeyTable2:
@ -18,8 +14,6 @@ CardKeyTable2:
db SILPH_CO_3F, $09, $09, 11
db SILPH_CO_5F, $04, $07, 12
db SILPH_CO_5F, $05, $07, 13
db SILPH_CO_9F, $08, $03, 18
db SILPH_CO_9F, $09, $03, 19
db -1 ; end
CardKeyTable3:

2
data/events/card_key_maps.asm
View file

@ -2,7 +2,5 @@ SilphCoMapList:
db SILPH_CO_3F
db SILPH_CO_5F
db SILPH_CO_7F
db SILPH_CO_9F
db SILPH_CO_10F
db SILPH_CO_11F
db -1 ; end

5
data/events/hidden_item_coords.asm
View file

@ -11,8 +11,8 @@ HiddenItemCoords:
hidden_item ROUTE_9, 14, 7
hidden_item SS_ANNE_KITCHEN, 13, 9
hidden_item SS_ANNE_B1F_ROOMS, 3, 1
hidden_item ROUTE_10, 9, 17
hidden_item ROUTE_10, 16, 53
hidden_item ROUTE_10, 9, 25
hidden_item ROUTE_10, 12, 71
hidden_item ROCKET_HIDEOUT_B1F, 21, 15
hidden_item ROCKET_HIDEOUT_B3F, 27, 17
hidden_item ROCKET_HIDEOUT_B4F, 25, 1
@ -23,7 +23,6 @@ HiddenItemCoords:
hidden_item SAFARI_ZONE_GATE, 10, 1 ; inaccessible
hidden_item SAFARI_ZONE_WEST, 6, 5
hidden_item SILPH_CO_5F, 12, 3
hidden_item SILPH_CO_9F, 2, 15
hidden_item COPYCATS_HOUSE_2F, 1, 1
hidden_item CERULEAN_CAVE_1F, 14, 11
hidden_item CERULEAN_CAVE_B1F, 27, 3

10
data/events/hidden_objects.asm
View file

@ -46,7 +46,6 @@ HiddenObjectMaps:
db SAFARI_ZONE_GATE
db SAFARI_ZONE_WEST
db SILPH_CO_5F
db SILPH_CO_9F
db COPYCATS_HOUSE_2F
db CERULEAN_CAVE_1F
db CERULEAN_CAVE_B1F
@ -142,7 +141,6 @@ HiddenObjectPointers:
dw SafariZoneEntranceHiddenObjects
dw SafariZoneWestHiddenObjects
dw SilphCo5FHiddenObjects
dw SilphCo9FHiddenObjects
dw CopycatsHouse2FHiddenObjects
dw CeruleanCave1HiddenObjects
dw CeruleanCave3HiddenObjects
@ -431,8 +429,8 @@ SSAnne10HiddenObjects:
db -1 ; end
Route10HiddenObjects:
hidden_object 9, 17, SUPER_POTION, HiddenItems
hidden_object 16, 53, MAX_ETHER, HiddenItems
hidden_object 9, 25, SUPER_POTION, HiddenItems
hidden_object 12, 71, MAX_ETHER, HiddenItems
db -1 ; end
RocketHideout1HiddenObjects:
@ -473,10 +471,6 @@ SilphCo5FHiddenObjects:
hidden_object 12, 3, ELIXER, HiddenItems
db -1 ; end
SilphCo9FHiddenObjects:
hidden_object 2, 15, MAX_POTION, HiddenItems
db -1 ; end
CopycatsHouse2FHiddenObjects:
hidden_object 1, 1, NUGGET, HiddenItems
db -1 ; end

3
data/maps/dungeon_maps.asm
View file

@ -13,6 +13,7 @@ DungeonMaps1:
db DIGLETTS_CAVE
db UNDERWATER_TUNNEL
db CINNABAR_VOLCANO_FLOORS
db SILPH_CO_11F
db CELESTE_HILL
db CELESTE_HILL_OUTSIDE
db CELESTE_HILL_CAVE
@ -34,8 +35,6 @@ DungeonMaps2:
; SILPH_CO_[2-8]F, POKEMON_MANSION[2F-B1F], SAFARI_ZONE, and
; CERULEAN_CAVE maps, except for SILPH_CO_1F
db SILPH_CO_3F, CERULEAN_CAVE_1F
; SILPH_CO_[9-11]F
db SILPH_CO_9F, SILPH_CO_11F
; SEAFOAM_ISLANDS_[B1F-B4F]
db SEAFOAM_ISLANDS_B1F, SEAFOAM_ISLANDS_B4F
; all ROCKET_HIDEOUT maps

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

@ -0,0 +1,2 @@
map_header Route10Gate, ROUTE_10_GATE, FOREST_GATE, 0
end_map_header

7
data/maps/hide_show_data.asm
View file

@ -238,7 +238,6 @@ MapHSPointers:
dw CinnabarVolcanoHS
dw CinnabarVolcanoFloorsHS
dw NoHS
dw SilphCo10FHS
dw SilphCo11FHS
dw NoHS
dw NoHS
@ -493,12 +492,6 @@ SilphCo7FHS:
db SILPH_CO_7F, $09, SHOW ; HS_SILPH_CO_7F_RIVAL
db SILPH_CO_7F, $0A, SHOW ; HS_SILPH_CO_7F_ITEM_1
db SILPH_CO_7F, $0B, SHOW ; HS_SILPH_CO_7F_ITEM_2
SilphCo10FHS:
db SILPH_CO_10F, $01, SHOW ; HS_SILPH_CO_10F_1
db SILPH_CO_10F, $02, SHOW ; HS_SILPH_CO_10F_2
db SILPH_CO_10F, $03, SHOW ; HS_SILPH_CO_10F_ITEM_1
db SILPH_CO_10F, $04, SHOW ; HS_SILPH_CO_10F_ITEM_2
db SILPH_CO_10F, $05, SHOW ; HS_SILPH_CO_10F_ITEM_3
SilphCo11FHS:
db SILPH_CO_11F, $03, SHOW ; Giovanni
db SILPH_CO_11F, $04, SHOW ; James

3
data/maps/map_header_banks.asm
View file

@ -235,8 +235,7 @@ MapHeaderBanks::
db BANK(CeruleanBadgeHouse_h)
db BANK(CinnabarVolcano_h) ; $01 UNUSED_MAP_E7
db BANK(CinnabarVolcanoFloors_h)
db BANK(SilphCo9F_h)
db BANK(SilphCo10F_h)
db BANK(Route10Gate_h)
db BANK(SilphCo11F_h)
db BANK(FarawayFerryDock_h)
db BANK(GarnetCavern2F_h) ; was UNUSED_MAP_ED

3
data/maps/map_header_pointers.asm
View file

@ -235,8 +235,7 @@ MapHeaderPointers::
dw CeruleanBadgeHouse_h
dw CinnabarVolcano_h ; UNUSED_MAP_E7
dw CinnabarVolcanoFloors_h
dw SilphCo9F_h
dw SilphCo10F_h
dw Route10Gate_h
dw SilphCo11F_h
dw FarawayFerryDock_h
dw GarnetCavern2F_h ; UNUSED_MAP_ED, used silph 2f

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

@ -9,8 +9,6 @@ CinnabarLabTradeRoom_Object:
def_object_events
object_event 3, 2, SPRITE_SUPER_NERD, STAY, DOWN, 1 ; person
object_event 1, 4, SPRITE_GRAMPS, STAY, NONE, 2 ; person
; object_event 5, 5, SPRITE_BEAUTY, STAY, UP, 3 ; person
object_event 3, 5, SPRITE_GAMEBOY_KID, STAY, DOWN, 3 ; Trader
object_event 3, 5, SPRITE_GAMEBOY_KID, STAY, DOWN, 2 ; Trader
def_warps_to CINNABAR_LAB_TRADE_ROOM

5
data/maps/objects/Route10.asm
View file

@ -7,6 +7,9 @@ Route10_Object:
warp_event 8, 61, ROCK_TUNNEL_1F, 3
warp_event 6, 47, POWER_PLANT, 1
warp_event 6, 3, UNDERWATER_TUNNEL, 2
warp_event 14, 61, ROUTE_10_GATE, 2
warp_event 14, 57, ROUTE_10_GATE, 1
warp_event 15, 57, ROUTE_10_GATE, 1
def_bg_events
bg_event 7, 27, 7 ; Route10Text7
@ -15,7 +18,7 @@ Route10_Object:
bg_event 5, 49, 10 ; Route10Text10
def_object_events
object_event 10, 52, SPRITE_SUPER_NERD, STAY, LEFT, 1, OPP_POKEMANIAC, 1
object_event 10, 50, SPRITE_SUPER_NERD, STAY, LEFT, 1, OPP_POKEMANIAC, 1
object_event 3, 65, SPRITE_HIKER, STAY, UP, 2, OPP_HIKER, 7
object_event 14, 72, SPRITE_SUPER_NERD, STAY, LEFT, 3, OPP_POKEMANIAC, 2
object_event 7, 33, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_JR_TRAINER_F, 7

14
data/maps/objects/Route10Gate.asm Normal file
View file

@ -0,0 +1,14 @@
Route10Gate_Object:
db $a ; border block
def_warp_events
warp_event 5, 0, ROUTE_10, 7
warp_event 4, 7, ROUTE_10, 6
warp_event 5, 7, ROUTE_10, 6
def_bg_events
def_object_events
object_event 3, 4, SPRITE_GRAMPS, STAY, LEFT, 1 ; person
def_warps_to ROUTE_10_GATE

3
data/maps/songs.asm
View file

@ -234,8 +234,7 @@ MapSongBanks::
db MUSIC_CITIES2, 0 ; CERULEAN_BADGE_HOUSE
db MUSIC_DUNGEON3, 0 ; CINNABAR_VOLCANO
db MUSIC_DUNGEON3, 0 ; CINNABAR_VOLCANO_FLOORS
db MUSIC_SILPH_CO, 0 ; SILPH_CO_9F
db MUSIC_SILPH_CO, 0 ; SILPH_CO_10F
db MUSIC_CITIES1, 0 ; ROUTE_10_GATE
db MUSIC_SILPH_CO, 0 ; SILPH_CO_11F
db MUSIC_DUNGEON2, 0 ; FARAWAY_FERRY_DOCK
db MUSIC_DUNGEON1, 0 ; GARNET_CAVERN_2F

1
data/maps/town_map_entries.asm
View file

@ -135,6 +135,7 @@ 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 ROUTE_10_GATE, 14, 4, Route10Name
internal_map SILPH_CO_11F, 10, 5, SilphCoName
internal_map FARAWAY_FERRY_DOCK, 15, 15, FarawayIslandName
internal_map GARNET_CAVERN_2F, 6, 10, GarnetCavernName

3
data/text/text_7.asm
View file

@ -142,8 +142,7 @@ _AfterTrade2Text::
text_ram wInGameTradeGiveMonName
text " you"
line "traded to me"
para "went and evolved!"
cont "went and evolved!"
done
_WannaTrade3Text::

1
data/wild/grass_water.asm
View file

@ -237,7 +237,6 @@ WildDataPointers:
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw NothingWildMons
dw GarnetCavern2FWildMons
dw UnderwaterTunnelWildMons
dw NothingWildMons

22
data/wild/maps/FarawayIslandInside.asm
View file

@ -1,15 +1,15 @@
FarawayIslandInsideMons: ; DEFINITELY needs reworking
FarawayIslandInsideMons:
def_grass_wildmons 10 ; encounter rate
db 30, EEVEE
db 30, MANKEY
db 30, MANKEY
db 30, PRIMEAPE
db 30, BUTTERFREE
db 30, EEVEE
db 30, EEVEE
db 30, EEVEE
db 30, EEVEE
db 30, EEVEE
db 25, MANKEY
db 28, GLOOM
db 26, BUTTERFREE
db 29, PRIMEAPE
db 24, MANKEY
db 30, DECILLA
db 26, MANKEY
db 30, GORILLAIMO
db 27, BUTTERFREE
db 30, AERODACTYL
end_grass_wildmons
def_water_wildmons 0 ; encounter rate