diff options
Diffstat (limited to 'battle-e/trainers/oscar.asm')
| -rw-r--r-- | battle-e/trainers/oscar.asm | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/battle-e/trainers/oscar.asm b/battle-e/trainers/oscar.asm index 718c9d8..25ed71c 100644 --- a/battle-e/trainers/oscar.asm +++ b/battle-e/trainers/oscar.asm @@ -1,17 +1,19 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP - db SAILOR + Class SAILOR BT_Floor MOSSDEEP - OT_Name "OSCAR" + Text_EN "OSCAR"8 OT_ID 00000, 00000 - Introduction DO,YOU,KNOW,THIS,POKEMON,_QU - After_Win HOW,WAS,MY,GHOST,POKEMON,_QU - After_Loss DID,YOU,LIKE,MY,POKEMON,_QU + Intro_EN DO,YOU,KNOW,THIS,POKEMON,_QU + Win_EN HOW,WAS,MY,GHOST,POKEMON,_QU + Loss_EN DID,YOU,LIKE,MY,POKEMON,_QU Pokemon ELECTRODE - dw LIECHI_BERRY + Holds LIECHI_BERRY Moves THUNDERBOLT, LIGHT_SCREEN, EXPLOSION, DOUBLE_TEAM Level 67 PP_Ups 0,0,0,0 @@ -19,7 +21,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,15,31,15, ELECTRODE_STATIC PV $00000013 ; ⚲ Rash - Nickname "ELECTRODE" + Text_EN "ELECTRODE"11 Friendship 255 Pokemon DODRIO @@ -31,11 +33,11 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,31,15,31,15,15, DODRIO_EARLY_BIRD PV $0000001C ; ♀ Adamant - Nickname "DODRIO" + Text_EN "DODRIO"11 Friendship 255 Pokemon GENGAR - dw PETAYA_BERRY + Holds PETAYA_BERRY Moves PSYCHIC, THUNDERBOLT, DESTINY_BOND, GIGA_DRAIN Level 73 PP_Ups 0,0,0,0 @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,31,15,15,15, GENGAR_LEVITATE PV $0000008C ; ♂ Modest - Nickname "GENGAR" + Text_EN "GENGAR"11 Friendship 255 + + End_Trainer
\ No newline at end of file |