Skip to content

Commit

Permalink
Add more trainer dialog.
Browse files Browse the repository at this point in the history
  • Loading branch information
roukaour committed Aug 1, 2016
1 parent 00f1fea commit 85e3995
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 12 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@ I was hesitant to make original changes like this, because the goal is to be an
These changes have been made since the previous 1.1.0 release. If you build the project as-is, it will include all of them.

* Add: New music by Mmmmmm and Pum.
* Add: More trainer dialog.
* Add: Wild Sneasel may hold a Razor Claw.
* Add: Wild Gligar may hold a Razor Fang.
* Add: Wild Oddish are rare in Ilex Forest during the day.
Expand Down
30 changes: 21 additions & 9 deletions maps/SaffronGym.asm
Original file line number Diff line number Diff line change
Expand Up @@ -271,15 +271,18 @@ UnknownText_0x18a136:
done

PsychicLeonSeenText:
text "TODO"
text "You cannot resist"
line "my psychic power!"
done

PsychicLeonBeatenText:
text "TODO"
text "My prediction was"
line "inaccurate…"
done

PsychicLeonAfterText:
text "TODO"
text "Sabrina's power is"
line "greater than mine!"
done

PsychicJaredSeenText:
Expand All @@ -302,27 +305,36 @@ UnknownText_0x18a1b3:
done

HexManiacLunaSeenText:
text "TODO"
text "Abra, Kadabra,"
line "Alakazam!"
done

HexManiacLunaBeatenText:
text "TODO"
text "My curse failed?"
done

HexManiacLunaAfterText:
text "TODO"
text "Alakazam is a pow-"
line "erful #mon,"

para "so Hex Maniacs use"
line "its name for"
cont "powerful spells."
done

HexManiacNatalieSeenText:
text "TODO"
text "Let us do battle!"
line "Mwahaha!"
done

HexManiacNatalieBeatenText:
text "TODO"
text "Mwaha--cough!"
done

HexManiacNatalieAfterText:
text "TODO"
text "Maybe I'm not cut"
line "out to be a Hex"
cont "Maniac…"
done

PsychicFranklinSeenText:
Expand Down
6 changes: 3 additions & 3 deletions trainers/trainers.asm
Original file line number Diff line number Diff line change
Expand Up @@ -8098,9 +8098,9 @@ HexManiacGroup:
db 0 ; normal

; party
db 44, DROWZEE
db 44, DROWZEE
db 46, HYPNO
db 45, DROWZEE
db 45, DROWZEE
db 47, HYPNO

db $ff ; end

Expand Down

0 comments on commit 85e3995

Please sign in to comment.