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

Merge branch 'mistress' into renewables

Browse source
This commit is contained in:
Thorn Avery 2024-11-28 10:08:13 +11:00
commit 02536e80ac
65 changed files with 3761 additions and 394 deletions
Download patch file Download diff file Expand all files Collapse all files

6
data/credits/credits_text.asm
View file

@ -90,7 +90,7 @@ CreditsTextPointers:
dw CredDannye
dw CredEro
dw CredBlueZangoose
dw CredSkye
dw CredHunnies
dw CredChatot
dw CredEni
dw CredVort
@ -276,8 +276,8 @@ CredEro:
db -4, "EROSUNICA@"
CredBlueZangoose:
db -5, "BLUEZANGOOSE@"
CredSkye:
db -5, "HEADBOISKYE@"
CredHunnies:
db -4, "HUNNIEBUNS@"
CredChatot:
db -4, "CHATOT4444@"
CredEni:

6
data/items/key_items.asm
View file

@ -74,10 +74,10 @@ KeyItemFlags:
dbit TRUE ; SILPH_SCOPE
dbit TRUE ; POKE_FLUTE
dbit TRUE ; LIFT_KEY
dbit TRUE ; EXP_ALL - Did you know this wasn't a key item originally? Yeesh, what if someone sold or tossed it??
dbit TRUE ; EXP_ALL - Did you know this wasn't a key item originally? Yeesh, what if someone sold or tossed it??
dbit TRUE ; was TRUE for OLD_ROD, now CANDY_JAR
dbit FALSE ; was GOOD_ROD & TRUE, now BOTTLE_CAP
dbit TRUE ; SUPER_ROD
dbit FALSE ; was GOOD_ROD & TRUE, now BOTTLE_CAP
dbit TRUE ; FISHING_ROD
dbit FALSE ; PP_UP
dbit FALSE ; ETHER
dbit FALSE ; MAX_ETHER

5
data/items/use_overworld.asm
View file

@ -3,7 +3,6 @@ UsableItems_CloseMenu:
db ESCAPE_ROPE
db ITEMFINDER
db POKE_FLUTE
;db OLD_ROD no longer exists
;db GOOD_ROD no longer exists
db SUPER_ROD
db FISHING_ROD
db POCKET_LAPRAS
db -1 ; end

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

@ -0,0 +1,2 @@
map_header FishingGuruHouse, FISHING_GURU_HOUSE, HOUSE, 0
end_map_header

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

@ -1,2 +0,0 @@
map_header Route12SuperRodHouse, ROUTE_12_SUPER_ROD_HOUSE, HOUSE, 0
end_map_header

2
data/maps/map_header_banks.asm
View file

@ -192,7 +192,7 @@ MapHeaderBanks::
db BANK(Route16Gate1F_h)
db BANK(Route16Gate2F_h)
db BANK(Route16FlyHouse_h)
db BANK(Route12SuperRodHouse_h)
db BANK(FishingGuruHouse_h)
db BANK(Route18Gate1F_h)
db BANK(Route18Gate2F_h)
db BANK(SeafoamIslands1F_h)

2
data/maps/map_header_pointers.asm
View file

@ -192,7 +192,7 @@ MapHeaderPointers::
dw Route16Gate1F_h
dw Route16Gate2F_h
dw Route16FlyHouse_h
dw Route12SuperRodHouse_h
dw FishingGuruHouse_h
dw Route18Gate1F_h
dw Route18Gate2F_h
dw SeafoamIslands1F_h

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

@ -2,8 +2,8 @@ ChampionsRoom_Object:
db $3 ; border block
def_warp_events
warp_event 3, 7, LANCES_ROOM, 2
warp_event 4, 7, LANCES_ROOM, 3
warp_event 4, 11, LANCES_ROOM, 2
warp_event 5, 11, LANCES_ROOM, 3
warp_event 3, 0, HALL_OF_FAME, 1
warp_event 4, 0, HALL_OF_FAME, 1
@ -11,6 +11,6 @@ ChampionsRoom_Object:
def_object_events
object_event 4, 2, SPRITE_BLUE, STAY, DOWN, 1 ; person
object_event 3, 7, SPRITE_OAK, STAY, UP, 2 ; person
object_event 3, 8, SPRITE_OAK, STAY, UP, 2 ; person
def_warps_to CHAMPIONS_ROOM

4
data/maps/objects/Route12SuperRodHouse.asm → data/maps/objects/FishingGuruHouse.asm
View file

