summaryrefslogtreecommitdiff
path: root/battle-e/trainers/clayton.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/clayton.asm
parent17853b802692237d98f96d1a80caf2019f71753e (diff)
Code cleanup; preparation for Japanese Battle eHEADmaster
Diffstat (limited to 'battle-e/trainers/clayton.asm')
-rw-r--r--battle-e/trainers/clayton.asm22
1 files changed, 13 insertions, 9 deletions
diff --git a/battle-e/trainers/clayton.asm b/battle-e/trainers/clayton.asm
index 418b0a4..2192e5a 100644
--- a/battle-e/trainers/clayton.asm
+++ b/battle-e/trainers/clayton.asm
@@ -1,14 +1,16 @@
-INCLUDE "macros.asm"
+INCLUDE "trainers/macros.asm"
+
+ Battle_Trainer
BT_Level 50
- db PKMN_RANGER_M
+ Class PKMN_RANGER_M
BT_Floor 5
- OT_Name "CLAYTON"
+ Text_EN "CLAYTON"8
OT_ID 00000, 00000
- Introduction HEHE,MY,BATTLE,ISN_T,THAT,SHAKY
- After_Win HEHE,_ELIP,_EARTHQUAKE,IS,VERY,SHAKY
- After_Loss UH_OH,MY,ATTACK,WAS,A_LITTLE,SHAKY
+ Intro_EN HEHE,MY,BATTLE,ISN_T,THAT,SHAKY
+ Win_EN HEHE,_ELIP,_EARTHQUAKE,IS,VERY,SHAKY
+ Loss_EN UH_OH,MY,ATTACK,WAS,A_LITTLE,SHAKY
Pokemon FLYGON
Holds SOFT_SAND
@@ -19,7 +21,7 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 15,15,15,31,15,15, FLYGON_LEVITATE
PV $00000090 ; ♂ Rash
- Nickname "FLYGON"
+ Text_EN "FLYGON"11
Friendship 255
Pokemon RHYDON
@@ -31,7 +33,7 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 31,31,15,15,15,15, RHYDON_ROCK_HEAD
PV $0000001B ; ♀ Brave
- Nickname "RHYDON"
+ Text_EN "RHYDON"11
Friendship 255
Pokemon SWAMPERT
@@ -43,5 +45,7 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 31,31,15,15,15,15, SWAMPERT_TORRENT
PV $0000007E ; ♂ Lonely
- Nickname "SWAMPERT"
+ Text_EN "SWAMPERT"11
Friendship 255
+
+ End_Trainer \ No newline at end of file