Skip to content

Commit 41f23cb

Browse files
committed
Final Party Changes? Hopefully?
- Adjusted BBBBBa's party closer to HOF 1/2, probably should have been clearer - Fixed Bucket's moveset - Fixed A's movesets
1 parent 4f2396b commit 41f23cb

File tree

3 files changed

+25
-25
lines changed

3 files changed

+25
-25
lines changed

data/trainers/scaled_parties.asm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,10 @@ KAYData:
148148
db $FF, 78, HITMONLEE, 79, GYARADOS, 81, STARMIE, 80, CHARIZARD, 80, BLISSEY, 79, RATICATE, 0
149149
150150
BBBBBaData:
151-
db $FF, 80, MEW, 81, KANGASKHAN, 79, JYNX, 87, SANDSLASH, 79, NIDOKING, 78, CHARIZARD, 0
151+
db $FF, 80, MEW, 81, KANGASKHAN, 79, JYNX, 87, SANDSLASH, 79, NIDOKING, 85, SEAKING, 0
152152

153153
ASHData:
154154
db $FF, 80, GYARADOS, 79, ARBOK, 78, ONIX, 78, VILEPLUME, 88, JABETTA, 79, HYPNO, 0
155155
156156
RocketAData:
157-
db $FF, 85, PHANCERO, 83, MAGNETON, 82, FLAREON, 82, GYARADOS, 82, CROBAT, 81, RATICATE, 0
157+
db $FF, 81, PHANCERO, 83, MAGNETON, 82, FLAREON, 82, GYARADOS, 82, CROBAT, 81, RATICATE, 0

data/trainers/special_moves.asm

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1691,10 +1691,10 @@ SpecialTrainerMoves:
16911691
db 5, 2, BLIZZARD
16921692
db 5, 3, WATER_GUN
16931693
db 5, 4, BIDE
1694-
db 6, 1, FIRE_BLAST
1695-
db 6, 2, SEISMIC_TOSS
1696-
db 6, 3, CUT
1697-
db 6, 4, FISSURE
1694+
db 6, 1, SURF
1695+
db 6, 2, HYPER_BEAM
1696+
db 6, 3, MIMIC
1697+
db 6, 4, TOXIC
16981698
db 0
16991699

17001700
db ASH, 1
@@ -1714,39 +1714,39 @@ SpecialTrainerMoves:
17141714
db 4, 2, ABSORB
17151715
db 4, 3, CUT
17161716
db 4, 4, SLEEP_POWDER
1717-
; db 5, 1,
1718-
; db 5, 2,
1719-
; db 5, 3,
1720-
; db 5, 4,
1717+
; db 5, 1, FLY
1718+
; db 5, 2, EARTHQUAKE
1719+
; db 5, 3, SUBMISSION
1720+
; db 5, 4, TRI_ATTACK
17211721
db 6, 1, PSYCHIC_M
17221722
db 6, 2, HEADBUTT
17231723
db 6, 3, DOUBLE_TEAM
17241724
db 6, 4, METRONOME
17251725
db 0
17261726

17271727
db ROCKETA, 1
1728-
; db 1, 1,
1729-
; db 1, 2,
1728+
; db 1, 1, DRILL_PECK
1729+
; db 1, 2, ICE_BEAM
17301730
db 1, 3, PSYCHIC_M
1731-
; db 1, 4,
1732-
; db 2, 1,
1733-
; db 2, 2,
1731+
; db 1, 4, AMNESIA
1732+
; db 2, 1, THUNDERBOLT
1733+
; db 2, 2, IRON_HEAD
17341734
db 2, 3, TRI_ATTACK
17351735
db 2, 4, THUNDER_WAVE
1736-
; db 3, 1,
1736+
; db 3, 1, FLAMETHROWER
17371737
db 3, 2, DIG
1738-
; db 3, 3,
1738+
; db 3, 3, RECOVER
17391739
; db 3, 4,
1740-
; db 4, 1,
1741-
; db 4, 2,
1742-
; db 4, 3,
1740+
; db 4, 1, SURF
1741+
; db 4, 2, ICE_BEAM
1742+
; db 4, 3, AGILITY
17431743
db 4, 4, SUBSTITUTE
17441744
db 5, 1, FLY
1745-
; db 5, 2,
1746-
; db 5, 3,
1745+
; db 5, 2, SLUDGE
1746+
; db 5, 3, NIGHT_SLASH
17471747
; db 5, 4,
1748-
; db 6, 1,
1749-
; db 6, 2,
1748+
; db 6, 1, BODY_SLAM
1749+
; db 6, 2, KOWTOW_CLEAVE
17501750
db 6, 3, DIG
17511751
db 6, 4, SWORDS_DANCE
17521752
db 0

data/trainers/special_nicknames_stats.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ SpecialTrainerNicknamesStats::
4646
mon_nick_stats "LOLA", 210, 124, 80, 194, 174
4747
mon_nick_stats "SKJJ", 273, 236, 251, 154, 157
4848
mon_nick_stats "MUTTB", 247, 183, 154, 148, 166
49-
mon_nick_stats "W)))):;;;;", 245, 174, 161, 165, 185
49+
mon_nick_stats "T IHG", 240, 188, 145, 164, 153
5050

5151
db ASH, 1
5252
; nickname, hp, atk, def, spc, spd

0 commit comments

Comments
 (0)