@ -1,4 +1,4 @@
Route12SuperRodHouse_Object:
FishingGuruHouse_Object:
db $a ; border block
def_warp_events
@ -11,4 +11,4 @@ Route12SuperRodHouse_Object:
object_event 2, 4, SPRITE_FISHING_GURU, STAY, RIGHT, 1 ; person
object_event 5, 6, SPRITE_YOUNGSTER, WALK, LEFT, 2 ; person
def_warps_to ROUTE_12_SUPER_ROD_HOUSE
def_warps_to FISHING_GURU_HOUSE

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

@ -3,7 +3,7 @@ GiovannisRoom_Object:
def_warp_events
warp_event 5, 4, VIRIDIAN_GYM, 3
warp_event 15, 4, VIRIDIAN_CITY, 6
warp_event 17, 4, VIRIDIAN_CITY, 6
def_bg_events
@ -12,7 +12,7 @@ GiovannisRoom_Object:
object_event 17, 8, SPRITE_PAPER, STAY, RIGHT, 2
object_event 17, 15, SPRITE_PAPER, STAY, DOWN, 3
object_event 14, 24, SPRITE_PAPER, STAY, RIGHT, 4
object_event 16, 4, SPRITE_POKE_BALL, STAY, NONE, 5, TM_EARTHQUAKE
object_event 18, 4, SPRITE_POKE_BALL, STAY, NONE, 5, TM_EARTHQUAKE
object_event 5, 22, SPRITE_POKE_BALL, STAY, NONE, 6, PROTECTOR
def_warps_to GIOVANNIS_ROOM

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

@ -2,7 +2,7 @@ Route24_Object:
db $2c ; border block
def_warp_events
warp_event 5, 5, ROUTE_12_SUPER_ROD_HOUSE, 1
warp_event 5, 5, FISHING_GURU_HOUSE, 1
def_bg_events

2
data/maps/town_map_entries.asm
View file

@ -111,7 +111,7 @@ InternalMapEntries:
internal_map MR_PSYCHICS_HOUSE, 10, 5, SaffronCityName
internal_map ROUTE_15_GATE_2F, 9, 13, Route15Name
internal_map ROUTE_16_FLY_HOUSE, 4, 5, Route16Name
internal_map ROUTE_12_SUPER_ROD_HOUSE, 10, 1, Route24Name
internal_map FISHING_GURU_HOUSE, 10, 1, Route24Name
internal_map ROUTE_18_GATE_2F, 7, 13, Route18Name
internal_map SEAFOAM_ISLANDS_1F, 5, 15, SeafoamIslandsName
internal_map ROUTE_22_GATE, 0, 7, Route22Name

12
data/text/text_2.asm
View file

@ -674,7 +674,9 @@ _ViridianBlackboardSleepText::
cont "battles."
para "Use AWAKENING to"
line "wake them up!"
line "wake it up, or"
cont "wait for it to"
cont "wake itself up!"
prompt
_ViridianBlackboardPoisonText::
@ -695,11 +697,11 @@ _ViridianBlackboardPoisonText::
prompt
_ViridianBlackboardPrlzText::
text "Paralysis could"
line "make #MON"
cont "moves misfire!"
text "Paralysis may"
line "make a #MON"
cont "unable to act!"
para "It even lowers"
para "It also lowers"
line "their SPEED!"
para "Paralysis remains"

5
data/text/text_6.asm
View file

@ -69,6 +69,11 @@ _SurfingGotOnText::
text "!"
prompt
_SurfingGotOnLaprasText:: ; i cringed irl doing it this way pls understand i do not like this either - pvk
text "<PLAYER> got on"
line "LAPRAS!"
prompt
_SurfingNoPlaceToGetOffText::
text "There's no place"
line "to get off!"

2
data/trainers/parties.asm
View file

@ -354,7 +354,7 @@ EngineerData:
; Celadon University
db 52, GOLEM_A, 0
; Super Rod encounter showcase, basically
; Fishing Rod encounter showcase, basically
FisherData:
; SS Anne 2F Rooms
db 17, GOLDEEN, TENTACOOL, KRABBY, 0

6
data/types/type_matchups.asm
View file

