summaryrefslogtreecommitdiff
path: root/battle-e/trainers/natasha.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/natasha.asm
parent17853b802692237d98f96d1a80caf2019f71753e (diff)
Code cleanup; preparation for Japanese Battle eHEADmaster
Diffstat (limited to 'battle-e/trainers/natasha.asm')
-rw-r--r--battle-e/trainers/natasha.asm24
1 files changed, 14 insertions, 10 deletions
diff --git a/battle-e/trainers/natasha.asm b/battle-e/trainers/natasha.asm
index 2781afb..77d5fce 100644
--- a/battle-e/trainers/natasha.asm
+++ b/battle-e/trainers/natasha.asm
@@ -1,14 +1,16 @@
-INCLUDE "macros.asm"
+INCLUDE "trainers/macros.asm"
+
+ Battle_Trainer
BT_Level 50
- db PSYCHIC_F
+ Class PSYCHIC_F
BT_Floor 12
- OT_Name "NATASHA"
+ Text_EN "NATASHA"8
OT_ID 00000, 00000
- Introduction LOOK,_EX,MY,SKILLED,ATTACK,_EX_EX
- After_Win OH_,WHERE,WAS,YOUR,_LIGHT_SCREEN,_QU
- After_Loss I,WAS,NO_MATCH,FOR,YOU,_EX_EX
+ Intro_EN LOOK,_EX,MY,SKILLED,ATTACK,_EX_EX
+ Win_EN OH_,WHERE,WAS,YOUR,_LIGHT_SCREEN,_QU
+ Loss_EN I,WAS,NO_MATCH,FOR,YOU,_EX_EX
Pokemon STARMIE
Holds SCOPE_LENS
@@ -19,7 +21,7 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 15,15,15,31,31,15, STARMIE_NATURAL_CURE
PV $0000000F ; ⚲ Modest
- Nickname "STARMIE"
+ Text_EN "STARMIE"11
Friendship 255
Pokemon SALAMENCE
@@ -31,11 +33,11 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 15,31,15,31,31,15, SALAMENCE_INTIMIDATE
PV $0000008C ; ♂ Modest
- Nickname "SALAMENCE"
+ Text_EN "SALAMENCE"11
Friendship 255
Pokemon SCEPTILE
- dw BRIGHTPOWDER
+ Holds BRIGHTPOWDER
Moves LEAF_BLADE, CRUNCH, DRAGON_CLAW, DOUBLE_TEAM
Level 50
PP_Ups 0,0,0,0
@@ -43,5 +45,7 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 31,15,15,31,15,15, SCEPTILE_OVERGROW
PV $0000000F ; ♀ Modest
- Nickname "SCEPTILE"
+ Text_EN "SCEPTILE"11
Friendship 255
+
+ End_Trainer \ No newline at end of file