summaryrefslogtreecommitdiff
path: root/battle-e/trainers/heather.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/heather.asm
parent17853b802692237d98f96d1a80caf2019f71753e (diff)
Code cleanup; preparation for Japanese Battle eHEADmaster
Diffstat (limited to 'battle-e/trainers/heather.asm')
-rw-r--r--battle-e/trainers/heather.asm24
1 files changed, 14 insertions, 10 deletions
diff --git a/battle-e/trainers/heather.asm b/battle-e/trainers/heather.asm
index c60f554..2b0c852 100644
--- a/battle-e/trainers/heather.asm
+++ b/battle-e/trainers/heather.asm
@@ -1,14 +1,16 @@
-INCLUDE "macros.asm"
+INCLUDE "trainers/macros.asm"
+
+ Battle_Trainer
BT_Level MOSSDEEP
- db PKMN_RANGER_F
+ Class PKMN_RANGER_F
BT_Floor MOSSDEEP
- OT_Name "HEATHER"
+ Text_EN "HEATHER"8
OT_ID 00000, 00000
- Introduction YOUR,ATTACK,GOES,BACK,TO,YOU
- After_Win _COUNTER,ATTACK,ARE,YOU,OK_,BLANK
- After_Loss OH,_EX,MY,_COUNTER,DIDN_T,WORK
+ Intro_EN YOUR,ATTACK,GOES,BACK,TO,YOU
+ Win_EN _COUNTER,ATTACK,ARE,YOU,OK_,BLANK
+ Loss_EN OH,_EX,MY,_COUNTER,DIDN_T,WORK
Pokemon MACHAMP
Holds SHELL_BELL
@@ -19,10 +21,10 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 31,15,15,15,15,31, MACHAMP_GUTS
PV $00000080 ; ♂ Adamant
- Nickname "MACHAMP"
+ Text_EN "MACHAMP"11
Friendship 255
- dw TENTACRUEL
+ Pokemon TENTACRUEL
Holds POISON_BARB
Moves MIRROR_COAT, SURF, SLUDGE_BOMB, ICE_BEAM
Level 78
@@ -31,7 +33,7 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 31,15,31,15,15,15, TENTACRUEL_LIQUID_OOZE
PV $0000000F ; ♀ Modest
- Nickname "TENTACRUEL"
+ Text_EN "TENTACRUEL"11
Friendship 255
Pokemon WOBBUFFET
@@ -43,5 +45,7 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 31,15,15,15,15,31, WOBBUFFET_SHADOW_TAG
PV $00000085 ; ♂ Impish
- Nickname "WOBBUFFET"
+ Text_EN "WOBBUFFET"11
Friendship 255
+
+ End_Trainer \ No newline at end of file