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

Very minor fixes

Browse source 
Fixes a few small text issues, updates the readme, and rebalances the fishing rod Pokemon. Also shifted Blottle to earlier in the Pokedex, cause I felt like it.
This commit is contained in:
MementoMartha 2023-04-23 16:18:02 +01:00
parent 2f01628cd9
commit eba8947133
11 changed files with 213 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,7 +19,7 @@ MtMoonB2F_Object:
object_event 12, 6, SPRITE_FOSSIL, STAY, NONE, 6 ; person
object_event 13, 6, SPRITE_FOSSIL, STAY, NONE, 7 ; person
object_event 25, 21, SPRITE_POKE_BALL, STAY, NONE, 8, HP_UP
object_event 21, 5, SPRITE_POKE_BALL, STAY, NONE, 9, WING_FOSSIL
object_event 21, 5, SPRITE_FOSSIL, STAY, NONE, 9, WING_FOSSIL
object_event 29, 7, SPRITE_SCIENTIST, STAY, NONE, 10, ; Crater Guard
def_warps_to MT_MOON_B2F

4
data/pokemon/base_stats.asm
View file

@ -128,6 +128,8 @@ INCLUDE "data/pokemon/base_stats/tentacool.asm"
INCLUDE "data/pokemon/base_stats/tentacruel.asm"
INCLUDE "data/pokemon/base_stats/toedscool.asm"
INCLUDE "data/pokemon/base_stats/toedscruel.asm"
INCLUDE "data/pokemon/base_stats/blottle.asm"
INCLUDE "data/pokemon/base_stats/pendraken.asm"
INCLUDE "data/pokemon/base_stats/ribbito.asm"
INCLUDE "data/pokemon/base_stats/croakozuna.asm"
INCLUDE "data/pokemon/base_stats/magnemite.asm"
@ -180,8 +182,6 @@ INCLUDE "data/pokemon/base_stats/cactus.asm"
INCLUDE "data/pokemon/base_stats/hitmonlee.asm"
INCLUDE "data/pokemon/base_stats/hitmonchan.asm"
INCLUDE "data/pokemon/base_stats/hitmontop.asm"
INCLUDE "data/pokemon/base_stats/blottle.asm"
INCLUDE "data/pokemon/base_stats/pendraken.asm"
INCLUDE "data/pokemon/base_stats/shellder.asm"
INCLUDE "data/pokemon/base_stats/cloyster.asm"
INCLUDE "data/pokemon/base_stats/taaban.asm"

4
data/pokemon/menu_icons.asm
View file

@ -128,6 +128,8 @@ MonPartyData:
nybble ICON_WATER ; Tentacruel
nybble ICON_GRASS ; Toedscool
nybble ICON_GRASS ; Toedscruel
nybble ICON_WATER ; Blottle
nybble ICON_WATER ; Pendraken
nybble ICON_MON ; Ribbito
nybble ICON_MON ; Croakozuna
nybble ICON_BALL ; Magnemite
@ -180,8 +182,6 @@ MonPartyData:
nybble ICON_MON ; Hitmonlee
nybble ICON_MON ; Hitmonchan
nybble ICON_MON ; Hitmontop
nybble ICON_WATER ; Blottle
nybble ICON_WATER ; Pendraken
nybble ICON_HELIX ; Shellder
nybble ICON_HELIX ; Cloyster
nybble ICON_HELIX ; Taaban

2
data/pokemon/new_dex_text.asm
View file

@ -403,7 +403,7 @@ _KokanaDexEntry::
next "WEEDLE. Due to the"
next "lack of a horn,"
para "it hides under"
page "it hides under"
next "trees, gnawing"
next "their roots"
dex

4
data/pokemon/palettes.asm
View file

@ -129,6 +129,8 @@ MonsterPalettes:
db PAL_CYANMON ; TENTACRUEL
db PAL_BROWNMON ; TOEDSCOOL
db PAL_YELLOWMON ; TOEDSCRUEL
db PAL_MEWMON ; BLOTTLE
db PAL_MEWMON ; PENDRAKEN
db PAL_GREENMON ; RIBBITO
db PAL_GREENMON ; CROAKOZUNA
db PAL_GREYMON ; MAGNEMITE
@ -181,8 +183,6 @@ MonsterPalettes:
db PAL_BROWNMON ; HITMONLEE
db PAL_BROWNMON ; HITMONCHAN
db PAL_BROWNMON ; HITMONTOP
db PAL_MEWMON ; BLOTTLE
db PAL_MEWMON ; PENDRAKEN
db PAL_PURPLEMON ; SHELLDER
db PAL_PURPLEMON ; CLOYSTER
db PAL_GREYMON ; TAABAN