@ -101,13 +101,15 @@ TypeEffects:
db FAIRY, DRAGON, SUPER_EFFECTIVE
db FAIRY, DARK, SUPER_EFFECTIVE
db FAIRY, FIGHTING, SUPER_EFFECTIVE
db FAIRY, BUG, SUPER_EFFECTIVE
db FAIRY, FIRE, NOT_VERY_EFFECTIVE
db FAIRY, POISON, NOT_VERY_EFFECTIVE
db FAIRY, ICE, NOT_VERY_EFFECTIVE
db FAIRY, STEEL, NOT_VERY_EFFECTIVE
db BUG, FAIRY, NOT_VERY_EFFECTIVE
db DARK, FAIRY, NOT_VERY_EFFECTIVE
db FIGHTING, FAIRY, NOT_VERY_EFFECTIVE
db POISON, FAIRY, SUPER_EFFECTIVE
db FIRE, FAIRY, SUPER_EFFECTIVE
db ICE, FAIRY, SUPER_EFFECTIVE
db STEEL, FAIRY, SUPER_EFFECTIVE
db DRAGON, FAIRY, NO_EFFECT
db ROCK, STEEL, NOT_VERY_EFFECTIVE

48
data/wild/fishing_rod.asm Normal file
View file

@ -0,0 +1,48 @@
FishingRodSlots::
db PALLET_TOWN, MAGIKARP, 7, ORFRY, 6, MAGIKARP, 8, ORFRY, 7
db VIRIDIAN_CITY, MAGIKARP, 5, ORFRY, 5, MAGIKARP, 7, ORFRY, 7
db ROUTE_22, MAGIKARP, 6, ORFRY, 5, MAGIKARP, 7, ORFRY, 7
db ROUTE_4, MAGIKARP, 12, ORFRY, 12, POLIWAG, 12, PSYDUCK, 13
db CERULEAN_CITY, MAGIKARP, 11, ORFRY, 14, POLIWAG, 13, STARYU, 13
db ROUTE_24, MAGIKARP, 12, ORFRY, 13, POLIWAG, 12, PSYDUCK, 12
db ROUTE_25, MAGIKARP, 11, POLIWAG, 12, ORFRY, 12, CHEEP, 12
db ROUTE_6, MAGIKARP, 12, ORFRY, 12, POLIWAG, 12, PSYDUCK, 12
db VERMILION_CITY, GOLDEEN, 14, SHELLDER, 13, CHEEP, 15, TENTACOOL, 13
db VERMILION_DOCK, MAGIKARP, 15, BLOTTLE, 13, CHEEP, 15, TENTACOOL, 15
db VERMILION_FERRY_DOCK, MAGIKARP, 16, BLOTTLE, 14, CHEEP, 13, TENTACOOL, 14
db ROUTE_11, WIGLETT, 15, KRABBY, 15, CHEEP, 14, TENTACOOL, 13
db DIGLETTS_CAVE, WIGLETT, 18, WIGLETT, 19, WIGLETT, 20, WUGTRIO, 28
db ROUTE_10, POLIWAG, 17, RIBBITO, 17, KRABBY, 19, SLOWPOKE, 18
db ROCK_TUNNEL_1F, POLIWAG, 16, RIBBITO, 16, KRABBY, 17, SLOWPOKE, 17
db ROUTE_12, POLIWAG, 18, RIBBITO, 15, KRABBY, 17, SLOWPOKE, 19
db CELADON_CITY, MAGIKARP, 15, MAGIKARP, 17, GRIMER, 20, MAGIKARP, 20
db CELADON_UNIVERSITY_OUTSIDE, MAGIKARP, 14, MAGIKARP, 18, GRIMER, 21, MAGIKARP, 19
db ROUTE_13, PSYDUCK, 25, KRABBY, 25, HORSEA, 24, POLIWHIRL, 26
db ROUTE_17, CHEEP, 25, KRABBY, 25, HORSEA, 25, POLIWHIRL, 25
db ROUTE_18, CHEEP, 26, KRABBY, 27, HORSEA, 26, POLIWHIRL, 27
db ROUTE_23, SLOWBRO, 23, KINGLER, 24, HORSEA, 22, POLIWHIRL, 25
db FUCHSIA_CITY, GRIMER, 25, KRABBY, 25, HORSEA, 25, GYARADOS, 26
db SAFARI_ZONE_CENTER, SLOWPOKE, 25, KRABBY, 26, DRATINI, 23, DRAGONAIR, 30
db SAFARI_ZONE_EAST, SLOWPOKE, 24, KRABBY, 24, WEIRDUCK, 22, DRATINI, 19
db SAFARI_ZONE_NORTH, SLOWPOKE, 26, KRABBY, 25, WEIRDUCK, 23, DRATINI, 21
db SAFARI_ZONE_WEST, SLOWPOKE, 23, KRABBY, 27, WEIRDUCK, 24, DRATINI, 20
db UNDERWATER_TUNNEL, SHELLDER, 30, STARYU, 29, JABETTA, 33, GOLDUCK, 34
db ROUTE_19, STARYU, 31, HORSEA, 31, SHELLDER, 31, SHARPOON, 32
db ROUTE_20, STARYU, 33, HORSEA, 33, SHELLDER, 33, SHARPOON, 34
db ROUTE_21, STARYU, 31, HORSEA, 32, SHELLDER, 31, SHARPOON, 32
db SEAFOAM_ISLANDS_B3F, KRABBY, 31, SEEL, 31, SHELLDER, 32, STARYU, 33
db SEAFOAM_ISLANDS_B4F, KRABBY, 32, SEEL, 33, SHELLDER, 33, LAPRAS, 35 ; fish for nessie if ur stupid enough - pvk
db CINNABAR_ISLAND, STARYU, 30, HORSEA, 30, SHELLDER, 30, SHARPOON, 30
db CINNABAR_VOLCANO_FLOORS, GROWLITHE, 32, MAGMAR, 35, MAGMAR, 35, MAGMAR, 36
db CINNABAR_VOLCANO, MAGMAR, 35, MAGMAR, 35, MAGMAR, 36, ARCANINE, 38
db BILLS_GARDEN, SQUIRTLE, 52, SQUIRTLE, 51, DRATINI, 50, DRAGONAIR, 53
db MT_MOON_CRATER, KABUTOPS, 49, OMASTAR, 49, SEAKING, 50, GYARADOS, 53
db CITRINE_FERRY_DOCK, PENDRAKEN, 48, TENTACRUEL, 49, KINGLER, 51, SHARPOON, 50
db CITRINE_CITY, PENDRAKEN, 48, TENTACRUEL, 49, KINGLER, 52, SHARPOON, 51
db BRUNSWICK_TRAIL, STARYU, 48, SEADRA, 49, GOLDUCK, 50, POLIWRATH, 50
db GARNET_CAVERN_1F, PENDRAKEN, 50, SEADRA, 49, POLIWRATH, 53, GYARADOS, 54
db GARNET_CAVERN_B1F, PENDRAKEN, 51, SEADRA, 48, POLITOED, 52, GYARADOS, 55
db SILPH_GAUNTLET_5F, SLOWBRO, 50, KINGLER, 51, GOLDUCK, 51, DRAGONAIR, 52
db CERULEAN_CAVE_1F, SHARPOON, 62, SLOWBRO, 64, CROAKOZUNA, 64, GYARADOS, 65
db CERULEAN_CAVE_B1F, SHARPOON, 62, SLOWKING, 64, CROAKOZUNA, 64, GYARADOS, 65
db -1 ; end

