summaryrefslogtreecommitdiff
path: root/battle-e/trainers/goro.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/goro.asm
parent17853b802692237d98f96d1a80caf2019f71753e (diff)
Code cleanup; preparation for Japanese Battle eHEADmaster
Diffstat (limited to 'battle-e/trainers/goro.asm')
-rw-r--r--battle-e/trainers/goro.asm20
1 files changed, 12 insertions, 8 deletions
diff --git a/battle-e/trainers/goro.asm b/battle-e/trainers/goro.asm
index e2f4f0e..43f9a33 100644
--- a/battle-e/trainers/goro.asm
+++ b/battle-e/trainers/goro.asm
@@ -1,14 +1,16 @@
-INCLUDE "macros.asm"
+INCLUDE "trainers/macros.asm"
+
+ Battle_Trainer
BT_Level MOSSDEEP
Class NINJA_BOY
BT_Floor MOSSDEEP
- OT_Name "GORO"
+ Text_EN "GORO"8
OT_ID 00000, 00000
- Introduction COME_ON,_EX_EX,COME_ON,_EX_EX,SPEED_BOOST,_EX_EX
- After_Win MORE,_EX_EX,MORE,_EX_EX,SPEED_BOOST,_EX_EX
- After_Loss ARRGH,_ELIP,GIVE_ME,MORE,SPEED_BOOST,_ELIP_EX
+ Intro_EN COME_ON,_EX_EX,COME_ON,_EX_EX,SPEED_BOOST,_EX_EX
+ Win_EN MORE,_EX_EX,MORE,_EX_EX,SPEED_BOOST,_EX_EX
+ Loss_EN ARRGH,_ELIP,GIVE_ME,MORE,SPEED_BOOST,_ELIP_EX
Pokemon ELECTRODE
Holds KING_S_ROCK
@@ -19,7 +21,7 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 15,15,15,31,31,15, ELECTRODE_STATIC
PV $0000000E ; ⚲ Naive
- Nickname "ELECTRODE"
+ Text_EN "ELECTRODE"11
Friendship 255
Pokemon NINJASK
@@ -31,7 +33,7 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 15,31,15,31,15,15, NINJASK_SPEED_BOOST
PV $000000D5 ; ♂ Jolly
- Nickname "NINJASK"
+ Text_EN "NINJASK"11
Friendship 255
Pokemon CROBAT
@@ -43,5 +45,7 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 15,31,15,31,15,15, CROBAT_INNER_FOCUS
PV $0000000D ; ♀ Jolly
- Nickname "CROBAT"
+ Text_EN "CROBAT"11
Friendship 255
+
+ End_Trainer \ No newline at end of file