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

Bug Fixes and stuff!

Browse source 
(kinda just clearing my commits list while I'm working on 1.3 still.)

- Lance's Room is no longer listed as a dungeon map

- Changed the layout of Cinnabar Volcano YET AGAIN, making it a little more visually appealing. If you get softlocked here, I will just sigh disapprovingly.

- Various moveset fixes:
     - Arcanine-H gets EQ and Fissure now
     - Raichu-A loses Counter
     - Raticate-A gets TBolt and Thunder
     - Swapped Bullet Punch and Iron Head around in Scizor's learnset
     - Umbreon gets Psychic
     - WigWug both now get Ice Beam and Blizzard
     - Seel and Dewgong get Water Gun by level up
     - Swapped inconsistent moveset levels for Omanyte and Omastar
     - Eevee gets Quick Attack earlier

- Fixed a typo in Slowbro-G's dex entry

- Changed the Tauros Combat Breed trader's text to remove a moveset inaccuracy

- Changed Misty's AI to now use X Specials instead of Potions

- Gave Chief's teams a slightly updated moveset

- Fixed an issue where Steel just...didn't resist Rock? How did I miss this?????

- Made Sandshrew more common in Mt Moon B2F

- Changed the Marowaks on Silph Gauntlet 4F to Guardias

- Fixed issues where receiving a Gym badge wouldn't play the correct sound in most situations

- Increased the level of the Salesman's Cubone gift from 17 to 23

- Decreased the levels of the Fossil gifts from 44 to 35

- More text fixes

-
This commit is contained in:
Martha Schilling 2024-01-26 23:20:54 +00:00
parent 7cd95d1561
commit 7742104bbb
40 changed files with 115 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

4
data/maps/dungeon_maps.asm
View file

@ -28,8 +28,8 @@ DungeonMaps1:
DungeonMaps2:
; all MT_MOON maps
db MT_MOON_1F, MT_MOON_B2F
; all SS_ANNE maps, VICTORY_ROAD_1F, LANCES_ROOM, and HALL_OF_FAME
db SS_ANNE_1F, HALL_OF_FAME
; all SS_ANNE and SILPH_GAUNTLET maps
db SS_ANNE_1F, SILPH_GAUNTLET_7F
; all POKEMON_TOWER maps and Lavender Town buildings
db LAVENDER_POKECENTER, LAVENDER_CUBONE_HOUSE
; SILPH_CO_[2-8]F, POKEMON_MANSION[2F-B1F], SAFARI_ZONE, and

16
data/maps/objects/CinnabarVolcano.asm
View file

@ -3,17 +3,17 @@ CinnabarVolcano_Object:
def_warp_events
warp_event 15, 21, CINNABAR_VOLCANO_FLOORS, 9
warp_event 16, 5, CINNABAR_VOLCANO_FLOORS, 10
warp_event 16, 3, CINNABAR_VOLCANO_FLOORS, 10
def_bg_events
def_object_events
object_event 15, 5, SPRITE_BIRD, STAY, UP, 1, MOLTRES, 50 | OW_POKEMON
object_event 13, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
object_event 14, 13, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person
object_event 14, 12, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 4 ; person
object_event 15, 12, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 5 ; person
object_event 14, 10, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person
object_event 15, 10, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person
object_event 14, 5, SPRITE_BIRD, STAY, UP, 1, MOLTRES, 50 | OW_POKEMON
object_event 13, 16, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
object_event 14, 15, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person
object_event 14, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 4 ; person
object_event 15, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 5 ; person
object_event 14, 12, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person
object_event 15, 12, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person
def_warps_to CINNABAR_VOLCANO

7
data/pokemon/base_stats/arcanineh.asm
View file

@ -15,9 +15,10 @@
; tm/hm learnset
tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \
RAGE, DRAGON_RAGE, DIG, MIMIC, DOUBLE_TEAM, \
REFLECT, BIDE, FIRE_BLAST, SWIFT, SKULL_BASH, \
REST, ROCK_SLIDE, SUBSTITUTE
RAGE, DRAGON_RAGE, EARTHQUAKE, FISSURE, DIG, \
TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \
FIRE_BLAST, SWIFT, SKULL_BASH, REST, ROCK_SLIDE, \
SUBSTITUTE
; end
db BANK(ArcanineHPicFront)

10
data/pokemon/base_stats/raichua.asm
View file

@ -15,11 +15,11 @@
; tm/hm learnset
tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \
DOUBLE_EDGE, HYPER_BEAM, PAY_DAY, SUBMISSION, COUNTER, \
SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, PSYCHIC_M, \
TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \
SWIFT, SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, \
SUBSTITUTE, FLY, SURF, FLASH
DOUBLE_EDGE, HYPER_BEAM, PAY_DAY, SUBMISSION, SEISMIC_TOSS, \
RAGE, THUNDERBOLT, THUNDER, PSYCHIC_M, TELEPORT, \
MIMIC, DOUBLE_TEAM, REFLECT, BIDE, SWIFT, \
SKULL_BASH, REST, THUNDER_WAVE, PSYWAVE, SUBSTITUTE, \
FLY, SURF, FLASH
; end
db BANK(RaichuAPicFront)

4
data/pokemon/base_stats/raticatea.asm
View file

@ -16,8 +16,8 @@
; tm/hm learnset
tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \
WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \
DIG, MIMIC, DOUBLE_TEAM, BIDE, SWIFT, \
SKULL_BASH, REST, SUBSTITUTE
THUNDERBOLT, THUNDER, DIG, MIMIC, DOUBLE_TEAM, \
BIDE, SWIFT, SKULL_BASH, REST, SUBSTITUTE
; end
db BANK(RaticateAPicFront)

2
data/pokemon/base_stats/scizor.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/scizor.pic", 0, 1 ; sprite dimensions
dw ScizorPicFront, ScizorPicBack
db QUICK_ATTACK, IRON_HEAD, NO_MOVE, NO_MOVE ; level 1 learnset
db QUICK_ATTACK, BULLET_PUNCH, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
; tm/hm learnset

4
data/pokemon/base_stats/umbreon.asm
View file

@ -15,8 +15,8 @@
; tm/hm learnset
tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \
RAGE, MIMIC, DOUBLE_TEAM, REFLECT, BIDE, \
SWIFT, SKULL_BASH, REST, SUBSTITUTE
RAGE, PSYCHIC_M, MIMIC, DOUBLE_TEAM, REFLECT, \
BIDE, SWIFT, SKULL_BASH, REST, SUBSTITUTE
; end
db BANK(UmbreonPicFront)

6
data/pokemon/base_stats/wiglett.asm
View file

@ -15,9 +15,9 @@
; tm/hm learnset
tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \
WATER_GUN, RAGE, EARTHQUAKE, FISSURE, DIG, \
MIMIC, DOUBLE_TEAM, BIDE, REST, SUBSTITUTE, \
CUT, SURF
WATER_GUN, ICE_BEAM, BLIZZARD, RAGE, EARTHQUAKE, \
FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \
REST, SUBSTITUTE, CUT, SURF
; end
db BANK(WiglettPicFront)

6
data/pokemon/base_stats/wugtrio.asm
View file

@ -15,9 +15,9 @@
; tm/hm learnset
tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \
WATER_GUN, HYPER_BEAM, RAGE, EARTHQUAKE, FISSURE, \
DIG, MIMIC, DOUBLE_TEAM, BIDE, REST, \
SUBSTITUTE, CUT, SURF
WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, RAGE, \
EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \
BIDE, REST, SUBSTITUTE, CUT, SURF
; end
db BANK(WugtrioPicFront)

14
data/pokemon/evos_moves.asm
View file

@ -1018,6 +1018,7 @@ SeelEvosMoves:
db EV_LEVEL, 34, DEWGONG
db 0
; Learnset
db 10, WATER_GUN
db 15, POWDER_SNOW
db 20, GROWL
db 25, AURORA_BEAM
@ -1516,8 +1517,8 @@ OmanyteEvosMoves:
db 21, ROCK_THROW
db 34, HORN_ATTACK
db 39, LEER
db 46, SPIKE_CANNON
db 53, HYDRO_PUMP
db 44, SPIKE_CANNON
db 49, HYDRO_PUMP
db 0
OmastarEvosMoves:
@ -1527,8 +1528,8 @@ OmastarEvosMoves:
db 21, ROCK_THROW
db 34, HORN_ATTACK
db 39, LEER
db 44, SPIKE_CANNON
db 49, HYDRO_PUMP
db 46, SPIKE_CANNON
db 53, HYDRO_PUMP
db 0
JigglypuffEvosMoves:
@ -1566,7 +1567,7 @@ EeveeEvosMoves:
; Learnset
db 8, SAND_ATTACK
db 16, GROWL
db 27, QUICK_ATTACK
db 23, QUICK_ATTACK
db 30, BITE
db 36, FOCUS_ENERGY
db 42, TAKE_DOWN
@ -1794,6 +1795,7 @@ DewgongEvosMoves:
; Evolutions
db 0
; Learnset
DB 10, WATER_GUN
db 15, POWDER_SNOW
db 20, GROWL
db 25, AURORA_BEAM
@ -2734,7 +2736,7 @@ ScizorEvosMoves:
db 29, SLASH
db 35, SWORDS_DANCE
db 42, AGILITY
db 50, BULLET_PUNCH
db 50, IRON_HEAD
db 0
RhyperiorEvosMoves:

4
data/pokemon/new_dex_text.asm
View file

@ -899,7 +899,7 @@ _RapidashGDexEntry::
dex
_SlowbroGDexEntry::
text "The DISTUBAN that"
text "The DISTURBAN that"
next "bit SLOWBRO has"
next "made it poisonous."
@ -915,7 +915,7 @@ _SlowkingGDexEntry::
page "Mumbling eerie"
next "spells, it makes"
next "strange POTIONs"
next "strange potions"
dex
_MukADexEntry::

4
data/text/text_7.asm
View file

@ -216,8 +216,8 @@ _AfterTrade6Text::
text "Isn't the Combat"
line "Breed amazing?"
para "HI JUMP KICK is"
line "so worth it!"
para "JUMP KICK is so"
line "worth it!"
done
_WannaTrade7Text::

2
data/trainers/ai_pointers.asm
View file

@ -37,7 +37,7 @@ TrainerAIPointers:
dbw 1, CooltrainerFAI ; cooltrainerf
dbw 1, BrunoAI ; bruno
dbw 5, BrockAI ; brock
dbw 2, MistyAI ; misty
dbw 1, MistyAI ; misty
dbw 1, LtSurgeAI ; surge
dbw 1, ErikaAI ; erika
dbw 2, KogaAI ; koga

23
data/trainers/special_moves.asm
View file

@ -163,8 +163,9 @@ SpecialTrainerMoves:
db BROCK, 7 ; Brock 6 badges
db 1, 1, SELFDESTRUCT
db 2, 2, SURF
db 2, 3, ICE_BEAM
db 2, 1, SPIKE_CANNON
db 2, 3, SURF
db 2, 4, ICE_BEAM
db 3, 1, SURF
db 3, 2, ROCK_THROW
db 3, 3, SWORDS_DANCE
@ -357,7 +358,7 @@ SpecialTrainerMoves:
db 3, 3, EMBER
db 4, 1, CUT
db 4, 4, DIG
db 5, 4, BODY_SLAM
db 5, 3, BODY_SLAM
db 0
db RIVAL2, 10 ; Pokemon Tower Rival w/Raichu
@ -1370,12 +1371,10 @@ SpecialTrainerMoves:
db 2, 1, BLIZZARD
db 2, 2, THUNDERBOLT
db 2, 3, SING
db 2, 4, HYPER_BEAM
db 3, 1, IRON_HEAD
db 3, 3, HYPER_BEAM
db 4, 1, EXPLOSION
db 2, 4, SURF
db 3, 3, BULLET_PUNCH
db 4, 1, FIRE_PUNCH
db 4, 2, THUNDERBOLT
db 4, 4, ICE_PUNCH
db 5, 1, THUNDERBOLT
db 5, 2, ICE_BEAM
db 5, 3, RECOVER
@ -1391,12 +1390,10 @@ SpecialTrainerMoves:
db 2, 1, BLIZZARD
db 2, 2, THUNDERBOLT
db 2, 3, SING
db 2, 4, HYPER_BEAM
db 3, 1, IRON_HEAD
db 3, 3, HYPER_BEAM
db 4, 1, EXPLOSION
db 2, 4, SURF
db 3, 3, BULLET_PUNCH
db 4, 1, FIRE_PUNCH
db 4, 2, THUNDERBOLT
db 4, 4, ICE_PUNCH
db 5, 1, THUNDERBOLT
db 5, 2, ICE_BEAM
db 5, 3, RECOVER

1
data/types/type_matchups.asm
View file

@ -110,4 +110,5 @@ TypeEffects:
db POISON, FAIRY, SUPER_EFFECTIVE
db STEEL, FAIRY, SUPER_EFFECTIVE
db DRAGON, FAIRY, NO_EFFECT
db ROCK, STEEL, NOT_VERY_EFFECTIVE
db -1 ; end

6
data/wild/maps/MtMoonB2F.asm
View file

@ -4,11 +4,11 @@ MtMoonB2FWildMons:
db 9, GEODUDE
db 10, BITTYBAT
db 10, GEODUDE
db 11, ZUBAT
db 10, PARAS
db 10, SANDSHREW
db 10, CLEFAIRY
db 10, PARAS
db 11, SANDSHREW
db 10, CLEFAIRY
db 12, SANDSHREW
db 12, ZUBAT
end_grass_wildmons

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

@ -1,7 +1,7 @@
Gauntlet4FWildMons:
def_grass_wildmons 10 ; encounter rate
db 48, HAUNTER
db 48, MAROWAK
db 48, GUARDIA
db 49, NINETALES
db 49, BALUMBA
db 49, HAUNTER