5
data/wild/good_rod.asm
View file

@ -1,5 +0,0 @@
; random choice of 2 good rod encounters
GoodRodMons:
; level, species
db 10, GOLDEEN
db 10, POLIWAG

2
data/wild/maps/Route13.asm
View file

@ -1,7 +1,7 @@
Route13WildMons:
def_grass_wildmons 20 ; encounter rate
db 24, ODDISH
db 25, PIDGEOTTO
db 25, FARFETCHD
db 23, BELLSPROUT
db 24, VENONAT
db 24, VENONAT

2
data/wild/maps/Route15.asm
View file

@ -2,7 +2,7 @@ Route15WildMons:
def_grass_wildmons 15 ; encounter rate
db 24, BELLSPROUT
db 26, VENONAT
db 25, SPEAROW
db 25, FARFETCHD
db 25, DITTO
db 22, BELLSPROUT
db 28, ODDISH

2
data/wild/maps/VictoryRoad3F.asm
View file

@ -7,7 +7,7 @@ VictoryRoad3FWildMons:
db 43, RHYHORN
db 43, GOLBAT
db 44, GAVILLAIN
db 44, SANDSLASH
db 50, CHANSEY ; Possible to Repel Trick, used for grinding.
db 44, PARASECT
db 45, HITMONCHAN ; LGPE Rare Spawn
end_grass_wildmons

159
data/wild/super_rod.asm
View file

