summaryrefslogtreecommitdiff
path: root/battle-e/trainers/logan.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/logan.asm
parent17853b802692237d98f96d1a80caf2019f71753e (diff)
Code cleanup; preparation for Japanese Battle eHEADmaster
Diffstat (limited to 'battle-e/trainers/logan.asm')
-rw-r--r--battle-e/trainers/logan.asm26
1 files changed, 15 insertions, 11 deletions
diff --git a/battle-e/trainers/logan.asm b/battle-e/trainers/logan.asm
index a556c2e..c7b9513 100644
--- a/battle-e/trainers/logan.asm
+++ b/battle-e/trainers/logan.asm
@@ -1,17 +1,19 @@
-INCLUDE "macros.asm"
+INCLUDE "trainers/macros.asm"
+
+ Battle_Trainer
BT_Level MOSSDEEP
- db RUIN_MANIAC
+ Class RUIN_MANIAC
BT_Floor MOSSDEEP
- OT_Name "LOGAN"
+ Text_EN "LOGAN"8
OT_ID 00000, 00000
- Introduction BEGINNING,_QU,END,_QU_EX,I_AM,CONFUSED
- After_Win _RELICANTH,_EX,_WAILORD,_QU_EX,CORRECT,_QU_EX
- After_Loss _WAILORD,_QU,_RELICANTH,_QU_EX,OPPOSITE,_QU_EX
+ Intro_EN BEGINNING,_QU,END,_QU_EX,I_AM,CONFUSED
+ Win_EN _RELICANTH,_EX,_WAILORD,_QU_EX,CORRECT,_QU_EX
+ Loss_EN _WAILORD,_QU,_RELICANTH,_QU_EX,OPPOSITE,_QU_EX
Pokemon WAILORD
- dw MYSTIC_WATER
+ Holds MYSTIC_WATER
Moves SURF, FISSURE, EARTHQUAKE, ICE_BEAM
Level 58
PP_Ups 0,0,0,0
@@ -19,7 +21,7 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 31,15,15,15,31,15, WAILORD_OBLIVIOUS
PV $00000011 ; ♀ Quiet
- Nickname "WAILORD"
+ Text_EN "WAILORD"11
Friendship 255
Pokemon ARMALDO
@@ -31,11 +33,11 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 31,31,15,15,15,15, ARMALDO_BATTLE_ARMOR
PV $00000080 ; ♂ Adamant
- Nickname "ARMALDO"
+ Text_EN "ARMALDO"11
Friendship 255
Pokemon RELICANTH
- dw CHESTO_BERRY
+ Holds CHESTO_BERRY
Moves DOUBLE_EDGE, REST, DIVE, AMNESIA
Level 62
PP_Ups 0,0,0,0
@@ -43,5 +45,7 @@ INCLUDE "macros.asm"
OT_ID 00000, 00000
IVs 31,31,15,15,15,15, RELICANTH_ROCK_HEAD
PV $00000076 ; ♂ Bashful
- Nickname "RELICANTH"
+ Text_EN "RELICANTH"11
Friendship 255
+
+ End_Trainer \ No newline at end of file