Bug Fixes and stuff!

(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

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)

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)

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)

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

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)

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)

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)

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:

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