summaryrefslogtreecommitdiff
path: root/battle-e/trainers/bryce.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/bryce.asm
parent17853b802692237d98f96d1a80caf2019f71753e (diff)
Code cleanup; preparation for Japanese Battle eHEADmaster
Diffstat (limited to 'battle-e/trainers/bryce.asm')
-rw-r--r--battle-e/trainers/bryce.asm24
1 files changed, 14 insertions, 10 deletions
diff --git a/battle-e/trainers/bryce.asm b/battle-e/trainers/bryce.asm
index da7b87e..623f5b5 100644
--- a/battle-e/trainers/bryce.asm
+++ b/battle-e/trainers/bryce.asm
@@ -1,14 +1,16 @@
-INCLUDE "macros.asm"
+INCLUDE "trainers/macros.asm"
+
+ Battle_Trainer
BT_Level MOSSDEEP
- db FISHERMAN
+ Class FISHERMAN
BT_Floor MOSSDEEP
- OT_Name "BRYCE"
+ Text_EN "BRYCE"8
OT_ID 00000, 00000
- Introduction FISHING,IS,JUST,SO,FANTASTIC,_EX
- After_Win I_AM,DONE,_AND,I_AM,GOING,FISHING
- After_Loss OKAY,LET_S,GO,FISHING,TOGETHER,_EX
+ Intro_EN FISHING,IS,JUST,SO,FANTASTIC,_EX
+ Win_EN I_AM,DONE,_AND,I_AM,GOING,FISHING
+ Loss_EN OKAY,LET_S,GO,FISHING,TOGETHER,_EX
Pokemon LANTURN
Holds CHERI_BERRY
@@ -19,11 +21,11 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 15,15,31,15,15,31, LANTURN_VOLT_ABSORB
PV $0000000F ; ♀ Modest
- Nickname "LANTURN"
+ Text_EN "LANTURN"11
Friendship 255
Pokemon SHARPEDO
- dw MYSTIC_WATER
+ Holds MYSTIC_WATER
Moves CRUNCH, SURF, ICE_BEAM, DOUBLE_EDGE
Level 84
PP_Ups 0,0,0,0
@@ -31,7 +33,7 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 15,31,15,15,31,15, SHARPEDO_ROUGH_SKIN
PV $000000D9 ; ♂ Quiet
- Nickname "SHARPEDO"
+ Text_EN "SHARPEDO"11
Friendship 255
Pokemon WHISCASH
@@ -43,5 +45,7 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 15,15,31,15,15,31, WHISCASH_OBLIVIOUS
PV $000000D4 ; ♂ Serious
- Nickname "WHISCASH"
+ Text_EN "WHISCASH"11
Friendship 255
+
+ End_Trainer \ No newline at end of file