summaryrefslogtreecommitdiff
path: root/battle-e/trainers/astrid.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/astrid.asm
parent17853b802692237d98f96d1a80caf2019f71753e (diff)
Code cleanup; preparation for Japanese Battle eHEADmaster
Diffstat (limited to 'battle-e/trainers/astrid.asm')
-rw-r--r--battle-e/trainers/astrid.asm22
1 files changed, 13 insertions, 9 deletions
diff --git a/battle-e/trainers/astrid.asm b/battle-e/trainers/astrid.asm
index 94930cd..3ff5cf3 100644
--- a/battle-e/trainers/astrid.asm
+++ b/battle-e/trainers/astrid.asm
@@ -1,17 +1,19 @@
-INCLUDE "macros.asm"
+INCLUDE "trainers/macros.asm"
+
+ Battle_Trainer
BT_Level 50
Class LADY
BT_Floor 0
- OT_Name "ASTRID"
+ Text_EN "ASTRID"8
OT_ID 00000, 00000
- Introduction TALKING,ABOUT,MY,CUTE,POKEMON,_QU
- After_Win YOUR,POKEMON,IS,_ELIP,CUTE,TOO
- After_Loss OH_,WASN_T,MY,POKEMON,CUTE,_QU
+ Intro_EN TALKING,ABOUT,MY,CUTE,POKEMON,_QU
+ Win_EN YOUR,POKEMON,IS,_ELIP,CUTE,TOO
+ Loss_EN OH_,WASN_T,MY,POKEMON,CUTE,_QU
Pokemon MAWILE
- dw SITRUS_BERRY
+ Holds SITRUS_BERRY
Moves IRON_DEFENSE, BITE, VICEGRIP, FAKE_TEARS
Level 50
PP_Ups 0,0,0,0
@@ -19,7 +21,7 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 15,15,15,15,15,15, MAWILE_INTIMIDATE
PV $0000001F ; ♀ Docile
- Nickname "MAWILE"
+ Text_EN "MAWILE"11
Friendship 255
Pokemon MINUN
@@ -31,7 +33,7 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 15,15,15,15,15,15, MINUN_MINUS
PV $000000D7 ; ♂ Modest
- Nickname "MINUN"
+ Text_EN "MINUN"11
Friendship 255
Pokemon SHIFTRY
@@ -43,5 +45,7 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 15,15,15,15,15,15, SHIFTRY_EARLY_BIRD
PV $000000D2 ; ♂ Timid
- Nickname "SHIFTRY"
+ Text_EN "SHIFTRY"11
Friendship 255
+
+ End_Trainer \ No newline at end of file