summaryrefslogtreecommitdiff
path: root/battle-e/trainers/natalie.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/natalie.asm
parent17853b802692237d98f96d1a80caf2019f71753e (diff)
Code cleanup; preparation for Japanese Battle eHEADmaster
Diffstat (limited to 'battle-e/trainers/natalie.asm')
-rw-r--r--battle-e/trainers/natalie.asm24
1 files changed, 14 insertions, 10 deletions
diff --git a/battle-e/trainers/natalie.asm b/battle-e/trainers/natalie.asm
index 2d795ef..f409012 100644
--- a/battle-e/trainers/natalie.asm
+++ b/battle-e/trainers/natalie.asm
@@ -1,14 +1,16 @@
-INCLUDE "macros.asm"
+INCLUDE "trainers/macros.asm"
+
+ Battle_Trainer
BT_Level MOSSDEEP
- db BATTLE_GIRL
+ Class BATTLE_GIRL
BT_Floor MOSSDEEP
- OT_Name "NATALIE"
+ Text_EN "NATALIE"8
OT_ID 00000, 00000
- Introduction GET,READY,TO,START,THE,BATTLE
- After_Win ALTHOUGH,I_AM,SMALL,I,BEAT,YOU
- After_Loss NEXT,BATTLE,I,WILL,BE,BETTER
+ Intro_EN GET,READY,TO,START,THE,BATTLE
+ Win_EN ALTHOUGH,I_AM,SMALL,I,BEAT,YOU
+ Loss_EN NEXT,BATTLE,I,WILL,BE,BETTER
Pokemon MAGIKARP
Holds CHOICE_BAND
@@ -19,7 +21,7 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 15,31,15,31,15,15, MAGIKARP_SWIFT_SWIM
PV $000000E4 ; ♂ Adamant
- Nickname "MAGIKARP"
+ Text_EN "MAGIKARP"11
Friendship 255
Pokemon LAIRON
@@ -31,11 +33,11 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 31,31,15,15,15,15, LAIRON_STURDY
PV $000000E4 ; ♂ Adamant
- Nickname "LAIRON"
+ Text_EN "LAIRON"11
Friendship 255
Pokemon SHELGON
- dw SITRUS_BERRY
+ Holds SITRUS_BERRY
Moves DRAGONBREATH, EMBER, BITE, THRASH
Level 50
PP_Ups 0,0,0,0
@@ -43,5 +45,7 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 31,15,15,15,15,31, SHELGON_ROCK_HEAD
PV $0000001C ; ♀ Adamant
- Nickname "SHELGON"
+ Text_EN "SHELGON"11
Friendship 255
+
+ End_Trainer \ No newline at end of file