27
data/pokemon/title_mons.asm
View file

@ -1,18 +1,21 @@
TitleMons:
; mons on the title screen are randomly chosen from here
db TOTARTLE
db CHARIZARD
db VENUSAUR
db TOTARTLE ; New Starters
db GOROCHU
db CROCKY
db TRAMPEL
db SYLVEON
db CROCKY ; RG Betas
db JAGG
db RHYPERIOR
db OMEGA
db MIKON
db KLEAVOR
db MAGNEZONE
db MADAAMU
db DEER
db CHEEP
db GYAOON
db TSUBOMITTO ; GS Betas
db MADAAMU
db PORYGON2 ; Post-Gen 1 Evos
db MAGNEZONE
db ANNIHILAPE
db SCREAM_TAIL ; LGPE and SV
db WUGTRIO
db MELTAN
db EXEGGUTOR_A ; Regional Variants
db WEEZING_G
db ARCANINE_H
db TAUROS_PA

195
data/wild/super_rod.asm
View file

@ -3,145 +3,162 @@ SuperRodData:
; map, fishing group
dbw PALLET_TOWN, .Group1
dbw VIRIDIAN_CITY, .Group1
dbw CERULEAN_CITY, .Group3
dbw VERMILION_CITY, .Group4
dbw CELADON_CITY, .Group5
dbw FUCHSIA_CITY, .Group7
dbw CERULEAN_CITY, .Group2
dbw VERMILION_CITY, .Group3
dbw CELADON_CITY, .Group11
dbw FUCHSIA_CITY, .Group5
dbw CINNABAR_ISLAND, .Group8
dbw CITRINE_CITY, .Group9
dbw ROUTE_4, .Group3
dbw ROUTE_6, .Group4
dbw ROUTE_10, .Group5
dbw ROUTE_11, .Group4
dbw ROUTE_12, .Group7
dbw ROUTE_13, .Group7
dbw ROUTE_17, .Group7
dbw ROUTE_18, .Group7
dbw ROUTE_4, .Group2
dbw ROUTE_6, .Group2
dbw ROUTE_10, .Group4
dbw ROUTE_11, .Group3
dbw ROUTE_12, .Group4
dbw ROUTE_13, .Group5
dbw ROUTE_17, .Group5
dbw ROUTE_18, .Group5
dbw ROUTE_19, .Group8
dbw ROUTE_20, .Group8
dbw ROUTE_21, .Group8
dbw ROUTE_22, .Group2
dbw ROUTE_23, .Group9
dbw ROUTE_24, .Group3
dbw ROUTE_22, .Group1
dbw ROUTE_23, .Group8
dbw ROUTE_24, .Group2
dbw ROUTE_25, .Group3
dbw CERULEAN_GYM, .Group3
dbw VERMILION_DOCK, .Group4
dbw CERULEAN_GYM, .Group2
dbw VERMILION_DOCK, .Group3
dbw SEAFOAM_ISLANDS_B3F, .Group8
dbw SEAFOAM_ISLANDS_B4F, .Group8
dbw SAFARI_ZONE_EAST, .Group6
dbw SAFARI_ZONE_NORTH, .Group6
dbw SAFARI_ZONE_WEST, .Group6
dbw SAFARI_ZONE_CENTER, .Group6
dbw CERULEAN_CAVE_2F, .Group9
dbw CERULEAN_CAVE_2F, .Group10
dbw CERULEAN_CAVE_B1F, .Group10
dbw CERULEAN_CAVE_1F, .Group9
dbw SILPH_GAUNTLET_5F, .Group10
dbw ROCK_TUNNEL_1F, .Group5
dbw CERULEAN_CAVE_1F, .Group10
dbw SILPH_GAUNTLET_5F, .Group6
dbw ROCK_TUNNEL_1F, .Group4
dbw CELADON_UNIVERSITY_OUTSIDE, .Group11
dbw FARAWAY_ISLAND_INSIDE, .Group7
dbw FARAWAY_ISLAND_INSIDE, .Group10
dbw MT_MOON_CRATER, .Group10
dbw DIGLETTS_CAVE, .Group12
dbw BILLS_GARDEN, .Group10
dbw UNDERWATER_TUNNEL, .Group7
dbw BILLS_GARDEN, .Group7
dbw UNDERWATER_TUNNEL, .Group8
db -1 ; end
; fishing groups
; number of monsters, followed by level/monster pairs
.Group1:
db 2
db 10, MAGIKARP
.Group1: ; Pallet, Viridian & Route 22
db 4
db 5, MAGIKARP
db 7, MAGIKARP
db 5, GYOPIN
db 7, GYOPIN
.Group2:
db 3
db 10, MAGIKARP
db 7, POLIWAG
db 10, GYOPIN
.Group3:
.Group2: ; Route 4, Cerulean, Route 24, Route 6
db 5
db 12, MAGIKARP
db 12, POLIWAG
db 12, GYOPIN
db 12, PSYDUCK
db 12, CHEEP
.Group3: ; Route 11, Route 25, Vermilion
db 5
db 15, SKIMPER
db 15, MAGIKARP
db 15, KRABBY
db 15, BLOTTLE
db 15, MAGIKARP
db 15, SLOWPOKE
db 15, TENTACOOL
db 15, CHEEP
.Group4:
.Group4: ; Route 10, Route 12, Rock Tunnel
db 5
db 20, KRABBY
db 20, SHELLDER
db 20, SLOWPOKE
db 20, PSYDUCK
db 20, TENTACOOL
db 20, BLOTTLE
db 20, HORSEA
db 20, MAGIKARP
.Group5:
db 5
.Group5: ; Route 13, Route 17, Route 18, Fuchsia
db 7
db 25, HORSEA
db 25, POLIWHIRL
db 25, SLOWPOKE
db 25, KRABBY
db 20, SKIMPER
db 25, CHEEP
db 25, BLOTTLE
db 25, GOLDEEN
.Group6:
db 6
.Group6: ; Safari Zone
db 7
db 15, DRATINI
db 28, KRABBY
db 25, CHEEP
db 20, SLOWPOKE
db 25, KRABBY
db 25, WEIRDUCK
db 25, POLIWHIRL
db 35, DRAGONAIR
db 32, BAWLIGUA
db 30, DRAGONAIR
db 20, SKIMPER
.Group7:
.Group7: ; Bill's Garden
db 6
db 35, TENTACRUEL
db 35, KINGLER
db 35, SEAKING
db 35, GYARADOS
db 35, PENDRAKEN
db 35, JABETTA
db 50, SQUIRTLE
db 50, WARTORTLE
db 50, TOTARTLE
db 50, DRATINI
db 50, DRAGONAIR
db 55, DRAGONITE
.Group8:
db 5
db 40, STARYU
db 40, SEADRA
db 40, SHELLDER
db 40, PENDRAKEN
db 40, JAGG
.Group8: ; Sea Routes, Route 23, Seafoam Islands, Underwater Tunnel
db 7
db 30, STARYU
db 30, HORSEA
db 30, SHELLDER
db 30, PENDRAKEN
db 30, JAGG
db 30, BLASTYKE
db 30, GOLDEEN
.Group9:
db 5
.Group9: ; Citrine, Chartreuse, Crimson
db 10
db 50, JAGG
db 50, SEAKING
db 50, KINGLER
db 50, SEADRA
db 50, PENDRAKEN
db 50, GYARADOS
db 50, SEAKING
db 50, KINGLER
db 50, SEADRA
db 50, PENDRAKEN
.Group10:
db 12
db 50, KINGLER
db 50, PENDRAKEN
db 50, SEAKING
db 100, MAGIKARP
db 50, SEADRA
db 50, STARYU
db 50, SHELLDER
db 50, SLOWBRO
db 50, GOLDUCK
db 50, JABETTA
db 50, POLIWHIRL
db 60, CRYITHAN
db 50, CROAKOZUNA
db 50, BLASTOISE
db 50, LAPRAS
.Group11:
db 4
db 25, MAGIKARP
.Group10: ; Cerulean Cave
db 10
db 50, SLOWBRO
db 50, SEAKING
db 50, KINGLER
db 50, WUGTRIO
db 50, SHELLDER
db 50, GYARADOS
db 50, JABETTA
db 50, CROAKOZUNA
db 50, GOLDUCK
db 100, MAGIKARP
.Group11: ; Celadon
db 7
db 5, MAGIKARP
db 10, MAGIKARP
db 15, MAGIKARP
db 20, MAGIKARP
db 25, MAGIKARP
db 20, GYARADOS
db 20, GRIMER
.Group12:
db 4
.Group12: ; Diglett's Cave
db 6
db 16, WIGLETT
db 18, WIGLETT
db 19, WIGLETT
db 21, WIGLETT
db 20, WIGLETT
db 28, WUGTRIO