diff options
| author | Háčky <hatschky@gmail.com> | 2014-11-27 07:15:45 +0000 |
|---|---|---|
| committer | Háčky <hatschky@gmail.com> | 2014-11-27 07:15:45 +0000 |
| commit | 319ed6d0e0266f5f6174a5acd929914db8cfae1d (patch) | |
| tree | 76408d9cadcbed1e702efa8c44f4cf5e364b0a4d /battle-e | |
| parent | 17853b802692237d98f96d1a80caf2019f71753e (diff) | |
Diffstat (limited to 'battle-e')
121 files changed, 1207 insertions, 908 deletions
diff --git a/battle-e/08-A001.asm b/battle-e/08-A001.asm index a64b2c0..88faba9 100644 --- a/battle-e/08-A001.asm +++ b/battle-e/08-A001.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/devin.bin", "sprites/trainers/cooltrainer_m.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "cooltrainer_m" +TRAINER EQUS "devin" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A002.asm b/battle-e/08-A002.asm index f234a86..cf8dfc2 100644 --- a/battle-e/08-A002.asm +++ b/battle-e/08-A002.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/goro.bin", "sprites/trainers/ninja_boy.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "ninja_boy" +TRAINER EQUS "goro" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A003.asm b/battle-e/08-A003.asm index a65a53d..d8e2f2e 100644 --- a/battle-e/08-A003.asm +++ b/battle-e/08-A003.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/sonya.bin", "sprites/trainers/tuber_f.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "tuber_f" +TRAINER EQUS "sonya" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A004.asm b/battle-e/08-A004.asm index 3955238..be84022 100644 --- a/battle-e/08-A004.asm +++ b/battle-e/08-A004.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/antonio.bin", "sprites/trainers/gentleman.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "gentleman" +TRAINER EQUS "antonio" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A005.asm b/battle-e/08-A005.asm index 0618719..e7c78f4 100644 --- a/battle-e/08-A005.asm +++ b/battle-e/08-A005.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/alana.bin", "sprites/trainers/pokefan_f.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "pokefan_f" +TRAINER EQUS "alana" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A006.asm b/battle-e/08-A006.asm index d4799c0..a4496e2 100644 --- a/battle-e/08-A006.asm +++ b/battle-e/08-A006.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/renee.bin", "sprites/trainers/picnicker.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "picnicker" +TRAINER EQUS "renee" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A007.asm b/battle-e/08-A007.asm index a59371a..410f6e1 100644 --- a/battle-e/08-A007.asm +++ b/battle-e/08-A007.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/sophie.bin", "sprites/trainers/lady.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "lady" +TRAINER EQUS "sophie" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A008.asm b/battle-e/08-A008.asm index 74f03ac..da41a2f 100644 --- a/battle-e/08-A008.asm +++ b/battle-e/08-A008.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/fay.bin", "sprites/trainers/beauty.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "beauty" +TRAINER EQUS "fay" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A009.asm b/battle-e/08-A009.asm index b6ad653..90cfc14 100644 --- a/battle-e/08-A009.asm +++ b/battle-e/08-A009.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/natasha.bin", "sprites/trainers/psychic_f.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "psychic_f" +TRAINER EQUS "natasha" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A010.asm b/battle-e/08-A010.asm index 19fd447..529da27 100644 --- a/battle-e/08-A010.asm +++ b/battle-e/08-A010.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/patrick.bin", "sprites/trainers/camper.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "camper" +TRAINER EQUS "patrick" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A011.asm b/battle-e/08-A011.asm index 4277986..dd3f281 100644 --- a/battle-e/08-A011.asm +++ b/battle-e/08-A011.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/oscar.bin", "sprites/trainers/sailor.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "sailor" +TRAINER EQUS "oscar" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A012.asm b/battle-e/08-A012.asm index dc42e69..a157b37 100644 --- a/battle-e/08-A012.asm +++ b/battle-e/08-A012.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/tyler.bin", "sprites/trainers/pokemaniac.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "pokemaniac" +TRAINER EQUS "tyler" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A013.asm b/battle-e/08-A013.asm index 765b14f..474ad10 100644 --- a/battle-e/08-A013.asm +++ b/battle-e/08-A013.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/rudy.bin", "sprites/trainers/youngster.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "youngster" +TRAINER EQUS "rudy" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A014.asm b/battle-e/08-A014.asm index e1cbf1f..e441da2 100644 --- a/battle-e/08-A014.asm +++ b/battle-e/08-A014.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/ellie.bin", "sprites/trainers/beauty.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "beauty" +TRAINER EQUS "ellie" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A015.asm b/battle-e/08-A015.asm index 40d2f81..9aba7d2 100644 --- a/battle-e/08-A015.asm +++ b/battle-e/08-A015.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/candice.bin", "sprites/trainers/pkmn_breeder_f.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "pkmn_breeder_f" +TRAINER EQUS "candice" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A016.asm b/battle-e/08-A016.asm index 457e3bd..ba88b88 100644 --- a/battle-e/08-A016.asm +++ b/battle-e/08-A016.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/belford.bin", "sprites/trainers/cooltrainer_m.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "cooltrainer_m" +TRAINER EQUS "belford" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A017.asm b/battle-e/08-A017.asm index 9aef588..e469bc1 100644 --- a/battle-e/08-A017.asm +++ b/battle-e/08-A017.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/clayton.bin", "sprites/trainers/pkmn_ranger_m.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "pkmn_ranger_m" +TRAINER EQUS "clayton" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A018.asm b/battle-e/08-A018.asm index d6ee1ca..a90b675 100644 --- a/battle-e/08-A018.asm +++ b/battle-e/08-A018.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/dustin.bin", "sprites/trainers/triathlete_m_swim.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "triathlete_m_swim" +TRAINER EQUS "dustin" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A019.asm b/battle-e/08-A019.asm index b860a5a..5d717d2 100644 --- a/battle-e/08-A019.asm +++ b/battle-e/08-A019.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/hugo.bin", "sprites/trainers/hiker.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "hiker" +TRAINER EQUS "hugo" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A020.asm b/battle-e/08-A020.asm index 68706ab..c4e2c16 100644 --- a/battle-e/08-A020.asm +++ b/battle-e/08-A020.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/jeffrey.bin", "sprites/trainers/youngster.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "youngster" +TRAINER EQUS "jeffrey" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A021.asm b/battle-e/08-A021.asm index e52c980..4683b88 100644 --- a/battle-e/08-A021.asm +++ b/battle-e/08-A021.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/logan.bin", "sprites/trainers/ruin_maniac.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "ruin_maniac" +TRAINER EQUS "logan" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A022.asm b/battle-e/08-A022.asm index 014c488..28f47fb 100644 --- a/battle-e/08-A022.asm +++ b/battle-e/08-A022.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/maggie.bin", "sprites/trainers/pokefan_f.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "pokefan_f" +TRAINER EQUS "maggie" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A023.asm b/battle-e/08-A023.asm index eb99dbb..97e38db 100644 --- a/battle-e/08-A023.asm +++ b/battle-e/08-A023.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/wilson.bin", "sprites/trainers/pkmn_breeder_m.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "pkmn_breeder_m" +TRAINER EQUS "wilson" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A024.asm b/battle-e/08-A024.asm index c09cd68..12fbaf6 100644 --- a/battle-e/08-A024.asm +++ b/battle-e/08-A024.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/zuril.bin", "sprites/trainers/ruin_maniac.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "ruin_maniac" +TRAINER EQUS "zuril" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A025.asm b/battle-e/08-A025.asm index 48a1e0c..b3b5e4e 100644 --- a/battle-e/08-A025.asm +++ b/battle-e/08-A025.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/mandy.bin", "sprites/trainers/school_kid_f.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "school_kid_f" +TRAINER EQUS "mandy" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A026.asm b/battle-e/08-A026.asm index dfb937a..b43fc2d 100644 --- a/battle-e/08-A026.asm +++ b/battle-e/08-A026.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/sofia.bin", "sprites/trainers/parasol_lady.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "parasol_lady" +TRAINER EQUS "sofia" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A027.asm b/battle-e/08-A027.asm index 5a13e29..937542f 100644 --- a/battle-e/08-A027.asm +++ b/battle-e/08-A027.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/hillary.bin", "sprites/trainers/lady.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "lady" +TRAINER EQUS "hillary" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A028.asm b/battle-e/08-A028.asm index c45b325..6f1c464 100644 --- a/battle-e/08-A028.asm +++ b/battle-e/08-A028.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/dominic.bin", "sprites/trainers/guitarist.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "guitarist" +TRAINER EQUS "dominic" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A029.asm b/battle-e/08-A029.asm index 15cdbeb..e6196b9 100644 --- a/battle-e/08-A029.asm +++ b/battle-e/08-A029.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/bryce.bin", "sprites/trainers/fisherman.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "fisherman" +TRAINER EQUS "bryce" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A030.asm b/battle-e/08-A030.asm index 31b6ef7..3e2c7d4 100644 --- a/battle-e/08-A030.asm +++ b/battle-e/08-A030.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/irvin.bin", "sprites/trainers/bug_maniac.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "bug_maniac" +TRAINER EQUS "irvin" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A031.asm b/battle-e/08-A031.asm index 3d010f3..e487ff5 100644 --- a/battle-e/08-A031.asm +++ b/battle-e/08-A031.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/natalie.bin", "sprites/trainers/battle_girl.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "battle_girl" +TRAINER EQUS "natalie" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A032.asm b/battle-e/08-A032.asm index 08e9a5e..2bcfded 100644 --- a/battle-e/08-A032.asm +++ b/battle-e/08-A032.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/sandia.bin", "sprites/trainers/expert_f.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "expert_f" +TRAINER EQUS "sandia" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A033.asm b/battle-e/08-A033.asm index fd2ab8a..70975c9 100644 --- a/battle-e/08-A033.asm +++ b/battle-e/08-A033.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/marcus.bin", "sprites/trainers/expert_m.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "expert_m" +TRAINER EQUS "marcus" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A034.asm b/battle-e/08-A034.asm index d8fb30b..f59bed9 100644 --- a/battle-e/08-A034.asm +++ b/battle-e/08-A034.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/raquel.bin", "sprites/trainers/cooltrainer_f.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "cooltrainer_f" +TRAINER EQUS "raquel" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A035.asm b/battle-e/08-A035.asm index f46c174..e427dba 100644 --- a/battle-e/08-A035.asm +++ b/battle-e/08-A035.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/tsutomu.bin", "sprites/trainers/black_belt.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "black_belt" +TRAINER EQUS "tsutomu" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A036.asm b/battle-e/08-A036.asm index e5fd650..90357d2 100644 --- a/battle-e/08-A036.asm +++ b/battle-e/08-A036.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/justine.bin", "sprites/trainers/pokefan_f.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "pokefan_f" +TRAINER EQUS "justine" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A037.asm b/battle-e/08-A037.asm index e891a75..809055f 100644 --- a/battle-e/08-A037.asm +++ b/battle-e/08-A037.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/heather.bin", "sprites/trainers/pkmn_ranger_f.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "pkmn_ranger_f" +TRAINER EQUS "heather" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A038.asm b/battle-e/08-A038.asm index 8f6fa43..ebbc8dd 100644 --- a/battle-e/08-A038.asm +++ b/battle-e/08-A038.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/judith.bin", "sprites/trainers/psychic_f.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "psychic_f" +TRAINER EQUS "judith" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A039.asm b/battle-e/08-A039.asm index 23df2ed..bb9c253 100644 --- a/battle-e/08-A039.asm +++ b/battle-e/08-A039.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/stuart.bin", "sprites/trainers/collector.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "collector" +TRAINER EQUS "stuart" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A040.asm b/battle-e/08-A040.asm index 5d8a4d4..87af50f 100644 --- a/battle-e/08-A040.asm +++ b/battle-e/08-A040.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/irazu.bin", "sprites/trainers/pkmn_ranger_m.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "pkmn_ranger_m" +TRAINER EQUS "irazu" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A041.asm b/battle-e/08-A041.asm index 83e64b6..d6caf5c 100644 --- a/battle-e/08-A041.asm +++ b/battle-e/08-A041.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/sandy.bin", "sprites/trainers/picnicker.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "picnicker" +TRAINER EQUS "sandy" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A042.asm b/battle-e/08-A042.asm index 3f822bc..07e0219 100644 --- a/battle-e/08-A042.asm +++ b/battle-e/08-A042.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/annie.bin", "sprites/trainers/swimmer_f.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "swimmer_f" +TRAINER EQUS "annie" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A043.asm b/battle-e/08-A043.asm index f52307c..1d1e571 100644 --- a/battle-e/08-A043.asm +++ b/battle-e/08-A043.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/celina.bin", "sprites/trainers/hex_maniac.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "hex_maniac" +TRAINER EQUS "celina" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A044.asm b/battle-e/08-A044.asm index 2381c26..c77517d 100644 --- a/battle-e/08-A044.asm +++ b/battle-e/08-A044.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/april.bin", "sprites/trainers/aroma_lady.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "aroma_lady" +TRAINER EQUS "april" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A045.asm b/battle-e/08-A045.asm index 02d41f5..2d1bb7e 100644 --- a/battle-e/08-A045.asm +++ b/battle-e/08-A045.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/hayden.bin", "sprites/trainers/guitarist.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "guitarist" +TRAINER EQUS "hayden" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A046.asm b/battle-e/08-A046.asm index d9b7cf5..b52a3c7 100644 --- a/battle-e/08-A046.asm +++ b/battle-e/08-A046.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/griffin.bin", "sprites/trainers/psychic_m.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "psychic_m" +TRAINER EQUS "griffin" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A047.asm b/battle-e/08-A047.asm index 5a3b4ad..ec97c8c 100644 --- a/battle-e/08-A047.asm +++ b/battle-e/08-A047.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/kendall.bin", "sprites/trainers/pokefan_m.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "pokefan_m" +TRAINER EQUS "kendall" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-A048.asm b/battle-e/08-A048.asm index 769ff7c..8f84f5c 100644 --- a/battle-e/08-A048.asm +++ b/battle-e/08-A048.asm @@ -1,2 +1,4 @@ -INCLUDE "battletrainer.tx" - BattleTrainer "trainers/fuego.bin", "sprites/trainers/cooltrainer_m.4bpp"
\ No newline at end of file +INCLUDE "../macros.asm" +CLASS EQUS "cooltrainer_m" +TRAINER EQUS "fuego" +INCLUDE "battletrainer-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-K001.asm b/battle-e/08-K001.asm index 57392ef..1696974 100644 --- a/battle-e/08-K001.asm +++ b/battle-e/08-K001.asm @@ -1,2 +1,3 @@ -INCLUDE "enigmaberry.tx" - EnigmaBerry "berries/pumkin.bin"
\ No newline at end of file +INCLUDE "../macros.asm" +BERRY EQUS "pumkin" +INCLUDE "enigmaberry-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-K002.asm b/battle-e/08-K002.asm index b2e73e0..294f87c 100644 --- a/battle-e/08-K002.asm +++ b/battle-e/08-K002.asm @@ -1,2 +1,3 @@ -INCLUDE "enigmaberry.tx" - EnigmaBerry "berries/drash.bin"
\ No newline at end of file +INCLUDE "../macros.asm" +BERRY EQUS "drash" +INCLUDE "enigmaberry-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-K003.asm b/battle-e/08-K003.asm index 46171f1..eeded08 100644 --- a/battle-e/08-K003.asm +++ b/battle-e/08-K003.asm @@ -1,2 +1,3 @@ -INCLUDE "enigmaberry.tx" - EnigmaBerry "berries/chilan.bin"
\ No newline at end of file +INCLUDE "../macros.asm" +BERRY EQUS "chilan" +INCLUDE "enigmaberry-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-K004.asm b/battle-e/08-K004.asm index d1b78a2..639236a 100644 --- a/battle-e/08-K004.asm +++ b/battle-e/08-K004.asm @@ -1,2 +1,3 @@ -INCLUDE "enigmaberry.tx" - EnigmaBerry "berries/strib.bin"
\ No newline at end of file +INCLUDE "../macros.asm" +BERRY EQUS "strib" +INCLUDE "enigmaberry-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-K005.asm b/battle-e/08-K005.asm index 63cc4e4..cde9012 100644 --- a/battle-e/08-K005.asm +++ b/battle-e/08-K005.asm @@ -1,2 +1,3 @@ -INCLUDE "enigmaberry.tx" - EnigmaBerry "berries/eggant.bin"
\ No newline at end of file +INCLUDE "../macros.asm" +BERRY EQUS "eggant" +INCLUDE "enigmaberry-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/08-K006.asm b/battle-e/08-K006.asm index 236f8dd..6f37886 100644 --- a/battle-e/08-K006.asm +++ b/battle-e/08-K006.asm @@ -1,2 +1,3 @@ -INCLUDE "enigmaberry.tx" - EnigmaBerry "berries/nutpea.bin"
\ No newline at end of file +INCLUDE "../macros.asm" +BERRY EQUS "nutpea" +INCLUDE "enigmaberry-{REGION_NAME}.tx"
\ No newline at end of file diff --git a/battle-e/Makefile b/battle-e/Makefile index d317c93..c55d1df 100644 --- a/battle-e/Makefile +++ b/battle-e/Makefile @@ -1,34 +1,76 @@ -all: 08-A001.z80 08-A002.z80 08-A003.z80 08-A004.z80 \ - 08-A005.z80 08-A006.z80 08-A007.z80 08-A008.z80 \ - 08-A009.z80 08-A010.z80 08-A011.z80 08-A012.z80 \ - 08-A013.z80 08-A014.z80 08-A015.z80 08-A016.z80 \ - 08-A017.z80 08-A018.z80 08-A019.z80 08-A020.z80 \ - 08-A021.z80 08-A022.z80 08-A023.z80 08-A024.z80 \ - 08-A025.z80 08-A026.z80 08-A027.z80 08-A028.z80 \ - 08-A029.z80 08-A030.z80 08-A031.z80 08-A032.z80 \ - 08-A033.z80 08-A034.z80 08-A035.z80 08-A036.z80 \ - 08-A037.z80 08-A038.z80 08-A039.z80 08-A040.z80 \ - 08-A041.z80 08-A042.z80 08-A043.z80 08-A044.z80 \ - 08-A045.z80 08-A046.z80 08-A047.z80 08-A048.z80 \ - 08-K001.z80 08-K002.z80 08-K003.z80 08-K004.z80 \ - 08-K005.z80 08-K006.z80 - -%.tx: %.asm - python ../scripts/charmap.py $< $@ - -08-A%.o: 08-A%.asm battletrainer.tx +SERIES_1_NUMS = A001 A002 A003 A004 A005 A006 A007 A008 A009 A010 A011 A012 A013 A014 A015 A016 A017 A018 A019 A020 A021 A022 A023 A024 A025 A026 A027 A028 A029 A030 A031 A032 A033 A034 A035 A036 A037 A038 A039 A040 A041 A042 A043 A044 A045 A046 A047 A048 K001 K002 K003 K004 K005 K006 +SERIES_1_TRAINERS = alana annie antonio april belford bryce candice celina clayton devin dominic dustin ellie fay fuego goro griffin hayden heather hillary hugo irazu irvin jeffrey judith justine kendall logan maggie mandy marcus natalie natasha oscar patrick raquel renee rudy sandia sandy sofia sonya sophie stuart tsutomu tyler wilson zuril +SERIES_1_BERRIES = chilan drash eggant nutpea pumkin strib +#PROMO_EN_TRAINERS = astrid nils + +all: series_1 verify +series_1: $(SERIES_1_TRAINERS:%=trainers/%-EN.mev) $(SERIES_1_BERRIES:%=berries/%-EN.mev) $(SERIES_1_NUMS:%=08-%-EN.z80) +verify: + md5sum --check battle-e.md5 + + +trainers/%-EN.tx: trainers/%.asm + python ../scripts/regionalize.py $< $@ EN EN +trainers/%.o: trainers/%.tx + rgbasm -o $@ $< +trainers/%.gbc: trainers/%.o + rgblink -o $@ $< +trainers/%.bin: trainers/%.gbc + python ../scripts/stripgbc.py $< $@ +trainers/%.z80: trainers/%.gbc + python ../scripts/stripgbc.py $< $@ +trainers/%.mev: trainers/%.bin + python ../scripts/checksum.py $< $@ + + +berries/%-EN.tx: berries/%.asm + python ../scripts/regionalize.py $< $@ EN EN +berries/%.o: berries/%.tx + rgbasm -o $@ $< +berries/%.gbc: berries/%.o + rgblink -o $@ $< +berries/%.bin: berries/%.gbc + python ../scripts/stripgbc.py $< $@ +berries/%.z80: berries/%.gbc + python ../scripts/stripgbc.py $< $@ +berries/%.mev: berries/%.bin + python ../scripts/checksum.py $< $@ + + +prologue-%.tx: prologue.asm + python ../scripts/regionalize.py $< $@ $* $* +prologue-%.o: prologue-%.tx rgbasm -o $@ $< -08-K%.o: 08-K%.asm enigmaberry.tx +prologue-%.gbc: prologue-%.o + rgblink -o $@ $< +prologue-%.bin: prologue-%.gbc + python ../scripts/stripgbc.py $< $@ + + +battletrainer-%.tx: battletrainer.asm prologue-%.bin + python ../scripts/ereadertext.py $< $@ $* +08-A%-EN.tx: 08-A%.asm battletrainer-EN.tx + python ../scripts/ereadertext.py $< $@ EN +08-A%.o: 08-A%.tx rgbasm -o $@ $< -%.gbc: %.o +08-A%.gbc: 08-A%.o rgblink -o $@ $< -# hack to use RGBDS for something other than its intended purpose 08-A%.z80: 08-A%.gbc - dd if=$< of=$@ bs=1 skip=256 count=6815 -# cmp -b ../z80/$@ $@ + python ../scripts/stripgbc.py $< $@ + + +enigmaberry-%.tx: enigmaberry.asm prologue-%.bin + python ../scripts/ereadertext.py $< $@ $* +08-K%-EN.tx: 08-K%.asm enigmaberry-EN.tx + python ../scripts/ereadertext.py $< $@ EN +08-K%.o: 08-K%.tx + rgbasm -o $@ $< +08-K%.gbc: 08-K%.o + rgblink -o $@ $< 08-K%.z80: 08-K%.gbc - dd if=$< of=$@ bs=1 skip=256 count=3578 -# cmp -b ../z80/$@ $@ + python ../scripts/stripgbc.py $< $@ clean: - rm -f *.z80 *.tx *.o *.gbc
\ No newline at end of file + rm -f *.z80 *.tx *.o *.gbc *.bin \ + trainers/*.tx trainers/*.o trainers/*.gbc trainers/*.bin trainers/*.mev \ + berries/*.tx berries/*.o berries/*.gbc berries/*.bin berries/*.mev
\ No newline at end of file diff --git a/battle-e/battle-e.md5 b/battle-e/battle-e.md5 new file mode 100644 index 0000000..1c0a9dc --- /dev/null +++ b/battle-e/battle-e.md5 @@ -0,0 +1,54 @@ +5fe4554d93efbd2b24ff50f3f5e76126 08-A001-EN.z80 +7c030d84126731dde962de644d19eb1e 08-A002-EN.z80 +9ff2d0f637f1bbe6a265cc76eb1ebc24 08-A003-EN.z80 +955901c7796d1867e6766d0692de804b 08-A004-EN.z80 +273f229ea587546360e6d1fb165af5ed 08-A005-EN.z80 +c9a9292d7c2aa62357ed7494776b7221 08-A006-EN.z80 +2522ab1870d1333b3b5a443524bdc0ff 08-A007-EN.z80 +a740b633defa47372bde2176cae2c361 08-A008-EN.z80 +9b6330d6cbb5cb70323aae930a91c41b 08-A009-EN.z80 +cbe3105ed4a0cfc793b4e382fa5efcf1 08-A010-EN.z80 +4ec98a0fc942f41ed312902f56637296 08-A011-EN.z80 +397a71709f453922d73a676124ad4812 08-A012-EN.z80 +1a938dc08c9ea430d77990c2640c800b 08-A013-EN.z80 +daae9352430edc5fdcc4c15c27e47a1e 08-A014-EN.z80 +411305c18c0624b8ba2a7194e57f669f 08-A015-EN.z80 +605607fea3907c70a9e03152038b6292 08-A016-EN.z80 +89629f1f6e65e741e75910384afe0c2d 08-A017-EN.z80 +604bdbfb4cfe3218df91f911a5ede0b9 08-A018-EN.z80 +48e1f0608b261e715f4976d065a4fe08 08-A019-EN.z80 +967885c86bc590c98a2ff483b707e391 08-A020-EN.z80 +c1d2589f23885b5e8291784ae76d2c88 08-A021-EN.z80 +dfb016ddaa2d438b406012cfc2e28353 08-A022-EN.z80 +7e037b1fb160909370a3bfae4fe129a0 08-A023-EN.z80 +05a1c3034e00ba0845765e728a310d25 08-A024-EN.z80 +ce3519291d46f405fee0959098c64a54 08-A025-EN.z80 +7cab8564f6f4f5cf037fc847bddd4c74 08-A026-EN.z80 +a519c3e5ad721022ba248e4b9b1e323a 08-A027-EN.z80 +2da60f79186da7906ee1c8ec6e24820b 08-A028-EN.z80 +e55220c4498c6318fd596f0ec5c47fe1 08-A029-EN.z80 +2d6d09463049b1fc021dd7540a6ad777 08-A030-EN.z80 +82d50b4f9a3f5b7ccd8770c7eb031bcb 08-A031-EN.z80 +1235e7ddb290145029379d7edbc080ee 08-A032-EN.z80 +33e295f2772c8a2a6ca7a0c5ad53bbe6 08-A033-EN.z80 +f73390fddc3f7149bd94ce5d0dc8c144 08-A034-EN.z80 +734acbe493a8ec1313ad9cc1acac06ff 08-A035-EN.z80 +24904efa6504d1a2df1a0866b93d4802 08-A036-EN.z80 +0485aa277f97183af2b08584327c8243 08-A037-EN.z80 +69fbcbea7d2474116ec61b9bf3cbf312 08-A038-EN.z80 +4830e4520251eaf6b34c81459d6e2e95 08-A039-EN.z80 +cff241aedb694ec1ae69363503d72f0c 08-A040-EN.z80 +36c0cabd7f0ed48626bf5af6c6c3a289 08-A041-EN.z80 +50b1f631aee6ec047c3a4e50bb57cee9 08-A042-EN.z80 +ebe7c17e61815351002744514c970e03 08-A043-EN.z80 +56e5774b5dfef9dab453b0e128ec830c 08-A044-EN.z80 +6ce848adb609ed429e1d98429561aa43 08-A045-EN.z80 +6a2f67a46600a396bf292d1dd157d128 08-A046-EN.z80 +90e3315b232fd956c495a880110a3203 08-A047-EN.z80 +18966453bdef23e566125aab79a4089a 08-A048-EN.z80 +e53f77ada353ba5a557944f5d77d2359 08-K001-EN.z80 +d51697c6ffc805038cee7e9e9bbc1a66 08-K002-EN.z80 +579aeb95be4516a4ccdfc7abd6d5c32f 08-K003-EN.z80 +18212da3adcf4ebdb9011b94dfc0f69d 08-K004-EN.z80 +5086e9248754cd3077021cbcfb94d580 08-K005-EN.z80 +565f2df48757c2e069a32dfa07e25fc4 08-K006-EN.z80 diff --git a/battle-e/battletrainer.asm b/battle-e/battletrainer.asm index 4516fb5..421ddd3 100644 --- a/battle-e/battletrainer.asm +++ b/battle-e/battletrainer.asm @@ -1,6 +1,3 @@ -INCLUDE "../macros.asm" - -BattleTrainer: MACRO SECTION "battletrainer",ROM0[$100] jp Start db $00 @@ -24,21 +21,16 @@ BackdropTilemap: ; A7C INCBIN "sprites/battletrainer.tilemap" Prologue: ; 0DFC - Insert_Prologue $12345678, "カ。ドＥ@", REGION_EN ; corrupted カードｅ “Card e” + INCBIN "prologue-{REGION_NAME}.bin" DataPacket: ; 0E38 - Insert_Header REGION_EN - db BATTLE_TRAINER - GBAPTR DataPacket, TrainerData ; $02000018 - dw $0002 -TrainerData: ; 0E50 - INCBIN \1 + INCBIN "trainers/{TRAINER}-{REGION_NAME}.mev" REPT 44 db 0 ; pads the data to 256 bytes ENDR TrainerSprite: ; 0F38 - INCBIN \2 + INCBIN "sprites/trainers/{CLASS}.4bpp" TrainerSpriteData: ; 1738 dw TrainerSprite dw TrainerPalette @@ -196,10 +188,9 @@ INCLUDE "../common/transfer_data.asm" INCLUDE "../common/wrap_up.asm" INCLUDE "../common/word_shift_right.asm" -SomeVar1: ds 1 ; 1B9F -SomeVar2: ds 2 ; 1BA0 -RegionHandlePtr: ds 1 ; 1BA2 -LeftDoorSpriteHandle: ds 2 ; 1BA3 -RightDoorSpriteHandle: ds 2 ; 1BA5 -TrainerSpriteHandle: ds 2 ; 1BA7 -ENDM
\ No newline at end of file +SomeVar1: EOF ; 1B9F +SomeVar2: dw 0 ; 1BA0 +RegionHandlePtr: db 0 ; 1BA2 +LeftDoorSpriteHandle: dw 0 ; 1BA3 +RightDoorSpriteHandle: dw 0 ; 1BA5 +TrainerSpriteHandle: dw 0 ; 1BA7
\ No newline at end of file diff --git a/battle-e/berries/Makefile b/battle-e/berries/Makefile deleted file mode 100644 index 1c28d80..0000000 --- a/battle-e/berries/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -all: chilan.bin drash.bin eggant.bin nutpea.bin pumkin.bin strib.bin - -%.1: %.asm - python ../../scripts/charmap.py $< $@ - -%.2: %.1 - rgbasm -o $@ $< - -%.3: %.2 - rgblink -o $@ $< - -%.4: %.3 - dd if=$< of=$@ bs=1 skip=256 count=1324 - -%.bin: %.4 - python ../../scripts/berrychecksum.py $< $@ - -clean: - rm -f *.bin
\ No newline at end of file diff --git a/battle-e/berries/chilan.asm b/battle-e/berries/chilan.asm index 9803491..19f24cb 100644 --- a/battle-e/berries/chilan.asm +++ b/battle-e/berries/chilan.asm @@ -1,24 +1,27 @@ -INCLUDE "macros.asm" +INCLUDE "berries/macros.asm" + + Enigma_Berry - Berry "CHILAN" - db SOFT + Text_EN "CHILAN"7 + Firmness SOFT Size 27,2 Yield_Range 1, 2 - REPT 8 - db 0 - ENDR - db 1 ; hours per growth stage - db 30,0,30,0,0 ; flavor - db 85 ; smoothness - db 0 + dd 0 + dd 0 + Growth_Stage_Hours 1 + Flavor 30, 0, 30, 0, 0 + Smoothness 85 BerrySprite: - INCBIN "../sprites/berries/chilan.4bpp" + INCBIN "sprites/berries/chilan.4bpp" BerryPalette: - INCLUDE "../sprites/berries/chilan.pal" + INCLUDE "sprites/berries/chilan.pal" + + Text_EN "This sparse BERRY grows quickly."45 + Text_EN "Its skin is quite tough."45 - Tag_Text "This sparse BERRY grows quickly." - Tag_Text "Its skin is quite tough." REPT 22 db 0 ; Pokéblock ingredient only - ENDR
\ No newline at end of file + ENDR + + End_Berry
\ No newline at end of file diff --git a/battle-e/berries/drash.asm b/battle-e/berries/drash.asm index a291536..62825cc 100644 --- a/battle-e/berries/drash.asm +++ b/battle-e/berries/drash.asm @@ -1,24 +1,29 @@ -INCLUDE "macros.asm" +INCLUDE "berries/macros.asm" - Berry "DRASH" - db VERY_HARD + Enigma_Berry + + Text_EN "DRASH@@"7 + Firmness VERY_HARD Size 13,4 Yield_Range 2, 3 - db 0,0,0,0,0,0,0,0 - db 18 ; hours per growth stage - db 0,0,40,0,0 ; flavor - db 65 ; smoothness - db 0 + dd 0 + dd 0 + Growth_Stage_Hours 18 + Flavor 0, 0, 40, 0, 0 + Smoothness 65 BerrySprite: - INCBIN "../sprites/berries/drash.4bpp" + INCBIN "sprites/berries/drash.4bpp" BerryPalette: - INCLUDE "../sprites/berries/drash.pal" + INCLUDE "sprites/berries/drash.pal" + + Text_EN "When it ripens, this sweet BERRY"45 + Text_EN "falls and sticks into the ground."45 - Tag_Text "When it ripens, this sweet BERRY" - Tag_Text "falls and sticks into the ground." db 0,0,0 db $10 ; cures poison db 0,0,0,0,0,0,0,0,0,0,0,0,0,0 db $04 ; self-cures poison - db 0,0,0
\ No newline at end of file + db 0,0,0 + + End_Berry
\ No newline at end of file diff --git a/battle-e/berries/eggant.asm b/battle-e/berries/eggant.asm index 4e9fab3..c7b1eaa 100644 --- a/battle-e/berries/eggant.asm +++ b/battle-e/berries/eggant.asm @@ -1,24 +1,29 @@ -INCLUDE "macros.asm" +INCLUDE "berries/macros.asm" - Berry "EGGANT" - db SOFT + Enigma_Berry + + Text_EN "EGGANT"7 + Firmness SOFT Size 4,1 Yield_Range 2, 3 - db 0,0,0,0, 0,0,0,0 - db 18 ; hours per growth stage - db 0,40,0,0,0 ; flavor - db 65 ; smoothness - db 0 + dd 0 + dd 0 + Growth_Stage_Hours 18 + Flavor 0, 40, 0, 0, 0 + Smoothness 65 BerrySprite: - INCBIN "../sprites/berries/eggant.4bpp" + INCBIN "sprites/berries/eggant.4bpp" BerryPalette: - INCLUDE "../sprites/berries/eggant.pal" + INCLUDE "sprites/berries/eggant.pal" + + Text_EN "Very dry tasting, especially the"45 + Text_EN "parts not exposed to the sun."45 - Tag_Text "Very dry tasting, especially the" - Tag_Text "parts not exposed to the sun." db 0,0,0 db $00 db 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0 db $1C ; self-cure infatuation - db 0,0,0
\ No newline at end of file + db 0,0,0 + + End_Berry
\ No newline at end of file diff --git a/battle-e/berries/macros.asm b/battle-e/berries/macros.asm index e58a1ca..472fec4 100644 --- a/battle-e/berries/macros.asm +++ b/battle-e/berries/macros.asm @@ -1,16 +1,17 @@ -RGB: MACRO - dw \1 | (\2 << 5) | (\3 << 10) - ENDM +INCLUDE "../macros.asm" -Berry: MACRO +Enigma_Berry: MACRO Section "berry",ROM0[$100] - db \1 - REPT 7 - STRLEN(\1) - db $FF - ENDR + db $01 + dd $02000000 + db REGION,0,REGION,0,0,0,$04,0,$80,$01,0,0 + db $07 + dd $02000018 + db $02,$00 ENDM ; firmness +Firmness EQUS "db" VERY_SOFT EQU 1 SOFT EQU 2 HARD EQU 3 @@ -25,13 +26,11 @@ Size: MACRO dw \1 * 10 + \2 ENDM -; this can’t be used because RGBDS has no reliable way of putting null bytes in strings -;Tag_Text: MACRO -; db \1 -; db $FF -; REPT 44 - STRLEN(\1) -; db 0 -; ENDR -; ENDM +Growth_Stage_Hours EQUS "db" +Flavor EQUS "db" +Smoothness EQUS "dw" ; not sure if the second byte is significant on its own -Tag_Text EQUS "db"
\ No newline at end of file +End_Berry: MACRO + dd 0 ; placeholder for checksum + EOF + ENDM
\ No newline at end of file diff --git a/battle-e/berries/nutpea.asm b/battle-e/berries/nutpea.asm index c45f320..0f3e530 100644 --- a/battle-e/berries/nutpea.asm +++ b/battle-e/berries/nutpea.asm @@ -1,23 +1,27 @@ -INCLUDE "macros.asm" +INCLUDE "berries/macros.asm" - Berry "NUTPEA" - db SUPER_HARD + Enigma_Berry + + Text_EN "NUTPEA"7 + Firmness SUPER_HARD Size 12,4 Yield_Range 1, 3 - db 0,0,0,0,0,0,0,0 - db 18 ; hours per growth stage - db 10,10,10,10,10 ; flavor - db 5 ; smoothness - db 0 + dd 0 + dd 0 + Growth_Stage_Hours 18 + Flavor 10, 10, 10, 10, 10 + Smoothness 5 BerrySprite: - INCBIN "../sprites/berries/nutpea.4bpp" - + INCBIN "sprites/berries/nutpea.4bpp" BerryPalette: - INCLUDE "../sprites/berries/nutpea.pal" + INCLUDE "sprites/berries/nutpea.pal" + + Text_EN "This BERRY is rigid and cracks open"45 + Text_EN "when the center is squeezed."45 - Tag_Text "This BERRY is rigid and cracks open" - Tag_Text "when the center is squeezed." REPT 22 db 0 ; Pokéblock ingredient only - ENDR
\ No newline at end of file + ENDR + + End_Berry
\ No newline at end of file diff --git a/battle-e/berries/pumkin.asm b/battle-e/berries/pumkin.asm index bb11372..8432140 100644 --- a/battle-e/berries/pumkin.asm +++ b/battle-e/berries/pumkin.asm @@ -1,24 +1,29 @@ -INCLUDE "macros.asm" +INCLUDE "berries/macros.asm" - Berry "PUMKIN" - db SUPER_HARD + Enigma_Berry + + Text_EN "PUMKIN"7 + Firmness SUPER_HARD Size 4,8 Yield_Range 2, 3 - db 0,0,0,0,0,0,0,0 - db 18 ; hours per growth stage - db 0,0,0,0,40 ; flavor - db 65 ; smoothness - db 0 + dd 0 + dd 0 + Growth_Stage_Hours 18 + Flavor 0, 0, 0, 0, 40 + Smoothness 65 BerrySprite: - INCBIN "../sprites/berries/pumkin.4bpp" + INCBIN "sprites/berries/pumkin.4bpp" BerryPalette: - INCLUDE "../sprites/berries/pumkin.pal" + INCLUDE "sprites/berries/pumkin.pal" + + Text_EN "This BERRY is amazingly sour."45 + Text_EN "It’s heavy due to its dense filling."45 - Tag_Text "This BERRY is amazingly sour." - Tag_Text "It’s heavy due to its dense filling." db 0,0,0 db $04 ; cures freeze db 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0 db $06 ; self-cures freeze - db 0,0,0
\ No newline at end of file + db 0,0,0 + + End_Berry
\ No newline at end of file diff --git a/battle-e/berries/strib.asm b/battle-e/berries/strib.asm index 362b2df..147f8c2 100644 --- a/battle-e/berries/strib.asm +++ b/battle-e/berries/strib.asm @@ -1,22 +1,27 @@ -INCLUDE "macros.asm" +INCLUDE "berries/macros.asm" - Berry "STRIB" - db HARD + Enigma_Berry + + Text_EN "STRIB@@"7 + Firmness HARD Size 12,2 Yield_Range 4, 12 - db 0,0,0,0,0,0,0,0 - db 24 ; hours per growth stage - db 30,0,0,30,0 ; flavor - db 85 ; smoothness - db 0 + dd 0 + dd 0 + Growth_Stage_Hours 24 + Flavor 30, 0, 0, 30, 0 + Smoothness 85 BerrySprite: - INCBIN "../sprites/berries/strib.4bpp" + INCBIN "sprites/berries/strib.4bpp" BerryPalette: - INCLUDE "../sprites/berries/strib.pal" + INCLUDE "sprites/berries/strib.pal" + + Text_EN "It grows slowly, but abundantly."45 + Text_EN "Makes a soothing sound when shaken."45 - Tag_Text "It grows slowly, but abundantly." - Tag_Text "Makes a soothing sound when shaken." REPT 22 db 0 ; Pokéblock ingredient only - ENDR
\ No newline at end of file + ENDR + + End_Berry
\ No newline at end of file diff --git a/battle-e/enigmaberry.asm b/battle-e/enigmaberry.asm index a6f0dce..36537ff 100644 --- a/battle-e/enigmaberry.asm +++ b/battle-e/enigmaberry.asm @@ -1,7 +1,3 @@ -INCLUDE "../macros.asm" -INCLUDE "macros.asm" - -EnigmaBerry: MACRO SECTION "drashberry",ROM0[$100] jp Start db $00 @@ -25,16 +21,10 @@ REPT 72 ENDR Prologue: - Insert_Prologue $12345678, "カ。ドＥ@", REGION_EN ; corrupted カードｅ “Card e” + INCBIN "prologue-{REGION_NAME}.bin" DataPacket: - Insert_Header REGION_EN - db CUSTOM_BERRY - GBAPTR DataPacket, BerryData - dw $0002 - -BerryData: - INCBIN \1 + INCBIN "berries/{BERRY}-{REGION_NAME}.mev" db 0,0 INCLUDE "../common/mem_struct.asm" @@ -43,7 +33,7 @@ BackgroundSpriteData: dw BackgroundSprite, BackgroundPalette, BackgroundTilemap db $05,$00,$01,$00 BerrySpriteData: - dw (BerryData+$1C),(BerryData+$49C) + dw (DataPacket+$18+$1C),(DataPacket+$18+$49C) db $06,$06,$01,$01,$01,$01,$01 Instructions1: ; B65 @@ -133,8 +123,7 @@ INCLUDE "../common/wrap_up.asm" INCLUDE "../common/word_shift_right.asm" -SomeVar1: ds 1 ; EFA -SomeVar2: ds 2 ; EFB -RegionHandlePtr: ds 1 ; EFD -SpriteHandlePtr: ds 2 ; EFE -ENDM
\ No newline at end of file +SomeVar1: EOF ; EFA +SomeVar2: dw 0 ; EFB +RegionHandlePtr: db 0 ; EFD +SpriteHandlePtr: dw 0 ; EFE
\ No newline at end of file diff --git a/battle-e/macros.asm b/battle-e/macros.asm deleted file mode 100644 index e4a9c1a..0000000 --- a/battle-e/macros.asm +++ /dev/null @@ -1,24 +0,0 @@ -INCLUDE "../constants/abilities.asm" -INCLUDE "../constants/items.asm" -INCLUDE "../constants/moves.asm" -INCLUDE "../constants/pokemon.asm" -INCLUDE "../constants/trainerclasses.asm" - -MOSSDEEP_BATTLE EQU 0 - -LEVEL: MACRO - dw \1 - ENDM -EVs: MACRO - db \1, \2, \3, \4, \5, \6 - ENDM -OT: MACRO - dw \1, \2 - ENDM -IVs: MACRO - dw \1 + (\2 << 5) + (\3 << 10) + ((\4 & 1) << 15) - dw (\4 >> 1) + (\5 << 4) + (\6 << 9) + (\7 << 15) - ENDM -PV: MACRO - dw (\1 & $FFFF), (\1 >> 16) - ENDM
\ No newline at end of file diff --git a/battle-e/prologue.asm b/battle-e/prologue.asm new file mode 100644 index 0000000..fdce843 --- /dev/null +++ b/battle-e/prologue.asm @@ -0,0 +1,14 @@ +INCLUDE "../macros.asm" +SECTION "prologue", ROM0[$100] + + db "GameFreak inc." + db 0,0,0,0,0,0 + dd $12345678 + Text "カ。ドＥ"8 ; corrupted カードｅ “Card e” + db 0,0,0,0,$01,$55 + db 0,0,0,0 + db REGION + db 0 + db "GameFreak inc." + db 0,0 + EOF
\ No newline at end of file diff --git a/battle-e/trainers/Makefile b/battle-e/trainers/Makefile deleted file mode 100644 index 04099cd..0000000 --- a/battle-e/trainers/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -all: alana.bin annie.bin antonio.bin april.bin astrid.bin belford.bin bryce.bin candice.bin celina.bin clayton.bin devin.bin dominic.bin dustin.bin ellie.bin fay.bin fuego.bin goro.bin griffin.bin hayden.bin heather.bin hillary.bin hugo.bin irazu.bin irvin.bin jeffrey.bin judith.bin justine.bin kendall.bin logan.bin maggie.bin mandy.bin marcus.bin natalie.bin natasha.bin nils.bin oscar.bin patrick.bin raquel.bin renee.bin rudy.bin sandia.bin sandy.bin sofia.bin sonya.bin sophie.bin stuart.bin testing.bin tsutomu.bin tyler.bin wilson.bin zuril.bin - -%.1: %.asm - python ../../scripts/charmap.py $< $@ - -%.2: %.1 - rgbasm -o $@ $< - -%.3: %.2 - rgblink -o $@ $< - -%.4: %.3 - dd if=$< of=$@ bs=1 skip=256 count=184 - -%.bin: %.4 - python ../../scripts/trainerchecksum.py $< $@ - -clean: - rm -f *.bin
\ No newline at end of file diff --git a/battle-e/trainers/alana.asm b/battle-e/trainers/alana.asm index daba955..3262868 100644 --- a/battle-e/trainers/alana.asm +++ b/battle-e/trainers/alana.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP - db POKEFAN_F + Class POKEFAN_F BT_Floor MOSSDEEP - OT_Name "ALANA" + Text_EN "ALANA"8 OT_ID 00000, 00000 - Introduction LET_S,START,THIS,_ELIP,BATTLE,_EX - After_Win OH_,DID,I,_ELIP,WIN,_QU - After_Loss OH_,DID,I,_ELIP,LOSE,_QU + Intro_EN LET_S,START,THIS,_ELIP,BATTLE,_EX + Win_EN OH_,DID,I,_ELIP,WIN,_QU + Loss_EN OH_,DID,I,_ELIP,LOSE,_QU Pokemon TORKOAL Holds QUICK_CLAW @@ -19,11 +21,11 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,15,15,15,31,31, TORKOAL_WHITE_SMOKE PV $000000D9 ; ♂ Quiet - Nickname "TORKOAL" + Text_EN "TORKOAL"11 Friendship 255 Pokemon DUSCLOPS - dw CHESTO_BERRY + Holds CHESTO_BERRY Moves CONFUSE_RAY, WILL_O_WISP, TOXIC, REST Level 80 PP_Ups 0,0,0,0 @@ -31,11 +33,11 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,15,31,15,15,31, DUSCLOPS_PRESSURE PV $00000016 ; ♀ Sassy - Nickname "DUSCLOPS" + Text_EN "DUSCLOPS"11 Friendship 255 Pokemon CORSOLA - dw MYSTIC_WATER + Holds MYSTIC_WATER Moves SURF, ROCK_TOMB, MIRROR_COAT, RECOVER Level 85 PP_Ups 0,0,0,0 @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,15,15,15,31,31, CORSOLA_NATURAL_CURE PV $0000001B ; ♀ Brave - Nickname "CORSOLA" + Text_EN "CORSOLA"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/annie.asm b/battle-e/trainers/annie.asm index 923fe6a..8fe3870 100644 --- a/battle-e/trainers/annie.asm +++ b/battle-e/trainers/annie.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP Class SWIMMER_F BT_Floor MOSSDEEP - OT_Name "ANNIE" + Text_EN "ANNIE"8 OT_ID 00000, 00000 - Introduction HERE_I_COME,_EX,GO,MY,WATER,POKEMON - After_Win IT_S,_A,GREAT,POKEMON,ISN_T,IT - After_Loss DON_T,YOU,KNOW,THIS,POKEMON,_QU + Intro_EN HERE_I_COME,_EX,GO,MY,WATER,POKEMON + Win_EN IT_S,_A,GREAT,POKEMON,ISN_T,IT + Loss_EN DON_T,YOU,KNOW,THIS,POKEMON,_QU Pokemon MACHAMP Holds BLACK_BELT @@ -19,7 +21,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,31,15,15,15,15, MACHAMP_GUTS PV $000000E7 ; ♂ Docile - Nickname "MACHAMP" + Text_EN "MACHAMP"11 Friendship 255 Pokemon MAGNETON @@ -31,7 +33,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,15,31,15, MAGNETON_STURDY PV $0000000C ; ⚲ Serious - Nickname "MAGNETON" + Text_EN "MAGNETON"11 Friendship 255 Pokemon BLASTOISE @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,15,31,15, BLASTOISE_TORRENT PV $00000012 ; ♀ Bashful - Nickname "BLASTOISE" + Text_EN "BLASTOISE"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/antonio.asm b/battle-e/trainers/antonio.asm index 468fa43..254f4f3 100644 --- a/battle-e/trainers/antonio.asm +++ b/battle-e/trainers/antonio.asm @@ -1,17 +1,19 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP Class GENTLEMAN BT_Floor MOSSDEEP - OT_Name "ANTONIO" + Text_EN "ANTONIO"8 OT_ID 00000, 00000 - Introduction HMM,HOW,ARE,MY,POKEMON,_QU - After_Win HMM,HOW,WERE,MY,POKEMON,_QU_EX - After_Loss NOTHING,MUCH,ABOUT,MY,POKEMON,_ELIP + Intro_EN HMM,HOW,ARE,MY,POKEMON,_QU + Win_EN HMM,HOW,WERE,MY,POKEMON,_QU_EX + Loss_EN NOTHING,MUCH,ABOUT,MY,POKEMON,_ELIP Pokemon DONPHAN - dw SITRUS_BERRY + Holds SITRUS_BERRY Moves EARTHQUAKE, ROCK_TOMB, SUNNY_DAY, FISSURE Level 53 PP_Ups 0,0,0,0 @@ -19,7 +21,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,31,15,15,15,15, DONPHAN_STURDY PV $000000E4 ; ♂ Adamant - Nickname "DONPHAN" + Text_EN "DONPHAN"11 Friendship 255 Pokemon SKARMORY @@ -31,11 +33,11 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,31,15,31,15,15, SKARMORY_STURDY PV $0000001C ; ♀ Adamant - Nickname "SKARMORY" + Text_EN "SKARMORY"11 Friendship 255 Pokemon HOUNDOOM - dw CHESTO_BERRY + Holds CHESTO_BERRY Moves OVERHEAT, IRON_TAIL, SLUDGE_BOMB, REST Level 60 PP_Ups 0,0,0,0 @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,31,15,31,31,15, HOUNDOOM_EARLY_BIRD PV $000000E1 ; ♂ Hardy - Nickname "HOUNDOOM" + Text_EN "HOUNDOOM"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/april.asm b/battle-e/trainers/april.asm index cc2a077..f68adda 100644 --- a/battle-e/trainers/april.asm +++ b/battle-e/trainers/april.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP - db AROMA_LADY + Class AROMA_LADY BT_Floor MOSSDEEP - OT_Name "APRIL" + Text_EN "APRIL"8 OT_ID 00000, 00000 - Introduction SMELL,THIS,_SWEET_SCENT,FROM,MY,POKEMON - After_Win YOU,LIKE,THIS,_SWEET_SCENT,TOO,MUCH - After_Loss I,CAN_T_WIN,WITH,ONLY,_SWEET_SCENT,_QU + Intro_EN SMELL,THIS,_SWEET_SCENT,FROM,MY,POKEMON + Win_EN YOU,LIKE,THIS,_SWEET_SCENT,TOO,MUCH + Loss_EN I,CAN_T_WIN,WITH,ONLY,_SWEET_SCENT,_QU Pokemon WEEZING Holds WHITE_HERB @@ -19,7 +21,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,15,15,31, WEEZING_LEVITATE PV $00000080 ; ♂ Adamant - Nickname "WEEZING" + Text_EN "WEEZING"11 Friendship 255 Pokemon BELLOSSOM @@ -31,7 +33,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,31,15,15,15, BELLOSSOM_CHLOROPHYLL PV $0000000F ; ♀ Modest - Nickname "BELLOSSOM" + Text_EN "BELLOSSOM"11 Friendship 255 Pokemon TROPIUS @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,15,15,31, TROPIUS_CHLOROPHYLL PV $00000019 ; ♀ Hardy - Nickname "TROPIUS" + Text_EN "TROPIUS"11 Friendship 255 + + End_Trainer
\ No newline at end of file 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 diff --git a/battle-e/trainers/belford.asm b/battle-e/trainers/belford.asm index badc125..df14d28 100644 --- a/battle-e/trainers/belford.asm +++ b/battle-e/trainers/belford.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level 100 - db COOLTRAINER_M + Class COOLTRAINER_M BT_Floor 5 - OT_Name "BELFORD" + Text_EN "BELFORD"8 OT_ID 00000, 00000 - Introduction YOU,WILL,NOT,LIKE,MY,ATTACK - After_Win TOO,BAD,YOU,DON_T,LIKE,POISON - After_Loss WHAT,_A,POKEMON,TRAINER,I,SURRENDER + Intro_EN YOU,WILL,NOT,LIKE,MY,ATTACK + Win_EN TOO,BAD,YOU,DON_T,LIKE,POISON + Loss_EN WHAT,_A,POKEMON,TRAINER,I,SURRENDER Pokemon DUSCLOPS Holds LEFTOVERS @@ -19,11 +21,11 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,20,31,20,20,20, DUSCLOPS_PRESSURE PV $00000094 ; ♂ Careful - Nickname "DUSCLOPS" + Text_EN "DUSCLOPS"11 Friendship 255 Pokemon CROBAT - dw BRIGHTPOWDER + Holds BRIGHTPOWDER Moves TOXIC, AIR_CUTTER, CONFUSE_RAY, SHADOW_BALL Level 100 PP_Ups 0,0,0,0 @@ -31,11 +33,11 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,31,20,20,20,20, CROBAT_INNER_FOCUS PV $0000001C ; ♀ Adamant - Nickname "CROBAT" + Text_EN "CROBAT"11 Friendship 255 Pokemon REGISTEEL - dw CHESTO_BERRY + Holds CHESTO_BERRY Moves TOXIC, REST, EARTHQUAKE, IRON_DEFENSE Level 100 PP_Ups 0,0,0,0 @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,20,20,20,20,31, REGISTEEL_CLEAR_BODY PV $0000001E ; ⚲ Bold - Nickname "REGISTEEL" + Text_EN "REGISTEEL"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/bryce.asm b/battle-e/trainers/bryce.asm index da7b87e..623f5b5 100644 --- a/battle-e/trainers/bryce.asm +++ b/battle-e/trainers/bryce.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP - db FISHERMAN + Class FISHERMAN BT_Floor MOSSDEEP - OT_Name "BRYCE" + Text_EN "BRYCE"8 OT_ID 00000, 00000 - Introduction FISHING,IS,JUST,SO,FANTASTIC,_EX - After_Win I_AM,DONE,_AND,I_AM,GOING,FISHING - After_Loss OKAY,LET_S,GO,FISHING,TOGETHER,_EX + Intro_EN FISHING,IS,JUST,SO,FANTASTIC,_EX + Win_EN I_AM,DONE,_AND,I_AM,GOING,FISHING + Loss_EN OKAY,LET_S,GO,FISHING,TOGETHER,_EX Pokemon LANTURN Holds CHERI_BERRY @@ -19,11 +21,11 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,15,31,15,15,31, LANTURN_VOLT_ABSORB PV $0000000F ; ♀ Modest - Nickname "LANTURN" + Text_EN "LANTURN"11 Friendship 255 Pokemon SHARPEDO - dw MYSTIC_WATER + Holds MYSTIC_WATER Moves CRUNCH, SURF, ICE_BEAM, DOUBLE_EDGE Level 84 PP_Ups 0,0,0,0 @@ -31,7 +33,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,31,15,15,31,15, SHARPEDO_ROUGH_SKIN PV $000000D9 ; ♂ Quiet - Nickname "SHARPEDO" + Text_EN "SHARPEDO"11 Friendship 255 Pokemon WHISCASH @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,15,31,15,15,31, WHISCASH_OBLIVIOUS PV $000000D4 ; ♂ Serious - Nickname "WHISCASH" + Text_EN "WHISCASH"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/candice.asm b/battle-e/trainers/candice.asm index 3437af8..0255788 100644 --- a/battle-e/trainers/candice.asm +++ b/battle-e/trainers/candice.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP - db PKMN_BREEDER_F + Class PKMN_BREEDER_F BT_Floor MOSSDEEP - OT_Name "CANDICE" + Text_EN "CANDICE"8 OT_ID 00000, 00000 - Introduction WE,ARE,READY,FOR,MORE,_GROWTH - After_Win WE,WILL,TRY,MORE,FOR,_GROWTH - After_Loss SORRY,PARTNER,I,WILL,_HARDEN,MYSELF + Intro_EN WE,ARE,READY,FOR,MORE,_GROWTH + Win_EN WE,WILL,TRY,MORE,FOR,_GROWTH + Loss_EN SORRY,PARTNER,I,WILL,_HARDEN,MYSELF Pokemon MAGIKARP Holds SILK_SCARF @@ -19,11 +21,11 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,14,15,14,14,30, MAGIKARP_SWIFT_SWIM PV $00000085 ; ♂ Impish - Nickname "MAGIKARP" + Text_EN "MAGIKARP"11 Friendship 255 Pokemon MUDKIP - dw MYSTIC_WATER + Holds MYSTIC_WATER Moves TACKLE, GROWL, MUD_SLAP, WATER_GUN Level 51 PP_Ups 0,0,0,0 @@ -31,7 +33,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,31,15,15,15,15, MUDKIP_TORRENT PV $00000083 ; ♂ Docile - Nickname "MUDKIP" + Text_EN "MUDKIP"11 Friendship 255 Pokemon DUSKULL @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,31,15,15,15, DUSKULL_LEVITATE PV $0000001B ; ♀ Brave - Nickname "DUSKULL" + Text_EN "DUSKULL"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/celina.asm b/battle-e/trainers/celina.asm index 579effa..b184447 100644 --- a/battle-e/trainers/celina.asm +++ b/battle-e/trainers/celina.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP Class HEX_MANIAC BT_Floor MOSSDEEP - OT_Name "CELINA" + Text_EN "CELINA"8 OT_ID 00000, 00000 - Introduction GHOST,_ELIP,WHAT,COULD,THAT,BE - After_Win GHOST,_ELIP,THEY,NEVER,GET,DEFEATED - After_Loss GHOST,_ELIP,THEY,GOT,DEFEATED,_QU + Intro_EN GHOST,_ELIP,WHAT,COULD,THAT,BE + Win_EN GHOST,_ELIP,THEY,NEVER,GET,DEFEATED + Loss_EN GHOST,_ELIP,THEY,GOT,DEFEATED,_QU Pokemon DUSCLOPS Holds SPELL_TAG @@ -19,7 +21,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,31,15,15,15,15, DUSCLOPS_PRESSURE PV $00000095 ; ♂ Quirky - Nickname "DUSCLOPS" + Text_EN "DUSCLOPS"11 Friendship 255 Pokemon SABLEYE @@ -31,7 +33,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,15,15,31, SABLEYE_KEEN_EYE PV $00000096 ; ♂ Hardy - Nickname "SABLEYE" + Text_EN "SABLEYE"11 Friendship 255 Pokemon SHEDINJA @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,31,15,31,15,15, SHEDINJA_WONDER_GUARD PV $00000080 ; ⚲ Adamant - Nickname "SHEDINJA" + Text_EN "SHEDINJA"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/clayton.asm b/battle-e/trainers/clayton.asm index 418b0a4..2192e5a 100644 --- a/battle-e/trainers/clayton.asm +++ b/battle-e/trainers/clayton.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level 50 - db PKMN_RANGER_M + Class PKMN_RANGER_M BT_Floor 5 - OT_Name "CLAYTON" + Text_EN "CLAYTON"8 OT_ID 00000, 00000 - Introduction HEHE,MY,BATTLE,ISN_T,THAT,SHAKY - After_Win HEHE,_ELIP,_EARTHQUAKE,IS,VERY,SHAKY - After_Loss UH_OH,MY,ATTACK,WAS,A_LITTLE,SHAKY + Intro_EN HEHE,MY,BATTLE,ISN_T,THAT,SHAKY + Win_EN HEHE,_ELIP,_EARTHQUAKE,IS,VERY,SHAKY + Loss_EN UH_OH,MY,ATTACK,WAS,A_LITTLE,SHAKY Pokemon FLYGON Holds SOFT_SAND @@ -19,7 +21,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,15,15,31,15,15, FLYGON_LEVITATE PV $00000090 ; ♂ Rash - Nickname "FLYGON" + Text_EN "FLYGON"11 Friendship 255 Pokemon RHYDON @@ -31,7 +33,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,31,15,15,15,15, RHYDON_ROCK_HEAD PV $0000001B ; ♀ Brave - Nickname "RHYDON" + Text_EN "RHYDON"11 Friendship 255 Pokemon SWAMPERT @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,31,15,15,15,15, SWAMPERT_TORRENT PV $0000007E ; ♂ Lonely - Nickname "SWAMPERT" + Text_EN "SWAMPERT"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/devin.asm b/battle-e/trainers/devin.asm index 77c0f00..9c946aa 100644 --- a/battle-e/trainers/devin.asm +++ b/battle-e/trainers/devin.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level 50 db COOLTRAINER_M BT_Floor 19 - OT_Name "DEVIN" + Text_EN "DEVIN"8 OT_ID 00000, 00000 - Introduction POWER,BATTLE,IS,ALWAYS,TRENDY,_EX - After_Win SEE,_QU,POWER,BATTLE,IS,TRENDY - After_Loss IS,_ELIP,POWER,BATTLE,TRENDY,_QU + Intro_EN POWER,BATTLE,IS,ALWAYS,TRENDY,_EX + Win_EN SEE,_QU,POWER,BATTLE,IS,TRENDY + Loss_EN IS,_ELIP,POWER,BATTLE,TRENDY,_QU Pokemon HERACROSS Holds SCOPE_LENS @@ -19,7 +21,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,31,15,31,15,15, HERACROSS_SWARM PV $000000E4 ; ♂ Adamant - Nickname "HERACROSS" + Text_EN "HERACROSS"11 Friendship 255 Pokemon SALAMENCE @@ -31,7 +33,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,31,15,31,15,15, SALAMENCE_INTIMIDATE PV $000000E4 ; ♂ Adamant - Nickname "SALAMENCE" + Text_EN "SALAMENCE"11 Friendship 255 Pokemon METAGROSS @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,31,15,31,15,15, METAGROSS_CLEAR_BODY PV $000000E4 ; ⚲ Adamant - Nickname "METAGROSS" + Text_EN "METAGROSS"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/dominic.asm b/battle-e/trainers/dominic.asm index 1a011af..261fefd 100644 --- a/battle-e/trainers/dominic.asm +++ b/battle-e/trainers/dominic.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP - db GUITARIST + Class GUITARIST BT_Floor MOSSDEEP - OT_Name "DOMINIC" + Text_EN "DOMINIC"8 OT_ID 00000, 00000 - Introduction LISTEN,TO,MY,SONG,_AND,SPIRIT - After_Win WOW,_EX_EX,ARE,YOU,LISTENING,_QU - After_Loss ARRGH,I,DON_T,LIKE,SAD,SONGS + Intro_EN LISTEN,TO,MY,SONG,_AND,SPIRIT + Win_EN WOW,_EX_EX,ARE,YOU,LISTENING,_QU + Loss_EN ARRGH,I,DON_T,LIKE,SAD,SONGS Pokemon SKARMORY Holds SHARP_BEAK @@ -19,11 +21,11 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,31,15,15,15,31, SKARMORY_STURDY PV $000000DF ; ♂ Careful - Nickname "SKARMORY" + Text_EN "SKARMORY"11 Friendship 255 Pokemon WAILORD - dw CHESTO_BERRY + Holds CHESTO_BERRY Moves ROAR, SURF, SLEEP_TALK, REST Level 70 PP_Ups 0,0,0,0 @@ -31,7 +33,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,15,31,15,15,31, WAILORD_WATER_VEIL PV $00000014 ; ♀ Calm - Nickname "WAILORD" + Text_EN "WAILORD"11 Friendship 255 Pokemon EXPLOUD @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,15,31,15,15,31, EXPLOUD_SOUNDPROOF PV $000000E8 ; ♂ Relaxed - Nickname "EXPLOUD" + Text_EN "EXPLOUD"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/dustin.asm b/battle-e/trainers/dustin.asm index 90d858d..8b74b73 100644 --- a/battle-e/trainers/dustin.asm +++ b/battle-e/trainers/dustin.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP - db TRIATHLETE_M_SWIM + Class TRIATHLETE_M_SWIM BT_Floor MOSSDEEP - OT_Name "DUSTIN" + Text_EN "DUSTIN"8 OT_ID 00000, 00000 - Introduction RUN,_EX,I,NEVER,_STOP,_EX - After_Win ALL_RIGHT,_EX,_STOP,_EX,I_AM,DONE - After_Loss NON_STOP,_EX,I,WILL,RUN,MORE + Intro_EN RUN,_EX,I,NEVER,_STOP,_EX + Win_EN ALL_RIGHT,_EX,_STOP,_EX,I_AM,DONE + Loss_EN NON_STOP,_EX,I,WILL,RUN,MORE Pokemon DODRIO Holds QUICK_CLAW @@ -19,7 +21,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,31,15,15,15,15, DODRIO_EARLY_BIRD PV $0000008A ; ♂ Jolly - Nickname "DODRIO" + Text_EN "DODRIO"11 Friendship 255 Pokemon MANECTRIC @@ -31,7 +33,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,15,15,15,15,15, MANECTRIC_STATIC PV $0000000E ; ♀ Naive - Nickname "MANECTRIC" + Text_EN "MANECTRIC"11 Friendship 255 Pokemon LINOONE @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,31,15,15, LINOONE_PICKUP PV $0000008B ; ♂ Naive - Nickname "LINOONE" + Text_EN "LINOONE"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/ellie.asm b/battle-e/trainers/ellie.asm index 8d79d03..ac2703e 100644 --- a/battle-e/trainers/ellie.asm +++ b/battle-e/trainers/ellie.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP Class BEAUTY BT_Floor MOSSDEEP - OT_Name "ELLIE" + Text_EN "ELLIE"8 OT_ID 00000, 00000 - Introduction I_AM,ON,A_LITTLE,DIET,_AND,HUNGRY - After_Win THIS,DIET,IS,REALLY,WORKING,ME - After_Loss SHOULD,I,EAT,LESS,_OR,MORE + Intro_EN I_AM,ON,A_LITTLE,DIET,_AND,HUNGRY + Win_EN THIS,DIET,IS,REALLY,WORKING,ME + Loss_EN SHOULD,I,EAT,LESS,_OR,MORE Pokemon CASTFORM Holds HEART_SCALE @@ -19,7 +21,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,15,31,15, CASTFORM_FORECAST PV $0000000F ; ♀ Modest - Nickname "CASTFORM" + Text_EN "CASTFORM"11 Friendship 255 Pokemon KOFFING @@ -31,7 +33,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,15,15,31, KOFFING_LEVITATE PV $0000008F ; ♂ Bashful - Nickname "KOFFING" + Text_EN "KOFFING"11 Friendship 255 Pokemon CHIMECHO @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,15,31,15, CHIMECHO_LEVITATE PV $0000000F ; ♀ Modest - Nickname "CHIMECHO" + Text_EN "CHIMECHO"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/fay.asm b/battle-e/trainers/fay.asm index 0e3e4b9..1eb4a3c 100644 --- a/battle-e/trainers/fay.asm +++ b/battle-e/trainers/fay.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level 100 Class BEAUTY BT_Floor 19 - OT_Name "FAY" + Text_EN "FAY"8 OT_ID 00000, 00000 - Introduction I,CAN_T,WAIT,TO,BATTLE,_EX_EX - After_Win _ICE_BEAM,WAS,TOO,COLD,FOR,YOU - After_Loss _ICY_WIND,DIDN_T,BEAT,YOUR,HOT,SPIRIT + Intro_EN I,CAN_T,WAIT,TO,BATTLE,_EX_EX + Win_EN _ICE_BEAM,WAS,TOO,COLD,FOR,YOU + Loss_EN _ICY_WIND,DIDN_T,BEAT,YOUR,HOT,SPIRIT Pokemon ALTARIA Holds SHELL_BELL @@ -19,7 +21,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 20,31,20,20,31,20, ALTARIA_NATURAL_CURE PV $000000E7 ; ♂ Docile - Nickname "ALTARIA" + Text_EN "ALTARIA"11 Friendship 255 Pokemon STARMIE @@ -31,7 +33,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,20,20,20,31,20, STARMIE_NATURAL_CURE PV $0000000F ; ⚲ Modest - Nickname "STARMIE" + Text_EN "STARMIE"11 Friendship 255 Pokemon REGICE @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 20,20,31,20,31,20, REGICE_CLEAR_BODY PV $00000020 ; ⚲ Relaxed - Nickname "REGICE" + Text_EN "REGICE"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/fuego.asm b/battle-e/trainers/fuego.asm index bdd41a1..55123d1 100644 --- a/battle-e/trainers/fuego.asm +++ b/battle-e/trainers/fuego.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level 100 - db COOLTRAINER_M + Class COOLTRAINER_M BT_Floor 5 - OT_Name "FUEGO" + Text_EN "FUEGO"8 OT_ID 00000, 00000 - Introduction I,HAVE,_A,FEELING,YOU,CAN_T_WIN - After_Win COLLECT,ICE,STEEL,_AND,ROCK,_EX - After_Loss ICE,STEEL,_AND,ROCK,DON_T,WORK + Intro_EN I,HAVE,_A,FEELING,YOU,CAN_T_WIN + Win_EN COLLECT,ICE,STEEL,_AND,ROCK,_EX + Loss_EN ICE,STEEL,_AND,ROCK,DON_T,WORK Pokemon GLALIE Holds SCOPE_LENS @@ -19,7 +21,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,20,31,20,20,20, GLALIE_INNER_FOCUS PV $00000096 ; ♂ Hardy - Nickname "GLALIE" + Text_EN "GLALIE"11 Friendship 255 Pokemon SKARMORY @@ -31,7 +33,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,20,20,20,20,31, SKARMORY_KEEN_EYE PV $00000017 ; ♀ Careful - Nickname "SKARMORY" + Text_EN "SKARMORY"11 Friendship 255 Pokemon REGIROCK @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,31,20,20,20,20, MASQUERAIN_INTIMIDATE PV $0000001B ; ⚲ Brave - Nickname "REGIROCK" + Text_EN "REGIROCK"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/goro.asm b/battle-e/trainers/goro.asm index e2f4f0e..43f9a33 100644 --- a/battle-e/trainers/goro.asm +++ b/battle-e/trainers/goro.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP Class NINJA_BOY BT_Floor MOSSDEEP - OT_Name "GORO" + Text_EN "GORO"8 OT_ID 00000, 00000 - Introduction COME_ON,_EX_EX,COME_ON,_EX_EX,SPEED_BOOST,_EX_EX - After_Win MORE,_EX_EX,MORE,_EX_EX,SPEED_BOOST,_EX_EX - After_Loss ARRGH,_ELIP,GIVE_ME,MORE,SPEED_BOOST,_ELIP_EX + Intro_EN COME_ON,_EX_EX,COME_ON,_EX_EX,SPEED_BOOST,_EX_EX + Win_EN MORE,_EX_EX,MORE,_EX_EX,SPEED_BOOST,_EX_EX + Loss_EN ARRGH,_ELIP,GIVE_ME,MORE,SPEED_BOOST,_ELIP_EX Pokemon ELECTRODE Holds KING_S_ROCK @@ -19,7 +21,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,15,15,31,31,15, ELECTRODE_STATIC PV $0000000E ; ⚲ Naive - Nickname "ELECTRODE" + Text_EN "ELECTRODE"11 Friendship 255 Pokemon NINJASK @@ -31,7 +33,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,31,15,31,15,15, NINJASK_SPEED_BOOST PV $000000D5 ; ♂ Jolly - Nickname "NINJASK" + Text_EN "NINJASK"11 Friendship 255 Pokemon CROBAT @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,31,15,31,15,15, CROBAT_INNER_FOCUS PV $0000000D ; ♀ Jolly - Nickname "CROBAT" + Text_EN "CROBAT"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/griffin.asm b/battle-e/trainers/griffin.asm index 6024039..2e1f38d 100644 --- a/battle-e/trainers/griffin.asm +++ b/battle-e/trainers/griffin.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP Class PSYCHIC_M BT_Floor MOSSDEEP - OT_Name "GRIFFIN" + Text_EN "GRIFFIN"8 OT_ID 00000, 00000 - Introduction CAN,YOU,SENSE,THE,PRESSURE,_QU - After_Win YOUR,PRESSURE,IS,WEAK,_AND,LACKING - After_Loss ARRGH,_EX,WHAT,FANTASTIC,PRESSURE,_EX_EX + Intro_EN CAN,YOU,SENSE,THE,PRESSURE,_QU + Win_EN YOUR,PRESSURE,IS,WEAK,_AND,LACKING + Loss_EN ARRGH,_EX,WHAT,FANTASTIC,PRESSURE,_EX_EX Pokemon BANETTE Holds LEPPA_BERRY @@ -19,11 +21,11 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,31,15,15,15, BANETTE_INSOMNIA PV $00000085 ; ♂ Impish - Nickname "BANETTE" + Text_EN "BANETTE"11 Friendship 255 Pokemon ABSOL - dw BRIGHTPOWDER + Holds BRIGHTPOWDER Moves PROTECT, DOUBLE_TEAM, REST, SLASH Level 54 PP_Ups 0,0,0,0 @@ -31,11 +33,11 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,31,15,15,15, ABSOL_PRESSURE PV $0000001C ; ♀ Adamant - Nickname "ABSOL" + Text_EN "ABSOL"11 Friendship 255 Pokemon DUSCLOPS - dw CHESTO_BERRY + Holds CHESTO_BERRY Moves PROTECT, REST, EARTHQUAKE, SHADOW_BALL Level 56 PP_Ups 0,0,0,0 @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,15,15,31, DUSCLOPS_PRESSURE PV $0000001C ; ♀ Adamant - Nickname "DUSCLOPS" + Text_EN "DUSCLOPS"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/hayden.asm b/battle-e/trainers/hayden.asm index 33c0d91..f6c92c1 100644 --- a/battle-e/trainers/hayden.asm +++ b/battle-e/trainers/hayden.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP - db GUITARIST + Class GUITARIST BT_Floor MOSSDEEP - OT_Name "HAYDEN" + Text_EN "HAYDEN"8 OT_ID 00000, 00000 - Introduction YEAH,_EX,COOL,_EXPLOSION,SONGS,_EX_EX - After_Win YEAH,_EX_EX,INCREDIBLE,_EXPLOSION,SONGS,_EX_EX - After_Loss NO,_EX,MY,SONGS,AREN_T,POPULAR + Intro_EN YEAH,_EX,COOL,_EXPLOSION,SONGS,_EX_EX + Win_EN YEAH,_EX_EX,INCREDIBLE,_EXPLOSION,SONGS,_EX_EX + Loss_EN NO,_EX,MY,SONGS,AREN_T,POPULAR Pokemon ELECTRODE Holds MAGNET @@ -19,7 +21,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,15,15,15, ELECTRODE_STATIC PV $00000080 ; ⚲ Adamant - Nickname "ELECTRODE" + Text_EN "ELECTRODE"11 Friendship 255 Pokemon SOLROCK @@ -31,7 +33,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,15,15,31, SOLROCK_LEVITATE PV $0000007F ; ⚲ Brave - Nickname "SOLROCK" + Text_EN "SOLROCK"11 Friendship 255 Pokemon SHIFTRY @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,31,15,15, SHIFTRY_EARLY_BIRD PV $00000080 ; ♂ Adamant - Nickname "SHIFTRY" + Text_EN "SHIFTRY"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/heather.asm b/battle-e/trainers/heather.asm index c60f554..2b0c852 100644 --- a/battle-e/trainers/heather.asm +++ b/battle-e/trainers/heather.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP - db PKMN_RANGER_F + Class PKMN_RANGER_F BT_Floor MOSSDEEP - OT_Name "HEATHER" + Text_EN "HEATHER"8 OT_ID 00000, 00000 - Introduction YOUR,ATTACK,GOES,BACK,TO,YOU - After_Win _COUNTER,ATTACK,ARE,YOU,OK_,BLANK - After_Loss OH,_EX,MY,_COUNTER,DIDN_T,WORK + Intro_EN YOUR,ATTACK,GOES,BACK,TO,YOU + Win_EN _COUNTER,ATTACK,ARE,YOU,OK_,BLANK + Loss_EN OH,_EX,MY,_COUNTER,DIDN_T,WORK Pokemon MACHAMP Holds SHELL_BELL @@ -19,10 +21,10 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,15,15,31, MACHAMP_GUTS PV $00000080 ; ♂ Adamant - Nickname "MACHAMP" + Text_EN "MACHAMP"11 Friendship 255 - dw TENTACRUEL + Pokemon TENTACRUEL Holds POISON_BARB Moves MIRROR_COAT, SURF, SLUDGE_BOMB, ICE_BEAM Level 78 @@ -31,7 +33,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,31,15,15,15, TENTACRUEL_LIQUID_OOZE PV $0000000F ; ♀ Modest - Nickname "TENTACRUEL" + Text_EN "TENTACRUEL"11 Friendship 255 Pokemon WOBBUFFET @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,15,15,31, WOBBUFFET_SHADOW_TAG PV $00000085 ; ♂ Impish - Nickname "WOBBUFFET" + Text_EN "WOBBUFFET"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/hillary.asm b/battle-e/trainers/hillary.asm index 1d06dd3..64ea16d 100644 --- a/battle-e/trainers/hillary.asm +++ b/battle-e/trainers/hillary.asm @@ -1,17 +1,19 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP Class LADY BT_Floor MOSSDEEP - OT_Name "HILLARY" + Text_EN "HILLARY"8 OT_ID 00000, 00000 - Introduction OH_,IS,MY,POKEMON,OVERWHELMING,_QU - After_Win _STOP,GOING,EASY,ON,ME,_EX_EX - After_Loss COULDN_T,YOU,GO_EASY,ON,ME,_QU + Intro_EN OH_,IS,MY,POKEMON,OVERWHELMING,_QU + Win_EN _STOP,GOING,EASY,ON,ME,_EX_EX + Loss_EN COULDN_T,YOU,GO_EASY,ON,ME,_QU Pokemon XATU - dw TWISTEDSPOON + Holds TWISTEDSPOON Moves PSYCHIC, SUNNY_DAY, CONFUSE_RAY, SOLARBEAM Level 54 PP_Ups 0,0,0,0 @@ -19,11 +21,11 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 0,15,15,31,31,15, XATU_SYNCHRONIZE PV $000000D7 ; ♂ Modest - Nickname "XATU" + Text_EN "XATU"11 Friendship 255 Pokemon WOBBUFFET - dw SITRUS_BERRY + Holds SITRUS_BERRY Moves COUNTER, MIRROR_COAT, SAFEGUARD, DESTINY_BOND Level 57 PP_Ups 0,0,0,0 @@ -31,7 +33,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,15,31,15,15,31, WOBBUFFET_SHADOW_TAG PV $00000012 ; ♀ Bashful - Nickname "WOBBUFFET" + Text_EN "WOBBUFFET"11 Friendship 255 Pokemon HOUNDOOM @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,15,15,31,31,15, HOUNDOOM_FLASH_FIRE PV $000000D7 ; ♂ Modest - Nickname "HOUNDOOM" + Text_EN "HOUNDOOM"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/hugo.asm b/battle-e/trainers/hugo.asm index 9017095..b42b4c7 100644 --- a/battle-e/trainers/hugo.asm +++ b/battle-e/trainers/hugo.asm @@ -1,17 +1,19 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP - db HIKER + Class HIKER BT_Floor MOSSDEEP - OT_Name "HUGO" + Text_EN "HUGO"8 OT_ID 00000, 00000 - Introduction START,_A,DIET,_QU,NO,WAY - After_Win HAH,_ELIP,I_AM,NOW,HUNGRY,_ELIP - After_Loss IT_S,SUPER,HARD,TO,DIET,_EX_EX + Intro_EN START,_A,DIET,_QU,NO,WAY + Win_EN HAH,_ELIP,I_AM,NOW,HUNGRY,_ELIP + Loss_EN IT_S,SUPER,HARD,TO,DIET,_EX_EX Pokemon WALREIN - dw SITRUS_BERRY + Holds SITRUS_BERRY Moves BLIZZARD, REST, BODY_SLAM, SURF Level 66 PP_Ups 0,0,0,0 @@ -19,7 +21,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,15,31,15, WALREIN_THICK_FAT PV $0000008E ; ♂ Quiet - Nickname "WALREIN" + Text_EN "WALREIN"11 Friendship 255 Pokemon HARIYAMA @@ -31,11 +33,11 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,31,15,15,15,15, HARIYAMA_THICK_FAT PV $0000007F ; ♂ Brave - Nickname "HARIYAMA" + Text_EN "HARIYAMA"11 Friendship 255 Pokemon GRUMPIG - dw SITRUS_BERRY + Holds SITRUS_BERRY Moves PSYCHIC, IRON_TAIL, CONFUSE_RAY, PROTECT Level 70 PP_Ups 0,0,0,0 @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,15,15,15,31,31, GRUMPIG_THICK_FAT PV $00000018 ; ♀ Quirky - Nickname "GRUMPIG" + Text_EN "GRUMPIG"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/irazu.asm b/battle-e/trainers/irazu.asm index 2804cc8..8fd4a45 100644 --- a/battle-e/trainers/irazu.asm +++ b/battle-e/trainers/irazu.asm @@ -1,17 +1,19 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level 100 - db PKMN_RANGER_M + Class PKMN_RANGER_M BT_Floor 12 - OT_Name "IRAZU" + Text_EN "IRAZU"8 OT_ID 00000, 00000 - Introduction MY,POKEMON,THANKS,ME,FOR,CARE - After_Win POKEMON,DON_T,TRUST,TRAINER,WITHOUT,CARE - After_Loss IF_I_LOSE,MY,_FRUSTRATION,LEVEL,GOES,UP + Intro_EN MY,POKEMON,THANKS,ME,FOR,CARE + Win_EN POKEMON,DON_T,TRUST,TRAINER,WITHOUT,CARE + Loss_EN IF_I_LOSE,MY,_FRUSTRATION,LEVEL,GOES,UP Pokemon KINGDRA - dw CHESTO_BERRY + Holds CHESTO_BERRY Moves RETURN, DRAGON_DANCE, REST, DOUBLE_TEAM Level 100 PP_Ups 3,0,0,0 @@ -19,7 +21,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,31,20,20,20,20, KINGDRA_SWIFT_SWIM PV $0000001C ; ♀ Adamant - Nickname "KINGDRA" + Text_EN "KINGDRA"11 Friendship 255 Pokemon HARIYAMA @@ -31,7 +33,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,20,20,20,20,31, HARIYAMA_THICK_FAT PV $00000080 ; ♂ Adamant - Nickname "HARIYAMA" + Text_EN "HARIYAMA"11 Friendship 255 Pokemon REGISTEEL @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,20,20,20,20,31, REGISTEEL_CLEAR_BODY PV $0000001C ; ⚲ Adamant - Nickname "REGISTEEL" + Text_EN "REGISTEEL"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/irvin.asm b/battle-e/trainers/irvin.asm index c838453..b2c8986 100644 --- a/battle-e/trainers/irvin.asm +++ b/battle-e/trainers/irvin.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP - db BUG_MANIAC + Class BUG_MANIAC BT_Floor MOSSDEEP - OT_Name "IRVIN" + Text_EN "IRVIN"8 OT_ID 00000, 00000 - Introduction MMM,_ELIP_EX,I,TRUST,BUG,POKEMON - After_Win ISN_T,MY,BUG,POKEMON,COOL,_QU - After_Loss BUG,POKEMON,ARE,ALWAYS,THE,BEST + Intro_EN MMM,_ELIP_EX,I,TRUST,BUG,POKEMON + Win_EN ISN_T,MY,BUG,POKEMON,COOL,_QU + Loss_EN BUG,POKEMON,ARE,ALWAYS,THE,BEST Pokemon BEAUTIFLY Holds POISON_BARB @@ -19,11 +21,11 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,31,15,15,15,15, BEAUTIFLY_SWARM PV $0000001C ; ♀ Adamant - Nickname "BEAUTIFLY" + Text_EN "BEAUTIFLY"11 Friendship 255 Pokemon DUSTOX - dw PERSIM_BERRY + Holds PERSIM_BERRY Moves PSYCHIC, SHADOW_BALL, MOONLIGHT, ATTRACT Level 92 PP_Ups 0,0,0,0 @@ -31,10 +33,10 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,15,31,15,15,31, DUSTOX_SHIELD_DUST PV $000000E1 ; ♂ Hardy - Nickname "DUSTOX" + Text_EN "DUSTOX"11 Friendship 255 - dw MASQUERAIN + Pokemon MASQUERAIN Holds LAX_INCENSE Moves SILVER_WIND, SOLARBEAM, ICE_BEAM, STUN_SPORE Level 91 @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,15,31,15,15,31, MASQUERAIN_INTIMIDATE PV $00000019 ; ♀ Hardy - Nickname "MASQUERAIN" + Text_EN "MASQUERAIN"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/jeffrey.asm b/battle-e/trainers/jeffrey.asm index ee1c946..e0c9737 100644 --- a/battle-e/trainers/jeffrey.asm +++ b/battle-e/trainers/jeffrey.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP - db YOUNGSTER + Class YOUNGSTER BT_Floor MOSSDEEP - OT_Name "JEFFREY" + Text_EN "JEFFREY"8 OT_ID 00000, 00000 - Introduction I,WILL,SHOW,YOU,MY,SECRET - After_Win YEAH,MY,SECRET,_ELIP,IS,SECRET - After_Loss GO_EASY,ON,ME,_ELIP,PLEASE,_EX + Intro_EN I,WILL,SHOW,YOU,MY,SECRET + Win_EN YEAH,MY,SECRET,_ELIP,IS,SECRET + Loss_EN GO_EASY,ON,ME,_ELIP,PLEASE,_EX Pokemon PINSIR Holds KING_S_ROCK @@ -19,7 +21,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,15,15,31, PINSIR_HYPER_CUTTER PV $00000080 ; ♂ Adamant - Nickname "PINSIR" + Text_EN "PINSIR"11 Friendship 255 Pokemon NINETALES @@ -31,11 +33,11 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,15,31,15, NINETALES_FLASH_FIRE PV $0000000F ; ♀ Modest - Nickname "NINETALES" + Text_EN "NINETALES"11 Friendship 255 Pokemon BLASTOISE - dw MYSTIC_WATER + Holds MYSTIC_WATER Moves SURF, BRICK_BREAK, EARTHQUAKE, ICE_BEAM Level 64 PP_Ups 0,0,0,0 @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,15,31,15, BLASTOISE_TORRENT PV $00000083 ; ♂ Docile - Nickname "BLASTOISE" + Text_EN "BLASTOISE"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/judith.asm b/battle-e/trainers/judith.asm index a999a4e..59db53b 100644 --- a/battle-e/trainers/judith.asm +++ b/battle-e/trainers/judith.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP - db PSYCHIC_F + Class PSYCHIC_F BT_Floor MOSSDEEP - OT_Name "JUDITH" + Text_EN "JUDITH"8 OT_ID 00000, 00000 - Introduction WELCOME,_ELIP_EX,I_AM,_A,_TRICK,_T_PSYCHIC - After_Win ISN_T,MY,_TRICK,SO,COOL,_QU - After_Loss _A,GOOD,_TRICK,IS,NEVER,EASY + Intro_EN WELCOME,_ELIP_EX,I_AM,_A,_TRICK,_T_PSYCHIC + Win_EN ISN_T,MY,_TRICK,SO,COOL,_QU + Loss_EN _A,GOOD,_TRICK,IS,NEVER,EASY Pokemon ALAKAZAM Holds CHOICE_BAND @@ -19,7 +21,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,15,15,31,31,15, ALAKAZAM_SYNCHRONIZE PV $00000087 ; ♂ Timid - Nickname "ALAKAZAM" + Text_EN "ALAKAZAM"11 Friendship 255 Pokemon KECLEON @@ -31,7 +33,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,31,15,15,15, KECLEON_COLOR_CHANGE PV $00000016 ; ⚲ Sassy - Nickname "KECLEON" + Text_EN "KECLEON"11 Friendship 255 Pokemon LINOONE @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,31,15,15, LINOONE_PICKUP PV $00000085 ; ♂ Impish - Nickname "LINOONE" + Text_EN "LINOONE"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/justine.asm b/battle-e/trainers/justine.asm index a090933..a34b9c3 100644 --- a/battle-e/trainers/justine.asm +++ b/battle-e/trainers/justine.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP - db POKEFAN_F + Class POKEFAN_F BT_Floor MOSSDEEP - OT_Name "JUSTINE" + Text_EN "JUSTINE"8 OT_ID 00000, 00000 - Introduction HEY,_QU_EX,LOOK,AT,MY,POKEMON - After_Win OH_DEAR,WAS,IT,A_LITTLE,SURPRISE,_QU - After_Loss OH_DEAR,IT,WAS,A_LITTLE,SURPRISE,_QU_EX + Intro_EN HEY,_QU_EX,LOOK,AT,MY,POKEMON + Win_EN OH_DEAR,WAS,IT,A_LITTLE,SURPRISE,_QU + Loss_EN OH_DEAR,IT,WAS,A_LITTLE,SURPRISE,_QU_EX Pokemon PIKACHU Holds LIGHT_BALL @@ -19,11 +21,11 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,15,15,31,31,15, PIKACHU_STATIC PV $0000000F ; ♀ Modest - Nickname "PIKACHU" + Text_EN "PIKACHU"11 Friendship 255 Pokemon GOLEM - dw BRIGHTPOWDER + Holds BRIGHTPOWDER Moves EXPLOSION, EARTHQUAKE, ROCK_SLIDE, FOCUS_PUNCH Level 62 PP_Ups 0,0,0,0 @@ -31,7 +33,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,15,15,31, GOLEM_STURDY PV $0000001B ; ♀ Brave - Nickname "GOLEM" + Text_EN "GOLEM"11 Friendship 255 Pokemon GENGAR @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,31,15,15,15, GENGAR_LEVITATE PV $00000087 ; ♂ Timid - Nickname "GENGAR" + Text_EN "GENGAR"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/kendall.asm b/battle-e/trainers/kendall.asm index 06cc2df..8fb2cca 100644 --- a/battle-e/trainers/kendall.asm +++ b/battle-e/trainers/kendall.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP Class POKEFAN_M BT_Floor MOSSDEEP - OT_Name "KENDALL" + Text_EN "KENDALL"8 OT_ID 00000, 00000 - Introduction _FLASH,_EX_EX,I,LIKE,IT,_EX_EX - After_Win CUTE,_EX,POKEMON,_EX,_FLASH,_EX_EX - After_Loss I,CAN_T_WIN,WITH,ONLY,_FLASH,_EX_EX + Intro_EN _FLASH,_EX_EX,I,LIKE,IT,_EX_EX + Win_EN CUTE,_EX,POKEMON,_EX,_FLASH,_EX_EX + Loss_EN I,CAN_T_WIN,WITH,ONLY,_FLASH,_EX_EX Pokemon PLUSLE Holds MAGNET @@ -19,7 +21,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,15,31,15, PLUSLE_PLUS PV $0000008C ; ♂ Modest - Nickname "PLUSLE" + Text_EN "PLUSLE"11 Friendship 255 Pokemon MINUN @@ -31,11 +33,11 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,31,15,15, MINUN_MINUS PV $0000000F ; ♀ Modest - Nickname "MINUN" + Text_EN "MINUN"11 Friendship 255 Pokemon SNORUNT - dw NEVERMELTICE + Holds NEVERMELTICE Moves BLOCK, ICY_WIND, PROTECT, FLASH Level 94 PP_Ups 0,0,0,0 @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,15,15,31, SNORUNT_INNER_FOCUS PV $0000000F ; ♀ Modest - Nickname "SNORUNT" + Text_EN "SNORUNT"11 Friendship 255 + + End_Trainer
\ No newline at end of file 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 diff --git a/battle-e/trainers/macros.asm b/battle-e/trainers/macros.asm index 9b389fa..bf6e501 100644 --- a/battle-e/trainers/macros.asm +++ b/battle-e/trainers/macros.asm @@ -1,59 +1,50 @@ -INCLUDE "../../constants/abilities.asm" -INCLUDE "../../constants/easychat.asm" -INCLUDE "../../constants/items.asm" -INCLUDE "../../constants/moves.asm" -INCLUDE "../../constants/pokemon.asm" -INCLUDE "../../constants/trainerclasses.asm" +INCLUDE "../macros.asm" +INCLUDE "../constants/abilities.asm" +INCLUDE "../constants/easychat.asm" +INCLUDE "../constants/items.asm" +INCLUDE "../constants/moves.asm" +INCLUDE "../constants/pokemon.asm" +INCLUDE "../constants/trainerclasses.asm" MOSSDEEP EQU 0 -BT_Level: MACRO +Battle_Trainer: MACRO Section "battle",ROM0[$100] - db \1 + db $01 + dd $02000000 + db REGION,0,REGION,0,0,0,$04,0,$80,$01,0,0 + db $0D + dd $02000018 + db $02,$00 ENDM -Class: MACRO - db (\1) - ENDM -BT_Floor: MACRO - dw \1 - ENDM -OT_Name: MACRO - db \1 - db $FF - REPT 7 - STRLEN(\1) - db 0 - ENDR - ENDM -Introduction: MACRO + +BT_Level EQUS "db" +Class EQUS "db" +BT_Floor EQUS "dw" ; the byte after it is 00, but apparently means something… +Intro_EN: MACRO + IF REGION == REGION_EN dw \1, \2, \3, \4, \5, \6 + ENDC ENDM -After_Win: MACRO +Win_EN: MACRO + IF REGION == REGION_EN dw \1, \2, \3, \4, \5, \6 + ENDC ENDM -After_Loss: MACRO +Loss_EN: MACRO + IF REGION == REGION_EN dw \1, \2, \3, \4, \5, \6 + ENDC ENDM -Pokemon: MACRO - dw \1 - ENDM -Holds: MACRO - dw (\1) - ENDM -Moves: MACRO - dw \1, \2, \3, \4 - ENDM -Level: MACRO - db \1 - ENDM +Pokemon EQUS "dw" +Holds EQUS "dw" +Moves EQUS "dw" +Level EQUS "db" PP_Ups: MACRO db (\1) + (\2 << 2) + (\3 << 4) + (\4 << 6) ENDM -EVs: MACRO - db \1, \2, \3, \4, \5, \6 - ENDM -OT_ID: MACRO - dw \1, \2 - ENDM +EVs EQUS "db" +OT_ID EQUS "dw" IVs: MACRO dw \1 + (\2 << 5) + (\3 << 10) + ((\4 & 1) << 15) dw (\4 >> 1) + (\5 << 4) + (\6 << 9) + (\7 << 15) @@ -61,13 +52,9 @@ IVs: MACRO PV: MACRO dw (\1 & $FFFF), (\1 >> 16) ENDM -Nickname: MACRO - db \1 - db $FF - REPT 10 - STRLEN(\1) - db 0 - ENDR - ENDM -Friendship: MACRO - db \1 +Friendship EQUS "db" + +End_Trainer: MACRO + db 0,0,0,0 + EOF ENDM
\ No newline at end of file diff --git a/battle-e/trainers/maggie.asm b/battle-e/trainers/maggie.asm index 4251d54..6f9ac60 100644 --- a/battle-e/trainers/maggie.asm +++ b/battle-e/trainers/maggie.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP - db POKEFAN_F + Class POKEFAN_F BT_Floor MOSSDEEP - OT_Name "MAGGIE" + Text_EN "MAGGIE"8 OT_ID 00000, 00000 - Introduction LOOK,AT,MY,CUTE,POKEMON,_EX - After_Win MY,POKEMON,ARE,SO,CUTE,_EX - After_Loss YOU,BETTER,CARE,FOR,MY,POKEMON + Intro_EN LOOK,AT,MY,CUTE,POKEMON,_EX + Win_EN MY,POKEMON,ARE,SO,CUTE,_EX + Loss_EN YOU,BETTER,CARE,FOR,MY,POKEMON Pokemon WYNAUT Holds LUM_BERRY @@ -19,7 +21,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,31,15,15,15, WYNAUT_SHADOW_TAG PV $00000083 ; ♂ Docile - Nickname "WYNAUT" + Text_EN "WYNAUT"11 Friendship 255 Pokemon WHISMUR @@ -31,7 +33,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,31,15,15,15,15, WHISMUR_SOUNDPROOF PV $0000001F ; ♀ Docile - Nickname "WHISMUR" + Text_EN "WHISMUR"11 Friendship 255 Pokemon PIKACHU @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,31,15,15, PIKACHU_STATIC PV $00000083 ; ♂ Docile - Nickname "PIKACHU" + Text_EN "PIKACHU"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/mandy.asm b/battle-e/trainers/mandy.asm index 77dab64..97304e1 100644 --- a/battle-e/trainers/mandy.asm +++ b/battle-e/trainers/mandy.asm @@ -1,17 +1,19 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level 50 - db SCHOOL_KID_F + Class SCHOOL_KID_F BT_Floor 12 - OT_Name "MANDY" + Text_EN "MANDY"8 OT_ID 00000, 00000 - Introduction I,WAKE_UP,_AND,STUDY,VERY,HARD - After_Win STUDY,IS,BORING,IT_S,NAP,TIME - After_Loss _REST,_ELIP,NAP,_ELIP,SLEEP,NOW + Intro_EN I,WAKE_UP,_AND,STUDY,VERY,HARD + Win_EN STUDY,IS,BORING,IT_S,NAP,TIME + Loss_EN _REST,_ELIP,NAP,_ELIP,SLEEP,NOW Pokemon ALTARIA - dw SITRUS_BERRY + Holds SITRUS_BERRY Moves SING, DRAGON_CLAW, ICE_BEAM, FLAMETHROWER Level 50 PP_Ups 0,0,0,0 @@ -19,7 +21,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,15,31,15,31,15, ALTARIA_NATURAL_CURE PV $0000000F ; ♀ Modest - Nickname "ALTARIA" + Text_EN "ALTARIA"11 Friendship 255 Pokemon BRELOOM @@ -31,11 +33,11 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,15,15,31,31,15, BRELOOM_EFFECT_SPORE PV $000000E4 ; ♂ Adamant - Nickname "BRELOOM" + Text_EN "BRELOOM"11 Friendship 255 Pokemon SLAKING - dw BRIGHTPOWDER + Holds BRIGHTPOWDER Moves YAWN, HYPER_BEAM, SHADOW_BALL, ICE_BEAM Level 50 PP_Ups 0,0,0,0 @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,31,15,15,15,31, SLAKING_TRUANT PV $000000DE ; ♂ Sassy - Nickname "SLAKING" + Text_EN "SLAKING"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/marcus.asm b/battle-e/trainers/marcus.asm index da4e19f..8d74bda 100644 --- a/battle-e/trainers/marcus.asm +++ b/battle-e/trainers/marcus.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level 50 - db EXPERT_M + Class EXPERT_M BT_Floor 5 - OT_Name "MARCUS" + Text_EN "MARCUS"8 OT_ID 00000, 00000 - Introduction MY,ATTACK,IS,GENIUS,_AND,INVINCIBLE - After_Win HOW,WAS,THE,POISON,ATTACK,_QU - After_Loss I,_ELIP,CAN_T,BEAT,YOU,_QU + Intro_EN MY,ATTACK,IS,GENIUS,_AND,INVINCIBLE + Win_EN HOW,WAS,THE,POISON,ATTACK,_QU + Loss_EN I,_ELIP,CAN_T,BEAT,YOU,_QU Pokemon SKARMORY Holds LEFTOVERS @@ -19,11 +21,11 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,14,15,15,14,30, SKARMORY_KEEN_EYE ; HP Bug 70 PV $00000094 ; ♂ Careful - Nickname "SKARMORY" + Text_EN "SKARMORY"11 Friendship 255 Pokemon HERACROSS - dw SITRUS_BERRY + Holds SITRUS_BERRY Moves TOXIC, PROTECT, MEGAHORN, DIG Level 50 PP_Ups 0,0,0,0 @@ -31,7 +33,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,31,15,15, HERACROSS_GUTS PV $0000000D ; ♀ Jolly - Nickname "HERACROSS" + Text_EN "HERACROSS"11 Friendship 255 Pokemon SWAMPERT @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,15,15,15, SWAMPERT_TORRENT PV $0000007F ; ♂ Brave - Nickname "SWAMPERT" + Text_EN "SWAMPERT"11 Friendship 255 + + End_Trainer
\ No newline at end of file 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 diff --git a/battle-e/trainers/natasha.asm b/battle-e/trainers/natasha.asm index 2781afb..77d5fce 100644 --- a/battle-e/trainers/natasha.asm +++ b/battle-e/trainers/natasha.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level 50 - db PSYCHIC_F + Class PSYCHIC_F BT_Floor 12 - OT_Name "NATASHA" + Text_EN "NATASHA"8 OT_ID 00000, 00000 - Introduction LOOK,_EX,MY,SKILLED,ATTACK,_EX_EX - After_Win OH_,WHERE,WAS,YOUR,_LIGHT_SCREEN,_QU - After_Loss I,WAS,NO_MATCH,FOR,YOU,_EX_EX + Intro_EN LOOK,_EX,MY,SKILLED,ATTACK,_EX_EX + Win_EN OH_,WHERE,WAS,YOUR,_LIGHT_SCREEN,_QU + Loss_EN I,WAS,NO_MATCH,FOR,YOU,_EX_EX Pokemon STARMIE Holds SCOPE_LENS @@ -19,7 +21,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,15,15,31,31,15, STARMIE_NATURAL_CURE PV $0000000F ; ⚲ Modest - Nickname "STARMIE" + Text_EN "STARMIE"11 Friendship 255 Pokemon SALAMENCE @@ -31,11 +33,11 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,31,15,31,31,15, SALAMENCE_INTIMIDATE PV $0000008C ; ♂ Modest - Nickname "SALAMENCE" + Text_EN "SALAMENCE"11 Friendship 255 Pokemon SCEPTILE - dw BRIGHTPOWDER + Holds BRIGHTPOWDER Moves LEAF_BLADE, CRUNCH, DRAGON_CLAW, DOUBLE_TEAM Level 50 PP_Ups 0,0,0,0 @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,31,15,15, SCEPTILE_OVERGROW PV $0000000F ; ♀ Modest - Nickname "SCEPTILE" + Text_EN "SCEPTILE"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/nils.asm b/battle-e/trainers/nils.asm index a6b38bd..ab6064c 100644 --- a/battle-e/trainers/nils.asm +++ b/battle-e/trainers/nils.asm @@ -1,17 +1,19 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level 50 Class GENTLEMAN BT_Floor 0 - OT_Name "NILS" + Text_EN "NILS"8 OT_ID 00000, 00000 - Introduction YOUR,CHALLENGE,IS,MORE,THAN,WELCOME - After_Win THAT_S,REALLY,ALL,YOU,GOT,_QU - After_Loss HMM,WELL,DONE,_ELIP,YOUNG,TRAINER + Intro_EN YOUR,CHALLENGE,IS,MORE,THAN,WELCOME + Win_EN THAT_S,REALLY,ALL,YOU,GOT,_QU + Loss_EN HMM,WELL,DONE,_ELIP,YOUNG,TRAINER Pokemon SABLEYE - dw SITRUS_BERRY + Holds SITRUS_BERRY Moves NIGHT_SHADE, FAKE_OUT, DETECT, KNOCK_OFF 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, SABLEYE_KEEN_EYE PV $000000CE ; ♂ Docile - Nickname "SABLEYE" + Text_EN "SABLEYE"11 Friendship 255 Pokemon PLUSLE @@ -31,7 +33,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,15,15,15,15,15, PLUSLE_PLUS PV $0000000F ; ♀ Modest - Nickname "PLUSLE" + Text_EN "PLUSLE"11 Friendship 255 Pokemon LUDICOLO @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,15,15,15,15,15, LUDICOLO_SWIFT_SWIM PV $000000D2 ; ♂ Timid - Nickname "LUDICOLO" + Text_EN "LUDICOLO"11 Friendship 255 + + End_Trainer
\ No newline at end of file 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 diff --git a/battle-e/trainers/patrick.asm b/battle-e/trainers/patrick.asm index 8537dba..dad780a 100644 --- a/battle-e/trainers/patrick.asm +++ b/battle-e/trainers/patrick.asm @@ -1,17 +1,19 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP Class CAMPER BT_Floor MOSSDEEP - OT_Name "PATRICK" + Text_EN "PATRICK"8 OT_ID 00000, 00000 - Introduction WHAT,COLOR,DO,I,LIKE,_QU - After_Win WASN_T,IT,_A,GOOD,COLOR,_QU - After_Loss I,WILL,ALWAYS,LIKE,MY,COLOR + Intro_EN WHAT,COLOR,DO,I,LIKE,_QU + Win_EN WASN_T,IT,_A,GOOD,COLOR,_QU + Loss_EN I,WILL,ALWAYS,LIKE,MY,COLOR Pokemon XATU - dw CHESTO_BERRY + Holds CHESTO_BERRY Moves PSYCHIC, CONFUSE_RAY, REST, NIGHT_SHADE Level 50 PP_Ups 0,0,0,0 @@ -19,7 +21,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,31,15,15, XATU_SYNCHRONIZE PV $0000000F ; ♀ Modest - Nickname "XATU" + Text_EN "XATU"11 Friendship 255 Pokemon LUDICOLO @@ -31,7 +33,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,31,15,15,15, LUDICOLO_SWIFT_SWIM PV $00000014 ; ♀ Calm - Nickname "LUDICOLO" + Text_EN "LUDICOLO"11 Friendship 255 Pokemon FLYGON @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,15,15,31,31,15, FLYGON_LEVITATE PV $00000090 ; ♂ Rash - Nickname "FLYGON" + Text_EN "FLYGON"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/raquel.asm b/battle-e/trainers/raquel.asm index 6ce0e4a..2670a6d 100644 --- a/battle-e/trainers/raquel.asm +++ b/battle-e/trainers/raquel.asm @@ -1,17 +1,19 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP - db COOLTRAINER_F + Class COOLTRAINER_F BT_Floor MOSSDEEP - OT_Name "RAQUEL" + Text_EN "RAQUEL"8 OT_ID 00000, 00000 - Introduction YOU_RE,NOT,_A,MATCH,TO_ME,_ELIP - After_Win I,ALWAYS,WIN,WITH,THIS,COLOR - After_Loss MY,DREAM,NEVER,GOES,AWAY,_ELIP + Intro_EN YOU_RE,NOT,_A,MATCH,TO_ME,_ELIP + Win_EN I,ALWAYS,WIN,WITH,THIS,COLOR + Loss_EN MY,DREAM,NEVER,GOES,AWAY,_ELIP Pokemon CRAWDAUNT - dw BLACKGLASSES + Holds BLACKGLASSES Moves HIDDEN_POWER, CRABHAMMER, SWORDS_DANCE, FRUSTRATION Level 52 PP_Ups 0,0,0,0 @@ -19,7 +21,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,15,31,15, CRAWDAUNT_HYPER_CUTTER ; HP Dark 70 PV $00000011 ; ♀ Quiet - Nickname "CRAWDAUNT" + Text_EN "CRAWDAUNT"11 Friendship 0 Pokemon ELECTRODE @@ -31,7 +33,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,15,31,15, ELECTRODE_STATIC PV $0000000A ; ⚲ Timid - Nickname "ELECTRODE" + Text_EN "ELECTRODE"11 Friendship 255 Pokemon BLAZIKEN @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,31,15,31,15,15, BLAZIKEN_BLAZE PV $0000008C ; ♂ Modest - Nickname "BLAZIKEN" + Text_EN "BLAZIKEN"11 Friendship 255 + + End_Trainer
\ No newline at end of file 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 diff --git a/battle-e/trainers/rudy.asm b/battle-e/trainers/rudy.asm index 8e42e79..54968a2 100644 --- a/battle-e/trainers/rudy.asm +++ b/battle-e/trainers/rudy.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP - db YOUNGSTER + Class YOUNGSTER BT_Floor MOSSDEEP - OT_Name "RUDY" + Text_EN "RUDY"8 OT_ID 00000, 00000 - Introduction YEAH,_EX,GO,_EX,_TACKLE,_EX_EX - After_Win I,SOMEHOW,WON,THE,BATTLE,_EX_EX - After_Loss I_AM,NOT,HOPELESS,BUT,I,GIVE_UP + Intro_EN YEAH,_EX,GO,_EX,_TACKLE,_EX_EX + Win_EN I,SOMEHOW,WON,THE,BATTLE,_EX_EX + Loss_EN I_AM,NOT,HOPELESS,BUT,I,GIVE_UP Pokemon CASCOON Holds EVERSTONE @@ -19,7 +21,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,31,15,15,15,15, CASCOON_SHED_SKIN PV $00000083 ; ♂ Docile - Nickname "CASCOON" + Text_EN "CASCOON"11 Friendship 255 Pokemon SILCOON @@ -31,7 +33,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,31,15,15,15,15, SILCOON_SHED_SKIN PV $00000012 ; ♀ Bashful - Nickname "SILCOON" + Text_EN "SILCOON"11 Friendship 255 Pokemon MAGIKARP @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,31,15,15,15,15, MAGIKARP_SWIFT_SWIM PV $00000095 ; ♂ Quirky - Nickname "MAGIKARP" + Text_EN "MAGIKARP"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/sandia.asm b/battle-e/trainers/sandia.asm index c6098f7..d8b23a7 100644 --- a/battle-e/trainers/sandia.asm +++ b/battle-e/trainers/sandia.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level 100 - db EXPERT_F + Class EXPERT_F BT_Floor 12 - OT_Name "SANDIA" + Text_EN "SANDIA"8 OT_ID 00000, 00000 - Introduction HERE_I_COME,_EX,MY,GUARD,IS,INVINCIBLE - After_Win I,BELIEVE,IN,MYSELF,_AND,TRAIN - After_Loss YOU,DID,_DETECT,MY,WEAK,POINTS + Intro_EN HERE_I_COME,_EX,MY,GUARD,IS,INVINCIBLE + Win_EN I,BELIEVE,IN,MYSELF,_AND,TRAIN + Loss_EN YOU,DID,_DETECT,MY,WEAK,POINTS Pokemon CLAYDOL Holds SHELL_BELL @@ -19,7 +21,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 20,20,31,20,20,31, CLAYDOL_LEVITATE PV $0000000F ; ⚲ Modest - Nickname "CLAYDOL" + Text_EN "CLAYDOL"11 Friendship 255 Pokemon METAGROSS @@ -31,11 +33,11 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 20,31,20,20,20,31, METAGROSS_CLEAR_BODY PV $0000001C ; ⚲ Adamant - Nickname "METAGROSS" + Text_EN "METAGROSS"11 Friendship 255 Pokemon REGICE - dw CHESTO_BERRY + Holds CHESTO_BERRY Moves CURSE, REST, ICE_BEAM, SUPERPOWER Level 100 PP_Ups 0,0,0,0 @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 20,20,31,31,20,20, REGICE_CLEAR_BODY PV $0000001E ; ⚲ Bold - Nickname "REGICE" + Text_EN "REGICE"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/sandy.asm b/battle-e/trainers/sandy.asm index 1cfc479..63a84b8 100644 --- a/battle-e/trainers/sandy.asm +++ b/battle-e/trainers/sandy.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level 50 Class PICNICKER BT_Floor 19 - OT_Name "SANDY" + Text_EN "SANDY"8 OT_ID 00000, 00000 - Introduction I,GOT,MY,POKEMON,WITH,POKEBLOCK - After_Win I,COLLECT,MORE,POKEMON,WITH,POKEBLOCK - After_Loss URGH,I,HAVE,NO,MORE,POKEBLOCK + Intro_EN I,GOT,MY,POKEMON,WITH,POKEBLOCK + Win_EN I,COLLECT,MORE,POKEMON,WITH,POKEBLOCK + Loss_EN URGH,I,HAVE,NO,MORE,POKEBLOCK Pokemon HERACROSS Holds BLACK_BELT @@ -19,11 +21,11 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,31,15,31,15,15, HERACROSS_GUTS PV $00000080 ; ♂ Adamant - Nickname "HERACROSS" + Text_EN "HERACROSS"11 Friendship 255 Pokemon GIRAFARIG - dw TWISTEDSPOON + Holds TWISTEDSPOON Moves PSYCHIC, MAGIC_COAT, CRUNCH, STOMP Level 50 PP_Ups 0,0,0,0 @@ -31,7 +33,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,31,15,15, GIRAFARIG_INNER_FOCUS PV $00000018 ; ♀ Quirky - Nickname "GIRAFARIG" + Text_EN "GIRAFARIG"11 Friendship 255 Pokemon DODRIO @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,31,15,31,15,15, DODRIO_EARLY_BIRD PV $00000080 ; ♂ Adamant - Nickname "DODRIO" + Text_EN "DODRIO"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/sofia.asm b/battle-e/trainers/sofia.asm index 2065789..2b3d742 100644 --- a/battle-e/trainers/sofia.asm +++ b/battle-e/trainers/sofia.asm @@ -1,17 +1,19 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP - db PARASOL_LADY + Class PARASOL_LADY BT_Floor MOSSDEEP - OT_Name "SOFIA" + Text_EN "SOFIA"8 OT_ID 00000, 00000 - Introduction HAPPY,_ELIP,DRIZZLE,_ELIP,_RAIN_DANCE,_EX - After_Win DRIZZLE,BUT,MY,FEELING,IS,_SUNNY_DAY - After_Loss _SUNNY_DAY,BUT,MY,FEELING,IS,DRIZZLE + Intro_EN HAPPY,_ELIP,DRIZZLE,_ELIP,_RAIN_DANCE,_EX + Win_EN DRIZZLE,BUT,MY,FEELING,IS,_SUNNY_DAY + Loss_EN _SUNNY_DAY,BUT,MY,FEELING,IS,DRIZZLE Pokemon KINGDRA - dw MYSTIC_WATER + Holds MYSTIC_WATER Moves RAIN_DANCE, SURF, ICE_BEAM, DRAGONBREATH Level 52 PP_Ups 0,0,0,0 @@ -19,7 +21,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,15,15,31,31,15, KINGDRA_SWIFT_SWIM PV $0000000F ; ♀ Modest - Nickname "KINGDRA" + Text_EN "KINGDRA"11 Friendship 255 Pokemon LUDICOLO @@ -31,7 +33,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,31,15,15,15, LUDICOLO_RAIN_DISH PV $000000E9 ; ♂ Impish - Nickname "LUDICOLO" + Text_EN "LUDICOLO"11 Friendship 255 Pokemon MANECTRIC @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,15,15,31,31,15, MANECTRIC_STATIC PV $0000000F ; ♀ Modest - Nickname "MANECTRIC" + Text_EN "MANECTRIC"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/sonya.asm b/battle-e/trainers/sonya.asm index 57cec8e..7dca37d 100644 --- a/battle-e/trainers/sonya.asm +++ b/battle-e/trainers/sonya.asm @@ -1,17 +1,19 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP - db TUBER_F + Class TUBER_F BT_Floor MOSSDEEP - OT_Name "SONYA" + Text_EN "SONYA"8 OT_ID 00000, 00000 - Introduction GROUND,POKEMON,ARE,SO,SCARY,_ELIP - After_Win MY,SURPRISE,STRATEGY,WAS,PERFECT,_QU_EX - After_Loss SIGH,_ELIP,MY,STRATEGY,DOESN_T,WORK + Intro_EN GROUND,POKEMON,ARE,SO,SCARY,_ELIP + Win_EN MY,SURPRISE,STRATEGY,WAS,PERFECT,_QU_EX + Loss_EN SIGH,_ELIP,MY,STRATEGY,DOESN_T,WORK Pokemon CLAYDOL - dw BRIGHTPOWDER + Holds BRIGHTPOWDER Moves PSYCHIC, EARTHQUAKE, ICE_BEAM, REFLECT Level 51 PP_Ups 0,0,0,0 @@ -19,11 +21,11 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,31,15,15,31,15, CLAYDOL_LEVITATE PV $00000020 ; ⚲ Relaxed - Nickname "CLAYDOL" + Text_EN "CLAYDOL"11 Friendship 255 Pokemon CHIMECHO - dw TWISTEDSPOON + Holds TWISTEDSPOON Moves PSYCHIC, SHADOW_BALL, LIGHT_SCREEN, DISABLE Level 53 PP_Ups 0,0,0,0 @@ -31,7 +33,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,15,31,0, CHIMECHO_LEVITATE PV $0000000F ; ♀ Modest - Nickname "CHIMECHO" + Text_EN "CHIMECHO"11 Friendship 255 Pokemon WEEZING @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,31,15,15,31,15, WEEZING_LEVITATE PV $000000D9 ; ♂ Quiet - Nickname "WEEZING" + Text_EN "WEEZING"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/sophie.asm b/battle-e/trainers/sophie.asm index 3fc6588..48dd91c 100644 --- a/battle-e/trainers/sophie.asm +++ b/battle-e/trainers/sophie.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP Class LADY BT_Floor MOSSDEEP - OT_Name "SOPHIE" + Text_EN "SOPHIE"8 OT_ID 00000, 00000 - Introduction MY,CUTENESS,WILL,_STOP,YOU,_EX - After_Win FUFUFU,DID,YOU,LIKE,IT,_QU_EX - After_Loss EH_,YOU,ARE,VERY,CUTE,TOO + Intro_EN MY,CUTENESS,WILL,_STOP,YOU,_EX + Win_EN FUFUFU,DID,YOU,LIKE,IT,_QU_EX + Loss_EN EH_,YOU,ARE,VERY,CUTE,TOO Pokemon DELCATTY Holds SILK_SCARF @@ -19,7 +21,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,31,15,31,15,15, DELCATTY_CUTE_CHARM PV $0000001C ; ♀ Adamant - Nickname "DELCATTY" + Text_EN "DELCATTY"11 Friendship 255 Pokemon LUVDISC @@ -31,11 +33,11 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,15,15,31,31,15, LUVDISC_SWIFT_SWIM PV $000000E7 ; ♂ Docile - Nickname "LUVDISC" + Text_EN "LUVDISC"11 Friendship 255 Pokemon KIRLIA - dw BRIGHTPOWDER + Holds BRIGHTPOWDER Moves ATTRACT, PSYCHIC, HYPNOSIS, DREAM_EATER Level 90 PP_Ups 0,0,0,0 @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,15,15,31,31,15, KIRLIA_TRACE PV $0000000F ; ♀ Modest - Nickname "KIRLIA" + Text_EN "KIRLIA"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/stuart.asm b/battle-e/trainers/stuart.asm index ff301f3..8aca226 100644 --- a/battle-e/trainers/stuart.asm +++ b/battle-e/trainers/stuart.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP - db COLLECTOR + Class COLLECTOR BT_Floor MOSSDEEP - OT_Name "STUART" + Text_EN "STUART"8 OT_ID 00000, 00000 - Introduction THERE,IS,NOTHING,BAD,ABOUT,THICK_FAT - After_Win MY,POKEMON,WILL,NEVER,DIET,_EX_EX - After_Loss MY,POKEMON,SHOULD,START,_A,DIET + Intro_EN THERE,IS,NOTHING,BAD,ABOUT,THICK_FAT + Win_EN MY,POKEMON,WILL,NEVER,DIET,_EX_EX + Loss_EN MY,POKEMON,SHOULD,START,_A,DIET Pokemon AGGRON Holds SCOPE_LENS @@ -19,11 +21,11 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,31,15,15,15,15, AGGRON_ROCK_HEAD PV $00000016 ; ♀ Sassy - Nickname "AGGRON" + Text_EN "AGGRON"11 Friendship 255 Pokemon WAILORD - dw CHESTO_BERRY + Holds CHESTO_BERRY Moves AMNESIA, REST, HYDRO_PUMP, BLIZZARD Level 51 PP_Ups 0,0,3,3 @@ -31,7 +33,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,15,15,31, WAILORD_OBLIVIOUS PV $00000091 ; ♂ Calm - Nickname "WAILORD" + Text_EN "WAILORD"11 Friendship 255 Pokemon METAGROSS @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,31,15,15,15,15, METAGROSS_CLEAR_BODY PV $00000017 ; ⚲ Careful - Nickname "METAGROSS" + Text_EN "METAGROSS"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/testing.asm b/battle-e/trainers/testing.asm deleted file mode 100644 index 1f4a754..0000000 --- a/battle-e/trainers/testing.asm +++ /dev/null @@ -1,44 +0,0 @@ -INCLUDE "macros.asm" - - BT_Level MOSSDEEP - Class HEX_MANIAC - BT_Floor MOSSDEEP - OT_Name "\{POKéBLOCK}ER" - OT_ID 00000, 00000 - - Introduction $0040,$0140,$0240,$2440,$2540,$2640 ; KADABRA NOSEPASS ??? ??? GRASSWHISTLE PECK - After_Win THIS,DIET,IS,REALLY,WORKING,ME - After_Loss $00C0,$01C0,$02C0,$24C0,$25C0,$26C0 ; ??? ??? ??? ??? ??? ZAP CANNON - - Pokemon CASTFORM - Holds HEART_SCALE - Moves RAIN_DANCE, WEATHER_BALL, THUNDER, ATTRACT - Level 2 - EVs 252,0,6,0,252,0 - OT_ID 00000, 00000 - IVs 31,15,15,15,31,15, CASTFORM_FORECAST - PV $0000000F - Nickname "XERNEAS" - Friendship 255 - - Pokemon KOFFING - Holds PEARL - Moves SLUDGE_BOMB, THUNDER, EXPLOSION, FLAMETHROWER - Level 3 - EVs 252,6,0,0,0,252 - OT_ID 00000, 00000 - IVs 31,15,15,15,15,31, KOFFING_LEVITATE - PV $0000008F - Nickname "YVELTAL" - Friendship 255 - - Pokemon CHIMECHO - Holds STARDUST - Moves PSYCHIC, CALM_MIND, LIGHT_SCREEN, YAWN - Level 4 - EVs 252,0,6,0,252,0 - OT_ID 00000, 00000 - IVs 31,15,15,15,31,15, CHIMECHO_LEVITATE - PV $0000000F - Nickname "ZYGARDE" - Friendship 255 diff --git a/battle-e/trainers/tsutomu.asm b/battle-e/trainers/tsutomu.asm index db92823..57ffe6e 100644 --- a/battle-e/trainers/tsutomu.asm +++ b/battle-e/trainers/tsutomu.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP - db TC_BLACK_BELT + Class TC_BLACK_BELT BT_Floor MOSSDEEP - OT_Name "TSUTOMU" + Text_EN "TSUTOMU"8 OT_ID 00000, 00000 - Introduction HIYAH,I,KNOW,YOUR,WEAK,POINTS - After_Win HAHAHA,_EX_EX,THAT_S,YOUR,WEAK,POINTS - After_Loss ARRGH,YOU,KNOW,MY,WEAK,POINTS + Intro_EN HIYAH,I,KNOW,YOUR,WEAK,POINTS + Win_EN HAHAHA,_EX_EX,THAT_S,YOUR,WEAK,POINTS + Loss_EN ARRGH,YOU,KNOW,MY,WEAK,POINTS Pokemon ZANGOOSE Holds SCOPE_LENS @@ -19,7 +21,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,31,15,15, ZANGOOSE_IMMUNITY PV $0000001C ; ♀ Adamant - Nickname "ZANGOOSE" + Text_EN "ZANGOOSE"11 Friendship 255 Pokemon SEVIPER @@ -31,7 +33,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,31,15,15, SEVIPER_SHED_SKIN PV $00000080 ; ♂ Adamant - Nickname "SEVIPER" + Text_EN "SEVIPER"11 Friendship 255 Pokemon MACHAMP @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 30,31,14,15,15,14, MACHAMP_GUTS ; HP Electric 70 PV $0000001C ; ♀ Adamant - Nickname "MACHAMP" + Text_EN "MACHAMP"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/tyler.asm b/battle-e/trainers/tyler.asm index 2b3fd04..1556237 100644 --- a/battle-e/trainers/tyler.asm +++ b/battle-e/trainers/tyler.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP - db POKEMANIAC + Class POKEMANIAC BT_Floor MOSSDEEP - OT_Name "TYLER" + Text_EN "TYLER"8 OT_ID 00000, 00000 - Introduction WHOAH,OVERWHELMING,MEGA,BLANK,ATTACK,_EX - After_Win WAHAHAHA,_EX,THAT,WAS,SERIOUS,_1_HIT_KO_ - After_Loss TOO_STRONG,_EX,GO_EASY,ON,ME,_EX + Intro_EN WHOAH,OVERWHELMING,MEGA,BLANK,ATTACK,_EX + Win_EN WAHAHAHA,_EX,THAT,WAS,SERIOUS,_1_HIT_KO_ + Loss_EN TOO_STRONG,_EX,GO_EASY,ON,ME,_EX Pokemon WALREIN Holds LAX_INCENSE @@ -19,11 +21,11 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 15,15,31,15,15,31, WALREIN_THICK_FAT PV $00000013 ; ♀ Rash - Nickname "WALREIN" + Text_EN "WALREIN"11 Friendship 255 Pokemon PINSIR - dw BRIGHTPOWDER + Holds BRIGHTPOWDER Moves GUILLOTINE, SUBMISSION, EARTHQUAKE, ROCK_TOMB Level 64 PP_Ups 0,0,0,0 @@ -31,7 +33,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,31,15,15, PINSIR_HYPER_CUTTER PV $0000008A ; ♂ Jolly - Nickname "PINSIR" + Text_EN "PINSIR"11 Friendship 255 Pokemon RHYDON @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,31,15,15,15,15, RHYDON_ROCK_HEAD PV $00000016 ; ♀ Sassy - Nickname "RHYDON" + Text_EN "RHYDON"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/wilson.asm b/battle-e/trainers/wilson.asm index d32d4a1..18bdc60 100644 --- a/battle-e/trainers/wilson.asm +++ b/battle-e/trainers/wilson.asm @@ -1,14 +1,16 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level MOSSDEEP - db PKMN_BREEDER_M + Class PKMN_BREEDER_M BT_Floor MOSSDEEP - OT_Name "WILSON" + Text_EN "WILSON"8 OT_ID 00000, 00000 - Introduction LISTEN,_EX,I,CARE,ABOUT,POKEMON - After_Win WHAT,IS,THE,NEXT,NORMAL,_QU - After_Loss I,CHALLENGE,YOU,AFTER,THIS,NORMAL + Intro_EN LISTEN,_EX,I,CARE,ABOUT,POKEMON + Win_EN WHAT,IS,THE,NEXT,NORMAL,_QU + Loss_EN I,CHALLENGE,YOU,AFTER,THIS,NORMAL Pokemon GLOOM Holds SUN_STONE @@ -19,7 +21,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,15,31,15, GLOOM_CHLOROPHYLL PV $00000012 ; ♀ Bashful - Nickname "GLOOM" + Text_EN "GLOOM"11 Friendship 255 Pokemon WURMPLE @@ -31,11 +33,11 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,31,15,15,15,15, WURMPLE_SHIELD_DUST PV $00000083 ; ♂ Docile - Nickname "WURMPLE" + Text_EN "WURMPLE"11 Friendship 255 Pokemon CLAMPERL - dw DEEPSEASCALE + Holds DEEPSEASCALE Moves WATER_PULSE, REFRESH, CONFUSE_RAY, WHIRLPOOL Level 54 PP_Ups 0,0,0,0 @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,15,15,15,15,31, CLAMPERL_SHELL_ARMOR PV $0000000F ; ♀ Modest - Nickname "CLAMPERL" + Text_EN "CLAMPERL"11 Friendship 255 + + End_Trainer
\ No newline at end of file diff --git a/battle-e/trainers/zuril.asm b/battle-e/trainers/zuril.asm index 6831f21..aae7d7c 100644 --- a/battle-e/trainers/zuril.asm +++ b/battle-e/trainers/zuril.asm @@ -1,17 +1,19 @@ -INCLUDE "macros.asm" +INCLUDE "trainers/macros.asm" + + Battle_Trainer BT_Level 100 - db RUIN_MANIAC + Class RUIN_MANIAC BT_Floor 12 - OT_Name "ZURIL" + Text_EN "ZURIL"8 OT_ID 00000, 00000 - Introduction FINALLY,I,GOT,_A,LEGEND,POKEMON - After_Win LEGEND,_ELIP,HOW,FABULOUS,IT,IS - After_Loss MY,LEGEND,WASN_T,ABOUT,VICTORY,_ELIP + Intro_EN FINALLY,I,GOT,_A,LEGEND,POKEMON + Win_EN LEGEND,_ELIP,HOW,FABULOUS,IT,IS + Loss_EN MY,LEGEND,WASN_T,ABOUT,VICTORY,_ELIP Pokemon FLYGON - dw BRIGHTPOWDER + Holds BRIGHTPOWDER Moves EARTHQUAKE, DRAGON_CLAW, SANDSTORM, CRUNCH Level 100 PP_Ups 0,0,0,0 @@ -19,7 +21,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,20,20,31,20,20, FLYGON_LEVITATE PV $0000000C ; ♀ Serious - Nickname "FLYGON" + Text_EN "FLYGON"11 Friendship 255 Pokemon WHISCASH @@ -31,7 +33,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,31,20,20,20,20, WHISCASH_OBLIVIOUS PV $00000095 ; ♂ Quirky - Nickname "WHISCASH" + Text_EN "WHISCASH"11 Friendship 255 Pokemon REGIROCK @@ -43,5 +45,7 @@ INCLUDE "macros.asm" OT_ID 00000, 00000 IVs 31,20,20,20,20,31, REGIROCK_CLEAR_BODY PV $0000001B ; ⚲ Brave - Nickname "REGIROCK" + Text_EN "REGIROCK"11 Friendship 255 + + End_Trainer
\ No newline at end of file |