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

The Big One Again

Browse source 
Pushing everything I've done, currently doesn't build because the Galarian Birds filesize is too thicc for the section but I need to push this before I go mad
This commit is contained in:
Martha Schilling 2024-08-25 19:39:01 +01:00
parent 1466465f63
commit 14f08c941d
57 changed files with 3676 additions and 370 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

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::
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

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

@ -0,0 +1,48 @@
FishingRodSlots::
db PALLET_TOWN, MAGIKARP, 5, ORFRY, 5, MAGIKARP, 7, ORFRY, 7
db VIRIDIAN_CITY, MAGIKARP, 5, ORFRY, 5, MAGIKARP, 7, ORFRY, 7
db ROUTE_22, MAGIKARP, 5, ORFRY, 5, MAGIKARP, 7, ORFRY, 7
db ROUTE_4, MAGIKARP, 12, ORFRY, 12, POLIWAG, 12, PSYDUCK, 12
db CERULEAN_CITY, MAGIKARP, 12, ORFRY, 12, POLIWAG, 12, PSYDUCK, 12
db ROUTE_24, MAGIKARP, 12, ORFRY, 12, POLIWAG, 12, PSYDUCK, 12
db ROUTE_25, MAGIKARP, 12, POLIWAG, 12, ORFRY, 12, CHEEP, 12
db ROUTE_6, MAGIKARP, 12, ORFRY, 12, POLIWAG, 12, PSYDUCK, 12
db VERMILION_CITY, MAGIKARP, 15, BLOTTLE, 15, CHEEP, 15, TENTACOOL, 15
db VERMILION_DOCK, MAGIKARP, 15, BLOTTLE, 15, CHEEP, 15, TENTACOOL, 15
db VERMILION_FERRY_DOCK, MAGIKARP, 15, BLOTTLE, 15, CHEEP, 15, TENTACOOL, 15
db ROUTE_11, MAGIKARP, 15, BLOTTLE, 15, CHEEP, 15, TENTACOOL, 15
db DIGLETTS_CAVE, WIGLETT, 18, WIGLETT, 19, WIGLETT, 20, WUGTRIO, 28
db ROUTE_10, POLIWAG, 18, RIBBITO, 18, KRABBY, 18, SLOWPOKE, 18
db ROCK_TUNNEL_1F, POLIWAG, 18, RIBBITO, 18, KRABBY, 18, SLOWPOKE, 18
db ROUTE_12, POLIWAG, 18, RIBBITO, 18, KRABBY, 18, SLOWPOKE, 18
db CELADON_CITY, MAGIKARP, 15, MAGIKARP, 18, GRIMER, 20, MAGIKARP, 20
db CELADON_UNIVERSITY_OUTSIDE, MAGIKARP, 15, MAGIKARP, 18, GRIMER, 20, MAGIKARP, 20
db ROUTE_13, BLOTTLE, 25, KRABBY, 25, HORSEA, 25, POLIWHIRL, 25
db ROUTE_17, BLOTTLE, 25, KRABBY, 25, HORSEA, 25, POLIWHIRL, 25
db ROUTE_18, BLOTTLE, 25, KRABBY, 25, HORSEA, 25, POLIWHIRL, 25
db ROUTE_23, BLOTTLE, 25, KRABBY, 25, HORSEA, 25, POLIWHIRL, 25
db FUCHSIA_CITY, BLOTTLE, 25, KRABBY, 25, HORSEA, 25, POLIWHIRL, 25
db SAFARI_ZONE_CENTER, SLOWPOKE, 25, KRABBY, 25, DRATINI, 20, DRAGONAIR, 30
db SAFARI_ZONE_EAST, SLOWPOKE, 25, KRABBY, 25, WEIRDUCK, 25, DRATINI, 20
db SAFARI_ZONE_NORTH, SLOWPOKE, 25, KRABBY, 25, WEIRDUCK, 25, DRATINI, 20
db SAFARI_ZONE_WEST, SLOWPOKE, 25, KRABBY, 25, WEIRDUCK, 25, DRATINI, 20
db UNDERWATER_TUNNEL, SHELLDER, 30, STARYU, 30, CROAKOZUNA, 33, GOLDUCK, 33
db ROUTE_19, GOLDEEN, 30, HORSEA, 30, SHELLDER, 30, STARYU, 30
db ROUTE_20, GOLDEEN, 30, HORSEA, 30, SHELLDER, 30, STARYU, 30
db ROUTE_21, GOLDEEN, 30, HORSEA, 30, SHELLDER, 30, STARYU, 30
db SEAFOAM_ISLANDS_B3F, GOLDEEN, 30, HORSEA, 30, SHELLDER, 30, STARYU, 30
db SEAFOAM_ISLANDS_B4F, GOLDEEN, 30, HORSEA, 30, SHELLDER, 30, STARYU, 30
db CINNABAR_ISLAND, GOLDEEN, 30, HORSEA, 30, SHELLDER, 30, STARYU, 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, 50, SQUIRTLE, 50, DRATINI, 50, DRAGONAIR, 50
db MT_MOON_CRATER, SEAKING, 50, SLOWBRO, 50, CROAKOZUNA, 50, GYARADOS, 50
db CITRINE_FERRY_DOCK, PENDRAKEN, 50, SEADRA, 50, KINGLER, 50, GYARADOS, 50
db CITRINE_CITY, PENDRAKEN, 50, SEADRA, 50, KINGLER, 50, GYARADOS, 50
db BRUNSWICK_TRAIL, PENDRAKEN, 50, SEADRA, 50, KINGLER, 50, GYARADOS, 50
db GARNET_CAVERN_1F, PENDRAKEN, 50, SEADRA, 50, KINGLER, 50, GYARADOS, 50
db GARNET_CAVERN_B1F, PENDRAKEN, 50, SEADRA, 50, KINGLER, 50, GYARADOS, 50
db SILPH_GAUNTLET_5F, SLOWBRO, 50, KINGLER, 50, GOLDUCK, 50, DRAGONAIR, 50
db CERULEAN_CAVE_1F, SEAKING, 50, SLOWBRO, 50, CROAKOZUNA, 50, GYARADOS, 50
db CERULEAN_CAVE_B1F, SEAKING, 50, SLOWBRO, 50, CROAKOZUNA, 50, GYARADOS, 50
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

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