summaryrefslogtreecommitdiff
path: root/battle-e/trainers/tyler.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/tyler.asm
parent17853b802692237d98f96d1a80caf2019f71753e (diff)
Code cleanup; preparation for Japanese Battle eHEADmaster
Diffstat (limited to 'battle-e/trainers/tyler.asm')
-rw-r--r--battle-e/trainers/tyler.asm24
1 files changed, 14 insertions, 10 deletions
diff --git a/battle-e/trainers/tyler.asm b/battle-e/trainers/tyler.asm
index 2b3fd04..1556237 100644
--- a/battle-e/trainers/tyler.asm
+++ b/battle-e/trainers/tyler.asm
@@ -1,14 +1,16 @@
-INCLUDE "macros.asm"
+INCLUDE "trainers/macros.asm"
+
+ Battle_Trainer
BT_Level MOSSDEEP
- db POKEMANIAC
+ Class POKEMANIAC
BT_Floor MOSSDEEP
- OT_Name "TYLER"
+ Text_EN "TYLER"8
OT_ID 00000, 00000
- Introduction WHOAH,OVERWHELMING,MEGA,BLANK,ATTACK,_EX
- After_Win WAHAHAHA,_EX,THAT,WAS,SERIOUS,_1_HIT_KO_
- After_Loss TOO_STRONG,_EX,GO_EASY,ON,ME,_EX
+ Intro_EN WHOAH,OVERWHELMING,MEGA,BLANK,ATTACK,_EX
+ Win_EN WAHAHAHA,_EX,THAT,WAS,SERIOUS,_1_HIT_KO_
+ Loss_EN TOO_STRONG,_EX,GO_EASY,ON,ME,_EX
Pokemon WALREIN
Holds LAX_INCENSE
@@ -19,11 +21,11 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 15,15,31,15,15,31, WALREIN_THICK_FAT
PV $00000013 ; ♀ Rash
- Nickname "WALREIN"
+ Text_EN "WALREIN"11
Friendship 255
Pokemon PINSIR
- dw BRIGHTPOWDER
+ Holds BRIGHTPOWDER
Moves GUILLOTINE, SUBMISSION, EARTHQUAKE, ROCK_TOMB
Level 64
PP_Ups 0,0,0,0
@@ -31,7 +33,7 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 31,15,15,31,15,15, PINSIR_HYPER_CUTTER
PV $0000008A ; ♂ Jolly
- Nickname "PINSIR"
+ Text_EN "PINSIR"11
Friendship 255
Pokemon RHYDON
@@ -43,5 +45,7 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 31,31,15,15,15,15, RHYDON_ROCK_HEAD
PV $00000016 ; ♀ Sassy
- Nickname "RHYDON"
+ Text_EN "RHYDON"11
Friendship 255
+
+ End_Trainer \ No newline at end of file