summaryrefslogtreecommitdiff
path: root/battle-e/trainers/annie.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/annie.asm
parent17853b802692237d98f96d1a80caf2019f71753e (diff)
Code cleanup; preparation for Japanese Battle eHEADmaster
Diffstat (limited to 'battle-e/trainers/annie.asm')
-rw-r--r--battle-e/trainers/annie.asm20
1 files changed, 12 insertions, 8 deletions
diff --git a/battle-e/trainers/annie.asm b/battle-e/trainers/annie.asm
index 923fe6a..8fe3870 100644
--- a/battle-e/trainers/annie.asm
+++ b/battle-e/trainers/annie.asm
@@ -1,14 +1,16 @@
-INCLUDE "macros.asm"
+INCLUDE "trainers/macros.asm"
+
+ Battle_Trainer
BT_Level MOSSDEEP
Class SWIMMER_F
BT_Floor MOSSDEEP
- OT_Name "ANNIE"
+ Text_EN "ANNIE"8
OT_ID 00000, 00000
- Introduction HERE_I_COME,_EX,GO,MY,WATER,POKEMON
- After_Win IT_S,_A,GREAT,POKEMON,ISN_T,IT
- After_Loss DON_T,YOU,KNOW,THIS,POKEMON,_QU
+ Intro_EN HERE_I_COME,_EX,GO,MY,WATER,POKEMON
+ Win_EN IT_S,_A,GREAT,POKEMON,ISN_T,IT
+ Loss_EN DON_T,YOU,KNOW,THIS,POKEMON,_QU
Pokemon MACHAMP
Holds BLACK_BELT
@@ -19,7 +21,7 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 31,31,15,15,15,15, MACHAMP_GUTS
PV $000000E7 ; ♂ Docile
- Nickname "MACHAMP"
+ Text_EN "MACHAMP"11
Friendship 255
Pokemon MAGNETON
@@ -31,7 +33,7 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 31,15,15,15,31,15, MAGNETON_STURDY
PV $0000000C ; ⚲ Serious
- Nickname "MAGNETON"
+ Text_EN "MAGNETON"11
Friendship 255
Pokemon BLASTOISE
@@ -43,5 +45,7 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 31,15,15,15,31,15, BLASTOISE_TORRENT
PV $00000012 ; ♀ Bashful
- Nickname "BLASTOISE"
+ Text_EN "BLASTOISE"11
Friendship 255
+
+ End_Trainer \ No newline at end of file