summaryrefslogtreecommitdiff
path: root/battle-e/trainers/renee.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/renee.asm
parent17853b802692237d98f96d1a80caf2019f71753e (diff)
Code cleanup; preparation for Japanese Battle eHEADmaster
Diffstat (limited to 'battle-e/trainers/renee.asm')
-rw-r--r--battle-e/trainers/renee.asm26
1 files changed, 15 insertions, 11 deletions
diff --git a/battle-e/trainers/renee.asm b/battle-e/trainers/renee.asm
index 86f36b0..6c7b716 100644
--- a/battle-e/trainers/renee.asm
+++ b/battle-e/trainers/renee.asm
@@ -1,17 +1,19 @@
-INCLUDE "macros.asm"
+INCLUDE "trainers/macros.asm"
+
+ Battle_Trainer
BT_Level MOSSDEEP
- db PICNICKER
+ Class PICNICKER
BT_Floor MOSSDEEP
- OT_Name "RENEE"
+ Text_EN "RENEE"8
OT_ID 00000, 00000
- Introduction MY,NATURE,IS,_ELIP,STATIC,_EX
- After_Win MY,FEELING,IS,NOW,LIKE,_SUNNY_DAY
- After_Loss MY,FEELING,IS,NOW,LIKE,DRIZZLE
+ Intro_EN MY,NATURE,IS,_ELIP,STATIC,_EX
+ Win_EN MY,FEELING,IS,NOW,LIKE,_SUNNY_DAY
+ Loss_EN MY,FEELING,IS,NOW,LIKE,DRIZZLE
Pokemon CASTFORM
- dw PETAYA_BERRY
+ Holds PETAYA_BERRY
Moves WEATHER_BALL, SOLARBEAM, SUNNY_DAY, FLAMETHROWER
Level 72
PP_Ups 0,0,0,0
@@ -19,7 +21,7 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 15,15,15,31,31,15, CASTFORM_FORECAST
PV $00000012 ; ♀ Bashful
- Nickname "CASTFORM"
+ Text_EN "CASTFORM"11
Friendship 255
Pokemon CASTFORM
@@ -31,11 +33,11 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 15,15,15,31,31,15, CASTFORM_FORECAST
PV $000000DA ; ♂ Bashful
- Nickname "CASTFORM"
+ Text_EN "CASTFORM"11
Friendship 255
Pokemon CASTFORM
- dw APICOT_BERRY
+ Holds APICOT_BERRY
Moves WEATHER_BALL, BLIZZARD, HAIL, ICE_BEAM
Level 74
PP_Ups 0,0,0,0
@@ -43,5 +45,7 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 15,15,15,31,31,15, CASTFORM_FORECAST
PV $00000012 ; ♀ Bashful
- Nickname "CASTFORM"
+ Text_EN "CASTFORM"11
Friendship 255
+
+ End_Trainer \ No newline at end of file