@ -1,159 +0,0 @@
; super rod encounters
SuperRodData:
; map, fishing group
dbw PALLET_TOWN, .Group1
dbw VIRIDIAN_CITY, .Group1
dbw CERULEAN_CITY, .Group2
dbw VERMILION_CITY, .Group4
dbw CELADON_CITY, .Group13
dbw FUCHSIA_CITY, .Group6
dbw CINNABAR_ISLAND, .Group9
dbw CITRINE_CITY, .Group11
dbw ROUTE_4, .Group2
dbw ROUTE_6, .Group2
dbw ROUTE_10, .Group5
dbw ROUTE_11, .Group4
dbw ROUTE_12, .Group5
dbw ROUTE_13, .Group6
dbw ROUTE_17, .Group6
dbw ROUTE_18, .Group6
dbw ROUTE_19, .Group9
dbw ROUTE_20, .Group9
dbw ROUTE_21, .Group9
dbw ROUTE_22, .Group1
dbw ROUTE_23, .Group6
dbw ROUTE_24, .Group2
dbw ROUTE_25, .Group3
dbw BRUNSWICK_TRAIL, .Group11
dbw VERMILION_DOCK, .Group4
dbw VERMILION_FERRY_DOCK, .Group4
dbw CITRINE_FERRY_DOCK, .Group11
dbw SEAFOAM_ISLANDS_B3F, .Group9
dbw SEAFOAM_ISLANDS_B4F, .Group9
dbw SAFARI_ZONE_EAST, .Group7
dbw SAFARI_ZONE_NORTH, .Group7
dbw SAFARI_ZONE_WEST, .Group7
dbw SAFARI_ZONE_CENTER, .Group7
dbw CERULEAN_CAVE_2F, .Group12
dbw CERULEAN_CAVE_B1F, .Group12
dbw CERULEAN_CAVE_1F, .Group12
dbw SILPH_GAUNTLET_5F, .Group7
dbw ROCK_TUNNEL_1F, .Group5
dbw CELADON_UNIVERSITY_OUTSIDE, .Group13
dbw MT_MOON_CRATER, .Group12
dbw DIGLETTS_CAVE, .Group14
dbw BILLS_GARDEN, .Group8
dbw UNDERWATER_TUNNEL, .Group10
dbw GARNET_CAVERN_1F, .Group11
dbw GARNET_CAVERN_2F, .Group11
dbw GARNET_CAVERN_B1F, .Group11
dbw CINNABAR_VOLCANO_FLOORS, .Group15
dbw CINNABAR_VOLCANO, .Group15
db -1 ; end
; fishing groups
; number of monsters, followed by level/monster pairs
.Group1: ; Pallet, Viridian & Route 22
db 4
db 5, MAGIKARP
db 7, MAGIKARP
db 5, ORFRY
db 7, ORFRY
.Group2: ; Route 4, Cerulean, Route 24, Route 6
db 4
db 12, MAGIKARP
db 12, POLIWAG
db 12, ORFRY
db 12, PSYDUCK
.Group3: ; Route 25
db 4
db 12, MAGIKARP
db 12, POLIWAG
db 12, ORFRY
db 12, CHEEP
.Group4: ; Route 11, Vermilion
db 4
db 15, BLOTTLE
db 15, MAGIKARP
db 15, TENTACOOL
db 15, CHEEP
.Group5: ; Route 10, Route 12, Rock Tunnel
db 4
db 20, RIBBITO
db 20, POLIWAG
db 20, SLOWPOKE
db 20, KRABBY
.Group6: ; Route 13, Route 17, Route 18, Fuchsia, Route 23
db 4
db 25, HORSEA
db 25, POLIWHIRL
db 25, KRABBY
db 25, BLOTTLE
.Group7: ; Safari Zone
db 4
db 15, DRATINI
db 20, SLOWPOKE
db 25, KRABBY
db 25, WEIRDUCK
.Group8: ; Bill's Garden
db 4
db 50, SQUIRTLE
db 50, SQUIRTLE
db 50, DRATINI
db 50, DRATINI
.Group9: ; Cinnabar, Route 19-21, Seafoam Islands
db 4
db 30, STARYU
db 30, HORSEA
db 30, SHELLDER
db 30, GOLDEEN
.Group10: ; Underwater Tunnel
db 4
db 35, SHELLDER
db 35, STARYU
db 35, CROAKOZUNA
db 35, GOLDUCK
.Group11: ; Citrine, Brunswick, Garnet
db 4
db 50, KINGLER
db 50, SEADRA
db 50, PENDRAKEN
db 50, GYARADOS
.Group12: ; Cerulean Cave, Mt Moon Crater
db 4
db 50, SLOWBRO
db 50, SEAKING
db 50, GYARADOS
db 50, CROAKOZUNA
.Group13: ; Celadon
db 4
db 10, MAGIKARP
db 15, MAGIKARP
db 20, MAGIKARP
db 20, GRIMER
.Group14: ; Diglett's Cave
db 4
db 17, WIGLETT
db 18, WIGLETT
db 19, WIGLETT
db 20, WIGLETT
.Group15: ; Cinnabar Volcano
db 3
db 35, MAGMAR
db 37, MAGMAR
db 40, MAGMAR