Skip to content

Commit ab37aee

Browse files
Added AMANDA
1 parent e21d349 commit ab37aee

File tree

3 files changed

+29
-2
lines changed

3 files changed

+29
-2
lines changed

data/trainers/names.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,5 @@ TrainerNames::
5353
li "JACKY" ; Often called Jack, but the only source for that is the file names themselves, which are oft shortened or literal japanese translations; all other context is "Shinjuku Jacky".
5454
li "JESSIE&JAMES"
5555
li "GIOVANNI"
56-
li "KRIS"
56+
li "AMANDA"
5757
assert_list_length NUM_TRAINERS

data/trainers/scaled_parties.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,4 +139,4 @@ KoichiData:
139139
db $FF, 60, MACHAMP, 60, ANNIHILAPE, 60, TAUROS_P, 65, HITMONLEE, 65, HITMONCHAN, 65, HITMONTOP, 0 ; Postgame
140140

141141
KrisData:
142-
db $FF, 11, HORSEA, 12, GOLDEEN, 14, STARMIE, 0 ; Misty's party for now
142+
db $FF, 100, ELECTABUZZ, 100, CLEFABLE, 100, POLIWRATH, 100, SCIZOR, 100, ALAKAZAM, 100, KANGASKHAN, 0

data/trainers/special_moves.asm

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1588,5 +1588,32 @@ SpecialTrainerMoves:
15881588
db 6, 3, THUNDER_WAVE
15891589
db 6, 4, SURF
15901590
db 0
1591+
1592+
db KRIS, 1 ; Amanda
1593+
db 1, 1, THUNDERBOLT
1594+
db 1, 2, FIRE_PUNCH
1595+
db 1, 3, ICE_PUNCH
1596+
db 1, 4, LIGHT_SCREEN
1597+
db 2, 1, DIZZY_PUNCH
1598+
db 2, 2, FIRE_PUNCH
1599+
db 2, 3, THUNDERPUNCH
1600+
db 2, 4, ICE_PUNCH
1601+
db 3, 1, HI_JUMP_KICK
1602+
db 3, 2, WATERFALL
1603+
db 3, 3, ICE_PUNCH
1604+
db 3, 4, HYPNOSIS
1605+
db 4, 1, SMART_STRIKE
1606+
db 4, 2, TWINEEDLE
1607+
db 4, 3, SLASH
1608+
db 4, 4, SWORDS_DANCE
1609+
db 5, 1, PSYCHIC_M
1610+
db 5, 2, FIRE_PUNCH
1611+
db 5, 3, THUNDERPUNCH
1612+
db 5, 4, ICE_PUNCH
1613+
db 6, 1, HEADBUTT
1614+
db 6, 2, EARTHQUAKE
1615+
db 6, 3, SURF
1616+
db 6, 4, NIGHT_SHADE
1617+
db 0
15911618
15921619
db -1 ; end

0 commit comments

Comments
 (0)