summaryrefslogtreecommitdiff
path: root/battle-e/trainers/hillary.asm
diff options
context:
space:
mode:
authorHáčky <hatschky@gmail.com>2014-11-27 07:15:45 +0000
committerHáčky <hatschky@gmail.com>2014-11-27 07:15:45 +0000
commit319ed6d0e0266f5f6174a5acd929914db8cfae1d (patch)
tree76408d9cadcbed1e702efa8c44f4cf5e364b0a4d /battle-e/trainers/hillary.asm
parent17853b802692237d98f96d1a80caf2019f71753e (diff)
Code cleanup; preparation for Japanese Battle eHEADmaster
Diffstat (limited to 'battle-e/trainers/hillary.asm')
-rw-r--r--battle-e/trainers/hillary.asm24
1 files changed, 14 insertions, 10 deletions
diff --git a/battle-e/trainers/hillary.asm b/battle-e/trainers/hillary.asm
index 1d06dd3..64ea16d 100644
--- a/battle-e/trainers/hillary.asm
+++ b/battle-e/trainers/hillary.asm
@@ -1,17 +1,19 @@
-INCLUDE "macros.asm"
+INCLUDE "trainers/macros.asm"
+
+ Battle_Trainer
BT_Level MOSSDEEP
Class LADY
BT_Floor MOSSDEEP
- OT_Name "HILLARY"
+ Text_EN "HILLARY"8
OT_ID 00000, 00000
- Introduction OH_,IS,MY,POKEMON,OVERWHELMING,_QU
- After_Win _STOP,GOING,EASY,ON,ME,_EX_EX
- After_Loss COULDN_T,YOU,GO_EASY,ON,ME,_QU
+ Intro_EN OH_,IS,MY,POKEMON,OVERWHELMING,_QU
+ Win_EN _STOP,GOING,EASY,ON,ME,_EX_EX
+ Loss_EN COULDN_T,YOU,GO_EASY,ON,ME,_QU
Pokemon XATU
- dw TWISTEDSPOON
+ Holds TWISTEDSPOON
Moves PSYCHIC, SUNNY_DAY, CONFUSE_RAY, SOLARBEAM
Level 54
PP_Ups 0,0,0,0
@@ -19,11 +21,11 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 0,15,15,31,31,15, XATU_SYNCHRONIZE
PV $000000D7 ; ♂ Modest
- Nickname "XATU"
+ Text_EN "XATU"11
Friendship 255
Pokemon WOBBUFFET
- dw SITRUS_BERRY
+ Holds SITRUS_BERRY
Moves COUNTER, MIRROR_COAT, SAFEGUARD, DESTINY_BOND
Level 57
PP_Ups 0,0,0,0
@@ -31,7 +33,7 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 15,15,31,15,15,31, WOBBUFFET_SHADOW_TAG
PV $00000012 ; ♀ Bashful
- Nickname "WOBBUFFET"
+ Text_EN "WOBBUFFET"11
Friendship 255
Pokemon HOUNDOOM
@@ -43,5 +45,7 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 15,15,15,31,31,15, HOUNDOOM_FLASH_FIRE
PV $000000D7 ; ♂ Modest
- Nickname "HOUNDOOM"
+ Text_EN "HOUNDOOM"11
Friendship 255
+
+ End_Trainer \ No newline at end of file