From 14f5a88e4c88fecbd3c041c5e9c3a5cb0f085832 Mon Sep 17 00:00:00 2001 From: Artrios Date: Tue, 13 Jul 2021 15:17:02 +0800 Subject: [PATCH 01/13] Add nature constants --- .gitignore | 3 +- battle-e/trainers/macros.asm | 1 + constants/natures.asm | 107 +++++++++++++++++++++++++++++++++++ 3 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 constants/natures.asm diff --git a/.gitignore b/.gitignore index ee130ba..1b54296 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ *.tx *.z80 *.mev -*.pyc \ No newline at end of file +*.pyc +/.vs diff --git a/battle-e/trainers/macros.asm b/battle-e/trainers/macros.asm index bf6e501..3d94cea 100644 --- a/battle-e/trainers/macros.asm +++ b/battle-e/trainers/macros.asm @@ -3,6 +3,7 @@ INCLUDE "../constants/abilities.asm" INCLUDE "../constants/easychat.asm" INCLUDE "../constants/items.asm" INCLUDE "../constants/moves.asm" +INCLUDE "../constants/natures.asm" INCLUDE "../constants/pokemon.asm" INCLUDE "../constants/trainerclasses.asm" diff --git a/constants/natures.asm b/constants/natures.asm new file mode 100644 index 0000000..98cf86e --- /dev/null +++ b/constants/natures.asm @@ -0,0 +1,107 @@ +;FEMALE +HARDY_FEMALE EQU $10000000 +LONELY_FEMALE EQU $10000001 +BRAVE_FEMALE EQU $10000001 +ADAMANT_FEMALE EQU $10000003 +NAUGHTY_FEMALE EQU $10000004 +BOLD_FEMALE EQU $10000005 +DOCILE_FEMALE EQU $10000006 +RELAXED_FEMALE EQU $10000007 +IMPISH_FEMALE EQU $00000008 +LAX_FEMALE EQU $00000009 +TIMID_FEMALE EQU $0000000A +HASTY_FEMALE EQU $0000000B +SERIOUS_FEMALE EQU $0000000C +JOLLY_FEMALE EQU $0000000D +NAIVE_FEMALE EQU $0000000E +MODEST_FEMALE EQU $0000000F +MILD_FEMALE EQU $00000010 +QUIET_FEMALE EQU $00000011 +BASHFUL_FEMALE EQU $00000012 +RASH_FEMALE EQU $00000013 +CALM_FEMALE EQU $00000014 +GENTLE_FEMALE EQU $00000015 +SASSY_FEMALE EQU $00000016 +CAREFUL_FEMALE EQU $00000017 +QUIRKY_FEMALE EQU $00000018 + +; MALE +HARDY_MALE EQU $000000E1 +LONELY_MALE EQU $000000E2 +BRAVE_MALE EQU $000000E3 +ADAMANT_MALE EQU $000000E4 +NAUGHTY_MALE EQU $000000E5 +BOLD_MALE EQU $000000E6 +DOCILE_MALE EQU $000000E7 +RELAXED_MALE EQU $000000E8 +IMPISH_MALE EQU $000000E9 +LAX_MALE EQU $000000EA +TIMID_MALE EQU $000000EB +HASTY_MALE EQU $000000EC +SERIOUS_MALE EQU $000000ED +JOLLY_MALE EQU $000000EE +NAIVE_MALE EQU $000000EF +MODEST_MALE EQU $000000F0 +QUIET_MALE EQU $000000F1 +BASHFUL_MALE EQU $000000F2 +RASH_MALE EQU $000000F3 +CALM_MALE EQU $000000F4 +GENTLE_MALE EQU $000000F5 +SASSY_MALE EQU $000000F6 +CAREFUL_MALE EQU $000000F7 +QUIRKY_MALE EQU $000000F8 + + + +;FEMALE +SHINY_HARDY_FEMALE EQU $00000000 +SHINY_LONELY_FEMALE EQU $00000001 +SHINY_BRAVE_FEMALE EQU $00000001 +SHINY_ADAMANT_FEMALE EQU $00000003 +SHINY_NAUGHTY_FEMALE EQU $00000004 +SHINY_BOLD_FEMALE EQU $00000005 +SHINY_DOCILE_FEMALE EQU $00000006 +SHINY_RELAXED_FEMALE EQU $00000007 +SHINY_IMPISH_FEMALE EQU $00080008 +SHINY_LAX_FEMALE EQU $00090009 +SHINY_TIMID_FEMALE EQU $000A000A +SHINY_HASTY_FEMALE EQU $000B000B +SHINY_SERIOUS_FEMALE EQU $000C000C +SHINY_JOLLY_FEMALE EQU $000D000D +SHINY_NAIVE_FEMALE EQU $000E000E +SHINY_MODEST_FEMALE EQU $000F000F +SHINY_MILD_FEMALE EQU $00100010 +SHINY_QUIET_FEMALE EQU $00110011 +SHINY_BASHFUL_FEMALE EQU $00120012 +SHINY_RASH_FEMALE EQU $00130013 +SHINY_CALM_FEMALE EQU $00140014 +SHINY_GENTLE_FEMALE EQU $00150015 +SHINY_SASSY_FEMALE EQU $00160016 +SHINY_CAREFUL_FEMALE EQU $00170017 +SHINY_QUIRKY_FEMALE EQU $00180018 + +; MALE +SHINY_HARDY_MALE EQU $00E100E1 +SHINY_LONELY_MALE EQU $00E200E2 +SHINY_BRAVE_MALE EQU $00E300E3 +SHINY_ADAMANT_MALE EQU $00E400E4 +SHINY_NAUGHTY_MALE EQU $00E500E5 +SHINY_BOLD_MALE EQU $00E600E6 +SHINY_DOCILE_MALE EQU $00E700E7 +SHINY_RELAXED_MALE EQU $00E800E8 +SHINY_IMPISH_MALE EQU $00E900E9 +SHINY_LAX_MALE EQU $00EA00EA +SHINY_TIMID_MALE EQU $00EB00EB +SHINY_HASTY_MALE EQU $00EC00EC +SHINY_SERIOUS_MALE EQU $00ED00ED +SHINY_JOLLY_MALE EQU $00EE00EE +SHINY_NAIVE_MALE EQU $00EF00EF +SHINY_MODEST_MALE EQU $00F000F0 +SHINY_QUIET_MALE EQU $00F100F1 +SHINY_BASHFUL_MALE EQU $00F200F2 +SHINY_RASH_MALE EQU $00F300F3 +SHINY_CALM_MALE EQU $00F400F4 +SHINY_GENTLE_MALE EQU $00F500F5 +SHINY_SASSY_MALE EQU $00F600F6 +SHINY_CAREFUL_MALE EQU $00F700F7 +SHINY_QUIRKY_MALE EQU $00F800F8 \ No newline at end of file From 2cf2a8e2cd29882ee49972c0e16894b6dd707689 Mon Sep 17 00:00:00 2001 From: Artrios Date: Tue, 13 Jul 2021 15:41:24 +0800 Subject: [PATCH 02/13] Add nevpk and nedcmake to Makefile --- battle-e/Makefile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/battle-e/Makefile b/battle-e/Makefile index c55d1df..a53b04e 100644 --- a/battle-e/Makefile +++ b/battle-e/Makefile @@ -57,6 +57,11 @@ battletrainer-%.tx: battletrainer.asm prologue-%.bin rgblink -o $@ $< 08-A%.z80: 08-A%.gbc python ../scripts/stripgbc.py $< $@ +08-A%.vpk: 08-A%.z80 + ./nevpk -c -i $< -o $@ +08-A%.raw: 08-A%.vpk + ./nedcmake -i $< -o $@ -type 1 -region 1 + mv $@-01.raw $@ enigmaberry-%.tx: enigmaberry.asm prologue-%.bin @@ -69,8 +74,13 @@ enigmaberry-%.tx: enigmaberry.asm prologue-%.bin rgblink -o $@ $< 08-K%.z80: 08-K%.gbc python ../scripts/stripgbc.py $< $@ +08-K%.vpk: 08-K%.z80 + ./nevpk -c -i $< -o $@ +08-K%.raw: 08-K%.vpk + ./nedcmake -i $< -o $@ -type 1 -region 1 -raw + mv $@-01.raw $@ clean: - rm -f *.z80 *.tx *.o *.gbc *.bin \ + rm -f *.z80 *.tx *.o *.gbc *.bin *.raw \ 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 From 9b6fab74913643b496ad7ff944292ebeb6cdccb5 Mon Sep 17 00:00:00 2001 From: Artrios Date: Tue, 13 Jul 2021 19:45:10 +0800 Subject: [PATCH 03/13] Add ability constants --- constants/abilities.asm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/constants/abilities.asm b/constants/abilities.asm index d044506..633fe0c 100644 --- a/constants/abilities.asm +++ b/constants/abilities.asm @@ -1,3 +1,8 @@ +ABILITY1 EQU 0 +ABILITY2 EQU 1 +ABILITY3 EQU 2 +ABILITY_HIDDEN EQU ABILITY3 + BULBASAUR_OVERGROW EQU 0 IVYSAUR_OVERGROW EQU 0 VENUSAUR_OVERGROW EQU 0 From c7bc39b42c13ad398d804564077648770601a20c Mon Sep 17 00:00:00 2001 From: Artrios Date: Wed, 14 Jul 2021 16:40:13 +0800 Subject: [PATCH 04/13] Add more script commands --- constants/scriptcommands.asm | 214 +++++++++++++++++++++++++++++++++++ 1 file changed, 214 insertions(+) diff --git a/constants/scriptcommands.asm b/constants/scriptcommands.asm index c45fbeb..dcba6cf 100644 --- a/constants/scriptcommands.asm +++ b/constants/scriptcommands.asm @@ -2,15 +2,108 @@ LASTRESULT EQU $800D end: MACRO db $02 ENDM +return: MACRO + db $03 + ENDM +call: MACRO + db $04 + dd \1 + ENDM +goto: MACRO + db $05 + dd \1 + ENDM +goto_if: MACRO + db $06 + db \1 + dd \2 + ENDM +call_if: MACRO + db $07 + db \1 + dd \2 + ENDM +gotostd: MACRO + db $08 + db \1 + ENDM callstd: MACRO db $09, \1 ENDM +gotostd_if: MACRO + db $0A + db \1 + db \2 + ENDM +callstd_if: MACRO + db $0B + db \3 + db \2 + ENDM +returnram: MACRO + db $0C + ENDM killscript: MACRO db $0D ENDM setbyte: MACRO db $0E, \1 ENDM +loadword: MACRO + db $0F + db \1 + dd \2 + ENDM +loadbyte: MACRO + db $10 + db \1 + db \2 + ENDM +writebytetoaddr: MACRO + db $11 + db \1 + dd \2 + ENDM +loadbytefromaddr: MACRO + db $12 + db \1 + dd \2 + ENDM +setptrbyte: MACRO + db $13 + db \1 + dd \2 + ENDM +copylocal: MACRO + db $14 + db \1 + db \2 + ENDM +copybyte: MACRO + db $15 + dd \1 + dd \2 + ENDM +setvar: MACRO + db $16 + dw \1 + dw \2 + ENDM +addvar: MACRO + db $17 + dw \1 + dw \2 + ENDM +subvar: MACRO + db $18 + dw \1 + dw \2 + ENDM +copyvar: MACRO + db $19 + dw \1 + dw \2 + ENDM copyvarifnotzero: MACRO db $1A dw \1, \2 @@ -27,6 +120,9 @@ checkflag: MACRO db $2B dw \1 ENDM +getpartysize: MACRO + db $43 + ENDM checkitemroom: MACRO db $46 dw \1, \2 @@ -54,6 +150,108 @@ release: MACRO waitkeypress: MACRO db $6D ENDM +showmonpic: MACRO + db $75 + dw \1 + db \2 + db \3 + ENDM +hidemonpic: MACRO + db $76 + ENDM +showcontestpainting: MACRO + db $77 + db \1 + ENDM +braillemessage: MACRO + db $78 + dd \1 + ENDM +brailleformat: MACRO + db \1 + db \2 + db \3 + db \4 + db \5 + db \6 + ENDM +givemon: MACRO + db $79 + dw \1 + db \2 + dw \3 + dd \4 + dd \5 + db \6 + ENDM +giveegg: MACRO + db $7A + dw \1 + ENDM +setmonmove: MACRO + db $7b + db \1 + db \2 + dw \3 + ENDM +checkpartymove: MACRO + db $7c + dw \1 + ENDM +bufferspeciesname: MACRO + db $7d + db \1 + dw \2 + ENDM +bufferleadmonspeciesname: MACRO + db $7E + db \1 + ENDM +bufferpartymonnick: MACRO + db $7f + db \1 + dw \2 + ENDM +bufferitemname: MACRO + db $80 + db \1 + dw \2 + ENDM +bufferdecorationname: MACRO + db $81 + db \1 + dw \2 + ENDM +buffermovename: MACRO + db $82 + db \1 + dw \2 + ENDM +random: MACRO + db $8F + dw \1 + ENDM +setrespawn: MACRO + db $9F + dw \1 + ENDM +checkplayergender: MACRO + db $A0 + ENDM +playmoncry: MACRO + db $A1 + dw \1 + dw \2 + ENDM +setwildbattle: MACRO + db $B6 + dw \1 + db \2 + dw \3 + ENDM +dowildbattle: MACRO + db $B7 + ENDM setvirtualaddress: MACRO db $B8 GBAPTR \1 @@ -70,4 +268,20 @@ virtualmsgbox: MACRO virtualloadpointer: MACRO db $BE GBAPTR \1 + ENDM +waitmoncry: MACRO + db $C5 + ENDM +setmoneventlegal: MACRO + db $CD + dw \1 + ENDM +checkmoneventlegal: MACRO + db $CE + dw \1 + ENDM +setmonmetlocation: MACRO + db $D2 + dw \1 + db \2 ENDM \ No newline at end of file From e2eefa3adc64ee72a73fc2f7c5c1e63962a171f9 Mon Sep 17 00:00:00 2001 From: Artrios Date: Fri, 16 Jul 2021 15:34:54 +0800 Subject: [PATCH 05/13] Add Japanese text to Series 1 and add sprites for Series 2 --- battle-e/sprites/trainers/bird_keeper.4bpp | Bin 0 -> 2048 bytes battle-e/sprites/trainers/bug_catcher.4bpp | Bin 0 -> 2048 bytes battle-e/sprites/trainers/kindler.4bpp | Bin 0 -> 2048 bytes battle-e/sprites/trainers/lass.4bpp | Bin 0 -> 2048 bytes battle-e/sprites/trainers/rich_boy.4bpp | Bin 0 -> 2048 bytes battle-e/sprites/trainers/school_kid_m.4bpp | Bin 0 -> 2048 bytes battle-e/sprites/trainers/triathlete_f_swim.4bpp | Bin 0 -> 2048 bytes battle-e/sprites/trainers/triathlete_m_bike.4bpp | Bin 0 -> 2048 bytes battle-e/sprites/trainers/triathlete_m_run.4bpp | Bin 0 -> 2048 bytes battle-e/trainers/alana.asm | 8 ++++++++ battle-e/trainers/annie.asm | 8 ++++++++ battle-e/trainers/antonio.asm | 8 ++++++++ battle-e/trainers/april.asm | 8 ++++++++ battle-e/trainers/belford.asm | 8 ++++++++ battle-e/trainers/bryce.asm | 8 ++++++++ battle-e/trainers/candice.asm | 8 ++++++++ battle-e/trainers/celina.asm | 8 ++++++++ battle-e/trainers/clayton.asm | 8 ++++++++ battle-e/trainers/devin.asm | 8 ++++++++ battle-e/trainers/dominic.asm | 8 ++++++++ battle-e/trainers/dustin.asm | 8 ++++++++ battle-e/trainers/ellie.asm | 8 ++++++++ battle-e/trainers/fay.asm | 8 ++++++++ battle-e/trainers/fuego.asm | 8 ++++++++ battle-e/trainers/goro.asm | 8 ++++++++ battle-e/trainers/griffin.asm | 8 ++++++++ battle-e/trainers/hayden.asm | 8 ++++++++ battle-e/trainers/heather.asm | 8 ++++++++ battle-e/trainers/hillary.asm | 8 ++++++++ battle-e/trainers/hugo.asm | 8 ++++++++ battle-e/trainers/irazu.asm | 8 ++++++++ battle-e/trainers/irvin.asm | 8 ++++++++ battle-e/trainers/jeffrey.asm | 8 ++++++++ battle-e/trainers/judith.asm | 8 ++++++++ battle-e/trainers/justine.asm | 8 ++++++++ battle-e/trainers/kendall.asm | 8 ++++++++ battle-e/trainers/logan.asm | 8 ++++++++ battle-e/trainers/macros.asm | 15 +++++++++++++++ battle-e/trainers/maggie.asm | 8 ++++++++ battle-e/trainers/mandy.asm | 8 ++++++++ battle-e/trainers/marcus.asm | 8 ++++++++ battle-e/trainers/natalie.asm | 8 ++++++++ battle-e/trainers/natasha.asm | 8 ++++++++ battle-e/trainers/oscar.asm | 8 ++++++++ battle-e/trainers/patrick.asm | 8 ++++++++ battle-e/trainers/raquel.asm | 8 ++++++++ battle-e/trainers/renee.asm | 8 ++++++++ battle-e/trainers/rudy.asm | 8 ++++++++ battle-e/trainers/sandia.asm | 8 ++++++++ battle-e/trainers/sandy.asm | 8 ++++++++ battle-e/trainers/sofia.asm | 8 ++++++++ battle-e/trainers/sonya.asm | 8 ++++++++ battle-e/trainers/sophie.asm | 8 ++++++++ battle-e/trainers/stuart.asm | 8 ++++++++ battle-e/trainers/tsutomu.asm | 8 ++++++++ battle-e/trainers/tyler.asm | 8 ++++++++ battle-e/trainers/wilson.asm | 8 ++++++++ battle-e/trainers/zuril.asm | 8 ++++++++ 58 files changed, 399 insertions(+) create mode 100644 battle-e/sprites/trainers/bird_keeper.4bpp create mode 100644 battle-e/sprites/trainers/bug_catcher.4bpp create mode 100644 battle-e/sprites/trainers/kindler.4bpp create mode 100644 battle-e/sprites/trainers/lass.4bpp create mode 100644 battle-e/sprites/trainers/rich_boy.4bpp create mode 100644 battle-e/sprites/trainers/school_kid_m.4bpp create mode 100644 battle-e/sprites/trainers/triathlete_f_swim.4bpp create mode 100644 battle-e/sprites/trainers/triathlete_m_bike.4bpp create mode 100644 battle-e/sprites/trainers/triathlete_m_run.4bpp diff --git a/battle-e/sprites/trainers/bird_keeper.4bpp b/battle-e/sprites/trainers/bird_keeper.4bpp new file mode 100644 index 0000000000000000000000000000000000000000..fddfd5f9ab7b13407940d84c1355ac4d22714d14 GIT binary patch literal 2048 zcmeH`QI5kf2t-kR0^|!s&IL@k|J` zFgeNo7#95OclMmjt3Ct1gDaRSyb560#|p>)i=MMjDU7;saS!MKkP-^3l0s#`bl#J3RrusjCri2Tc&I^ZJSpT*85 zqJiainQ^*`>j~af6M+cqYg=OLv6Dz)Pketp@Quks86fD zIGD##yt()2aHRx+bAvB^+R#H2%~|ryxmSyC9)vyw+Jy)^*E&}pV7e^KQ6PVUzpDn8 zFeR`PC&{i2Bpdt&a`MKfuiX#kL<2F3C7q@6GV476dGa2Lr$Wp5oMv<)JLgLs{Rqw^ z;lw(*b7`Q`Kq-cm%0Dl72jASm-_Z-AZyd?xjM~vGu_sjY(K?yTu literal 0 HcmV?d00001 diff --git a/battle-e/sprites/trainers/kindler.4bpp b/battle-e/sprites/trainers/kindler.4bpp new file mode 100644 index 0000000000000000000000000000000000000000..694caba1e619d6061b2a6396e72e086c2d899656 GIT binary patch literal 2048 zcmeH{TXMr73`Lo;0u3AJkPV=)|Go8G*`(k+zT!?kD$lie8S4nyDgE0C8EEXesr8~e}WCxN3jSyY_MxU`2cV>bv;Hsb#aB16V!Lk z6<4n<>(HYJP9JN9I4l7cf=!Ib?=ffO(bk#!u47u*Gs-BZ+&p>HWk8qWyc5qnHd29C zLP*(`zdy)MF>grdd6&4CT0iy&`R*Mr9nBd41x_~B7crZ; zrUE5WB2+ihQb%{-Q!uaQre*JHezTFZ8i7}W4qfq;|NUfQwM(s%*IIFPnkH*z*S8TLyciIovfj7PY literal 0 HcmV?d00001 diff --git a/battle-e/sprites/trainers/lass.4bpp b/battle-e/sprites/trainers/lass.4bpp new file mode 100644 index 0000000000000000000000000000000000000000..02d3745c80cad15957930ff4fec2a1dfab4097df GIT binary patch literal 2048 zcmdT@QLe-w2qe!FkX~RzFCgXqcY8C~+IH9O&r9}oNv0}TWkwMBHw%%_tJ@J2<>%Wi zRI4^j7&p)-T!17#WrbthK%d`@evOC|ho=NweM4jlc^fI3Q!Vl<`Pjmn^EQ0 z!BqD9pr3`Pde0#9L!TFEl=NnSN-mP%aHYS$XjSgBN5Ai;GobrV%Ad8|YOM3#pt|nM z&{n_dJwZce@!AU`bN=7ouPe+OS3lf=2zT5zio4J2b87T8!+llykPp8Yzqdl1{lAVo D2CymS literal 0 HcmV?d00001 diff --git a/battle-e/sprites/trainers/school_kid_m.4bpp b/battle-e/sprites/trainers/school_kid_m.4bpp new file mode 100644 index 0000000000000000000000000000000000000000..6b28739cccdb20d83a886a0c49b6da7d8a6e025f GIT binary patch literal 2048 zcmeHH(XGQE42;SI77J9)0(QLrZto64fHuscNOuKm=X^g0<;)-P$aRh#De;dz?TfxQct$Q@v#jY4YF5o{y$_8`F=(s+xiAj@#J>NT}i}c2+0HO&o*P)A?Ms;x%0V E0A@BVDF6Tf literal 0 HcmV?d00001 diff --git a/battle-e/sprites/trainers/triathlete_f_swim.4bpp b/battle-e/sprites/trainers/triathlete_f_swim.4bpp new file mode 100644 index 0000000000000000000000000000000000000000..e90e2b981170e4e1c973ce78bcaf7b4194103743 GIT binary patch literal 2048 zcmeH{VQ#}93`Ws7f#nNS&INF||K0XJqbO0+pWD<*v-&{*hw^Nb*8c4mA~4uf!scw# zY}k_1%hXF9kEF3gjFysqskV6U=E8bEs90rUJz~%pwBblAVm^3zRvd^&&J~aQj%#M% z?1hmAV zOVE}t@QOp_`$gTanouQtwu$i~g`vb;C7$I@C@xwq1Gn+n`1&sR$tJFTiSfY{&GA{$Gk4CqfQJ7X3We+j~;Y+Vi&Ar8csaAInW^g(&(pR0BPM|Je z*xQ!>PAf#pA=G~~1c{SJBY4Vkh~{GS2Jt53LNoM?yco|dq2WN~eUH28Q+tII4YC|~ z<7@qVE!V-X@!k*&4aBuJF%n;irq~)QwXF`mgTIenSu>yc?|P)S;B(4*eWN)3kAZME zFiA`%&K(#cm}NDqs!AXy#pM}qAjDh+4N(ccGPWl167MB@{2E-L)Hx3g+Sr3NNYEL| zN)UZ9&@PqlrFlq;1)?BsoLL@aF4#4Ft{7*2aA#3`09U3jkrFtT`+-Q@_cJK`=a0jd d^!dc8Qs-2BDu?;t*o=D5j5)cOI!pg^><8xOJ@o(p literal 0 HcmV?d00001 diff --git a/battle-e/sprites/trainers/triathlete_m_run.4bpp b/battle-e/sprites/trainers/triathlete_m_run.4bpp new file mode 100644 index 0000000000000000000000000000000000000000..8778504388ee50702407d90dd6875618160b2bf9 GIT binary patch literal 2048 zcmeH{U2elL41MyL``>LJo&T&D`qH5fBS1K|T-jupn*HNN2PU(rnKie` z7dA$-vZ=gyeugSD_W>sK0p@w%v$F>lbLF%8pRP$`HFQtt{|RZ4^nzG(cw^PQQTTzvRNlL%xXe2+iV}k>)91?noAt7v*Tlg|cyG&xx|4D10=KP?E8~d&0tn zH{we}1V#)9PBxyfdb52KNlComE?$O+O2!AIX z{3APij&PPHI}yxJFTDHnhWRPi%J%H`2-afOS=nE%ZeK`~8pfQxM(t&p%lA7Eh+=Ot z98{krE2X*$+V3O33G?xbXUz|;X;PxpT~T;99vl!W^?X6h?!iU+82Y!r!bd7&L`DRI f`dm<~opC8Lp>@hdj!D{&_qrNllZALMzA*m=!6Y_5 literal 0 HcmV?d00001 diff --git a/battle-e/trainers/alana.asm b/battle-e/trainers/alana.asm index 3262868..4d35383 100644 --- a/battle-e/trainers/alana.asm +++ b/battle-e/trainers/alana.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class POKEFAN_F BT_Floor MOSSDEEP Text_EN "ALANA"8 + Text_JP "チズ"8 OT_ID 00000, 00000 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 + Intro_JP $0e0e, $0c06, $0c06, $061c, $0c06, $1005 + Win_JP $0c0c, $0c06, $0c06, $0607, $0c03, $ffff + Loss_JP $0c0c, $0c06, $0c06, $062e, $0c03, $ffff + Pokemon TORKOAL Holds QUICK_CLAW Moves OVERHEAT, BODY_SLAM, FLAIL, YAWN @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 15,15,15,15,31,31, TORKOAL_WHITE_SMOKE PV $000000D9 ; ♂ Quiet Text_EN "TORKOAL"11 + Text_JP "コータス"11 Friendship 255 Pokemon DUSCLOPS @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 15,15,31,15,15,31, DUSCLOPS_PRESSURE PV $00000016 ; ♀ Sassy Text_EN "DUSCLOPS"11 + Text_JP "サマヨール"11 Friendship 255 Pokemon CORSOLA @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 15,15,15,15,31,31, CORSOLA_NATURAL_CURE PV $0000001B ; ♀ Brave Text_EN "CORSOLA"11 + Text_JP "サニーゴ"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 8fe3870..a9094e8 100644 --- a/battle-e/trainers/annie.asm +++ b/battle-e/trainers/annie.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class SWIMMER_F BT_Floor MOSSDEEP Text_EN "ANNIE"8 + Text_JP "チハル"8 OT_ID 00000, 00000 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 + Intro_JP $1421, $045f, $020e, $0804, $0c01, $ffff + Win_JP $0c2d, $1e0b, $020e, $1214, $1004, $0c03 + Loss_JP $0814, $1032, $0c00, $1421, $020e, $102e + Pokemon MACHAMP Holds BLACK_BELT Moves CROSS_CHOP, EARTHQUAKE, ROCK_SLIDE, FIRE_BLAST @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 31,31,15,15,15,15, MACHAMP_GUTS PV $000000E7 ; ♂ Docile Text_EN "MACHAMP"11 + Text_JP "カイリキー"11 Friendship 255 Pokemon MAGNETON @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,15,31,15, MAGNETON_STURDY PV $0000000C ; ⚲ Serious Text_EN "MAGNETON"11 + Text_JP "レアコイル"11 Friendship 255 Pokemon BLASTOISE @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,15,31,15, BLASTOISE_TORRENT PV $00000012 ; ♀ Bashful Text_EN "BLASTOISE"11 + Text_JP "カメックス"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 254f4f3..a9d693d 100644 --- a/battle-e/trainers/antonio.asm +++ b/battle-e/trainers/antonio.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class GENTLEMAN BT_Floor MOSSDEEP Text_EN "ANTONIO"8 + Text_JP "クリント"8 OT_ID 00000, 00000 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 + Intro_JP $1e1b, $1015, $0c03, $0a48, $020e, $0c01 + Win_JP $1e1b, $1014, $0c03, $0a48, $020e, $0c01 + Loss_JP $1e1b, $0e1f, $142f, $1005, $0a48, $020e + Pokemon DONPHAN Holds SITRUS_BERRY Moves EARTHQUAKE, ROCK_TOMB, SUNNY_DAY, FISSURE @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 31,31,15,15,15,15, DONPHAN_STURDY PV $000000E4 ; ♂ Adamant Text_EN "DONPHAN"11 + Text_JP "ドンファン"11 Friendship 255 Pokemon SKARMORY @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 15,31,15,31,15,15, SKARMORY_STURDY PV $0000001C ; ♀ Adamant Text_EN "SKARMORY"11 + Text_JP "エアームド"11 Friendship 255 Pokemon HOUNDOOM @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 15,31,15,31,31,15, HOUNDOOM_EARLY_BIRD PV $000000E1 ; ♂ Hardy Text_EN "HOUNDOOM"11 + Text_JP "ヘルガー"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 f68adda..f515e08 100644 --- a/battle-e/trainers/april.asm +++ b/battle-e/trainers/april.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class AROMA_LADY BT_Floor MOSSDEEP Text_EN "APRIL"8 + Text_JP "レイコ"8 OT_ID 00000, 00000 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 + Intro_JP $0a48, $020e, $ffff, $24e6, $1628, $1021 + Win_JP $0c13, $0c06, $ffff, $24e6, $1423, $1021 + Loss_JP $24e6, $0e16, $100b, $060a, $1034, $1032 + Pokemon WEEZING Holds WHITE_HERB Moves HAZE, SLUDGE_BOMB, SMOKESCREEN, SUNNY_DAY @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,15,15,31, WEEZING_LEVITATE PV $00000080 ; ♂ Adamant Text_EN "WEEZING"11 + Text_JP "マタドガス"11 Friendship 255 Pokemon BELLOSSOM @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,31,15,15,15, BELLOSSOM_CHLOROPHYLL PV $0000000F ; ♀ Modest Text_EN "BELLOSSOM"11 + Text_JP "キレイハナ"11 Friendship 255 Pokemon TROPIUS @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,15,15,31, TROPIUS_CHLOROPHYLL PV $00000019 ; ♀ Hardy Text_EN "TROPIUS"11 + Text_JP "トロピウス"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 df14d28..69b6f9d 100644 --- a/battle-e/trainers/belford.asm +++ b/battle-e/trainers/belford.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class COOLTRAINER_M BT_Floor 5 Text_EN "BELFORD"8 + Text_JP "ミスケ"8 OT_ID 00000, 00000 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 + Intro_JP $0c2b, $0a1a, $1e0b, $0612, $140e, $1005 + Win_JP $121b, $1015, $0c00, $043c, $140e, $1021 + Loss_JP $1424, $020b, $1015, $0c06, $0635, $103e + Pokemon DUSCLOPS Holds LEFTOVERS Moves TOXIC, NIGHT_SHADE, CONFUSE_RAY, WILL_O_WISP @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 31,20,31,20,20,20, DUSCLOPS_PRESSURE PV $00000094 ; ♂ Careful Text_EN "DUSCLOPS"11 + Text_JP "サマヨール"11 Friendship 255 Pokemon CROBAT @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,31,20,20,20,20, CROBAT_INNER_FOCUS PV $0000001C ; ♀ Adamant Text_EN "CROBAT"11 + Text_JP "クロバット"11 Friendship 255 Pokemon REGISTEEL @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 31,20,20,20,20,31, REGISTEEL_CLEAR_BODY PV $0000001E ; ⚲ Bold Text_EN "REGISTEEL"11 + Text_JP "レジスチル"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 623f5b5..97cea39 100644 --- a/battle-e/trainers/bryce.asm +++ b/battle-e/trainers/bryce.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class FISHERMAN BT_Floor MOSSDEEP Text_EN "BRYCE"8 + Text_JP "ナオユキ"8 OT_ID 00000, 00000 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 + Intro_JP $1a20, $0e1d, $0e39, $1423, $1015, $0c00 + Win_JP $0c37, $1c10, $ffff, $1a20, $160a, $100f + Loss_JP $081c, $0a1e, $ffff, $1a20, $1622, $1035 + Pokemon LANTURN Holds CHERI_BERRY Moves CONFUSE_RAY, THUNDER_WAVE, SURF, THUNDERBOLT @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 15,15,31,15,15,31, LANTURN_VOLT_ABSORB PV $0000000F ; ♀ Modest Text_EN "LANTURN"11 + Text_JP "ランターン"11 Friendship 255 Pokemon SHARPEDO @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 15,31,15,15,31,15, SHARPEDO_ROUGH_SKIN PV $000000D9 ; ♂ Quiet Text_EN "SHARPEDO"11 + Text_JP "サメハダー"11 Friendship 255 Pokemon WHISCASH @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 15,15,31,15,15,31, WHISCASH_OBLIVIOUS PV $000000D4 ; ♂ Serious Text_EN "WHISCASH"11 + Text_JP "ナマズン"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 0255788..4f0d4c2 100644 --- a/battle-e/trainers/candice.asm +++ b/battle-e/trainers/candice.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class PKMN_BREEDER_F BT_Floor MOSSDEEP Text_EN "CANDICE"8 + Text_JP "モモコ"8 OT_ID 00000, 00000 Intro_EN WE,ARE,READY,FOR,MORE,_GROWTH Win_EN WE,WILL,TRY,MORE,FOR,_GROWTH Loss_EN SORRY,PARTNER,I,WILL,_HARDEN,MYSELF + Intro_JP $120f, $1c25, $244a, $1621, $140f, $1034 + Win_JP $0a45, $0e36, $120f, $244a, $1628, $0c3d + Loss_JP $080d, $0a3d, $0e36, $244a, $1628, $0e08 + Pokemon MAGIKARP Holds SILK_SCARF Moves TACKLE, SPLASH, FLAIL, 0 @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 31,14,15,14,14,30, MAGIKARP_SWIFT_SWIM PV $00000085 ; ♂ Impish Text_EN "MAGIKARP"11 + Text_JP "コイキング"11 Friendship 255 Pokemon MUDKIP @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,31,15,15,15,15, MUDKIP_TORRENT PV $00000083 ; ♂ Docile Text_EN "MUDKIP"11 + Text_JP "ミズゴロウ"11 Friendship 255 Pokemon DUSKULL @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,31,15,15,15, DUSKULL_LEVITATE PV $0000001B ; ♀ Brave Text_EN "DUSKULL"11 + Text_JP "ヨマワル"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 b184447..682fb6b 100644 --- a/battle-e/trainers/celina.asm +++ b/battle-e/trainers/celina.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class HEX_MANIAC BT_Floor MOSSDEEP Text_EN "CELINA"8 + Text_JP "チトセ"8 OT_ID 00000, 00000 Intro_EN GHOST,_ELIP,WHAT,COULD,THAT,BE Win_EN GHOST,_ELIP,THEY,NEVER,GET,DEFEATED Loss_EN GHOST,_ELIP,THEY,GOT,DEFEATED,_QU + Intro_JP $0a48, $041f, $0c06, $1e22, $1004, $0c03 + Win_JP $0a48, $041f, $0c06, $26c1, $0e0c, $162d + Loss_JP $0a48, $041f, $0c06, $26c1, $0e24, $0c06 + Pokemon DUSCLOPS Holds SPELL_TAG Moves WILL_O_WISP, SHADOW_BALL, ICE_BEAM, EARTHQUAKE @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 31,31,15,15,15,15, DUSCLOPS_PRESSURE PV $00000095 ; ♂ Quirky Text_EN "DUSCLOPS"11 + Text_JP "サマヨール"11 Friendship 255 Pokemon SABLEYE @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,15,15,31, SABLEYE_KEEN_EYE PV $00000096 ; ♂ Hardy Text_EN "SABLEYE"11 + Text_JP "ヤミラミ"11 Friendship 255 Pokemon SHEDINJA @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 15,31,15,31,15,15, SHEDINJA_WONDER_GUARD PV $00000080 ; ⚲ Adamant Text_EN "SHEDINJA"11 + Text_JP "ヌケニン"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 2192e5a..cd79c85 100644 --- a/battle-e/trainers/clayton.asm +++ b/battle-e/trainers/clayton.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class PKMN_RANGER_M BT_Floor 5 Text_EN "CLAYTON"8 + Text_JP "エイコウ"8 OT_ID 00000, 00000 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 + Intro_JP $0606, $2459, $0c06, $1404, $103e, $ffff + Win_JP $0c30, $0c06, $ffff, $2459, $0620, $1019 + Loss_JP $0c09, $0c06, $ffff, $2459, $2001, $ffff + Pokemon FLYGON Holds SOFT_SAND Moves EARTHQUAKE, DRAGON_CLAW, GIGA_DRAIN, FLAMETHROWER @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 15,15,15,31,15,15, FLYGON_LEVITATE PV $00000090 ; ♂ Rash Text_EN "FLYGON"11 + Text_JP "フライゴン"11 Friendship 255 Pokemon RHYDON @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,31,15,15,15,15, RHYDON_ROCK_HEAD PV $0000001B ; ♀ Brave Text_EN "RHYDON"11 + Text_JP "サイドン"11 Friendship 255 Pokemon SWAMPERT @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 31,31,15,15,15,15, SWAMPERT_TORRENT PV $0000007E ; ♂ Lonely Text_EN "SWAMPERT"11 + Text_JP "ラグラージ"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 9c946aa..8c9f487 100644 --- a/battle-e/trainers/devin.asm +++ b/battle-e/trainers/devin.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" db COOLTRAINER_M BT_Floor 19 Text_EN "DEVIN"8 + Text_JP "シュウサク"8 OT_ID 00000, 00000 Intro_EN POWER,BATTLE,IS,ALWAYS,TRENDY,_EX Win_EN SEE,_QU,POWER,BATTLE,IS,TRENDY Loss_EN IS,_ELIP,POWER,BATTLE,TRENDY,_QU + Intro_JP $1c07, $061e, $0618, $0e0b, $280f, $1012 + Win_JP $0c32, $0e39, $061e, $0618, $280f, $1021 + Loss_JP $0c0e, $061e, $0618, $280f, $102b, $0c03 + Pokemon HERACROSS Holds SCOPE_LENS Moves MEGAHORN, RETURN, BULK_UP, BRICK_BREAK @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 15,31,15,31,15,15, HERACROSS_SWARM PV $000000E4 ; ♂ Adamant Text_EN "HERACROSS"11 + Text_JP "ヘラクロス"11 Friendship 255 Pokemon SALAMENCE @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 15,31,15,31,15,15, SALAMENCE_INTIMIDATE PV $000000E4 ; ♂ Adamant Text_EN "SALAMENCE"11 + Text_JP "ボーマンダ"11 Friendship 255 Pokemon METAGROSS @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 15,31,15,31,15,15, METAGROSS_CLEAR_BODY PV $000000E4 ; ⚲ Adamant Text_EN "METAGROSS"11 + Text_JP "メタグロス"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 261fefd..4e8b830 100644 --- a/battle-e/trainers/dominic.asm +++ b/battle-e/trainers/dominic.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class GUITARIST BT_Floor MOSSDEEP Text_EN "DOMINIC"8 + Text_JP "カツヒロ"8 OT_ID 00000, 00000 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 + Intro_JP $0a14, $262e, $0c01, $0c3c, $0c01, $ffff + Win_JP $0a14, $1034, $ffff, $26bf, $1a19, $0c3c + Loss_JP $0a14, $1034, $ffff, $200d, $1a19, $1220 + Pokemon SKARMORY Holds SHARP_BEAK Moves SPIKES, ROAR, DRILL_PECK, STEEL_WING @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 15,31,15,15,15,31, SKARMORY_STURDY PV $000000DF ; ♂ Careful Text_EN "SKARMORY"11 + Text_JP "エアームド"11 Friendship 255 Pokemon WAILORD @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 15,15,31,15,15,31, WAILORD_WATER_VEIL PV $00000014 ; ♀ Calm Text_EN "WAILORD"11 + Text_JP "ホエルオー"11 Friendship 255 Pokemon EXPLOUD @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 15,15,31,15,15,31, EXPLOUD_SOUNDPROOF PV $000000E8 ; ♂ Relaxed Text_EN "EXPLOUD"11 + Text_JP "バクオング"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 8b74b73..3fa7723 100644 --- a/battle-e/trainers/dustin.asm +++ b/battle-e/trainers/dustin.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class TRIATHLETE_M_SWIM BT_Floor MOSSDEEP Text_EN "DUSTIN"8 + Text_JP "タカアキ"8 OT_ID 00000, 00000 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 + Intro_JP $1638, $1638, $0c00, $0a49, $142d, $0c00 + Win_JP $0c37, $1c19, $0c00, $1637, $1c14, $0c00 + Loss_JP $200d, $0e36, $0c00, $1638, $1638, $0c00 + Pokemon DODRIO Holds QUICK_CLAW Moves DOUBLE_TEAM, TRI_ATTACK, STEEL_WING, AERIAL_ACE @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 31,31,15,15,15,15, DODRIO_EARLY_BIRD PV $0000008A ; ♂ Jolly Text_EN "DODRIO"11 + Text_JP "ドードリオ"11 Friendship 255 Pokemon MANECTRIC @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 15,15,15,15,15,15, MANECTRIC_STATIC PV $0000000E ; ♀ Naive Text_EN "MANECTRIC"11 + Text_JP "ライボルト"11 Friendship 255 Pokemon LINOONE @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,31,15,15, LINOONE_PICKUP PV $0000008B ; ♂ Naive Text_EN "LINOONE"11 + Text_JP "マッスグマ"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 ac2703e..7b39b8c 100644 --- a/battle-e/trainers/ellie.asm +++ b/battle-e/trainers/ellie.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class BEAUTY BT_Floor MOSSDEEP Text_EN "ELLIE"8 + Text_JP "リエ"8 OT_ID 00000, 00000 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 + Intro_JP $120f, $1a1a, $0c00, $0e1b, $0c06, $2019 + Win_JP $1a1a, $1034, $1003, $1401, $0c3d, $ffff + Loss_JP $0c26, $1a1a, $ffff, $122d, $1004, $0c03 + Pokemon CASTFORM Holds HEART_SCALE Moves RAIN_DANCE, WEATHER_BALL, THUNDER, ATTRACT @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,15,31,15, CASTFORM_FORECAST PV $0000000F ; ♀ Modest Text_EN "CASTFORM"11 + Text_JP "ポワルン"11 Friendship 255 Pokemon KOFFING @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,15,15,31, KOFFING_LEVITATE PV $0000008F ; ♂ Bashful Text_EN "KOFFING"11 + Text_JP "ドガース"11 Friendship 255 Pokemon CHIMECHO @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,15,31,15, CHIMECHO_LEVITATE PV $0000000F ; ♀ Modest Text_EN "CHIMECHO"11 + Text_JP "チリーン"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 1eb4a3c..800abd5 100644 --- a/battle-e/trainers/fay.asm +++ b/battle-e/trainers/fay.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class BEAUTY BT_Floor 19 Text_EN "FAY"8 + Text_JP "セイラ"8 OT_ID 00000, 00000 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 + Intro_JP $1c28, $0618, $0e1d, $201a, $1041, $0c00 + Win_JP $263a, $0e28, $201a, $1e11, $1021, $ffff + Loss_JP $1400, $0618, $24c4, $0e30, $2612, $1015 + Pokemon ALTARIA Holds SHELL_BELL Moves ICE_BEAM, FLAMETHROWER, EARTHQUAKE, AERIAL_ACE @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 20,31,20,20,31,20, ALTARIA_NATURAL_CURE PV $000000E7 ; ♂ Docile Text_EN "ALTARIA"11 + Text_JP "チルタリス"11 Friendship 255 Pokemon STARMIE @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,20,20,20,31,20, STARMIE_NATURAL_CURE PV $0000000F ; ⚲ Modest Text_EN "STARMIE"11 + Text_JP "スターミー"11 Friendship 255 Pokemon REGICE @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 20,20,31,20,31,20, REGICE_CLEAR_BODY PV $00000020 ; ⚲ Relaxed Text_EN "REGICE"11 + Text_JP "レジアイス"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 55123d1..0b291c6 100644 --- a/battle-e/trainers/fuego.asm +++ b/battle-e/trainers/fuego.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class COOLTRAINER_M BT_Floor 5 Text_EN "FUEGO"8 + Text_JP "ヒエイ"8 OT_ID 00000, 00000 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 + Intro_JP $0a1a, $0e28, $0631, $1211, $103e, $ffff + Win_JP $0420, $0446, $040a, $1606, $1622, $0c00 + Loss_JP $0420, $0446, $040a, $100b, $1427, $1005 + Pokemon GLALIE Holds SCOPE_LENS Moves SHEER_COLD, ICE_BEAM, EARTHQUAKE, CRUNCH @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 31,20,31,20,20,20, GLALIE_INNER_FOCUS PV $00000096 ; ♂ Hardy Text_EN "GLALIE"11 + Text_JP "オニゴーリ"11 Friendship 255 Pokemon SKARMORY @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,20,20,20,20,31, SKARMORY_KEEN_EYE PV $00000017 ; ♀ Careful Text_EN "SKARMORY"11 + Text_JP "エアームド"11 Friendship 255 Pokemon REGIROCK @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 31,31,20,20,20,20, MASQUERAIN_INTIMIDATE PV $0000001B ; ⚲ Brave Text_EN "REGIROCK"11 + Text_JP "レジロック"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 43f9a33..c9d3b85 100644 --- a/battle-e/trainers/goro.asm +++ b/battle-e/trainers/goro.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class NINJA_BOY BT_Floor MOSSDEEP Text_EN "GORO"8 + Text_JP "タカナオ"8 OT_ID 00000, 00000 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 + Intro_JP $1434, $1434, $0c05, $0414, $0414, $0c05 + Win_JP $0e36, $0e36, $0c05, $0414, $0414, $0c05 + Loss_JP $201e, $200c, $0c06, $0e36, $0414, $0c05 + Pokemon ELECTRODE Holds KING_S_ROCK Moves THUNDERBOLT, LIGHT_SCREEN, MIRROR_COAT, EXPLOSION @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 15,15,15,31,31,15, ELECTRODE_STATIC PV $0000000E ; ⚲ Naive Text_EN "ELECTRODE"11 + Text_JP "マルマイン"11 Friendship 255 Pokemon NINJASK @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 15,31,15,31,15,15, NINJASK_SPEED_BOOST PV $000000D5 ; ♂ Jolly Text_EN "NINJASK"11 + Text_JP "テッカニン"11 Friendship 255 Pokemon CROBAT @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 15,31,15,31,15,15, CROBAT_INNER_FOCUS PV $0000000D ; ♀ Jolly Text_EN "CROBAT"11 + Text_JP "クロバット"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 2e1f38d..ed6f4fc 100644 --- a/battle-e/trainers/griffin.asm +++ b/battle-e/trainers/griffin.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class PSYCHIC_M BT_Floor MOSSDEEP Text_EN "GRIFFIN"8 + Text_JP "アスオ"8 OT_ID 00000, 00000 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 + Intro_JP $0a1a, $0c00, $1e0b, $0454, $164c, $1003 + Win_JP $0a1d, $0454, $0e24, $1e10, $103c, $1016 + Loss_JP $0c0e, $0c00, $0e24, $0454, $1e24, $0c01 + Pokemon BANETTE Holds LEPPA_BERRY Moves SPITE, PROTECT, DOUBLE_TEAM, WILL_O_WISP @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,31,15,15,15, BANETTE_INSOMNIA PV $00000085 ; ♂ Impish Text_EN "BANETTE"11 + Text_JP "ジュペッタ"11 Friendship 255 Pokemon ABSOL @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,31,15,15,15, ABSOL_PRESSURE PV $0000001C ; ♀ Adamant Text_EN "ABSOL"11 + Text_JP "アブソル"11 Friendship 255 Pokemon DUSCLOPS @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,15,15,31, DUSCLOPS_PRESSURE PV $0000001C ; ♀ Adamant Text_EN "DUSCLOPS"11 + Text_JP "サマヨール"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 f6c92c1..960694f 100644 --- a/battle-e/trainers/hayden.asm +++ b/battle-e/trainers/hayden.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class GUITARIST BT_Floor MOSSDEEP Text_EN "HAYDEN"8 + Text_JP "シュウキチ"8 OT_ID 00000, 00000 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 + Intro_JP $2805, $0c00, $2699, $2208, $1013, $0c01 + Win_JP $2805, $0c01, $0a14, $2806, $2699, $0c01 + Loss_JP $081d, $0c00, $0a14, $1034, $2208, $201f + Pokemon ELECTRODE Holds MAGNET Moves EXPLOSION, MIRROR_COAT, LIGHT_SCREEN, SWIFT @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,15,15,15, ELECTRODE_STATIC PV $00000080 ; ⚲ Adamant Text_EN "ELECTRODE"11 + Text_JP "マルマイン"11 Friendship 255 Pokemon SOLROCK @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,15,15,31, SOLROCK_LEVITATE PV $0000007F ; ⚲ Brave Text_EN "SOLROCK"11 + Text_JP "ソルロック"11 Friendship 255 Pokemon SHIFTRY @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,31,15,15, SHIFTRY_EARLY_BIRD PV $00000080 ; ♂ Adamant Text_EN "SHIFTRY"11 + Text_JP "ダーテング"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 2b0c852..c68860b 100644 --- a/battle-e/trainers/heather.asm +++ b/battle-e/trainers/heather.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class PKMN_RANGER_F BT_Floor MOSSDEEP Text_EN "HEATHER"8 + Text_JP "シズカ"8 OT_ID 00000, 00000 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 + Intro_JP $0a1d, $162a, $063e, $0a1c, $1613, $103e + Win_JP $2444, $161a, $1010, $0e0a, $1227, $0c03 + Loss_JP $0624, $0c00, $2444, $26c5, $1641, $1032 + Pokemon MACHAMP Holds SHELL_BELL Moves COUNTER, CROSS_CHOP, ROCK_SLIDE, EARTHQUAKE @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,15,15,31, MACHAMP_GUTS PV $00000080 ; ♂ Adamant Text_EN "MACHAMP"11 + Text_JP "カイリキー"11 Friendship 255 Pokemon TENTACRUEL @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,31,15,15,15, TENTACRUEL_LIQUID_OOZE PV $0000000F ; ♀ Modest Text_EN "TENTACRUEL"11 + Text_JP "ドククラゲ"11 Friendship 255 Pokemon WOBBUFFET @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,15,15,31, WOBBUFFET_SHADOW_TAG PV $00000085 ; ♂ Impish Text_EN "WOBBUFFET"11 + Text_JP "ソーナンス"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 64ea16d..c7974c9 100644 --- a/battle-e/trainers/hillary.asm +++ b/battle-e/trainers/hillary.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class LADY BT_Floor MOSSDEEP Text_EN "HILLARY"8 + Text_JP "ヒサエ"8 OT_ID 00000, 00000 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 + Intro_JP $1e1b, $0c03, $0a48, $020e, $1422, $1004 + Win_JP $0c31, $0622, $1628, $0e0c, $142f, $1026 + Loss_JP $1421, $0e08, $0e1d, $062c, $140e, $1026 + Pokemon XATU Holds TWISTEDSPOON Moves PSYCHIC, SUNNY_DAY, CONFUSE_RAY, SOLARBEAM @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 0,15,15,31,31,15, XATU_SYNCHRONIZE PV $000000D7 ; ♂ Modest Text_EN "XATU"11 + Text_JP "ネイティオ"11 Friendship 255 Pokemon WOBBUFFET @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 15,15,31,15,15,31, WOBBUFFET_SHADOW_TAG PV $00000012 ; ♀ Bashful Text_EN "WOBBUFFET"11 + Text_JP "ソーナンス"11 Friendship 255 Pokemon HOUNDOOM @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 15,15,15,31,31,15, HOUNDOOM_FLASH_FIRE PV $000000D7 ; ♂ Modest Text_EN "HOUNDOOM"11 + Text_JP "ヘルガー"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 b42b4c7..b894b36 100644 --- a/battle-e/trainers/hugo.asm +++ b/battle-e/trainers/hugo.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class HIKER BT_Floor MOSSDEEP Text_EN "HUGO"8 + Text_JP "ユキヒコ"8 OT_ID 00000, 00000 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 + Intro_JP $1a1a, $0e24, $ffff, $1622, $103f, $1011 + Win_JP $0c26, $0c06, $0e36, $1e23, $122c, $0c06 + Loss_JP $0c26, $0c06, $ffff, $1a1a, $122f, $0c06 + Pokemon WALREIN Holds SITRUS_BERRY Moves BLIZZARD, REST, BODY_SLAM, SURF @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,15,31,15, WALREIN_THICK_FAT PV $0000008E ; ♂ Quiet Text_EN "WALREIN"11 + Text_JP "トドゼルガ"11 Friendship 255 Pokemon HARIYAMA @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,31,15,15,15,15, HARIYAMA_THICK_FAT PV $0000007F ; ♂ Brave Text_EN "HARIYAMA"11 + Text_JP "ハリテヤマ"11 Friendship 255 Pokemon GRUMPIG @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 15,15,15,15,31,31, GRUMPIG_THICK_FAT PV $00000018 ; ♀ Quirky Text_EN "GRUMPIG"11 + Text_JP "ブーピッグ"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 8fd4a45..445599c 100644 --- a/battle-e/trainers/irazu.asm +++ b/battle-e/trainers/irazu.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class PKMN_RANGER_M BT_Floor 12 Text_EN "IRAZU"8 + Text_JP "コシキ"8 OT_ID 00000, 00000 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 + Intro_JP $020e, $0e08, $24d8, $0a37, $0e29, $24d8 + Win_JP $0603, $142f, $020b, $0c06, $020e, $0634 + Loss_JP $062e, $1010, $0e08, $0a27, $26da, $0c06 + Pokemon KINGDRA Holds CHESTO_BERRY Moves RETURN, DRAGON_DANCE, REST, DOUBLE_TEAM @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 31,31,20,20,20,20, KINGDRA_SWIFT_SWIM PV $0000001C ; ♀ Adamant Text_EN "KINGDRA"11 + Text_JP "キングドラ"11 Friendship 255 Pokemon HARIYAMA @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,20,20,20,20,31, HARIYAMA_THICK_FAT PV $00000080 ; ♂ Adamant Text_EN "HARIYAMA"11 + Text_JP "ハリテヤマ"11 Friendship 255 Pokemon REGISTEEL @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 31,20,20,20,20,31, REGISTEEL_CLEAR_BODY PV $0000001C ; ⚲ Adamant Text_EN "REGISTEEL"11 + Text_JP "レジスチル"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 b2c8986..fefd909 100644 --- a/battle-e/trainers/irvin.asm +++ b/battle-e/trainers/irvin.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class BUG_MANIAC BT_Floor MOSSDEEP Text_EN "IRVIN"8 + Text_JP "ムツオ"8 OT_ID 00000, 00000 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 + Intro_JP $0c36, $0c05, $ffff, $0462, $1005, $ffff + Win_JP $0a3a, $0461, $020e, $2806, $0c03, $ffff + Loss_JP $0461, $020e, $0e1f, $1c1c, $0606, $100f + Pokemon BEAUTIFLY Holds POISON_BARB Moves SILVER_WIND, AERIAL_ACE, MORNING_SUN, STUN_SPORE @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 31,31,15,15,15,15, BEAUTIFLY_SWARM PV $0000001C ; ♀ Adamant Text_EN "BEAUTIFLY"11 + Text_JP "アゲハント"11 Friendship 255 Pokemon DUSTOX @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 15,15,31,15,15,31, DUSTOX_SHIELD_DUST PV $000000E1 ; ♂ Hardy Text_EN "DUSTOX"11 + Text_JP "ドクケイル"11 Friendship 255 Pokemon MASQUERAIN @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 15,15,31,15,15,31, MASQUERAIN_INTIMIDATE PV $00000019 ; ♀ Hardy Text_EN "MASQUERAIN"11 + Text_JP "アメモース"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 e0c9737..684e784 100644 --- a/battle-e/trainers/jeffrey.asm +++ b/battle-e/trainers/jeffrey.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class YOUNGSTER BT_Floor MOSSDEEP Text_EN "JEFFREY"8 + Text_JP "タツミ"8 OT_ID 00000, 00000 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 + Intro_JP $0a37, $1034, $1439, $1c28, $164c, $103e + Win_JP $1439, $1034, $1439, $0c06, $1439, $1016 + Loss_JP $0e1b, $0622, $ffff, $1611, $100a, $0c06 + Pokemon PINSIR Holds KING_S_ROCK Moves SWORDS_DANCE, GUILLOTINE, EARTHQUAKE, BRICK_BREAK @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,15,15,31, PINSIR_HYPER_CUTTER PV $00000080 ; ♂ Adamant Text_EN "PINSIR"11 + Text_JP "カイロス"11 Friendship 255 Pokemon NINETALES @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,15,31,15, NINETALES_FLASH_FIRE PV $0000000F ; ♀ Modest Text_EN "NINETALES"11 + Text_JP "キュウコン"11 Friendship 255 Pokemon BLASTOISE @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,15,31,15, BLASTOISE_TORRENT PV $00000083 ; ♂ Docile Text_EN "BLASTOISE"11 + Text_JP "カメックス"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 59db53b..188388b 100644 --- a/battle-e/trainers/judith.asm +++ b/battle-e/trainers/judith.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class PSYCHIC_F BT_Floor MOSSDEEP Text_EN "JUDITH"8 + Text_JP "ナナエ"8 OT_ID 00000, 00000 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 + Intro_JP $0828, $0c05, $ffff, $0a45, $270f, $040e + Win_JP $0a45, $1034, $270f, $1423, $1021, $ffff + Loss_JP $270f, $0e17, $1229, $102b, $103f, $0c00 + Pokemon ALAKAZAM Holds CHOICE_BAND Moves TRICK, DISABLE, PSYCHIC, REFLECT @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 15,15,15,31,31,15, ALAKAZAM_SYNCHRONIZE PV $00000087 ; ♂ Timid Text_EN "ALAKAZAM"11 + Text_JP "フーディン"11 Friendship 255 Pokemon KECLEON @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,31,15,15,15, KECLEON_COLOR_CHANGE PV $00000016 ; ⚲ Sassy Text_EN "KECLEON"11 + Text_JP "カクレオン"11 Friendship 255 Pokemon LINOONE @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,31,15,15, LINOONE_PICKUP PV $00000085 ; ♂ Impish Text_EN "LINOONE"11 + Text_JP "マッスグマ"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 a34b9c3..8b7dace 100644 --- a/battle-e/trainers/justine.asm +++ b/battle-e/trainers/justine.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class POKEFAN_F BT_Floor MOSSDEEP Text_EN "JUSTINE"8 + Text_JP "セツコ"8 OT_ID 00000, 00000 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 + Intro_JP $081c, $081c, $0c02, $0e1b, $020e, $1643 + Win_JP $0c32, $0c32, $0c02, $0e1b, $1234, $1004 + Loss_JP $0c0c, $0c0c, $0c02, $0e1b, $1234, $0c02 + Pokemon PIKACHU Holds LIGHT_BALL Moves QUICK_ATTACK, DOUBLE_TEAM, LIGHT_SCREEN, THUNDERBOLT @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 15,15,15,31,31,15, PIKACHU_STATIC PV $0000000F ; ♀ Modest Text_EN "PIKACHU"11 + Text_JP "ピカチュウ"11 Friendship 255 Pokemon GOLEM @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,15,15,31, GOLEM_STURDY PV $0000001B ; ♀ Brave Text_EN "GOLEM"11 + Text_JP "ゴローニャ"11 Friendship 255 Pokemon GENGAR @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,31,15,15,15, GENGAR_LEVITATE PV $00000087 ; ♂ Timid Text_EN "GENGAR"11 + Text_JP "ゲンガー"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 8fb2cca..3948573 100644 --- a/battle-e/trainers/kendall.asm +++ b/battle-e/trainers/kendall.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class POKEFAN_M BT_Floor MOSSDEEP Text_EN "KENDALL"8 + Text_JP "タケモト"8 OT_ID 00000, 00000 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 + Intro_JP $1e16, $1405, $1033, $2694, $2694, $0c01 + Win_JP $0418, $020e, $0c00, $0418, $2694, $0c01 + Loss_JP $2694, $0e16, $100b, $060a, $100c, $0c01 + Pokemon PLUSLE Holds MAGNET Moves SPARK, ATTRACT, SUBSTITUTE, FLASH @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,15,31,15, PLUSLE_PLUS PV $0000008C ; ♂ Modest Text_EN "PLUSLE"11 + Text_JP "プラスル"11 Friendship 255 Pokemon MINUN @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,31,15,15, MINUN_MINUS PV $0000000F ; ♀ Modest Text_EN "MINUN"11 + Text_JP "マイナン"11 Friendship 255 Pokemon SNORUNT @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,15,15,31, SNORUNT_INNER_FOCUS PV $0000000F ; ♀ Modest Text_EN "SNORUNT"11 + Text_JP "ユキワラシ"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 c7b9513..0407d64 100644 --- a/battle-e/trainers/logan.asm +++ b/battle-e/trainers/logan.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class RUIN_MANIAC BT_Floor MOSSDEEP Text_EN "LOGAN"8 + Text_JP "マサユキ"8 OT_ID 00000, 00000 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 + Intro_JP $1c21, $0c03, $1c0a, $0c02, $1209, $0c06 + Win_JP $017d, $0c00, $013a, $0c02, $1014, $0c02 + Loss_JP $013a, $0c03, $017d, $0c02, $1e1c, $1e24 + Pokemon WAILORD Holds MYSTIC_WATER Moves SURF, FISSURE, EARTHQUAKE, ICE_BEAM @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,15,31,15, WAILORD_OBLIVIOUS PV $00000011 ; ♀ Quiet Text_EN "WAILORD"11 + Text_JP "ホエルオー"11 Friendship 255 Pokemon ARMALDO @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,31,15,15,15,15, ARMALDO_BATTLE_ARMOR PV $00000080 ; ♂ Adamant Text_EN "ARMALDO"11 + Text_JP "アーマルド"11 Friendship 255 Pokemon RELICANTH @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 31,31,15,15,15,15, RELICANTH_ROCK_HEAD PV $00000076 ; ♂ Bashful Text_EN "RELICANTH"11 + Text_JP "ジーランス"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 3d94cea..f871c20 100644 --- a/battle-e/trainers/macros.asm +++ b/battle-e/trainers/macros.asm @@ -37,6 +37,21 @@ Loss_EN: MACRO dw \1, \2, \3, \4, \5, \6 ENDC ENDM +Intro_JP: MACRO + IF REGION == REGION_JP + dw \1, \2, \3, \4, \5, \6 + ENDC + ENDM +Win_JP: MACRO + IF REGION == REGION_JP + dw \1, \2, \3, \4, \5, \6 + ENDC + ENDM +Loss_JP: MACRO + IF REGION == REGION_JP + dw \1, \2, \3, \4, \5, \6 + ENDC + ENDM Pokemon EQUS "dw" Holds EQUS "dw" Moves EQUS "dw" diff --git a/battle-e/trainers/maggie.asm b/battle-e/trainers/maggie.asm index 6f9ac60..34f02ac 100644 --- a/battle-e/trainers/maggie.asm +++ b/battle-e/trainers/maggie.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class POKEFAN_F BT_Floor MOSSDEEP Text_EN "MAGGIE"8 + Text_JP "ミスズ"8 OT_ID 00000, 00000 Intro_EN LOOK,AT,MY,CUTE,POKEMON,_EX Win_EN MY,POKEMON,ARE,SO,CUTE,_EX Loss_EN YOU,BETTER,CARE,FOR,MY,POKEMON + Intro_JP $1643, $0c00, $ffff, $0a48, $0418, $020e + Win_JP $0a45, $1034, $020e, $0418, $0418, $0c00 + Loss_JP $0c0c, $0c33, $0c00, $0e36, $1616, $103e + Pokemon WYNAUT Holds LUM_BERRY Moves COUNTER, MIRROR_COAT, SAFEGUARD, DESTINY_BOND @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,31,15,15,15, WYNAUT_SHADOW_TAG PV $00000083 ; ♂ Docile Text_EN "WYNAUT"11 + Text_JP "ソーナノ"11 Friendship 255 Pokemon WHISMUR @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,31,15,15,15,15, WHISMUR_SOUNDPROOF PV $0000001F ; ♀ Docile Text_EN "WHISMUR"11 + Text_JP "ゴニョニョ"11 Friendship 255 Pokemon PIKACHU @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,31,15,15, PIKACHU_STATIC PV $00000083 ; ♂ Docile Text_EN "PIKACHU"11 + Text_JP "ピカチュウ"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 97304e1..4b5f5fa 100644 --- a/battle-e/trainers/mandy.asm +++ b/battle-e/trainers/mandy.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class SCHOOL_KID_F BT_Floor 12 Text_EN "MANDY"8 + Text_JP "ユキコ"8 OT_ID 00000, 00000 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 + Intro_JP $0449, $0448, $0c00, $1822, $1822, $0c01 + Win_JP $1822, $1224, $1021, $1a28, $102a, $2018 + Loss_JP $1634, $269c, $0c06, $0a46, $0c06, $1a28 + Pokemon ALTARIA Holds SITRUS_BERRY Moves SING, DRAGON_CLAW, ICE_BEAM, FLAMETHROWER @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 15,15,31,15,31,15, ALTARIA_NATURAL_CURE PV $0000000F ; ♀ Modest Text_EN "ALTARIA"11 + Text_JP "チルタリス"11 Friendship 255 Pokemon BRELOOM @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 15,15,15,31,31,15, BRELOOM_EFFECT_SPORE PV $000000E4 ; ♂ Adamant Text_EN "BRELOOM"11 + Text_JP "キノガッサ"11 Friendship 255 Pokemon SLAKING @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 15,31,15,15,15,31, SLAKING_TRUANT PV $000000DE ; ♂ Sassy Text_EN "SLAKING"11 + Text_JP "ケッキング"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 8d74bda..f7c8fab 100644 --- a/battle-e/trainers/marcus.asm +++ b/battle-e/trainers/marcus.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class EXPERT_M BT_Floor 5 Text_EN "MARCUS"8 + Text_JP "ヨシヒコ"8 OT_ID 00000, 00000 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 + Intro_JP $0a43, $1034, $0612, $0624, $0623, $100b + Win_JP $1e1b, $100b, $0c00, $265c, $0612, $0c01 + Loss_JP $0a43, $0e1f, $ffff, $0a1a, $0e28, $060c + Pokemon SKARMORY Holds LEFTOVERS Moves TOXIC, PROTECT, SKY_ATTACK, HIDDEN_POWER @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 31,14,15,15,14,30, SKARMORY_KEEN_EYE ; HP Bug 70 PV $00000094 ; ♂ Careful Text_EN "SKARMORY"11 + Text_JP "エアームド"11 Friendship 255 Pokemon HERACROSS @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,31,15,15, HERACROSS_GUTS PV $0000000D ; ♀ Jolly Text_EN "HERACROSS"11 + Text_JP "ヘラクロス"11 Friendship 255 Pokemon SWAMPERT @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,15,15,15, SWAMPERT_TORRENT PV $0000007F ; ♂ Brave Text_EN "SWAMPERT"11 + Text_JP "ラグラージ"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 f409012..9946383 100644 --- a/battle-e/trainers/natalie.asm +++ b/battle-e/trainers/natalie.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class BATTLE_GIRL BT_Floor MOSSDEEP Text_EN "NATALIE"8 + Text_JP "ノリコ"8 OT_ID 00000, 00000 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 + Intro_JP $0e0e, $0c00, $0804, $020e, $0628, $0c01 + Win_JP $201e, $1428, $0e0a, $0a1c, $0607, $0c3d + Loss_JP $201e, $1428, $0e0a, $1c1c, $1210, $0c3d + Pokemon MAGIKARP Holds CHOICE_BAND Moves SPLASH, TACKLE, FLAIL, 0 @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 15,31,15,31,15,15, MAGIKARP_SWIFT_SWIM PV $000000E4 ; ♂ Adamant Text_EN "MAGIKARP"11 + Text_JP "コイキング"11 Friendship 255 Pokemon LAIRON @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,31,15,15,15,15, LAIRON_STURDY PV $000000E4 ; ♂ Adamant Text_EN "LAIRON"11 + Text_JP "コドラ"11 Friendship 255 Pokemon SHELGON @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,15,15,31, SHELGON_ROCK_HEAD PV $0000001C ; ♀ Adamant Text_EN "SHELGON"11 + Text_JP "コモルー"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 77d5fce..4b432fc 100644 --- a/battle-e/trainers/natasha.asm +++ b/battle-e/trainers/natasha.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class PSYCHIC_F BT_Floor 12 Text_EN "NATASHA"8 + Text_JP "ユキエ"8 OT_ID 00000, 00000 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 + Intro_JP $1643, $0c00, $1e0b, $063e, $0617, $0c01 + Win_JP $0c0c, $0c03, $2671, $142f, $1034, $0c03 + Loss_JP $0c0c, $0c03, $ffff, $0a02, $0621, $0c01 + Pokemon STARMIE Holds SCOPE_LENS Moves PSYCHIC, THUNDERBOLT, SURF, ICE_BEAM @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 15,15,15,31,31,15, STARMIE_NATURAL_CURE PV $0000000F ; ⚲ Modest Text_EN "STARMIE"11 + Text_JP "スターミー"11 Friendship 255 Pokemon SALAMENCE @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 15,31,15,31,31,15, SALAMENCE_INTIMIDATE PV $0000008C ; ♂ Modest Text_EN "SALAMENCE"11 + Text_JP "ボーマンダ"11 Friendship 255 Pokemon SCEPTILE @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,31,15,15, SCEPTILE_OVERGROW PV $0000000F ; ♀ Modest Text_EN "SCEPTILE"11 + Text_JP "ジュカイン"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 25ed71c..c1814bb 100644 --- a/battle-e/trainers/oscar.asm +++ b/battle-e/trainers/oscar.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class SAILOR BT_Floor MOSSDEEP Text_EN "OSCAR"8 + Text_JP "シゲカズ"8 OT_ID 00000, 00000 Intro_EN DO,YOU,KNOW,THIS,POKEMON,_QU Win_EN HOW,WAS,MY,GHOST,POKEMON,_QU Loss_EN DID,YOU,LIKE,MY,POKEMON,_QU + Intro_JP $1e0b, $020e, $0c06, $1620, $140f, $0c03 + Win_JP $1028, $1e0b, $041f, $0432, $1034, $020e + Loss_JP $1e0b, $020e, $ffff, $1e1b, $1014, $0c03 + Pokemon ELECTRODE Holds LIECHI_BERRY Moves THUNDERBOLT, LIGHT_SCREEN, EXPLOSION, DOUBLE_TEAM @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,15,31,15, ELECTRODE_STATIC PV $00000013 ; ⚲ Rash Text_EN "ELECTRODE"11 + Text_JP "マルマイン"11 Friendship 255 Pokemon DODRIO @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 15,31,15,31,15,15, DODRIO_EARLY_BIRD PV $0000001C ; ♀ Adamant Text_EN "DODRIO"11 + Text_JP "ドードリオ"11 Friendship 255 Pokemon GENGAR @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,31,15,15,15, GENGAR_LEVITATE PV $0000008C ; ♂ Modest Text_EN "GENGAR"11 + Text_JP "ゲンガー"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 dad780a..16930e1 100644 --- a/battle-e/trainers/patrick.asm +++ b/battle-e/trainers/patrick.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class CAMPER BT_Floor MOSSDEEP Text_EN "PATRICK"8 + Text_JP "ヤスヒロ"8 OT_ID 00000, 00000 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 + Intro_JP $0a3a, $1228, $0408, $164c, $1005, $ffff + Win_JP $0c1a, $0c06, $1e0b, $0408, $1405, $1021 + Loss_JP $0a3a, $1228, $0408, $0408, $1603, $0c06 + Pokemon XATU Holds CHESTO_BERRY Moves PSYCHIC, CONFUSE_RAY, REST, NIGHT_SHADE @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,31,15,15, XATU_SYNCHRONIZE PV $0000000F ; ♀ Modest Text_EN "XATU"11 + Text_JP "ネイティオ"11 Friendship 255 Pokemon LUDICOLO @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,31,15,15,15, LUDICOLO_SWIFT_SWIM PV $00000014 ; ♀ Calm Text_EN "LUDICOLO"11 + Text_JP "ルンパッパ"11 Friendship 255 Pokemon FLYGON @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 15,15,15,31,31,15, FLYGON_LEVITATE PV $00000090 ; ♂ Rash Text_EN "FLYGON"11 + Text_JP "フライゴン"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 2670a6d..0d02231 100644 --- a/battle-e/trainers/raquel.asm +++ b/battle-e/trainers/raquel.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class COOLTRAINER_F BT_Floor MOSSDEEP Text_EN "RAQUEL"8 + Text_JP "トシコ"8 OT_ID 00000, 00000 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 + Intro_JP $0a48, $0a00, $1628, $0e28, $143b, $103e + Win_JP $1c06, $060b, $0e08, $1e0b, $0408, $1228 + Loss_JP $0408, $1603, $0e0c, $142f, $1827, $0c06 + Pokemon CRAWDAUNT Holds BLACKGLASSES Moves HIDDEN_POWER, CRABHAMMER, SWORDS_DANCE, FRUSTRATION @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,15,31,15, CRAWDAUNT_HYPER_CUTTER ; HP Dark 70 PV $00000011 ; ♀ Quiet Text_EN "CRAWDAUNT"11 + Text_JP "シザリガー"11 Friendship 0 Pokemon ELECTRODE @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,15,31,15, ELECTRODE_STATIC PV $0000000A ; ⚲ Timid Text_EN "ELECTRODE"11 + Text_JP "マルマイン"11 Friendship 255 Pokemon BLAZIKEN @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 15,31,15,31,15,15, BLAZIKEN_BLAZE PV $0000008C ; ♂ Modest Text_EN "BLAZIKEN"11 + Text_JP "バシャーモ"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 6c7b716..df81286 100644 --- a/battle-e/trainers/renee.asm +++ b/battle-e/trainers/renee.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class PICNICKER BT_Floor MOSSDEEP Text_EN "RENEE"8 + Text_JP "モトコ"8 OT_ID 00000, 00000 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 + Intro_JP $0a48, $0206, $0c06, $0444, $103b, $0c03 + Win_JP $1c07, $1034, $0e09, $26f1, $103b, $0c03 + Loss_JP $1c07, $1034, $0e09, $0404, $103b, $0c03 + Pokemon CASTFORM Holds PETAYA_BERRY Moves WEATHER_BALL, SOLARBEAM, SUNNY_DAY, FLAMETHROWER @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 15,15,15,31,31,15, CASTFORM_FORECAST PV $00000012 ; ♀ Bashful Text_EN "CASTFORM"11 + Text_JP "ポワルン"11 Friendship 255 Pokemon CASTFORM @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 15,15,15,31,31,15, CASTFORM_FORECAST PV $000000DA ; ♂ Bashful Text_EN "CASTFORM"11 + Text_JP "ポワルン"11 Friendship 255 Pokemon CASTFORM @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 15,15,15,31,31,15, CASTFORM_FORECAST PV $00000012 ; ♀ Bashful Text_EN "CASTFORM"11 + Text_JP "ポワルン"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 54968a2..c74737e 100644 --- a/battle-e/trainers/rudy.asm +++ b/battle-e/trainers/rudy.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class YOUNGSTER BT_Floor MOSSDEEP Text_EN "RUDY"8 + Text_JP "ケンジロウ"8 OT_ID 00000, 00000 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 + Intro_JP $2007, $2009, $ffff, $2621, $0c01, $ffff + Win_JP $200f, $2013, $0c06, $0e26, $0607, $103f + Loss_JP $2019, $201c, $0c06, $0c0f, $062d, $0c06 + Pokemon CASCOON Holds EVERSTONE Moves TACKLE, HARDEN, STRING_SHOT, POISON_STING @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 31,31,15,15,15,15, CASCOON_SHED_SKIN PV $00000083 ; ♂ Docile Text_EN "CASCOON"11 + Text_JP "マユルド"11 Friendship 255 Pokemon SILCOON @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,31,15,15,15,15, SILCOON_SHED_SKIN PV $00000012 ; ♀ Bashful Text_EN "SILCOON"11 + Text_JP "カラサリス"11 Friendship 255 Pokemon MAGIKARP @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 31,31,15,15,15,15, MAGIKARP_SWIFT_SWIM PV $00000095 ; ♂ Quirky Text_EN "MAGIKARP"11 + Text_JP "コイキング"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 d8b23a7..83d488a 100644 --- a/battle-e/trainers/sandia.asm +++ b/battle-e/trainers/sandia.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class EXPERT_F BT_Floor 12 Text_EN "SANDIA"8 + Text_JP "オスズ"8 OT_ID 00000, 00000 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 + Intro_JP $0a43, $1034, $0632, $1421, $1034, $100b + Win_JP $0a2a, $1627, $180f, $1628, $0e0c, $100b + Loss_JP $1421, $0632, $0e1f, $1222, $1403, $100b + Pokemon CLAYDOL Holds SHELL_BELL Moves COSMIC_POWER, REST, PSYCHIC, SHADOW_BALL @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 20,20,31,20,20,31, CLAYDOL_LEVITATE PV $0000000F ; ⚲ Modest Text_EN "CLAYDOL"11 + Text_JP "ネンドール"11 Friendship 255 Pokemon METAGROSS @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 20,31,20,20,20,31, METAGROSS_CLEAR_BODY PV $0000001C ; ⚲ Adamant Text_EN "METAGROSS"11 + Text_JP "メタグロス"11 Friendship 255 Pokemon REGICE @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 20,20,31,31,20,20, REGICE_CLEAR_BODY PV $0000001E ; ⚲ Bold Text_EN "REGICE"11 + Text_JP "レジアイス"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 63a84b8..87cfb1e 100644 --- a/battle-e/trainers/sandy.asm +++ b/battle-e/trainers/sandy.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class PICNICKER BT_Floor 19 Text_EN "SANDY"8 + Text_JP "トシミ"8 OT_ID 00000, 00000 Intro_EN I,GOT,MY,POKEMON,WITH,POKEBLOCK Win_EN I,COLLECT,MORE,POKEMON,WITH,POKEBLOCK Loss_EN URGH,I,HAVE,NO,MORE,POKEBLOCK + Intro_JP $2212, $162c, $0201, $1e11, $020e, $103e + Win_JP $2212, $162c, $0e36, $020e, $0201, $100d + Loss_JP $0c0a, $0c06, $1c27, $2212, $142f, $103f + Pokemon HERACROSS Holds BLACK_BELT Moves BRICK_BREAK, COUNTER, MEGAHORN, EARTHQUAKE @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 15,31,15,31,15,15, HERACROSS_GUTS PV $00000080 ; ♂ Adamant Text_EN "HERACROSS"11 + Text_JP "ヘラクロス"11 Friendship 255 Pokemon GIRAFARIG @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,31,15,15, GIRAFARIG_INNER_FOCUS PV $00000018 ; ♀ Quirky Text_EN "GIRAFARIG"11 + Text_JP "キリンリキ"11 Friendship 255 Pokemon DODRIO @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 15,31,15,31,15,15, DODRIO_EARLY_BIRD PV $00000080 ; ♂ Adamant Text_EN "DODRIO"11 + Text_JP "ドードリオ"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 2b3d742..4c7b9d8 100644 --- a/battle-e/trainers/sofia.asm +++ b/battle-e/trainers/sofia.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class PARASOL_LADY BT_Floor MOSSDEEP Text_EN "SOFIA"8 + Text_JP "フミコ"8 OT_ID 00000, 00000 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 + Intro_JP $2022, $24f0, $0c06, $0404, $0c06, $0c00 + Win_JP $0404, $0e1f, $0a48, $0e09, $0c06, $26f1 + Loss_JP $26f1, $0e1f, $0a48, $0e09, $0c06, $0404 + Pokemon KINGDRA Holds MYSTIC_WATER Moves RAIN_DANCE, SURF, ICE_BEAM, DRAGONBREATH @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 15,15,15,31,31,15, KINGDRA_SWIFT_SWIM PV $0000000F ; ♀ Modest Text_EN "KINGDRA"11 + Text_JP "キングドラ"11 Friendship 255 Pokemon LUDICOLO @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,31,15,15,15, LUDICOLO_RAIN_DISH PV $000000E9 ; ♂ Impish Text_EN "LUDICOLO"11 + Text_JP "ルンパッパ"11 Friendship 255 Pokemon MANECTRIC @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 15,15,15,31,31,15, MANECTRIC_STATIC PV $0000000F ; ♀ Modest Text_EN "MANECTRIC"11 + Text_JP "ライボルト"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 7dca37d..51bc0aa 100644 --- a/battle-e/trainers/sonya.asm +++ b/battle-e/trainers/sonya.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class TUBER_F BT_Floor MOSSDEEP Text_EN "SONYA"8 + Text_JP "ジュンコ"8 OT_ID 00000, 00000 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 + Intro_JP $0a45, $0426, $0432, $1219, $0c06, $0c25 + Win_JP $2536, $0616, $1419, $1014, $0c02, $ffff + Loss_JP $0616, $1014, $0e0a, $060a, $0c06, $1220 + Pokemon CLAYDOL Holds BRIGHTPOWDER Moves PSYCHIC, EARTHQUAKE, ICE_BEAM, REFLECT @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 15,31,15,15,31,15, CLAYDOL_LEVITATE PV $00000020 ; ⚲ Relaxed Text_EN "CLAYDOL"11 + Text_JP "ネンドール"11 Friendship 255 Pokemon CHIMECHO @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,15,31,0, CHIMECHO_LEVITATE PV $0000000F ; ♀ Modest Text_EN "CHIMECHO"11 + Text_JP "チリーン"11 Friendship 255 Pokemon WEEZING @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 15,31,15,15,31,15, WEEZING_LEVITATE PV $000000D9 ; ♂ Quiet Text_EN "WEEZING"11 + Text_JP "マタドガス"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 48dd91c..5eb9197 100644 --- a/battle-e/trainers/sophie.asm +++ b/battle-e/trainers/sophie.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class LADY BT_Floor MOSSDEEP Text_EN "SOPHIE"8 + Text_JP "マミナ"8 OT_ID 00000, 00000 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 + Intro_JP $0a48, $0419, $0e28, $2432, $1026, $0c00 + Win_JP $0c13, $ffff, $ffff, $26d5, $1e11, $0c03 + Loss_JP $0419, $1034, $1402, $0a46, $26d5, $0c05 + Pokemon DELCATTY Holds SILK_SCARF Moves SING, REST, SUBSTITUTE, DOUBLE_EDGE @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 15,31,15,31,15,15, DELCATTY_CUTE_CHARM PV $0000001C ; ♀ Adamant Text_EN "DELCATTY"11 + Text_JP "エネコロロ"11 Friendship 255 Pokemon LUVDISC @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 15,15,15,31,31,15, LUVDISC_SWIFT_SWIM PV $000000E7 ; ♂ Docile Text_EN "LUVDISC"11 + Text_JP "ラブカス"11 Friendship 255 Pokemon KIRLIA @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 15,15,15,31,31,15, KIRLIA_TRACE PV $0000000F ; ♀ Modest Text_EN "KIRLIA"11 + Text_JP "キルリア"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 8aca226..2ee09a3 100644 --- a/battle-e/trainers/stuart.asm +++ b/battle-e/trainers/stuart.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class COLLECTOR BT_Floor MOSSDEEP Text_EN "STUART"8 + Text_JP "エツヤ"8 OT_ID 00000, 00000 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 + Intro_JP $0a3a, $020e, $245a, $1628, $0e2b, $0402 + Win_JP $0a3a, $020e, $1a1a, $1e23, $1622, $100e + Loss_JP $0a3a, $020e, $0e1b, $1a1a, $100d, $1005 + Pokemon AGGRON Holds SCOPE_LENS Moves EARTHQUAKE, ROCK_TOMB, IRON_TAIL, DOUBLE_EDGE @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 31,31,15,15,15,15, AGGRON_ROCK_HEAD PV $00000016 ; ♀ Sassy Text_EN "AGGRON"11 + Text_JP "ボスゴドラ"11 Friendship 255 Pokemon WAILORD @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,15,15,31, WAILORD_OBLIVIOUS PV $00000091 ; ♂ Calm Text_EN "WAILORD"11 + Text_JP "ホエルオー"11 Friendship 255 Pokemon METAGROSS @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 31,31,15,15,15,15, METAGROSS_CLEAR_BODY PV $00000017 ; ⚲ Careful Text_EN "METAGROSS"11 + Text_JP "メタグロス"11 Friendship 255 End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/tsutomu.asm b/battle-e/trainers/tsutomu.asm index 57ffe6e..eb7d0f7 100644 --- a/battle-e/trainers/tsutomu.asm +++ b/battle-e/trainers/tsutomu.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class TC_BLACK_BELT BT_Floor MOSSDEEP Text_EN "TSUTOMU"8 + Text_JP "トシユキ"8 OT_ID 00000, 00000 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 + Intro_JP $0a1d, $0639, $062b, $0627, $100f, $ffff + Win_JP $0c28, $0c01, $0639, $062b, $1401, $1032 + Loss_JP $0c0e, $0639, $062b, $061a, $164b, $1031 + Pokemon ZANGOOSE Holds SCOPE_LENS Moves SWORDS_DANCE, REST, ATTRACT, SLASH @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,31,15,15, ZANGOOSE_IMMUNITY PV $0000001C ; ♀ Adamant Text_EN "ZANGOOSE"11 + Text_JP "ザングース"11 Friendship 255 Pokemon SEVIPER @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,31,15,15, SEVIPER_SHED_SKIN PV $00000080 ; ♂ Adamant Text_EN "SEVIPER"11 + Text_JP "ハブネーク"11 Friendship 255 Pokemon MACHAMP @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 30,31,14,15,15,14, MACHAMP_GUTS ; HP Electric 70 PV $0000001C ; ♀ Adamant Text_EN "MACHAMP"11 + Text_JP "カイリキー"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 1556237..8bf5287 100644 --- a/battle-e/trainers/tyler.asm +++ b/battle-e/trainers/tyler.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class POKEMANIAC BT_Floor MOSSDEEP Text_EN "TYLER"8 + Text_JP "トモタカ"8 OT_ID 00000, 00000 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 + Intro_JP $0c10, $1422, $0c00, $2806, $0612, $0c01 + Win_JP $0c3e, $1421, $1021, $0e2d, $2807, $0c00 + Loss_JP $0c16, $0621, $0c00, $0622, $1621, $103e + Pokemon WALREIN Holds LAX_INCENSE Moves SHEER_COLD, REST, SNORE, ICE_BEAM @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 15,15,31,15,15,31, WALREIN_THICK_FAT PV $00000013 ; ♀ Rash Text_EN "WALREIN"11 + Text_JP "トドゼルガ"11 Friendship 255 Pokemon PINSIR @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,31,15,15, PINSIR_HYPER_CUTTER PV $0000008A ; ♂ Jolly Text_EN "PINSIR"11 + Text_JP "カイロス"11 Friendship 255 Pokemon RHYDON @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 31,31,15,15,15,15, RHYDON_ROCK_HEAD PV $00000016 ; ♀ Sassy Text_EN "RHYDON"11 + Text_JP "サイドン"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 18bdc60..5b9e691 100644 --- a/battle-e/trainers/wilson.asm +++ b/battle-e/trainers/wilson.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class PKMN_BREEDER_M BT_Floor MOSSDEEP Text_EN "WILSON"8 + Text_JP "シンジ"8 OT_ID 00000, 00000 Intro_EN LISTEN,_EX,I,CARE,ABOUT,POKEMON Win_EN WHAT,IS,THE,NEXT,NORMAL,_QU Loss_EN I,CHALLENGE,YOU,AFTER,THIS,NORMAL + Intro_JP $1440, $1617, $0c00, $020e, $1225, $1016 + Win_JP $1e1b, $1609, $0204, $1628, $1034, $1005 + Loss_JP $1c1c, $0204, $1621, $061f, $1011, $0c00 + Pokemon GLOOM Holds SUN_STONE Moves POISONPOWDER, STUN_SPORE, SLEEP_POWDER, RAZOR_LEAF @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,15,31,15, GLOOM_CHLOROPHYLL PV $00000012 ; ♀ Bashful Text_EN "GLOOM"11 + Text_JP "クサイハナ"11 Friendship 255 Pokemon WURMPLE @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,31,15,15,15,15, WURMPLE_SHIELD_DUST PV $00000083 ; ♂ Docile Text_EN "WURMPLE"11 + Text_JP "ケムッソ"11 Friendship 255 Pokemon CLAMPERL @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 31,15,15,15,15,31, CLAMPERL_SHELL_ARMOR PV $0000000F ; ♀ Modest Text_EN "CLAMPERL"11 + Text_JP "パールル"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 aae7d7c..f81fcf3 100644 --- a/battle-e/trainers/zuril.asm +++ b/battle-e/trainers/zuril.asm @@ -6,12 +6,17 @@ INCLUDE "trainers/macros.asm" Class RUIN_MANIAC BT_Floor 12 Text_EN "ZURIL"8 + Text_JP "イナオ"8 OT_ID 00000, 00000 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 + Intro_JP $1c1b, $0a43, $ffff, $0625, $020e, $0201 + Win_JP $0625, $0e1d, $0c06, $1423, $081b, $103e + Loss_JP $0631, $0625, $0c06, $0e24, $0e0c, $100b + Pokemon FLYGON Holds BRIGHTPOWDER Moves EARTHQUAKE, DRAGON_CLAW, SANDSTORM, CRUNCH @@ -22,6 +27,7 @@ INCLUDE "trainers/macros.asm" IVs 31,20,20,31,20,20, FLYGON_LEVITATE PV $0000000C ; ♀ Serious Text_EN "FLYGON"11 + Text_JP "フライゴン"11 Friendship 255 Pokemon WHISCASH @@ -34,6 +40,7 @@ INCLUDE "trainers/macros.asm" IVs 31,31,20,20,20,20, WHISCASH_OBLIVIOUS PV $00000095 ; ♂ Quirky Text_EN "WHISCASH"11 + Text_JP "ナマズン"11 Friendship 255 Pokemon REGIROCK @@ -46,6 +53,7 @@ INCLUDE "trainers/macros.asm" IVs 31,20,20,20,20,31, REGIROCK_CLEAR_BODY PV $0000001B ; ⚲ Brave Text_EN "REGIROCK"11 + Text_JP "レジロック"11 Friendship 255 End_Trainer \ No newline at end of file From 7171d08f844015043c1956880ee58b434caad8d2 Mon Sep 17 00:00:00 2001 From: Artrios Date: Fri, 16 Jul 2021 17:11:21 +0800 Subject: [PATCH 06/13] Add Japanese Series 2 trainers --- battle-e/08-B001.asm | 4 ++ battle-e/08-B002.asm | 4 ++ battle-e/08-B003.asm | 4 ++ battle-e/08-B004.asm | 4 ++ battle-e/08-B005.asm | 4 ++ battle-e/08-B006.asm | 4 ++ battle-e/08-B007.asm | 4 ++ battle-e/08-B008.asm | 4 ++ battle-e/08-B009.asm | 4 ++ battle-e/08-B010.asm | 4 ++ battle-e/08-B011.asm | 4 ++ battle-e/08-B012.asm | 4 ++ battle-e/08-B013.asm | 4 ++ battle-e/08-B014.asm | 4 ++ battle-e/08-B015.asm | 4 ++ battle-e/08-B016.asm | 4 ++ battle-e/08-B017.asm | 4 ++ battle-e/08-B018.asm | 4 ++ battle-e/08-B019.asm | 4 ++ battle-e/08-B020.asm | 4 ++ battle-e/08-B021.asm | 4 ++ battle-e/08-B022.asm | 4 ++ battle-e/08-B023.asm | 4 ++ battle-e/08-B024.asm | 4 ++ battle-e/08-B025.asm | 4 ++ battle-e/08-B026.asm | 4 ++ battle-e/08-B027.asm | 4 ++ battle-e/08-B028.asm | 4 ++ battle-e/08-B029.asm | 4 ++ battle-e/08-B030.asm | 4 ++ battle-e/08-B031.asm | 4 ++ battle-e/08-B032.asm | 4 ++ battle-e/08-B033.asm | 4 ++ battle-e/08-B034.asm | 4 ++ battle-e/08-B035.asm | 4 ++ battle-e/08-B036.asm | 4 ++ battle-e/08-B037.asm | 4 ++ battle-e/08-B038.asm | 4 ++ battle-e/08-B039.asm | 4 ++ battle-e/08-B040.asm | 4 ++ battle-e/08-B041.asm | 4 ++ battle-e/08-B042.asm | 4 ++ battle-e/08-B043.asm | 4 ++ battle-e/08-B044.asm | 4 ++ battle-e/08-B045.asm | 4 ++ battle-e/08-B046.asm | 4 ++ battle-e/08-B047.asm | 4 ++ battle-e/08-B048.asm | 4 ++ battle-e/Makefile | 8 ++- battle-e/sprites/trainers/dragon_tamer.4bpp | Bin 0 -> 2048 bytes battle-e/trainers/anthony.asm | 51 ++++++++++++++++++++ battle-e/trainers/chisa.asm | 51 ++++++++++++++++++++ battle-e/trainers/daikichi.asm | 51 ++++++++++++++++++++ battle-e/trainers/danpei.asm | 51 ++++++++++++++++++++ battle-e/trainers/fiennes.asm | 51 ++++++++++++++++++++ battle-e/trainers/fugen.asm | 51 ++++++++++++++++++++ battle-e/trainers/fukune.asm | 51 ++++++++++++++++++++ battle-e/trainers/harue.asm | 51 ++++++++++++++++++++ battle-e/trainers/hoyoshi.asm | 51 ++++++++++++++++++++ battle-e/trainers/ihara.asm | 51 ++++++++++++++++++++ battle-e/trainers/jo.asm | 51 ++++++++++++++++++++ battle-e/trainers/junji.asm | 51 ++++++++++++++++++++ battle-e/trainers/junpei.asm | 51 ++++++++++++++++++++ battle-e/trainers/kiyoshi.asm | 51 ++++++++++++++++++++ battle-e/trainers/koto.asm | 51 ++++++++++++++++++++ battle-e/trainers/kuen.asm | 51 ++++++++++++++++++++ battle-e/trainers/kyohei.asm | 51 ++++++++++++++++++++ battle-e/trainers/makio.asm | 51 ++++++++++++++++++++ battle-e/trainers/mami.asm | 51 ++++++++++++++++++++ battle-e/trainers/masaru.asm | 51 ++++++++++++++++++++ battle-e/trainers/matsuo.asm | 51 ++++++++++++++++++++ battle-e/trainers/miyoko.asm | 51 ++++++++++++++++++++ battle-e/trainers/moet.asm | 51 ++++++++++++++++++++ battle-e/trainers/momoko.asm | 51 ++++++++++++++++++++ battle-e/trainers/natsuko.asm | 51 ++++++++++++++++++++ battle-e/trainers/noriko.asm | 51 ++++++++++++++++++++ battle-e/trainers/nozomu.asm | 51 ++++++++++++++++++++ battle-e/trainers/otoya.asm | 51 ++++++++++++++++++++ battle-e/trainers/reina.asm | 51 ++++++++++++++++++++ battle-e/trainers/rina.asm | 51 ++++++++++++++++++++ battle-e/trainers/ruizo.asm | 51 ++++++++++++++++++++ battle-e/trainers/ryo.asm | 51 ++++++++++++++++++++ battle-e/trainers/sadayo.asm | 51 ++++++++++++++++++++ battle-e/trainers/satoe.asm | 51 ++++++++++++++++++++ battle-e/trainers/shigeko.asm | 51 ++++++++++++++++++++ battle-e/trainers/shigenobu.asm | 51 ++++++++++++++++++++ battle-e/trainers/shinji.asm | 51 ++++++++++++++++++++ battle-e/trainers/shizu.asm | 51 ++++++++++++++++++++ battle-e/trainers/suekichi.asm | 51 ++++++++++++++++++++ battle-e/trainers/sueno.asm | 51 ++++++++++++++++++++ battle-e/trainers/tomoyasu.asm | 51 ++++++++++++++++++++ battle-e/trainers/toshinao.asm | 51 ++++++++++++++++++++ battle-e/trainers/toshitsugu.asm | 51 ++++++++++++++++++++ battle-e/trainers/umami.asm | 51 ++++++++++++++++++++ battle-e/trainers/yoko.asm | 51 ++++++++++++++++++++ battle-e/trainers/yu.asm | 51 ++++++++++++++++++++ battle-e/trainers/yuka.asm | 51 ++++++++++++++++++++ battle-e/trainers/yukio.asm | 51 ++++++++++++++++++++ 98 files changed, 2647 insertions(+), 1 deletion(-) create mode 100644 battle-e/08-B001.asm create mode 100644 battle-e/08-B002.asm create mode 100644 battle-e/08-B003.asm create mode 100644 battle-e/08-B004.asm create mode 100644 battle-e/08-B005.asm create mode 100644 battle-e/08-B006.asm create mode 100644 battle-e/08-B007.asm create mode 100644 battle-e/08-B008.asm create mode 100644 battle-e/08-B009.asm create mode 100644 battle-e/08-B010.asm create mode 100644 battle-e/08-B011.asm create mode 100644 battle-e/08-B012.asm create mode 100644 battle-e/08-B013.asm create mode 100644 battle-e/08-B014.asm create mode 100644 battle-e/08-B015.asm create mode 100644 battle-e/08-B016.asm create mode 100644 battle-e/08-B017.asm create mode 100644 battle-e/08-B018.asm create mode 100644 battle-e/08-B019.asm create mode 100644 battle-e/08-B020.asm create mode 100644 battle-e/08-B021.asm create mode 100644 battle-e/08-B022.asm create mode 100644 battle-e/08-B023.asm create mode 100644 battle-e/08-B024.asm create mode 100644 battle-e/08-B025.asm create mode 100644 battle-e/08-B026.asm create mode 100644 battle-e/08-B027.asm create mode 100644 battle-e/08-B028.asm create mode 100644 battle-e/08-B029.asm create mode 100644 battle-e/08-B030.asm create mode 100644 battle-e/08-B031.asm create mode 100644 battle-e/08-B032.asm create mode 100644 battle-e/08-B033.asm create mode 100644 battle-e/08-B034.asm create mode 100644 battle-e/08-B035.asm create mode 100644 battle-e/08-B036.asm create mode 100644 battle-e/08-B037.asm create mode 100644 battle-e/08-B038.asm create mode 100644 battle-e/08-B039.asm create mode 100644 battle-e/08-B040.asm create mode 100644 battle-e/08-B041.asm create mode 100644 battle-e/08-B042.asm create mode 100644 battle-e/08-B043.asm create mode 100644 battle-e/08-B044.asm create mode 100644 battle-e/08-B045.asm create mode 100644 battle-e/08-B046.asm create mode 100644 battle-e/08-B047.asm create mode 100644 battle-e/08-B048.asm create mode 100644 battle-e/sprites/trainers/dragon_tamer.4bpp create mode 100644 battle-e/trainers/anthony.asm create mode 100644 battle-e/trainers/chisa.asm create mode 100644 battle-e/trainers/daikichi.asm create mode 100644 battle-e/trainers/danpei.asm create mode 100644 battle-e/trainers/fiennes.asm create mode 100644 battle-e/trainers/fugen.asm create mode 100644 battle-e/trainers/fukune.asm create mode 100644 battle-e/trainers/harue.asm create mode 100644 battle-e/trainers/hoyoshi.asm create mode 100644 battle-e/trainers/ihara.asm create mode 100644 battle-e/trainers/jo.asm create mode 100644 battle-e/trainers/junji.asm create mode 100644 battle-e/trainers/junpei.asm create mode 100644 battle-e/trainers/kiyoshi.asm create mode 100644 battle-e/trainers/koto.asm create mode 100644 battle-e/trainers/kuen.asm create mode 100644 battle-e/trainers/kyohei.asm create mode 100644 battle-e/trainers/makio.asm create mode 100644 battle-e/trainers/mami.asm create mode 100644 battle-e/trainers/masaru.asm create mode 100644 battle-e/trainers/matsuo.asm create mode 100644 battle-e/trainers/miyoko.asm create mode 100644 battle-e/trainers/moet.asm create mode 100644 battle-e/trainers/momoko.asm create mode 100644 battle-e/trainers/natsuko.asm create mode 100644 battle-e/trainers/noriko.asm create mode 100644 battle-e/trainers/nozomu.asm create mode 100644 battle-e/trainers/otoya.asm create mode 100644 battle-e/trainers/reina.asm create mode 100644 battle-e/trainers/rina.asm create mode 100644 battle-e/trainers/ruizo.asm create mode 100644 battle-e/trainers/ryo.asm create mode 100644 battle-e/trainers/sadayo.asm create mode 100644 battle-e/trainers/satoe.asm create mode 100644 battle-e/trainers/shigeko.asm create mode 100644 battle-e/trainers/shigenobu.asm create mode 100644 battle-e/trainers/shinji.asm create mode 100644 battle-e/trainers/shizu.asm create mode 100644 battle-e/trainers/suekichi.asm create mode 100644 battle-e/trainers/sueno.asm create mode 100644 battle-e/trainers/tomoyasu.asm create mode 100644 battle-e/trainers/toshinao.asm create mode 100644 battle-e/trainers/toshitsugu.asm create mode 100644 battle-e/trainers/umami.asm create mode 100644 battle-e/trainers/yoko.asm create mode 100644 battle-e/trainers/yu.asm create mode 100644 battle-e/trainers/yuka.asm create mode 100644 battle-e/trainers/yukio.asm diff --git a/battle-e/08-B001.asm b/battle-e/08-B001.asm new file mode 100644 index 0000000..57363a7 --- /dev/null +++ b/battle-e/08-B001.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "pkmn_breeder_f" +TRAINER EQUS "mami" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B002.asm b/battle-e/08-B002.asm new file mode 100644 index 0000000..3f0f3dc --- /dev/null +++ b/battle-e/08-B002.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "ruin_maniac" +TRAINER EQUS "toshitsugu" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B003.asm b/battle-e/08-B003.asm new file mode 100644 index 0000000..1b31adf --- /dev/null +++ b/battle-e/08-B003.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "expert_f" +TRAINER EQUS "koto" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B004.asm b/battle-e/08-B004.asm new file mode 100644 index 0000000..7d65e22 --- /dev/null +++ b/battle-e/08-B004.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "black_belt" +TRAINER EQUS "masaru" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B005.asm b/battle-e/08-B005.asm new file mode 100644 index 0000000..36a97bd --- /dev/null +++ b/battle-e/08-B005.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "tuber_f" +TRAINER EQUS "harue" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B006.asm b/battle-e/08-B006.asm new file mode 100644 index 0000000..cf1eebf --- /dev/null +++ b/battle-e/08-B006.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "ninja_boy" +TRAINER EQUS "yu" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B007.asm b/battle-e/08-B007.asm new file mode 100644 index 0000000..22ac366 --- /dev/null +++ b/battle-e/08-B007.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "rich_boy" +TRAINER EQUS "matsuo" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B008.asm b/battle-e/08-B008.asm new file mode 100644 index 0000000..7de6968 --- /dev/null +++ b/battle-e/08-B008.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "dragon_tamer" +TRAINER EQUS "kuen" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B009.asm b/battle-e/08-B009.asm new file mode 100644 index 0000000..6cdf0f5 --- /dev/null +++ b/battle-e/08-B009.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "cooltrainer_f" +TRAINER EQUS "shizu" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B010.asm b/battle-e/08-B010.asm new file mode 100644 index 0000000..d20a200 --- /dev/null +++ b/battle-e/08-B010.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "rich_boy" +TRAINER EQUS "junpei" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B011.asm b/battle-e/08-B011.asm new file mode 100644 index 0000000..1ea26c4 --- /dev/null +++ b/battle-e/08-B011.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "kindler" +TRAINER EQUS "jo" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B012.asm b/battle-e/08-B012.asm new file mode 100644 index 0000000..3cba4dc --- /dev/null +++ b/battle-e/08-B012.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "gentleman" +TRAINER EQUS "fiennes" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B013.asm b/battle-e/08-B013.asm new file mode 100644 index 0000000..042b8d5 --- /dev/null +++ b/battle-e/08-B013.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "black_belt" +TRAINER EQUS "danpei" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B014.asm b/battle-e/08-B014.asm new file mode 100644 index 0000000..2e198a7 --- /dev/null +++ b/battle-e/08-B014.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "beauty" +TRAINER EQUS "yuka" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B015.asm b/battle-e/08-B015.asm new file mode 100644 index 0000000..94829bb --- /dev/null +++ b/battle-e/08-B015.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "lass" +TRAINER EQUS "yoko" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B016.asm b/battle-e/08-B016.asm new file mode 100644 index 0000000..81cd958 --- /dev/null +++ b/battle-e/08-B016.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "hex_maniac" +TRAINER EQUS "fukune" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B017.asm b/battle-e/08-B017.asm new file mode 100644 index 0000000..a8fa81a --- /dev/null +++ b/battle-e/08-B017.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "psychic_m" +TRAINER EQUS "kiyoshi" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B018.asm b/battle-e/08-B018.asm new file mode 100644 index 0000000..243edb1 --- /dev/null +++ b/battle-e/08-B018.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "ninja_boy" +TRAINER EQUS "toshinao" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B019.asm b/battle-e/08-B019.asm new file mode 100644 index 0000000..a6593ee --- /dev/null +++ b/battle-e/08-B019.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "bird_keeper" +TRAINER EQUS "otoya" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B020.asm b/battle-e/08-B020.asm new file mode 100644 index 0000000..65772a8 --- /dev/null +++ b/battle-e/08-B020.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "swimmer_f" +TRAINER EQUS "natsuko" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B021.asm b/battle-e/08-B021.asm new file mode 100644 index 0000000..3bdc74a --- /dev/null +++ b/battle-e/08-B021.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "hex_maniac" +TRAINER EQUS "sadayo" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B022.asm b/battle-e/08-B022.asm new file mode 100644 index 0000000..fa9d27c --- /dev/null +++ b/battle-e/08-B022.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "collector" +TRAINER EQUS "junji" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B023.asm b/battle-e/08-B023.asm new file mode 100644 index 0000000..fd679a6 --- /dev/null +++ b/battle-e/08-B023.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "pkmn_breeder_m" +TRAINER EQUS "shinji" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B024.asm b/battle-e/08-B024.asm new file mode 100644 index 0000000..aded067 --- /dev/null +++ b/battle-e/08-B024.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "expert_m" +TRAINER EQUS "fugen" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B025.asm b/battle-e/08-B025.asm new file mode 100644 index 0000000..f327b70 --- /dev/null +++ b/battle-e/08-B025.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "hex_maniac" +TRAINER EQUS "rina" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B026.asm b/battle-e/08-B026.asm new file mode 100644 index 0000000..f8043b2 --- /dev/null +++ b/battle-e/08-B026.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "ninja_boy" +TRAINER EQUS "ruizo" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B027.asm b/battle-e/08-B027.asm new file mode 100644 index 0000000..7bb198d --- /dev/null +++ b/battle-e/08-B027.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "triathlete_m_bike" +TRAINER EQUS "nozomu" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B028.asm b/battle-e/08-B028.asm new file mode 100644 index 0000000..b5d110f --- /dev/null +++ b/battle-e/08-B028.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "guitarist" +TRAINER EQUS "kyohei" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B029.asm b/battle-e/08-B029.asm new file mode 100644 index 0000000..2289156 --- /dev/null +++ b/battle-e/08-B029.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "bug_catcher" +TRAINER EQUS "yukio" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B030.asm b/battle-e/08-B030.asm new file mode 100644 index 0000000..fdd7e68 --- /dev/null +++ b/battle-e/08-B030.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "pokefan_m" +TRAINER EQUS "makia" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B031.asm b/battle-e/08-B031.asm new file mode 100644 index 0000000..93297ab --- /dev/null +++ b/battle-e/08-B031.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "battle_girl" +TRAINER EQUS "noriko" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B032.asm b/battle-e/08-B032.asm new file mode 100644 index 0000000..dbbb174 --- /dev/null +++ b/battle-e/08-B032.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "pkmn_ranger_f" +TRAINER EQUS "hoyoshi" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B033.asm b/battle-e/08-B033.asm new file mode 100644 index 0000000..b3f4c7a --- /dev/null +++ b/battle-e/08-B033.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "school_kid_m" +TRAINER EQUS "tomoyasu" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B034.asm b/battle-e/08-B034.asm new file mode 100644 index 0000000..402a7ed --- /dev/null +++ b/battle-e/08-B034.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "gentleman" +TRAINER EQUS "anthony" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B035.asm b/battle-e/08-B035.asm new file mode 100644 index 0000000..873b146 --- /dev/null +++ b/battle-e/08-B035.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "triathlete_m_swim" +TRAINER EQUS "ryo" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B036.asm b/battle-e/08-B036.asm new file mode 100644 index 0000000..94a9c04 --- /dev/null +++ b/battle-e/08-B036.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "guitarist" +TRAINER EQUS "daikichi" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B037.asm b/battle-e/08-B037.asm new file mode 100644 index 0000000..a6bd47b --- /dev/null +++ b/battle-e/08-B037.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "pkmn_breeder_m" +TRAINER EQUS "shigenobu" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B038.asm b/battle-e/08-B038.asm new file mode 100644 index 0000000..8fe7805 --- /dev/null +++ b/battle-e/08-B038.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "pkmn_ranger_f" +TRAINER EQUS "reina" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B039.asm b/battle-e/08-B039.asm new file mode 100644 index 0000000..d119b77 --- /dev/null +++ b/battle-e/08-B039.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "pkmn_breeder_f" +TRAINER EQUS "momoko" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B040.asm b/battle-e/08-B040.asm new file mode 100644 index 0000000..366290f --- /dev/null +++ b/battle-e/08-B040.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "cooltrainer_m" +TRAINER EQUS "ihara" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B041.asm b/battle-e/08-B041.asm new file mode 100644 index 0000000..0b58de9 --- /dev/null +++ b/battle-e/08-B041.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "psychic_f" +TRAINER EQUS "satoe" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B042.asm b/battle-e/08-B042.asm new file mode 100644 index 0000000..ec71a18 --- /dev/null +++ b/battle-e/08-B042.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "bird_keeper" +TRAINER EQUS "suekichi" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B043.asm b/battle-e/08-B043.asm new file mode 100644 index 0000000..ce5757c --- /dev/null +++ b/battle-e/08-B043.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "aroma_lady" +TRAINER EQUS "miyoko" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B044.asm b/battle-e/08-B044.asm new file mode 100644 index 0000000..81ab37d --- /dev/null +++ b/battle-e/08-B044.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "lady" +TRAINER EQUS "moet" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B045.asm b/battle-e/08-B045.asm new file mode 100644 index 0000000..9ff1074 --- /dev/null +++ b/battle-e/08-B045.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "school_kid_f" +TRAINER EQUS "chisa" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B046.asm b/battle-e/08-B046.asm new file mode 100644 index 0000000..da21088 --- /dev/null +++ b/battle-e/08-B046.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "hex_maniac" +TRAINER EQUS "sueno" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B047.asm b/battle-e/08-B047.asm new file mode 100644 index 0000000..36f824a --- /dev/null +++ b/battle-e/08-B047.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "pokefan_f" +TRAINER EQUS "shigeko" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/08-B048.asm b/battle-e/08-B048.asm new file mode 100644 index 0000000..cc031ed --- /dev/null +++ b/battle-e/08-B048.asm @@ -0,0 +1,4 @@ +INCLUDE "../macros.asm" +CLASS EQUS "cooltrainer_f" +TRAINER EQUS "umami" +INCLUDE "battletrainer-{REGION_NAME}.tx" \ No newline at end of file diff --git a/battle-e/Makefile b/battle-e/Makefile index a53b04e..55ef042 100644 --- a/battle-e/Makefile +++ b/battle-e/Makefile @@ -1,10 +1,16 @@ 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 +SERIES_2_NUMS = B001 B002 B003 B004 B005 B006 B007 B008 B009 B010 B011 B012 B013 B014 B015 B016 B017 B018 B019 B020 B021 B022 B023 B024 B025 B026 B027 B028 B029 B030 B031 B032 B033 B034 B035 B036 B037 B038 B039 B040 B041 B042 B043 B044 B045 B046 B047 B048 +SERIES_2_TRAINERS = anthony chisa daikichi danpei fiennes fugen fukune harue hoyoshi ihara jo junji junpei hiyoshi koto kuen kyohei makio mami masaru matsuo miyoko moet momoko natsuko noriko nozomu otoya reina rina ruizo ryo sadayo satoe shigeko shigenobu shinji shizu suekichi sueno tomoyasu toshinao toshitsugu umami yoko yu yuka yukio + #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) +series_1: $(SERIES_1_TRAINERS:%=trainers/%-EN.mev) $(SERIES_1_BERRIES:%=berries/%-EN.mev) $(SERIES_1_NUMS:%=08-%-EN.raw) +series_2: $(SERIES_2_TRAINERS:%=trainers/%-JP.mev) $(SERIES_2_NUMS:%=08-%-JP.raw) +EN: $(SERIES_1_TRAINERS:%=trainers/%-EN.mev) $(SERIES_1_BERRIES:%=berries/%-EN.mev) $(SERIES_1_NUMS:%=08-%-EN.z80) +JP: $(SERIES_1_TRAINERS:%=trainers/%-JP.mev) $(SERIES_1_NUMS:%=08-%-JP.raw) $(SERIES_2_TRAINERS:%=trainers/%-JP.mev) $(SERIES_2_NUMS:%=08-%-JP.raw) verify: md5sum --check battle-e.md5 diff --git a/battle-e/sprites/trainers/dragon_tamer.4bpp b/battle-e/sprites/trainers/dragon_tamer.4bpp new file mode 100644 index 0000000000000000000000000000000000000000..a0657a15add46ce9afac3266b665d4fa9bc04b6b GIT binary patch literal 2048 zcmdUuYi`6K41}%a1Qr*l+zY^R|GV`Y2zjXK{%ER=YGoF%dCb^ev)inhHUH^#g68`9 zzgD1LthiftXXs$+!e+_bEARx`=GUx#%TMCc3Y-bY{@Mm-@!naX4w(lBPjRh%EkBmo zE}o3XbF6oIP~8e&?)lgPmB7I&_md0WL*EMYj_0`b?Z(ScR~Cj=>1D3ks)rG?=o#E= zGCotSx-t|>Wzzl$)?9%puM4DCb)8^+yA>)>#OQa~NA98TC3*TZ_WDl!EaceZcKsI# zOs%T*3Y@bKhSpsVC>QF31s9*c`*=*9hf)6>D>>ph>Ob|aeK2zn@k&5EUPa#(`+%ch er(C5mBG4MoGe%w`{4=7l;Vdq1$Kxz|-S-6?Dk@(9 literal 0 HcmV?d00001 diff --git a/battle-e/trainers/anthony.asm b/battle-e/trainers/anthony.asm new file mode 100644 index 0000000..4cc23d1 --- /dev/null +++ b/battle-e/trainers/anthony.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db GENTLEMAN + BT_Floor 0 + Text_JP "アンソニー"8 + OT_ID 00000, 00000 + + Intro_JP $0a43, $1e0b, $0408, $1228, $102b, $100b + Win_JP $0a43, $1034, $020e, $1405, $0408, $100b + Loss_JP $0a1a, $1034, $020e, $1405, $0408, $100b + + Pokemon ALAKAZAM + Holds LUM_BERRY + Moves CALM_MIND, PSYCHIC, REFLECT, THUNDERPUNCH + Level 50 + PP_Ups 0,0,0,0 + EVs 6,0,0,252,252,0 + OT_ID 00000, 00000 + IVs 15,15,15,31,31,15, 0 + PV $0000000F + Text_JP "フーディン"11 + Friendship 255 + + Pokemon HARIYAMA + Holds FOCUS_BAND + Moves REVENGE, EARTHQUAKE, FAKE_OUT, REVERSAL + Level 53 + PP_Ups 0,0,0,0 + EVs 252,252,0,0,0,6 + OT_ID 00000, 00000 + IVs 31,31,15,15,15,15, 0 + PV $00000080 + Text_JP "ハリテヤマ"11 + Friendship 255 + + Pokemon SHEDINJA + Holds SPELL_TAG + Moves CONFUSE_RAY, SHADOW_BALL, TOXIC, PROTECT + Level 56 + PP_Ups 0,0,0,0 + EVs 0,252,6,252,0,0 + OT_ID 00000, 00000 + IVs 15,31,15,31,15,15, 0 + PV $0000001C + Text_JP "ヌケニン"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/chisa.asm b/battle-e/trainers/chisa.asm new file mode 100644 index 0000000..3bba7e8 --- /dev/null +++ b/battle-e/trainers/chisa.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db SCHOOL_KID_F + BT_Floor 0 + Text_JP "チサ"8 + OT_ID 00000, 00000 + + Intro_JP $1428, $020e, $162c, $1616, $1602, $1033 + Win_JP $1428, $0418, $0e16, $100b, $142f, $103f + Loss_JP $0418, $0e16, $102b, $0a48, $1428, $020e + + Pokemon AZURILL + Holds SEA_INCENSE + Moves SING, SURF, RETURN, IRON_TAIL + Level 94 + PP_Ups 0,0,0,0 + EVs 255,0,0,255,0,0 + OT_ID 00000, 00000 + IVs 15,15,31,15,15,31, 0 + PV $00000019 + Text_JP "ルリリ"11 + Friendship 255 + + Pokemon WYNAUT + Holds LAX_INCENSE + Moves COUNTER, MIRROR_COAT, SAFEGUARD, SPLASH + Level 94 + PP_Ups 0,0,0,0 + EVs 255,0,0,255,0,0 + OT_ID 00000, 00000 + IVs 15,15,31,15,15,31, 0 + PV $000000E0 + Text_JP "ソーナノ"11 + Friendship 255 + + Pokemon PICHU + Holds CHERI_BERRY + Moves THUNDER_WAVE, SWEET_KISS, THUNDERBOLT, REVERSAL + Level 95 + PP_Ups 0,0,0,0 + EVs 0,0,0,255,255,0 + OT_ID 00000, 00000 + IVs 15,15,15,31,31,15, 0 + PV $000000E7 + Text_JP "ピチュー"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/daikichi.asm b/battle-e/trainers/daikichi.asm new file mode 100644 index 0000000..8b4cdc7 --- /dev/null +++ b/battle-e/trainers/daikichi.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db GUITARIST + BT_Floor 0 + Text_JP "ダイキチ"8 + OT_ID 00000, 00000 + + Intro_JP $0a14, $1034, $020e, $2017, $242c, $100e + Win_JP $0801, $0c00, $ffff, $2017, $0607, $100e + Loss_JP $0811, $0c00, $ffff, $1400, $0628, $1014 + + Pokemon SEVIPER + Holds BLACKGLASSES + Moves CRUNCH, HAZE, DOUBLE_TEAM, GLARE + Level 70 + PP_Ups 0,0,0,0 + EVs 252,0,6,0,252,0 + OT_ID 00000, 00000 + IVs 31,15,15,15,31,15, 0 + PV $0000008C + Text_JP "ハブネーク"11 + Friendship 255 + + Pokemon SHARPEDO + Holds BLACKGLASSES + Moves CRUNCH, SLASH, SURF, SWAGGER + Level 71 + PP_Ups 0,0,0,0 + EVs 252,0,0,6,252,0 + OT_ID 00000, 00000 + IVs 31,15,15,15,31,15, 0 + PV $0000000F + Text_JP "サメハダー"11 + Friendship 255 + + Pokemon GIRAFARIG + Holds BLACKGLASSES + Moves CRUNCH, DOUBLE_TEAM, REST, CALM_MIND + Level 72 + PP_Ups 0,0,0,0 + EVs 252,0,0,252,6,0 + OT_ID 00000, 00000 + IVs 31,15,15,31,15,15, 0 + PV $0000000F + Text_JP "キリンリキ"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/danpei.asm b/battle-e/trainers/danpei.asm new file mode 100644 index 0000000..ca0d6d9 --- /dev/null +++ b/battle-e/trainers/danpei.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db TC_BLACK_BELT + BT_Floor 0 + Text_JP "ダンペイ"8 + OT_ID 00000, 00000 + + Intro_JP $0636, $1034, $0407, $020b, $1019, $0c01 + Win_JP $2002, $1019, $0c00, $180f, $0e11, $1019 + Loss_JP $0407, $1034, $180f, $0e36, $1210, $1019 + + Pokemon LAIRON + Holds CHESTO_BERRY + Moves DOUBLE_EDGE, ROAR, REST, IRON_DEFENSE + Level 68 + PP_Ups 0,0,0,0 + EVs 252,252,0,0,0,6 + OT_ID 00000, 00000 + IVs 31,31,15,15,15,15, 1 + PV $0000001C + Text_JP "コドラ"11 + Friendship 255 + + Pokemon GRAVELER + Holds LAX_INCENSE + Moves DOUBLE_EDGE, HIDDEN_POWER, DOUBLE_TEAM, ATTRACT + Level 70 + PP_Ups 0,0,0,0 + EVs 252,252,0,0,0,6 + OT_ID 00000, 00000 + IVs 30,31,14,15,15,14, 0 + PV $000000E4 + Text_JP "ゴローン"11 + Friendship 255 + + Pokemon SHELGON + Holds SHELL_BELL + Moves DOUBLE_EDGE, SCARY_FACE, BRICK_BREAK, DRAGON_DANCE + Level 72 + PP_Ups 0,0,0,0 + EVs 252,252,0,0,0,6 + OT_ID 00000, 00000 + IVs 31,31,15,15,15,15, 0 + PV $0000001C + Text_JP "コモルー"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/fiennes.asm b/battle-e/trainers/fiennes.asm new file mode 100644 index 0000000..d4c48e9 --- /dev/null +++ b/battle-e/trainers/fiennes.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db GENTLEMAN + BT_Floor 0 + Text_JP "ファインズ"8 + OT_ID 00000, 00000 + + Intro_JP $0a49, $123a, $020e, $1646, $140f, $103e + Win_JP $1234, $1e11, $1005, $0c28, $0c00, $ffff + Loss_JP $0465, $1642, $1238, $1c27, $1613, $0c06 + + Pokemon GIRAFARIG + Holds SITRUS_BERRY + Moves PSYCHIC, DOUBLE_TEAM, CRUNCH, TOXIC + Level 70 + PP_Ups 0,0,0,0 + EVs 6,0,0,252,252,0 + OT_ID 00000, 00000 + IVs 15,15,15,31,31,15, 1 + PV $00000087 + Text_JP "キリンリキ"11 + Friendship 255 + + Pokemon WOBBUFFET + Holds FOCUS_BAND + Moves COUNTER, MIRROR_COAT, SAFEGUARD, DESTINY_BOND + Level 72 + PP_Ups 0,0,0,0 + EVs 252,0,252,0,0,6 + OT_ID 00000, 00000 + IVs 31,15,15,15,15,31, 0 + PV $00000084 + Text_JP "ソーナンス"11 + Friendship 255 + + Pokemon TYPHLOSION + Holds LUM_BERRY + Moves DOUBLE_TEAM, OVERHEAT, EARTHQUAKE, ATTRACT + Level 74 + PP_Ups 0,48,0,0 + EVs 6,252,0,252,0,0 + OT_ID 00000, 00000 + IVs 31,15,15,31,15,15, 0 + PV $0000000F + Text_JP "バクフーン"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/fugen.asm b/battle-e/trainers/fugen.asm new file mode 100644 index 0000000..e4f6ed2 --- /dev/null +++ b/battle-e/trainers/fugen.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 100 + db EXPERT_M + BT_Floor 5 + Text_JP "フゲン"8 + OT_ID 00000, 00000 + + Intro_JP $1620, $140f, $1005, $0a28, $061d, $0c05 + Win_JP $24b3, $1034, $0612, $1e1b, $100b, $0c01 + Loss_JP $141a, $100b, $0c00, $0e2d, $24b3, $0c01 + + Pokemon RAICHU + Holds LEFTOVERS + Moves REVERSAL, THUNDERBOLT, THUNDER_WAVE, SLAM + Level 100 + PP_Ups 0,0,0,0 + EVs 6,0,0,252,252,0 + OT_ID 00000, 00000 + IVs 20,20,20,31,31,20, 0 + PV $0000001D + Text_JP "ライチュウ"11 + Friendship 255 + + Pokemon MEDICHAM + Holds LUM_BERRY + Moves REVERSAL, HI_JUMP_KICK, ICE_PUNCH, PSYCHIC + Level 100 + PP_Ups 0,0,0,0 + EVs 252,0,0,252,0,6 + OT_ID 00000, 00000 + IVs 31,20,20,31,20,20, 0 + PV $00000080 + Text_JP "チャーレム"11 + Friendship 255 + + Pokemon BLAZIKEN + Holds SALAC_BERRY + Moves REVERSAL, BLAZE_KICK, SKY_UPPERCUT, ENDURE + Level 100 + PP_Ups 0,0,0,0 + EVs 6,252,0,252,0,0 + OT_ID 00000, 00000 + IVs 20,31,20,31,20,20, 0 + PV $000000E2 + Text_JP "バシャーモ"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/fukune.asm b/battle-e/trainers/fukune.asm new file mode 100644 index 0000000..e112160 --- /dev/null +++ b/battle-e/trainers/fukune.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 100 + db HEX_MANIAC + BT_Floor 12 + Text_JP "フクネ"8 + OT_ID 00000, 00000 + + Intro_JP $1e0f, $1219, $0c04, $201a, $102d, $0c05 + Win_JP $0e2d, $26ae, $1034, $143a, $102d, $0c05 + Loss_JP $0a48, $020e, $0e1d, $26ae, $0c06, $0c03 + + Pokemon DUSCLOPS + Holds LEFTOVERS + Moves CONFUSE_RAY, NIGHT_SHADE, PROTECT, CURSE + Level 100 + PP_Ups 0,0,0,0 + EVs 252,0,252,0,0,6 + OT_ID 00000, 00000 + IVs 31,20,20,20,20,31, 0 + PV $00000093 + Text_JP "サマヨール"11 + Friendship 255 + + Pokemon TORKOAL + Holds CHESTO_BERRY + Moves BODY_SLAM, REST, AMNESIA, CURSE + Level 100 + PP_Ups 0,0,0,3 + EVs 252,0,6,0,0,252 + OT_ID 00000, 00000 + IVs 31,20,20,20,20,31, 0 + PV $00000016 + Text_JP "コータス"11 + Friendship 255 + + Pokemon SWAMPERT + Holds SHELL_BELL + Moves EARTHQUAKE, BRICK_BREAK, REST, CURSE + Level 100 + PP_Ups 0,0,0,0 + EVs 252,0,6,0,0,252 + OT_ID 00000, 00000 + IVs 31,20,20,20,20,31, 0 + PV $00000080 + Text_JP "ラグラージ"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/harue.asm b/battle-e/trainers/harue.asm new file mode 100644 index 0000000..7c2bfa9 --- /dev/null +++ b/battle-e/trainers/harue.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db TUBER_F + BT_Floor 0 + Text_JP "ハルエ"8 + OT_ID 00000, 00000 + + Intro_JP $0a02, $0175, $1222, $0c03, $1642, $1602 + Win_JP $2639, $042c, $0c06, $0628, $042c, $0c06 + Loss_JP $0c0a, $0c00, $0a01, $1034, $0175, $0c04 + + Pokemon CLAMPERL + Holds DEEPSEASCALE + Moves RAIN_DANCE, CONFUSE_RAY, TOXIC, PROTECT + Level 71 + PP_Ups 0,0,0,0 + EVs 0,0,255,0,0,255 + OT_ID 00000, 00000 + IVs 15,15,31,15,15,31, 0 + PV $000000DC + Text_JP "パールル"11 + Friendship 255 + + Pokemon HUNTAIL + Holds BRIGHTPOWDER + Moves RAIN_DANCE, HYDRO_PUMP, CRUNCH, ROCK_TOMB + Level 73 + PP_Ups 0,0,0,0 + EVs 0,0,0,0,255,255 + OT_ID 00000, 00000 + IVs 15,15,15,15,31,31, 0 + PV $00000010 + Text_JP "ハンテール"11 + Friendship 255 + + Pokemon GOREBYSS + Holds SHELL_BELL + Moves RAIN_DANCE, SURF, PSYCHIC, SHADOW_BALL + Level 74 + PP_Ups 0,0,0,0 + EVs 0,0,0,0,255,255 + OT_ID 00000, 00000 + IVs 15,15,15,15,31,31, 0 + PV $00000010 + Text_JP "サクラビス"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/hoyoshi.asm b/battle-e/trainers/hoyoshi.asm new file mode 100644 index 0000000..828959e --- /dev/null +++ b/battle-e/trainers/hoyoshi.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 100 + db PKMN_RANGER_F + BT_Floor 19 + Text_JP "ホヨシ"8 + OT_ID 00000, 00000 + + Intro_JP $0a48, $061d, $0e1d, $0e1a, $142a, $1042 + Win_JP $1e1b, $0c03, $ffff, $142a, $1010, $1021 + Loss_JP $0a02, $1615, $0620, $0e36, $142a, $102a + + Pokemon CRADILY + Holds LUM_BERRY + Moves INGRAIN, GIGA_DRAIN, CONFUSE_RAY, REST + Level 100 + PP_Ups 0,0,0,0 + EVs 6,0,252,0,0,252 + OT_ID 00000, 00000 + IVs 20,20,31,20,20,31, 0 + PV $0000001E + Text_JP "ユレイドル"11 + Friendship 255 + + Pokemon LUDICOLO + Holds LEFTOVERS + Moves LEECH_SEED, TOXIC, DOUBLE_TEAM, RAIN_DANCE + Level 100 + PP_Ups 0,0,0,0 + EVs 6,0,252,0,0,252 + OT_ID 00000, 00000 + IVs 31,20,31,20,20,20, 1 + PV $000000E6 + Text_JP "ルンパッパ"11 + Friendship 255 + + Pokemon MILOTIC + Holds BRIGHTPOWDER + Moves RECOVER, SURF, CONFUSE_RAY, MIRROR_COAT + Level 100 + PP_Ups 0,0,0,0 + EVs 0,0,252,6,252,0 + OT_ID 00000, 00000 + IVs 20,20,31,31,20,20, 0 + PV $0000001E + Text_JP "ミロカロス"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/ihara.asm b/battle-e/trainers/ihara.asm new file mode 100644 index 0000000..ce1f244 --- /dev/null +++ b/battle-e/trainers/ihara.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 100 + db COOLTRAINER_M + BT_Floor 12 + Text_JP "イハラ"8 + OT_ID 00000, 00000 + + Intro_JP $0a1b, $0606, $0e0c, $142f, $1023, $0e08 + Win_JP $24cf, $0605, $1034, $1404, $061d, $1020 + Loss_JP $24cf, $0e16, $100b, $060a, $1023, $1032 + + Pokemon SHIFTRY + Holds BRIGHTPOWDER + Moves SWAGGER, EXTRASENSORY, FAINT_ATTACK, GROWTH + Level 100 + PP_Ups 0,0,0,0 + EVs 6,0,0,252,252,0 + OT_ID 00000, 00000 + IVs 20,20,20,31,31,20, 1 + PV $0000000F + Text_JP "ダーテング"11 + Friendship 255 + + Pokemon WAILORD + Holds CHESTO_BERRY + Moves SWAGGER, WATER_SPOUT, REST, ICE_BEAM + Level 100 + PP_Ups 0,0,0,0 + EVs 252,0,0,0,252,6 + OT_ID 00000, 00000 + IVs 31,20,20,20,31,20, 0 + PV $0000000F + Text_JP "ホエルオー"11 + Friendship 255 + + Pokemon SLAKING + Holds LUM_BERRY + Moves SWAGGER, HYPER_BEAM, SHADOW_BALL, EARTHQUAKE + Level 100 + PP_Ups 0,0,0,0 + EVs 252,252,0,6,0,0 + OT_ID 00000, 00000 + IVs 31,31,20,20,20,20, 0 + PV $00000080 + Text_JP "ケッキング"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/jo.asm b/battle-e/trainers/jo.asm new file mode 100644 index 0000000..f86b9ec --- /dev/null +++ b/battle-e/trainers/jo.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db KINDLER + BT_Floor 0 + Text_JP "ジョウ"8 + OT_ID 00000, 00000 + + Intro_JP $141f, $26f1, $0c00, $201f, $26f1, $0c00 + Win_JP $0e09, $26f1, $0c01, $0609, $26f1, $0c01 + Loss_JP $1402, $26f1, $100b, $1430, $1239, $0c06 + + Pokemon SOLROCK + Holds WHITE_HERB + Moves SUNNY_DAY, SOLARBEAM, FLAMETHROWER, EXPLOSION + Level 58 + PP_Ups 0,0,0,0 + EVs 252,0,6,0,0,252 + OT_ID 00000, 00000 + IVs 31,15,15,15,15,31, 0 + PV $0000000F + Text_JP "ソルロック"11 + Friendship 255 + + Pokemon SHIFTRY + Holds + Moves SUNNY_DAY, SOLARBEAM, GIGA_DRAIN, THIEF + Level 60 + PP_Ups 0,0,0,0 + EVs 252,0,0,0,252,6 + OT_ID 00000, 00000 + IVs 31,15,15,15,31,15, 0 + PV $0000000F + Text_JP "ダーテング"11 + Friendship 255 + + Pokemon CAMERUPT + Holds CHARCOAL + Moves SUNNY_DAY, FLAMETHROWER, EARTHQUAKE, AMNESIA + Level 62 + PP_Ups 0,0,0,0 + EVs 252,0,252,0,0,6 + OT_ID 00000, 00000 + IVs 31,15,31,15,15,15, 0 + PV $0000008C + Text_JP "バクーダ"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/junji.asm b/battle-e/trainers/junji.asm new file mode 100644 index 0000000..604dda9 --- /dev/null +++ b/battle-e/trainers/junji.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db COLLECTOR + BT_Floor 0 + Text_JP "ジュンジ"8 + OT_ID 00000, 00000 + + Intro_JP $0467, $1034, $1429, $020e, $1606, $1028 + Win_JP $0467, $1429, $0134, $1232, $102d, $0c00 + Loss_JP $0467, $1429, $020e, $0e36, $1606, $103f + + Pokemon SPINDA + Holds MACHO_BRACE + Moves TEETER_DANCE, THRASH, TRICK, ATTRACT + Level 88 + PP_Ups 0,0,0,0 + EVs 252,252,6,0,0,0 + OT_ID 00000, 00000 + IVs 31,31,15,15,15,15, 0 + PV $EEE32A53 + Text_JP "パッチール"11 + Friendship 255 + + Pokemon SPINDA + Holds PERSIM_BERRY + Moves TEETER_DANCE, DIZZY_PUNCH, HYPNOSIS, FAINT_ATTACK + Level 88 + PP_Ups 0,0,0,0 + EVs 252,6,252,0,0,0 + OT_ID 00000, 00000 + IVs 15,15,15,15,15,15, 0 + PV $E3FDF3FD + Text_JP "パッチール"11 + Friendship 255 + + Pokemon SPINDA + Holds CHERI_BERRY + Moves TEETER_DANCE, PSYBEAM, DOUBLE_EDGE, ROCK_SLIDE + Level 88 + PP_Ups 0,0,0,0 + EVs 252,252,6,0,0,0 + OT_ID 00000, 00000 + IVs 31,15,15,15,15,15, 0 + PV $88888888 + Text_JP "パッチール"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/junpei.asm b/battle-e/trainers/junpei.asm new file mode 100644 index 0000000..281f733 --- /dev/null +++ b/battle-e/trainers/junpei.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db RICH_BOY + BT_Floor 0 + Text_JP "ジュンペイ"8 + OT_ID 00000, 00000 + + Intro_JP $1e0b, $0408, $ffff, $061b, $1405, $1021 + Win_JP $0a1e, $0408, $1034, $061b, $142f, $100e + Loss_JP $1c12, $1429, $0408, $1606, $100d, $1005 + + Pokemon ALTARIA + Holds CHERI_BERRY + Moves DRAGON_CLAW, AERIAL_ACE, PROTECT, PERISH_SONG + Level 50 + PP_Ups 0,0,0,0 + EVs 252,0,6,0,0,252 + OT_ID 00000, 00000 + IVs 31,15,15,15,15,31, 0 + PV $00000089 + Text_JP "チルタリス"11 + Friendship 255 + + Pokemon METAGROSS + Holds QUICK_CLAW + Moves METEOR_MASH, BRICK_BREAK, EARTHQUAKE, PSYCHIC + Level 52 + PP_Ups 0,0,0,0 + EVs 252,6,252,0,0,0 + OT_ID 00000, 00000 + IVs 31,15,31,15,15,15, 0 + PV $0000001B + Text_JP "メタグロス"11 + Friendship 255 + + Pokemon KINGDRA + Holds BLACKGLASSES + Moves DRAGONBREATH, SURF, ICE_BEAM, HIDDEN_POWER + Level 54 + PP_Ups 0,0,0,0 + EVs 252,0,0,0,252,6 + OT_ID 00000, 00000 + IVs 15,15,15,15,31,31, 0 + PV $0000000F + Text_JP "キングドラ"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/kiyoshi.asm b/battle-e/trainers/kiyoshi.asm new file mode 100644 index 0000000..b93ef02 --- /dev/null +++ b/battle-e/trainers/kiyoshi.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 50 + db PSYCHIC_M + BT_Floor 12 + Text_JP "キヨシ"8 + OT_ID 00000, 00000 + + Intro_JP $143a, $061e, $ffff, $2023, $2017, $0c01 + Win_JP $1618, $100e, $ffff, $0a3a, $2546, $0c00 + Loss_JP $1427, $1014, $0c04, $0a3a, $2546, $0c06 + + Pokemon GRUMPIG + Holds LUM_BERRY + Moves EXTRASENSORY, LIGHT_SCREEN, SHADOW_BALL, CONFUSE_RAY + Level 50 + PP_Ups 0,0,0,0 + EVs 252,0,0,252,6,0 + OT_ID 00000, 00000 + IVs 31,15,15,31,15,15, 1 + PV $00000013 + Text_JP "ブーピッグ"11 + Friendship 255 + + Pokemon SHIFTRY + Holds LEFTOVERS + Moves EXTRASENSORY, BRICK_BREAK, GIGA_DRAIN, FAINT_ATTACK + Level 50 + PP_Ups 0,0,0,0 + EVs 6,0,0,252,252,0 + OT_ID 00000, 00000 + IVs 15,15,15,31,31,15, 1 + PV $00000011 + Text_JP "ダーテング"11 + Friendship 255 + + Pokemon EXPLOUD + Holds CHESTO_BERRY + Moves EXTRASENSORY, HYPER_VOICE, REST, SLEEP_TALK + Level 50 + PP_Ups 0,0,0,0 + EVs 252,0,6,0,252,0 + OT_ID 00000, 00000 + IVs 31,15,15,15,31,15, 0 + PV $0000008C + Text_JP "バクオング"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/koto.asm b/battle-e/trainers/koto.asm new file mode 100644 index 0000000..7c71bc9 --- /dev/null +++ b/battle-e/trainers/koto.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db EXPERT_F + BT_Floor 0 + Text_JP "コト"8 + OT_ID 00000, 00000 + + Intro_JP $180f, $1034, $1a1c, $141c, $100f, $ffff + Win_JP $201e, $1433, $1034, $0c01, $ffff, $ffff + Loss_JP $0c0f, $0c04, $0e36, $180f, $100b, $0c04 + + Pokemon PINSIR + Holds FOCUS_BAND + Moves GUILLOTINE, REVENGE, FLAIL, ATTRACT + Level 52 + PP_Ups 0,0,0,3 + EVs 255,0,0,255,0,0 + OT_ID 00000, 00000 + IVs 31,15,15,31,15,15, 0 + PV $000000DF + Text_JP "カイロス"11 + Friendship 255 + + Pokemon SEAKING + Holds QUICK_CLAW + Moves HORN_DRILL, SURF, ICE_BEAM, FLAIL + Level 56 + PP_Ups 0,0,0,3 + EVs 0,0,0,255,255,0 + OT_ID 00000, 00000 + IVs 31,15,15,31,15,15, 1 + PV $000000DC + Text_JP "アズマオウ"11 + Friendship 255 + + Pokemon DUGTRIO + Holds BRIGHTPOWDER + Moves FISSURE, EARTHQUAKE, DOUBLE_TEAM, ROCK_SLIDE + Level 60 + PP_Ups 0,0,0,3 + EVs 0,255,0,255,0,0 + OT_ID 00000, 00000 + IVs 15,15,31,15,15,31, 1 + PV $000000DF + Text_JP "ダグトリオ"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/kuen.asm b/battle-e/trainers/kuen.asm new file mode 100644 index 0000000..5438721 --- /dev/null +++ b/battle-e/trainers/kuen.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 100 + db DRAGON_TAMER + BT_Floor 19 + Text_JP "クエン"8 + OT_ID 00000, 00000 + + Intro_JP $1624, $1034, $063e, $1643, $1007, $0c00 + Win_JP $142b, $1034, $2751, $0e2a, $1011, $0c00 + Loss_JP $1209, $0c04, $ffff, $0a48, $2751, $0c06 + + Pokemon SALAMENCE + Holds DRAGON_FANG + Moves DRAGON_CLAW, CRUNCH, STEEL_WING, DOUBLE_EDGE + Level 100 + PP_Ups 0,0,0,0 + EVs 0,252,0,6,252,0 + OT_ID 00000, 00000 + IVs 20,20,20,31,31,20, 0 + PV $00000019 + Text_JP "ボーマンダ"11 + Friendship 255 + + Pokemon AGGRON + Holds QUICK_CLAW + Moves DRAGON_CLAW, BRICK_BREAK, EARTHQUAKE, IRON_TAIL + Level 100 + PP_Ups 0,0,0,0 + EVs 6,252,0,0,252,0 + OT_ID 00000, 00000 + IVs 31,20,20,20,31,20, 0 + PV $000000E2 + Text_JP "ボスゴドラ"11 + Friendship 255 + + Pokemon SCEPTILE + Holds LUM_BERRY + Moves DRAGON_CLAW, AERIAL_ACE, LEAF_BLADE, EARTHQUAKE + Level 100 + PP_Ups 0,0,0,0 + EVs 0,252,0,6,252,0 + OT_ID 00000, 00000 + IVs 20,31,20,31,20,20, 0 + PV $0000000F + Text_JP "ジュカイン"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/kyohei.asm b/battle-e/trainers/kyohei.asm new file mode 100644 index 0000000..ed135c7 --- /dev/null +++ b/battle-e/trainers/kyohei.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db GUITARIST + BT_Floor 0 + Text_JP "キョウヘイ"8 + OT_ID 00000, 00000 + + Intro_JP $2010, $0612, $1621, $1236, $100e, $ffff + Win_JP $0612, $1628, $0e2b, $0a1e, $122f, $0c01 + Loss_JP $0a1d, $0612, $0e28, $060c, $100e, $ffff + + Pokemon RAICHU + Holds MAGNET + Moves THUNDER, RAIN_DANCE, FACADE, REVERSAL + Level 54 + PP_Ups 0,0,0,0 + EVs 0,0,0,255,255,0 + OT_ID 00000, 00000 + IVs 15,15,15,31,31,15, 0 + PV $000000D7 + Text_JP "ライチュウ"11 + Friendship 255 + + Pokemon SHARPEDO + Holds SHELL_BELL + Moves SURF, CRUNCH, EARTHQUAKE, ROCK_TOMB + Level 56 + PP_Ups 0,0,0,0 + EVs 0,0,0,255,255,0 + OT_ID 00000, 00000 + IVs 15,31,15,15,31,15, 0 + PV $000000E1 + Text_JP "サメハダー"11 + Friendship 255 + + Pokemon ROSELIA + Holds POISON_BARB + Moves SLUDGE_BOMB, GIGA_DRAIN, GRASSWHISTLE, SYNTHESIS + Level 58 + PP_Ups 0,0,0,0 + EVs 0,255,0,0,255,0 + OT_ID 00000, 00000 + IVs 15,31,15,31,15,15, 1 + PV $00000019 + Text_JP "ロゼリア"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/makio.asm b/battle-e/trainers/makio.asm new file mode 100644 index 0000000..423c624 --- /dev/null +++ b/battle-e/trainers/makio.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db POKEFAN_M + BT_Floor 0 + Text_JP "マキオ"8 + OT_ID 00000, 00000 + + Intro_JP $1e10, $020e, $100b, $1219, $1021, $ffff + Win_JP $24b8, $1228, $0c01, $281e, $2818, $0c01 + Loss_JP $1219, $0e16, $100b, $1427, $1239, $1015 + + Pokemon GLALIE + Holds LEPPA_BERRY + Moves ICE_BEAM, EARTHQUAKE, CRUNCH, SHEER_COLD + Level 62 + PP_Ups 0,0,0,0 + EVs 0,0,0,255,255,0 + OT_ID 00000, 00000 + IVs 15,15,15,31,31,15, 0 + PV $000000D7 + Text_JP "オニゴーリ"11 + Friendship 255 + + Pokemon LOUDRED + Holds LIECHI_BERRY + Moves HYPER_VOICE, OVERHEAT, EXTRASENSORY, SHADOW_BALL + Level 57 + PP_Ups 0,0,0,0 + EVs 0,255,0,0,255,0 + OT_ID 00000, 00000 + IVs 15,31,15,15,31,15, 0 + PV $000000E1 + Text_JP "ドゴーム"11 + Friendship 255 + + Pokemon SHIFTRY + Holds CHESTO_BERRY + Moves GIGA_DRAIN, REST, EXTRASENSORY, EXPLOSION + Level 59 + PP_Ups 0,0,0,0 + EVs 0,0,0,255,255,0 + OT_ID 00000, 00000 + IVs 31,15,15,15,31,15, 1 + PV $000000D7 + Text_JP "ダーテング"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/mami.asm b/battle-e/trainers/mami.asm new file mode 100644 index 0000000..93f5dbd --- /dev/null +++ b/battle-e/trainers/mami.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 50 + db PKMN_BREEDER_F + BT_Floor 5 + Text_JP "マミ"8 + OT_ID 00000, 00000 + + Intro_JP $040c, $0e16, $100b, $142f, $1044, $ffff + Win_JP $0c32, $1032, $0c03, $0a3d, $0620, $1021 + Loss_JP $040b, $0c06, $0e1f, $062e, $1004, $0c06 + + Pokemon GARDEVOIR + Holds SITRUS_BERRY + Moves PSYCHIC, THUNDERBOLT, WILL_O_WISP, CALM_MIND + Level 50 + PP_Ups 0,0,0,0 + EVs 6,0,0,252,252,0 + OT_ID 00000, 00000 + IVs 15,15,15,31,31,15, 0 + PV $0000000F + Text_JP "サーナイト"11 + Friendship 255 + + Pokemon NINETALES + Holds LUM_BERRY + Moves FLAMETHROWER, CONFUSE_RAY, SAFEGUARD, GRUDGE + Level 50 + PP_Ups 0,0,0,0 + EVs 6,0,0,252,252,0 + OT_ID 00000, 00000 + IVs 31,15,15,15,31,15, 0 + PV $0000000F + Text_JP "キュウコン"11 + Friendship 255 + + Pokemon MILOTIC + Holds LEFTOVERS + Moves TOXIC, DIVE, PROTECT, RECOVER + Level 50 + PP_Ups 0,0,0,0 + EVs 252,0,252,0,0,6 + OT_ID 00000, 00000 + IVs 31,15,31,15,15,15, 0 + PV $0000000F + Text_JP "ミロカロス"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/masaru.asm b/battle-e/trainers/masaru.asm new file mode 100644 index 0000000..327e035 --- /dev/null +++ b/battle-e/trainers/masaru.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db TC_BLACK_BELT + BT_Floor 0 + Text_JP "マサル"8 + OT_ID 00000, 00000 + + Intro_JP $0c11, $0c01, $ffff, $061e, $2808, $0c01 + Win_JP $0c10, $ffff, $ffff, $0421, $250c, $0c01 + Loss_JP $0e2c, $1002, $0c03, $061e, $062e, $0c03 + + Pokemon MEDICHAM + Holds BLACK_BELT + Moves DETECT, RECOVER, HI_JUMP_KICK, PSYCHIC + Level 52 + PP_Ups 0,0,0,0 + EVs 0,255,0,0,255,0 + OT_ID 00000, 00000 + IVs 15,31,15,15,31,15, 0 + PV $0000001F + Text_JP "チャーレム"11 + Friendship 255 + + Pokemon MACHAMP + Holds SCOPE_LENS + Moves BULK_UP, CROSS_CHOP, EARTHQUAKE, ROCK_SLIDE + Level 51 + PP_Ups 0,0,0,0 + EVs 0,255,0,255,0,0 + OT_ID 00000, 00000 + IVs 15,31,15,31,15,15, 0 + PV $000000E4 + Text_JP "カイリキー"11 + Friendship 255 + + Pokemon HERACROSS + Holds SALAC_BERRY + Moves MEGAHORN, ENDURE, REVERSAL, EARTHQUAKE + Level 53 + PP_Ups 0,0,0,0 + EVs 0,255,0,255,0,0 + OT_ID 00000, 00000 + IVs 15,31,15,31,15,15, 0 + PV $000000E4 + Text_JP "ヘラクロス"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/matsuo.asm b/battle-e/trainers/matsuo.asm new file mode 100644 index 0000000..3b11680 --- /dev/null +++ b/battle-e/trainers/matsuo.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db RICH_BOY + BT_Floor 0 + Text_JP "マツオ"8 + OT_ID 00000, 00000 + + Intro_JP $0e31, $0418, $020e, $0e0b, $0602, $0c00 + Win_JP $0e31, $1427, $100c, $0a1d, $020e, $0c00 + Loss_JP $1c12, $0e0b, $0e31, $0620, $020e, $1645 + + Pokemon SPHEAL + Holds CHERI_BERRY + Moves AURORA_BEAM, EARTHQUAKE, REST, SNORE + Level 92 + PP_Ups 0,0,0,0 + EVs 0,255,0,0,255,0 + OT_ID 00000, 00000 + IVs 15,31,15,15,31,15, 0 + PV $00000011 + Text_JP "タマザラシ"11 + Friendship 255 + + Pokemon JIGGLYPUFF + Holds PERSIM_BERRY + Moves SING, DOUBLE_EDGE, PSYCHIC, THUNDERBOLT + Level 91 + PP_Ups 0,0,0,0 + EVs 0,255,0,0,255,0 + OT_ID 00000, 00000 + IVs 15,31,15,15,31,15, 0 + PV $0000001B + Text_JP "プリン"11 + Friendship 255 + + Pokemon MARILL + Holds PECHA_BERRY + Moves SURF, ICE_BEAM, DIG, DOUBLE_EDGE + Level 94 + PP_Ups 0,0,0,0 + EVs 0,255,0,0,255,0 + OT_ID 00000, 00000 + IVs 15,31,15,15,31,15, 1 + PV $0000001F + Text_JP "マリル"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/miyoko.asm b/battle-e/trainers/miyoko.asm new file mode 100644 index 0000000..e48f7a2 --- /dev/null +++ b/battle-e/trainers/miyoko.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db AROMA_LADY + BT_Floor 0 + Text_JP "ミヨコ"8 + OT_ID 00000, 00000 + + Intro_JP $0a02, $041c, $020e, $1222, $1004, $0c03 + Win_JP $041c, $020e, $1443, $061d, $1014, $1021 + Loss_JP $2538, $0e1d, $ffff, $1405, $1021, $ffff + + Pokemon CACTURNE + Holds SHELL_BELL + Moves LEECH_SEED, FAINT_ATTACK, COUNTER, NEEDLE_ARM + Level 55 + PP_Ups 0,0,0,0 + EVs 255,255,0,0,0,0 + OT_ID 00000, 00000 + IVs 15,15,31,15,31,15, 0 + PV $000000DC + Text_JP "ノクタス"11 + Friendship 255 + + Pokemon LUDICOLO + Holds LEFTOVERS + Moves DIVE, LEECH_SEED, TOXIC, ATTRACT + Level 52 + PP_Ups 0,0,0,0 + EVs 255,0,255,0,0,0 + OT_ID 00000, 00000 + IVs 15,15,31,15,15,31, 1 + PV $00000014 + Text_JP "ルンパッパ"11 + Friendship 255 + + Pokemon SCEPTILE + Holds LUM_BERRY + Moves LEECH_SEED, LEAF_BLADE, DRAGON_CLAW, DOUBLE_TEAM + Level 54 + PP_Ups 0,0,0,0 + EVs 0,0,0,255,255,0 + OT_ID 00000, 00000 + IVs 15,15,15,31,31,15, 0 + PV $000000D7 + Text_JP "ジュカイン"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/moet.asm b/battle-e/trainers/moet.asm new file mode 100644 index 0000000..784d0ec --- /dev/null +++ b/battle-e/trainers/moet.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db LADY + BT_Floor 0 + Text_JP "モエ"8 + OT_ID 00000, 00000 + + Intro_JP $244a, $1e11, $0a48, $020e, $1643, $080a + Win_JP $0619, $1034, $1439, $0204, $1026, $ffff + Loss_JP $123a, $020e, $0e1f, $060a, $0e24, $0c04 + + Pokemon RALTS + Holds BRIGHTPOWDER + Moves FUTURE_SIGHT, WILL_O_WISP, LIGHT_SCREEN, TOXIC + Level 69 + PP_Ups 0,0,0,0 + EVs 255,0,255,0,0,0 + OT_ID 00000, 00000 + IVs 15,15,31,15,15,31, 1 + PV $0000001F + Text_JP "ラルトス"11 + Friendship 255 + + Pokemon KIRLIA + Holds TWISTEDSPOON + Moves FUTURE_SIGHT, DESTINY_BOND, REFLECT, SHADOW_BALL + Level 72 + PP_Ups 0,0,0,0 + EVs 0,0,255,255,0,0 + OT_ID 00000, 00000 + IVs 15,15,15,31,15,31, 0 + PV $00000012 + Text_JP "キルリア"11 + Friendship 255 + + Pokemon GARDEVOIR + Holds LEFTOVERS + Moves PSYCHIC, THUNDERBOLT, HYPNOSIS, PROTECT + Level 75 + PP_Ups 0,0,0,0 + EVs 0,0,0,255,255,0 + OT_ID 00000, 00000 + IVs 15,15,15,31,31,15, 0 + PV $0000000F + Text_JP "サーナイト"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/momoko.asm b/battle-e/trainers/momoko.asm new file mode 100644 index 0000000..b1d356b --- /dev/null +++ b/battle-e/trainers/momoko.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db PKMN_BREEDER_F + BT_Floor 0 + Text_JP "モモコ"8 + OT_ID 00000, 00000 + + Intro_JP $1c1b, $0204, $0c01, $020e, $1643, $1032 + Win_JP $0204, $1628, $0e1d, $1423, $1015, $0c01 + Loss_JP $0204, $1e11, $0e0a, $244a, $201e, $1018 + + Pokemon GYARADOS + Holds CHESTO_BERRY + Moves SURF, DRAGON_DANCE, REST, HIDDEN_POWER + Level 97 + PP_Ups 0,0,0,0 + EVs 252,0,6,0,0,252 + OT_ID 00000, 00000 + IVs 31,14,15,14,14,30, 0 + PV $00000085 + Text_JP "ギャラドス"11 + Friendship 255 + + Pokemon SWAMPERT + Holds SHELL_BELL + Moves SURF, ICE_BEAM, EARTHQUAKE, PROTECT + Level 98 + PP_Ups 0,0,0,0 + EVs 252,252,0,0,0,6 + OT_ID 00000, 00000 + IVs 31,31,15,15,15,15, 0 + PV $00000083 + Text_JP "ラグラージ"11 + Friendship 255 + + Pokemon DUSCLOPS + Holds LEFTOVERS + Moves ICE_BEAM, PSYCHIC, SHADOW_BALL, EARTHQUAKE + Level 99 + PP_Ups 0,0,0,0 + EVs 252,0,252,0,0,6 + OT_ID 00000, 00000 + IVs 31,15,31,15,15,15, 0 + PV $0000001B + Text_JP "サマヨール"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/natsuko.asm b/battle-e/trainers/natsuko.asm new file mode 100644 index 0000000..6d52682 --- /dev/null +++ b/battle-e/trainers/natsuko.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db TRIATHLETE_F_SWIM + BT_Floor 0 + Text_JP "ナツコ"8 + OT_ID 00000, 00000 + + Intro_JP $2723, $1628, $0e29, $141b, $0e0b, $1225 + Win_JP $2723, $1621, $ffff, $0408, $0408, $020f + Loss_JP $123a, $0408, $1014, $1034, $0c06, $121b + + Pokemon LANTURN + Holds MYSTIC_WATER + Moves CONFUSE_RAY, SURF, THUNDERBOLT, TAKE_DOWN + Level 70 + PP_Ups 0,0,0,0 + EVs 252,0,6,0,252,0 + OT_ID 00000, 00000 + IVs 31,15,15,15,31,15, 0 + PV $0000000F + Text_JP "ランターン"11 + Friendship 255 + + Pokemon HUNTAIL + Holds MYSTIC_WATER + Moves CONFUSE_RAY, CRUNCH, SURF, MUD_SPORT + Level 72 + PP_Ups 0,0,0,0 + EVs 252,0,0,0,252,6 + OT_ID 00000, 00000 + IVs 31,15,15,15,31,15, 0 + PV $00000095 + Text_JP "ハンテール"11 + Friendship 255 + + Pokemon RELICANTH + Holds LEFTOVERS + Moves SURF, ROCK_SLIDE, EARTHQUAKE, ROCK_TOMB + Level 74 + PP_Ups 0,0,0,0 + EVs 252,0,6,0,0,252 + OT_ID 00000, 00000 + IVs 31,15,31,15,15,31, 0 + PV $00000080 + Text_JP "ジーランス"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/noriko.asm b/battle-e/trainers/noriko.asm new file mode 100644 index 0000000..fc2e9e2 --- /dev/null +++ b/battle-e/trainers/noriko.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db BATTLE_GIRL + BT_Floor 0 + Text_JP "ノリコ"8 + OT_ID 00000, 00000 + + Intro_JP $1e10, $0c1c, $1618, $244a, $1e11, $1044 + Win_JP $0c32, $0a48, $020e, $0e12, $1413, $1021 + Loss_JP $0e36, $1413, $020e, $1034, $1a32, $1020 + + Pokemon GYARADOS + Holds CHESTO_BERRY + Moves HYPER_BEAM, DRAGON_DANCE, EARTHQUAKE, REST + Level 92 + PP_Ups 0,0,0,0 + EVs 0,255,0,255,0,0 + OT_ID 00000, 00000 + IVs 15,31,31,15,15,15, 0 + PV $000000E4 + Text_JP "ギャラドス"11 + Friendship 255 + + Pokemon AGGRON + Holds BRIGHTPOWDER + Moves HYPER_BEAM, AERIAL_ACE, EARTHQUAKE, ROCK_TOMB + Level 94 + PP_Ups 0,0,0,0 + EVs 0,255,0,0,0,255 + OT_ID 00000, 00000 + IVs 15,31,15,15,15,31, 0 + PV $000000E4 + Text_JP "ボスゴドラ"11 + Friendship 255 + + Pokemon SALAMENCE + Holds KING_S_ROCK + Moves HYPER_BEAM, DRAGON_CLAW, EARTHQUAKE, CRUNCH + Level 96 + PP_Ups 0,0,0,0 + EVs 0,255,0,0,255,0 + OT_ID 00000, 00000 + IVs 15,31,15,31,15,15, 0 + PV $0000001C + Text_JP "ボーマンダ"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/nozomu.asm b/battle-e/trainers/nozomu.asm new file mode 100644 index 0000000..4e913a6 --- /dev/null +++ b/battle-e/trainers/nozomu.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db TRIATHLETE_M_BIKE + BT_Floor 0 + Text_JP "ノゾム"8 + OT_ID 00000, 00000 + + Intro_JP $2013, $1a15, $1a34, $1c28, $1c0a, $1011 + Win_JP $1643, $1007, $103e, $0a3a, $020e, $0c00 + Loss_JP $201e, $1014, $0c04, $0a3a, $020e, $0c04 + + Pokemon RAICHU + Holds LUM_BERRY + Moves THUNDERBOLT, THUNDER_WAVE, LIGHT_SCREEN, IRON_TAIL + Level 55 + PP_Ups 0,0,0,0 + EVs 0,0,0,255,255,0 + OT_ID 00000, 00000 + IVs 15,15,15,31,31,15, 0 + PV $0000000F + Text_JP "ライチュウ"11 + Friendship 255 + + Pokemon GOLDUCK + Holds BRIGHTPOWDER + Moves SURF, ICE_BEAM, AERIAL_ACE, PSYCHIC + Level 57 + PP_Ups 0,0,0,0 + EVs 255,0,0,0,255,0 + OT_ID 00000, 00000 + IVs 15,15,15,31,31,15, 0 + PV $000000D7 + Text_JP "ゴルダック"11 + Friendship 255 + + Pokemon TAUROS + Holds SHELL_BELL + Moves HYPER_BEAM, EARTHQUAKE, THUNDERBOLT, FACADE + Level 60 + PP_Ups 0,0,0,0 + EVs 0,255,0,255,0,0 + OT_ID 00000, 00000 + IVs 15,31,15,15,15,31, 0 + PV $000000E4 + Text_JP "ケンタロス"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/otoya.asm b/battle-e/trainers/otoya.asm new file mode 100644 index 0000000..c2c999a --- /dev/null +++ b/battle-e/trainers/otoya.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db BIRD_KEEPER + BT_Floor 0 + Text_JP "オトヤ"8 + OT_ID 00000, 00000 + + Intro_JP $0601, $0c00, $0a3a, $2413, $0a34, $0c01 + Win_JP $0c37, $1419, $0c00, $0a3d, $1421, $100f + Loss_JP $1231, $0c04, $ffff, $2007, $2007, $0c04 + + Pokemon TROPIUS + Holds MIRACLE_SEED + Moves EARTHQUAKE, AERIAL_ACE, MAGICAL_LEAF, BODY_SLAM + Level 66 + PP_Ups 0,0,0,0 + EVs 252,252,6,0,0,0 + OT_ID 00000, 00000 + IVs 31,31,15,15,15,15, 0 + PV $000000E3 + Text_JP "トロピウス"11 + Friendship 255 + + Pokemon XATU + Holds SHARP_BEAK + Moves CONFUSE_RAY, PSYCHIC, DRILL_PECK, TOXIC + Level 67 + PP_Ups 0,0,0,0 + EVs 6,0,0,252,252,0 + OT_ID 00000, 00000 + IVs 15,15,15,15,15,15, 0 + PV $0000000C + Text_JP "ネイティオ"11 + Friendship 255 + + Pokemon SKARMORY + Holds SCOPE_LENS + Moves STEEL_WING, AERIAL_ACE, PROTECT, SWIFT + Level 68 + PP_Ups 0,0,0,0 + EVs 252,252,0,0,0,6 + OT_ID 00000, 00000 + IVs 31,31,15,15,15,15, 0 + PV $00000080 + Text_JP "エアームド"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/reina.asm b/battle-e/trainers/reina.asm new file mode 100644 index 0000000..3d82dcb --- /dev/null +++ b/battle-e/trainers/reina.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db PKMN_RANGER_F + BT_Floor 0 + Text_JP "レイナ"8 + OT_ID 00000, 00000 + + Intro_JP $1a2b, $0e28, $0e14, $1236, $063e, $1017 + Win_JP $1c18, $0a34, $1012, $0e21, $0606, $1022 + Loss_JP $1c18, $0a34, $1012, $062e, $0e1f, $1405 + + Pokemon MAWILE + Holds CLEANSE_TAG + Moves SWEET_SCENT, STRENGTH, ROCK_SMASH, SECRET_POWER + Level 85 + PP_Ups 0,0,0,0 + EVs 252,252,6,0,0,0 + OT_ID 00000, 00000 + IVs 31,31,15,15,15,15, 1 + PV $00000080 + Text_JP "クチート"11 + Friendship 255 + + Pokemon GOLDUCK + Holds SMOKE_BALL + Moves SURF, WATERFALL, DIVE, DIG + Level 90 + PP_Ups 0,0,0,0 + EVs 252,6,0,0,0,252 + OT_ID 00000, 00000 + IVs 31,15,15,15,15,31, 1 + PV $0000000F + Text_JP "ゴルダック"11 + Friendship 255 + + Pokemon TROPIUS + Holds AMULET_COIN + Moves FLY, CUT, FLASH, STRENGTH + Level 85 + PP_Ups 0,0,0,0 + EVs 252,252,0,0,0,6 + OT_ID 00000, 00000 + IVs 31,31,0,15,15,15, 0 + PV $00000080 + Text_JP "トロピウス"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/rina.asm b/battle-e/trainers/rina.asm new file mode 100644 index 0000000..b5f4509 --- /dev/null +++ b/battle-e/trainers/rina.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db HEX_MANIAC + BT_Floor 0 + Text_JP "リナ"8 + OT_ID 00000, 00000 + + Intro_JP $2005, $1601, $102a, $0a48, $0605, $103e + Win_JP $0a48, $26c2, $0c04, $0a1c, $060e, $0c04 + Loss_JP $0a45, $0e0b, $0c06, $1601, $1010, $0c06 + + Pokemon DUSCLOPS + Holds APICOT_BERRY + Moves WILL_O_WISP, TOXIC, ROCK_TOMB, DESTINY_BOND + Level 84 + PP_Ups 0,0,0,0 + EVs 0,0,255,0,0,255 + OT_ID 00000, 00000 + IVs 15,15,31,15,15,31, 0 + PV $000000D5 + Text_JP "サマヨール"11 + Friendship 255 + + Pokemon BANETTE + Holds WHITE_HERB + Moves SHADOW_BALL, THUNDERBOLT, PSYCHIC, DESTINY_BOND + Level 87 + PP_Ups 0,0,0,0 + EVs 0,0,0,255,255,0 + OT_ID 00000, 00000 + IVs 15,31,15,31,15,15, 0 + PV $0000000A + Text_JP "ジュペッタ"11 + Friendship 255 + + Pokemon GARDEVOIR + Holds TWISTEDSPOON + Moves PSYCHIC, CALM_MIND, DOUBLE_TEAM, DESTINY_BOND + Level 89 + PP_Ups 0,0,0,0 + EVs 0,0,0,255,255,0 + OT_ID 00000, 00000 + IVs 15,15,15,31,31,15, 1 + PV $0000000A + Text_JP "サーナイト"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/ruizo.asm b/battle-e/trainers/ruizo.asm new file mode 100644 index 0000000..4514b65 --- /dev/null +++ b/battle-e/trainers/ruizo.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 50 + db NINJA_BOY + BT_Floor 5 + Text_JP "ルイゾウ"8 + OT_ID 00000, 00000 + + Intro_JP $2805, $0c00, $ffff, $180f, $1621, $1037 + Win_JP $0632, $162d, $1022, $2732, $1422, $0c00 + Loss_JP $0c09, $0c06, $ffff, $120d, $2732, $0c04 + + Pokemon SANDSLASH + Holds QUICK_CLAW + Moves CRUSH_CLAW, ROCK_TOMB, ATTRACT, SWORDS_DANCE + Level 50 + PP_Ups 0,0,0,0 + EVs 0,252,0,6,0,252 + OT_ID 00000, 00000 + IVs 15,31,15,15,15,31, 0 + PV $0000001C + Text_JP "サンドパン"11 + Friendship 255 + + Pokemon VIGOROTH + Holds SCOPE_LENS + Moves CRUSH_CLAW, BRICK_BREAK, BULK_UP, COUNTER + Level 50 + PP_Ups 0,0,0,0 + EVs 6,252,0,252,0,0 + OT_ID 00000, 00000 + IVs 15,31,15,31,15,15, 0 + PV $000000E4 + Text_JP "ヤルキモノ"11 + Friendship 255 + + Pokemon ZANGOOSE + Holds FOCUS_BAND + Moves CRUSH_CLAW, AERIAL_ACE, SWORDS_DANCE, FLAIL + Level 50 + PP_Ups 0,0,0,0 + EVs 6,252,0,252,0,0 + OT_ID 00000, 00000 + IVs 15,31,15,31,15,15, 0 + PV $000000E4 + Text_JP "ザングース"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/ryo.asm b/battle-e/trainers/ryo.asm new file mode 100644 index 0000000..b6aa8c8 --- /dev/null +++ b/battle-e/trainers/ryo.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db TRIATHLETE_M_SWIM + BT_Floor 0 + Text_JP "リョウ"8 + OT_ID 00000, 00000 + + Intro_JP $0a2c, $1643, $0c04, $0a3a, $1234, $020e + Win_JP $0c37, $0c01, $1e0b, $020e, $1232, $1015 + Loss_JP $0613, $0c01, $123a, $020e, $1014, $0e0a + + Pokemon MAGCARGO + Holds QUICK_CLAW + Moves FLAMETHROWER, ROCK_SLIDE, LIGHT_SCREEN, AMNESIA + Level 54 + PP_Ups 0,0,0,0 + EVs 252,0,252,0,0,6 + OT_ID 00000, 00000 + IVs 31,15,31,15,15,15, 0 + PV $00000011 + Text_JP "マグカルゴ"11 + Friendship 255 + + Pokemon AZUMARILL + Holds CHESTO_BERRY + Moves SURF, REST, SUBSTITUTE, FOCUS_PUNCH + Level 56 + PP_Ups 0,0,0,0 + EVs 252,6,0,0,0,252 + OT_ID 00000, 00000 + IVs 31,15,31,15,15,15, 1 + PV $00000080 + Text_JP "マリルリ"11 + Friendship 255 + + Pokemon PORYGON2 + Holds CHESTO_BERRY + Moves ICE_BEAM, THUNDERBOLT, REST, RECYCLE + Level 58 + PP_Ups 0,0,0,0 + EVs 252,0,6,0,252,0 + OT_ID 00000, 00000 + IVs 31,15,15,15,31,15, 0 + PV $0000000F + Text_JP "ポリゴン２"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/sadayo.asm b/battle-e/trainers/sadayo.asm new file mode 100644 index 0000000..fa81ca5 --- /dev/null +++ b/battle-e/trainers/sadayo.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db HEX_MANIAC + BT_Floor 0 + Text_JP "サダヨ"8 + OT_ID 00000, 00000 + + Intro_JP $0a15, $020e, $0c03, $0a0c, $020e, $0c03 + Win_JP $1243, $1430, $0c03, $1439, $1030, $0c06 + Loss_JP $164c, $1041, $0c03, $143a, $1030, $0c00 + + Pokemon ELECTRODE + Holds CHERI_BERRY + Moves EXPLOSION, MIRROR_COAT, THUNDERBOLT, PROTECT + Level 60 + PP_Ups 0,0,0,0 + EVs 252,0,0,6,252,0 + OT_ID 00000, 00000 + IVs 31,15,15,15,31,15, 1 + PV $00000018 + Text_JP "マルマイン"11 + Friendship 255 + + Pokemon CLAYDOL + Holds PETAYA_BERRY + Moves PSYCHIC, EARTHQUAKE, ROCK_TOMB, LIGHT_SCREEN + Level 62 + PP_Ups 0,0,0,0 + EVs 252,0,0,6,0,252 + OT_ID 00000, 00000 + IVs 31,15,15,15,15,31, 0 + PV $0000000C + Text_JP "ネンドール"11 + Friendship 255 + + Pokemon SHEDINJA + Holds BRIGHTPOWDER + Moves SPITE, CONFUSE_RAY, SHADOW_BALL, HYPER_BEAM + Level 64 + PP_Ups 0,0,0,0 + EVs 0,255,0,255,0,0 + OT_ID 00000, 00000 + IVs 15,31,15,31,15,15, 0 + PV $0000001C + Text_JP "ヌケニン"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/satoe.asm b/battle-e/trainers/satoe.asm new file mode 100644 index 0000000..56acd80 --- /dev/null +++ b/battle-e/trainers/satoe.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 50 + db PSYCHIC_F + BT_Floor 12 + Text_JP "サトエ"8 + OT_ID 00000, 00000 + + Intro_JP $26b6, $0e0c, $0e1d, $0e12, $1225, $103e + Win_JP $26b6, $061e, $1034, $0619, $1032, $0c00 + Loss_JP $0408, $0408, $1610, $0637, $0827, $1018 + + Pokemon ALAKAZAM + Holds TWISTEDSPOON + Moves REFLECT, LIGHT_SCREEN, ICE_PUNCH, PSYCHIC + Level 50 + PP_Ups 0,0,0,0 + EVs 6,0,0,252,252,0 + OT_ID 00000, 00000 + IVs 15,15,15,31,31,15, 0 + PV $0000000F + Text_JP "フーディン"11 + Friendship 255 + + Pokemon GOLDUCK + Holds MYSTIC_WATER + Moves LIGHT_SCREEN, IRON_TAIL, SURF, ICE_BEAM + Level 50 + PP_Ups 0,0,0,0 + EVs 252,0,0,6,252,0 + OT_ID 00000, 00000 + IVs 31,15,15,15,31,15, 1 + PV $000000E0 + Text_JP "ゴルダック"11 + Friendship 255 + + Pokemon MAGNETON + Holds MAGNET + Moves REFLECT, TRI_ATTACK, THUNDER_WAVE, THUNDERBOLT + Level 50 + PP_Ups 0,0,0,0 + EVs 0,0,6,252,252,0 + OT_ID 00000, 00000 + IVs 15,15,15,31,31,15, 1 + PV $0000000F + Text_JP "レアコイル"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/shigeko.asm b/battle-e/trainers/shigeko.asm new file mode 100644 index 0000000..4d73f7f --- /dev/null +++ b/battle-e/trainers/shigeko.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db POKEFAN_F + BT_Floor 0 + Text_JP "シゲコ"8 + OT_ID 00000, 00000 + + Intro_JP $0e1b, $1e14, $020e, $0418, $100b, $142f + Win_JP $1e0a, $1034, $020e, $1a24, $1239, $1021 + Loss_JP $062e, $0e1f, $0418, $020e, $1030, $103e + + Pokemon WAILMER + Holds MYSTIC_WATER + Moves FISSURE, SURF, EARTHQUAKE, ATTRACT + Level 80 + PP_Ups 0,0,0,0 + EVs 255,0,0,0,255,0 + OT_ID 00000, 00000 + IVs 31,15,15,15,31,15, 0 + PV $0000000C + Text_JP "ホエルコ"11 + Friendship 255 + + Pokemon SEEDOT + Holds MIRACLE_SEED + Moves EXPLOSION, BIDE, PROTECT, BULLET_SEED + Level 82 + PP_Ups 0,0,0,0 + EVs 255,255,0,0,0,0 + OT_ID 00000, 00000 + IVs 31,31,15,15,15,15, 1 + PV $000000E0 + Text_JP "タネボー"11 + Friendship 255 + + Pokemon PIKACHU + Holds LIGHT_BALL + Moves AGILITY, THUNDER, QUICK_ATTACK, IRON_TAIL + Level 85 + PP_Ups 0,0,0,0 + EVs 0,255,0,0,255,0 + OT_ID 00000, 00000 + IVs 15,15,15,31,31,15, 0 + PV $00000013 + Text_JP "ピカチュウ"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/shigenobu.asm b/battle-e/trainers/shigenobu.asm new file mode 100644 index 0000000..a7a1133 --- /dev/null +++ b/battle-e/trainers/shigenobu.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db PKMN_BREEDER_M + BT_Floor 0 + Text_JP "シゲノブ"8 + OT_ID 00000, 00000 + + Intro_JP $020e, $2204, $1c17, $0a3a, $2200, $1643 + Win_JP $020e, $2204, $0619, $1e04, $0c03, $1429 + Loss_JP $2200, $1621, $1207, $1e03, $0628, $1014 + + Pokemon TORCHIC + Holds PINK_SCARF + Moves GROWL, SWAGGER, PECK, ATTRACT + Level 68 + PP_Ups 0,0,0,0 + EVs 0,252,6,0,0,252 + OT_ID 00000, 00000 + IVs 15,31,15,15,15,31, 0 + PV $0000006E + Text_JP "アチャモ"11 + Friendship 255 + + Pokemon BEAUTIFLY + Holds BLUE_SCARF + Moves SUNNY_DAY, MORNING_SUN, SILVER_WIND, STUN_SPORE + Level 70 + PP_Ups 0,0,0,0 + EVs 252,252,0,6,0,0 + OT_ID 00000, 00000 + IVs 31,31,15,15,15,15, 0 + PV $00000010 + Text_JP "アゲハント"11 + Friendship 255 + + Pokemon SPOINK + Holds GREEN_SCARF + Moves TRICK, MAGIC_COAT, CALM_MIND, PSYBEAM + Level 72 + PP_Ups 0,0,0,0 + EVs 252,6,0,0,252,0 + OT_ID 00000, 00000 + IVs 31,15,15,15,31,15, 1 + PV $00000091 + Text_JP "バネブー"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/shinji.asm b/battle-e/trainers/shinji.asm new file mode 100644 index 0000000..6c9f1b8 --- /dev/null +++ b/battle-e/trainers/shinji.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db PKMN_BREEDER_M + BT_Floor 0 + Text_JP "シンジ"8 + OT_ID 00000, 00000 + + Intro_JP $1c12, $1034, $0a3b, $0e07, $1429, $100e + Win_JP $1e1b, $244a, $1e11, $1002, $164c, $0c03 + Loss_JP $1e04, $0c03, $201e, $244a, $122d, $0c03 + + Pokemon BELLOSSOM + Holds MIRACLE_SEED + Moves INGRAIN, POISONPOWDER, RETURN, GIGA_DRAIN + Level 90 + PP_Ups 0,0,0,0 + EVs 252,0,0,0,252,6 + OT_ID 00000, 00000 + IVs 31,15,15,15,31,15, 0 + PV $00000012 + Text_JP "キレイハナ"11 + Friendship 255 + + Pokemon DUSTOX + Holds SILVERPOWDER + Moves TOXIC, PROTECT, SILVER_WIND, PSYCHIC + Level 91 + PP_Ups 0,0,0,0 + EVs 252,252,0,0,0,6 + OT_ID 00000, 00000 + IVs 31,31,15,15,15,15, 0 + PV $00000083 + Text_JP "ドクケイル"11 + Friendship 255 + + Pokemon GOREBYSS + Holds SHELL_BELL + Moves SURF, PSYCHIC, ICE_BEAM, CONFUSE_RAY + Level 92 + PP_Ups 0,0,0,0 + EVs 252,0,6,0,0,252 + OT_ID 00000, 00000 + IVs 31,15,15,15,15,31, 0 + PV $0000000F + Text_JP "サクラビス"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/shizu.asm b/battle-e/trainers/shizu.asm new file mode 100644 index 0000000..19b674c --- /dev/null +++ b/battle-e/trainers/shizu.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 50 + db COOLTRAINER_F + BT_Floor 19 + Text_JP "シズ"8 + OT_ID 00000, 00000 + + Intro_JP $0c13, $0c04, $063e, $140c, $1642, $1602 + Win_JP $1e21, $0432, $1034, $063e, $0e1f, $0e2a + Loss_JP $0c0c, $1234, $0c00, $063e, $062e, $1024 + + Pokemon STARMIE + Holds SCOPE_LENS + Moves PSYCHIC, SURF, ICE_BEAM, THUNDERBOLT + Level 50 + PP_Ups 0,0,0,0 + EVs 6,0,0,252,252,0 + OT_ID 00000, 00000 + IVs 15,15,15,31,31,15, 1 + PV $0000000F + Text_JP "スターミー"11 + Friendship 255 + + Pokemon BRELOOM + Holds BRIGHTPOWDER + Moves FOCUS_PUNCH, SLUDGE_BOMB, IRON_TAIL, SPORE + Level 50 + PP_Ups 0,0,0,0 + EVs 6,252,0,252,0,0 + OT_ID 00000, 00000 + IVs 15,31,15,31,15,15, 0 + PV $0000008A + Text_JP "キノガッサ"11 + Friendship 255 + + Pokemon SLAKING + Holds LEFTOVERS + Moves HYPER_BEAM, SHADOW_BALL, EARTHQUAKE, AERIAL_ACE + Level 50 + PP_Ups 0,0,0,0 + EVs 252,252,0,6,0,0 + OT_ID 00000, 00000 + IVs 31,31,15,15,15,15, 0 + PV $0000000D + Text_JP "ケッキング"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/suekichi.asm b/battle-e/trainers/suekichi.asm new file mode 100644 index 0000000..f1e23e8 --- /dev/null +++ b/battle-e/trainers/suekichi.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db BIRD_KEEPER + BT_Floor 0 + Text_JP "スエキチ"8 + OT_ID 00000, 00000 + + Intro_JP $0a3a, $161a, $063e, $0a1e, $1e1b, $1628 + Win_JP $274c, $060e, $0e08, $0c33, $120a, $ffff + Loss_JP $274c, $060e, $0e0a, $122f, $0628, $1014 + + Pokemon KECLEON + Holds QUICK_CLAW + Moves AERIAL_ACE, DOUBLE_TEAM, FAINT_ATTACK, PSYBEAM + Level 55 + PP_Ups 0,0,0,0 + EVs 0,255,0,0,255,0 + OT_ID 00000, 00000 + IVs 15,31,15,15,31,15, 0 + PV $000000E7 + Text_JP "カクレオン"11 + Friendship 255 + + Pokemon SWELLOW + Holds SHARP_BEAK + Moves AERIAL_ACE, ENDEAVOR, STEEL_WING, DOUBLE_TEAM + Level 58 + PP_Ups 0,0,0,0 + EVs 255,255,0,0,0,0 + OT_ID 00000, 00000 + IVs 15,31,15,31,15,15, 0 + PV $0000001C + Text_JP "オオスバメ"11 + Friendship 255 + + Pokemon SANDSLASH + Holds SOFT_SAND + Moves AERIAL_ACE, SLASH, EARTHQUAKE, SAND_TOMB + Level 56 + PP_Ups 0,0,0,0 + EVs 255,255,0,0,0,0 + OT_ID 00000, 00000 + IVs 31,31,15,15,15,15, 0 + PV $000000E4 + Text_JP "サンドパン"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/sueno.asm b/battle-e/trainers/sueno.asm new file mode 100644 index 0000000..438c76f --- /dev/null +++ b/battle-e/trainers/sueno.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db HEX_MANIAC + BT_Floor 0 + Text_JP "スエノ"8 + OT_ID 00000, 00000 + + Intro_JP $1c07, $0e16, $103e, $0626, $102a, $0c00 + Win_JP $0626, $102a, $0e1d, $1610, $1430, $0c03 + Loss_JP $0626, $1430, $0a05, $0605, $1018, $0c04 + + Pokemon WOBBUFFET + Holds SALAC_BERRY + Moves COUNTER, MIRROR_COAT, SAFEGUARD, DESTINY_BOND + Level 57 + PP_Ups 0,0,0,0 + EVs 255,0,100,55,0,100 + OT_ID 00000, 00000 + IVs 15,15,31,15,15,31, 0 + PV $00000021 + Text_JP "ソーナンス"11 + Friendship 255 + + Pokemon DUSCLOPS + Holds LEFTOVERS + Moves MEAN_LOOK, CONFUSE_RAY, TOXIC, PROTECT + Level 55 + PP_Ups 0,0,0,0 + EVs 0,0,255,0,0,255 + OT_ID 00000, 00000 + IVs 15,15,31,15,15,31, 0 + PV $000000E6 + Text_JP "サマヨール"11 + Friendship 255 + + Pokemon NOSEPASS + Holds CHERI_BERRY + Moves BLOCK, THUNDER_WAVE, SANDSTORM, EXPLOSION + Level 58 + PP_Ups 0,0,0,0 + EVs 0,255,0,0,0,255 + OT_ID 00000, 00000 + IVs 15,31,15,15,15,31, 1 + PV $000000E9 + Text_JP "ノズパス"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/tomoyasu.asm b/battle-e/trainers/tomoyasu.asm new file mode 100644 index 0000000..ae3e5d6 --- /dev/null +++ b/battle-e/trainers/tomoyasu.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 50 + db SCHOOL_KID_M + BT_Floor 5 + Text_JP "トモヤス"8 + OT_ID 00000, 00000 + + Intro_JP $0a05, $020e, $ffff, $1643, $1602, $0c00 + Win_JP $0a1d, $020e, $ffff, $1409, $1403, $0c00 + Loss_JP $0a1d, $020e, $ffff, $1409, $1431, $0c00 + + Pokemon BRELOOM + Holds QUICK_CLAW + Moves SPORE, FOCUS_PUNCH, LEECH_SEED, HIDDEN_POWER + Level 50 + PP_Ups 0,0,0,0 + EVs 6,252,0,252,0,0 + OT_ID 00000, 00000 + IVs 15,31,15,31,14,14, 0 + PV $0000000D + Text_JP "キノガッサ"11 + Friendship 255 + + Pokemon MANECTRIC + Holds SCOPE_LENS + Moves THUNDER_WAVE, THUNDER, RAIN_DANCE, CRUNCH + Level 50 + PP_Ups 0,0,0,0 + EVs 6,0,0,252,252,0 + OT_ID 00000, 00000 + IVs 15,15,15,31,31,15, 0 + PV $000000D7 + Text_JP "ライボルト"11 + Friendship 255 + + Pokemon DUSCLOPS + Holds LEFTOVERS + Moves WILL_O_WISP, PROTECT, SHADOW_BALL, TOXIC + Level 50 + PP_Ups 0,0,0,0 + EVs 252,0,252,0,0,6 + OT_ID 00000, 00000 + IVs 31,15,31,15,15,15, 0 + PV $00000020 + Text_JP "サマヨール"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/toshinao.asm b/battle-e/trainers/toshinao.asm new file mode 100644 index 0000000..50b6d21 --- /dev/null +++ b/battle-e/trainers/toshinao.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db NINJA_BOY + BT_Floor 0 + Text_JP "トシナオ"8 + OT_ID 00000, 00000 + + Intro_JP $0812, $102d, $0c00, $1e15, $0c00, $ffff + Win_JP $265c, $1034, $0619, $102d, $0c00, $ffff + Loss_JP $265c, $0e1f, $0c04, $201c, $102d, $0c04 + + Pokemon TENTACRUEL + Holds SITRUS_BERRY + Moves CONFUSE_RAY, SURF, TOXIC, MIRROR_COAT + Level 50 + PP_Ups 0,0,0,0 + EVs 252,0,252,0,0,6 + OT_ID 00000, 00000 + IVs 31,15,31,15,15,15, 0 + PV $0000008C + Text_JP "ドククラゲ"11 + Friendship 255 + + Pokemon WEEZING + Holds CHERI_BERRY + Moves PROTECT, TOXIC, EXPLOSION, FLAMETHROWER + Level 52 + PP_Ups 0,0,0,0 + EVs 252,0,0,0,6,252 + OT_ID 00000, 00000 + IVs 31,15,15,15,15,31, 0 + PV $00000080 + Text_JP "マタドガス"11 + Friendship 255 + + Pokemon CROBAT + Holds LUM_BERRY + Moves TOXIC, CONFUSE_RAY, SHADOW_BALL, AIR_CUTTER + Level 54 + PP_Ups 0,0,0,0 + EVs 252,6,0,0,0,252 + OT_ID 00000, 00000 + IVs 31,15,15,15,15,31, 0 + PV $0000001C + Text_JP "クロバット"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/toshitsugu.asm b/battle-e/trainers/toshitsugu.asm new file mode 100644 index 0000000..fbe6e52 --- /dev/null +++ b/battle-e/trainers/toshitsugu.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db RUIN_MANIAC + BT_Floor 0 + Text_JP "トシツグ"8 + OT_ID 00000, 00000 + + Intro_JP $0c1c, $1c26, $1034, $1241, $140c, $100b + Win_JP $1c26, $1034, $1813, $0e28, $1241, $140c + Loss_JP $0810, $0c04, $1c26, $1034, $1827, $0c04 + + Pokemon RELICANTH + Holds SEA_INCENSE + Moves SURF, ROCK_SLIDE, YAWN, SAFEGUARD + Level 55 + PP_Ups 0,0,0,0 + EVs 255,255,0,0,0,0 + OT_ID 00000, 00000 + IVs 31,31,15,15,15,15, 0 + PV $000000D4 + Text_JP "ジーランス"11 + Friendship 255 + + Pokemon ARMALDO + Holds SCOPE_LENS + Moves SLASH, ROCK_SLIDE, EARTHQUAKE, IRON_TAIL + Level 54 + PP_Ups 0,0,0,0 + EVs 0,255,0,0,0,255 + OT_ID 00000, 00000 + IVs 15,31,15,15,15,31, 0 + PV $0000001C + Text_JP "アーマルド"11 + Friendship 255 + + Pokemon CRADILY + Holds LEFTOVERS + Moves GIGA_DRAIN, ANCIENTPOWER, AMNESIA, RECOVER + Level 58 + PP_Ups 0,0,0,0 + EVs 0,0,255,0,0,255 + OT_ID 00000, 00000 + IVs 15,15,31,15,15,31, 0 + PV $00000007 + Text_JP "ユレイドル"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/umami.asm b/battle-e/trainers/umami.asm new file mode 100644 index 0000000..4c2ffbd --- /dev/null +++ b/battle-e/trainers/umami.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 100 + db COOLTRAINER_F + BT_Floor 12 + Text_JP "ウマミ"8 + OT_ID 00000, 00000 + + Intro_JP $0a48, $020e, $0e28, $0e14, $060a, $1044 + Win_JP $0c04, $103c, $122d, $0628, $1014, $0c3d + Loss_JP $0a48, $0212, $0e1f, $060a, $0e24, $0c05 + + Pokemon ARMALDO + Holds LEFTOVERS + Moves HYPER_BEAM, ANCIENTPOWER, AERIAL_ACE, SWORDS_DANCE + Level 100 + PP_Ups 0,0,0,0 + EVs 0,252,6,0,0,252 + OT_ID 00000, 00000 + IVs 20,31,31,20,20,20, 0 + PV $0000001C + Text_JP "アーマルド"11 + Friendship 255 + + Pokemon AGGRON + Holds SHELL_BELL + Moves EARTHQUAKE, AERIAL_ACE, DOUBLE_EDGE, IRON_TAIL + Level 100 + PP_Ups 0,0,0,0 + EVs 0,252,252,0,0,6 + OT_ID 00000, 00000 + IVs 20,31,31,20,20,20, 1 + PV $000000E4 + Text_JP "ボスゴドラ"11 + Friendship 255 + + Pokemon METAGROSS + Holds CHESTO_BERRY + Moves EARTHQUAKE, METEOR_MASH, PSYCHIC, REST + Level 100 + PP_Ups 0,0,0,0 + EVs 0,252,0,6,252,0 + OT_ID 00000, 00000 + IVs 20,31,20,20,31,20, 0 + PV $0000001B + Text_JP "メタグロス"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/yoko.asm b/battle-e/trainers/yoko.asm new file mode 100644 index 0000000..05465df --- /dev/null +++ b/battle-e/trainers/yoko.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db LASS + BT_Floor 0 + Text_JP "ヨウコ"8 + OT_ID 00000, 00000 + + Intro_JP $081c, $1643, $1643, $0e2a, $0418, $1021 + Win_JP $0c32, $1032, $0c03, $0419, $26d5, $1021 + Loss_JP $0c19, $0c00, $262d, $0e17, $0418, $103d + + Pokemon JIGGLYPUFF + Holds PINK_SCARF + Moves SING, CHARM, DEFENSE_CURL, MIMIC + Level 85 + PP_Ups 0,0,0,0 + EVs 252,0,252,0,0,6 + OT_ID 00000, 00000 + IVs 31,15,31,15,15,15, 0 + PV $00000012 + Text_JP "プリン"11 + Friendship 255 + + Pokemon SKITTY + Holds PINK_SCARF + Moves TICKLE, UPROAR, ASSIST, TAIL_WHIP + Level 90 + PP_Ups 0,0,0,0 + EVs 252,0,252,0,0,6 + OT_ID 00000, 00000 + IVs 31,15,15,15,15,15, 0 + PV $000000DA + Text_JP "エネコ"11 + Friendship 255 + + Pokemon LUVDISC + Holds PINK_SCARF + Moves WATER_GUN, MUD_SPORT, SWEET_KISS, ATTRACT + Level 95 + PP_Ups 0,0,0,0 + EVs 252,0,0,252,0,6 + OT_ID 00000, 00000 + IVs 31,15,15,31,15,15, 0 + PV $00000012 + Text_JP "ラブカス"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/yu.asm b/battle-e/trainers/yu.asm new file mode 100644 index 0000000..f6f523a --- /dev/null +++ b/battle-e/trainers/yu.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db NINJA_BOY + BT_Floor 0 + Text_JP "ユウ"8 + OT_ID 00000, 00000 + + Intro_JP $26bc, $0e1d, $ffff, $1232, $1017, $ffff + Win_JP $2005, $0c04, $ffff, $1804, $160a, $0c03 + Loss_JP $0a3d, $0c01, $1804, $1e23, $1216, $1017 + + Pokemon WEEZING + Holds LAX_INCENSE + Moves SLUDGE_BOMB, FLAMETHROWER, THUNDERBOLT, EXPLOSION + Level 82 + PP_Ups 0,0,0,0 + EVs 0,255,0,0,255,0 + OT_ID 00000, 00000 + IVs 15,15,15,31,15,31, 0 + PV $000000E1 + Text_JP "マタドガス"11 + Friendship 255 + + Pokemon SWALOT + Holds LAX_INCENSE + Moves SLUDGE_BOMB, YAWN, GIGA_DRAIN, ICE_BEAM + Level 80 + PP_Ups 0,0,0,0 + EVs 0,255,0,0,255,0 + OT_ID 00000, 00000 + IVs 15,15,31,15,15,31, 0 + PV $00000019 + Text_JP "マルノーム"11 + Friendship 255 + + Pokemon MUK + Holds LAX_INCENSE + Moves SLUDGE_BOMB, GIGA_DRAIN, ROCK_TOMB, EXPLOSION + Level 81 + PP_Ups 0,0,0,0 + EVs 0,255,255,0,0,0 + OT_ID 00000, 00000 + IVs 15,31,15,15,15,31, 1 + PV $000000E4 + Text_JP "ベトベトン"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/yuka.asm b/battle-e/trainers/yuka.asm new file mode 100644 index 0000000..0b62678 --- /dev/null +++ b/battle-e/trainers/yuka.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db BEAUTY + BT_Floor 0 + Text_JP "ユカ"8 + OT_ID 00000, 00000 + + Intro_JP $044a, $1a2a, $ffff, $1228, $102e, $0c00 + Win_JP $0e36, $044a, $103c, $1606, $0e19, $0c03 + Loss_JP $0e36, $044a, $103c, $1606, $103f, $0c04 + + Pokemon SABLEYE + Holds BRIGHTPOWDER + Moves SHADOW_BALL, KNOCK_OFF, FAINT_ATTACK, CONFUSE_RAY + Level 75 + PP_Ups 0,0,0,0 + EVs 252,6,0,0,252,0 + OT_ID 00000, 00000 + IVs 31,31,15,15,15,15, 0 + PV $0000001B + Text_JP "ヤミラミ"11 + Friendship 255 + + Pokemon GRUMPIG + Holds BRIGHTPOWDER + Moves PSYCHIC, REST, SNORE, FLASH + Level 80 + PP_Ups 0,0,0,3 + EVs 6,0,0,252,252,0 + OT_ID 00000, 00000 + IVs 15,15,15,31,31,15, 0 + PV $0000008C + Text_JP "ブーピッグ"11 + Friendship 255 + + Pokemon CLAMPERL + Holds BRIGHTPOWDER + Moves SURF, DOUBLE_TEAM, ICE_BEAM, IRON_DEFENSE + Level 85 + PP_Ups 0,0,0,0 + EVs 252,0,6,0,252,0 + OT_ID 00000, 00000 + IVs 31,15,15,15,31,15, 0 + PV $00000016 + Text_JP "パールル"11 + Friendship 255 + + End_Trainer \ No newline at end of file diff --git a/battle-e/trainers/yukio.asm b/battle-e/trainers/yukio.asm new file mode 100644 index 0000000..62ee247 --- /dev/null +++ b/battle-e/trainers/yukio.asm @@ -0,0 +1,51 @@ +INCLUDE "trainers/macros.asm" + + Battle_Trainer + + BT_Level 0 + db BUG_CATCHER + BT_Floor 0 + Text_JP "ユキオ"8 + OT_ID 00000, 00000 + + Intro_JP $0461, $020e, $1034, $061e, $1642, $1602 + Win_JP $0c3a, $0c00, $2010, $0461, $162a, $100f + Loss_JP $0c16, $0c00, $0a3a, $0461, $060a, $103f + + Pokemon NINJASK + Holds SILVERPOWDER + Moves SWORDS_DANCE, PROTECT, BATON_PASS, SILVER_WIND + Level 70 + PP_Ups 0,0,0,0 + EVs 0,255,0,255,0,0 + OT_ID 00000, 00000 + IVs 15,31,15,31,15,15, 0 + PV $0000001C + Text_JP "テッカニン"11 + Friendship 255 + + Pokemon PINSIR + Holds LAX_INCENSE + Moves SEISMIC_TOSS, EARTHQUAKE, HYPER_BEAM, GUILLOTINE + Level 72 + PP_Ups 0,0,0,0 + EVs 0,255,0,255,0,0 + OT_ID 00000, 00000 + IVs 15,31,15,31,15,15, 0 + PV $000000E4 + Text_JP "カイロス"11 + Friendship 255 + + Pokemon HERACROSS + Holds SCOPE_LENS + Moves MEGAHORN, EARTHQUAKE, BRICK_BREAK, ROCK_TOMB + Level 69 + PP_Ups 0,0,0,0 + EVs 0,255,0,255,0,0 + OT_ID 00000, 00000 + IVs 15,31,15,31,15,15, 0 + PV $000000E4 + Text_JP "ヘラクロス"11 + Friendship 255 + + End_Trainer \ No newline at end of file From b02200192a20e372a544ccb301c4f20320e57fc2 Mon Sep 17 00:00:00 2001 From: Artrios Date: Fri, 16 Jul 2021 17:32:43 +0800 Subject: [PATCH 07/13] Removed makefile options (can't compile japanese text) --- battle-e/Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/battle-e/Makefile b/battle-e/Makefile index 55ef042..8cb2ea3 100644 --- a/battle-e/Makefile +++ b/battle-e/Makefile @@ -8,9 +8,6 @@ SERIES_2_TRAINERS = anthony chisa daikichi danpei fiennes fugen fukune harue hoy all: series_1 verify series_1: $(SERIES_1_TRAINERS:%=trainers/%-EN.mev) $(SERIES_1_BERRIES:%=berries/%-EN.mev) $(SERIES_1_NUMS:%=08-%-EN.raw) -series_2: $(SERIES_2_TRAINERS:%=trainers/%-JP.mev) $(SERIES_2_NUMS:%=08-%-JP.raw) -EN: $(SERIES_1_TRAINERS:%=trainers/%-EN.mev) $(SERIES_1_BERRIES:%=berries/%-EN.mev) $(SERIES_1_NUMS:%=08-%-EN.z80) -JP: $(SERIES_1_TRAINERS:%=trainers/%-JP.mev) $(SERIES_1_NUMS:%=08-%-JP.raw) $(SERIES_2_TRAINERS:%=trainers/%-JP.mev) $(SERIES_2_NUMS:%=08-%-JP.raw) verify: md5sum --check battle-e.md5 From 1f995daa4cab001f0c239451bbb1139c2d96ac35 Mon Sep 17 00:00:00 2001 From: Artrios Date: Sat, 17 Jul 2021 10:24:19 +0800 Subject: [PATCH 08/13] Add ribbon eCard --- constants/ribbons.asm | 7 ++ ribbons/00-R000.asm | 173 ++++++++++++++++++++++++++++++++++++++++++ ribbons/Makefile | 40 ++++++++++ ribbons/prologue.asm | 15 ++++ ribbons/ribbon.asm | 19 +++++ ribbons/ticket.4bpp | 1 + ribbons/ticket.pal | 5 ++ 7 files changed, 260 insertions(+) create mode 100644 constants/ribbons.asm create mode 100644 ribbons/00-R000.asm create mode 100644 ribbons/Makefile create mode 100644 ribbons/prologue.asm create mode 100644 ribbons/ribbon.asm create mode 100644 ribbons/ticket.4bpp create mode 100644 ribbons/ticket.pal diff --git a/constants/ribbons.asm b/constants/ribbons.asm new file mode 100644 index 0000000..e2553cf --- /dev/null +++ b/constants/ribbons.asm @@ -0,0 +1,7 @@ +MARINE_RIBBON EQU $00 +LAND_RIBBON EQU $01 +SKY_RIBBON EQU $02 +COUNTRY_RIBBON EQU $03 +NATIONAL_RIBBON EQU $04 +EARTH_RIBBON EQU $05 +WORLD_RIBBON EQU $06 \ No newline at end of file diff --git a/ribbons/00-R000.asm b/ribbons/00-R000.asm new file mode 100644 index 0000000..c45ed38 --- /dev/null +++ b/ribbons/00-R000.asm @@ -0,0 +1,173 @@ +INCLUDE "../macros.asm" +SECTION "eonticket",ROM0[$100] +jp Start +db $00 + +TicketSprite: ; 104 + INCBIN "ticket.4bpp" +TicketPalette: ; 1604 + INCLUDE "ticket.pal" + +Prologue: + INCBIN "prologue-{REGION_NAME}.bin" + +DataPacket: ; 164a + INCBIN "ribbon-{REGION_NAME}.mev" + db 0,0,0 ; padding + +INCLUDE "../common/mem_struct.asm" + +SpriteData: + dw TicketSprite,TicketPalette + db $15,$08,$01,$01,$01,$01,$01 ; width 15, height 8 + +Instructions1: ; 1921 + db "Link e-Reader to Pokémon Emerald\n" + db "and select Mystery Events on the\n" + db "game's main menu.\n" + db "Press the B Button to cancel.\0" + +Instructions2: ; 199d + db "Press the A Button on the Game Boy\n" + db "Advance containing Pokémon Emerald\n" + db "to receive a commemorative ribbon.\0" + +DeliveryInProcess: ; 1a0d + db "Ribbon delivery in Process...\0" + +TicketDelivered: ; 1a2f + db "Ribbons delivered!\n" + db "\n" + db "Press the A Button to resend.\n" + db "Press the B Button to cancel.\0" + +; this function is subtly different than the one +; on the Battle e cards, for no apparent reason +TransferData: + LD_IND_HL SomeVar1 + push de + ld hl, $bbbb + LD_IND_HL Space_1 + EX_DE_HL + LD_IND_HL Space_2 + API_0C7 Space_1 + + wait $01 + pop hl + inc hl + ld b, $01 + call WordShiftRight + + LD_IND_HL SomeVar2 +.asm_1aa1 + LD_HL_IND SomeVar2 + ld a, l + or h + ret z + + ld hl, $8888 + LD_IND_HL Space_1 + ld e, $01 + +.asm_1aaf + ld a, e + cp $08 + jr nc, .asm_1ad9 + + push de + LD_HL_IND SomeVar1 + ld c, [hl] + inc hl + ld b, [hl] + inc hl + LD_IND_HL SomeVar1 + ld l, e + ld h, $00 + add hl, hl + ld de, Space_1 + add hl, de + ld [hl], c + inc hl + ld [hl], b + pop de + LD_HL_IND SomeVar2 + dec hl + LD_IND_HL SomeVar2 + ld a, l + or h + jr z, .asm_1ad9 + + inc e + jr .asm_1aaf + +.asm_1ad9 + API_0C7 Space_1 + wait $01 + jr .asm_1aa1 + +Start: ; 1ae2 + API_121 + + CreateCustomSprite SpriteHandlePtr, $80, SpriteData + SetSpritePos SpriteHandlePtr, 120, 64 + SpriteHide SpriteHandlePtr + + CreateRegion RegionHandlePtr, 30, 6, 0, 14, 0, 4 + + ld h, a + ld l, $00 + SetTextSize + + API_09B RegionHandlePtr, $0102 + SetTextColor RegionHandlePtr, 2, 0 + SetRegionColor RegionHandlePtr, 0 + SetBackgroundPalette 16, $0040, TicketPalette + + FadeIn 16 + wait 16 + + API $0C6 + + DrawText RegionHandlePtr, Instructions1, 8, 4 + API $08D + +INCLUDE "../common/wait_for_link.asm" + + SpriteShow SpriteHandlePtr + + DrawText RegionHandlePtr, Instructions2, 8, 4 + API $08D + + ld a, b + nop + +UNKNOWN_VALUE EQU $0078 +INCLUDE "../common/wait_for_ready.asm" + + DrawText RegionHandlePtr, DeliveryInProcess, 8, 4 + +DATA_TRANSFER_LENGTH EQU 6144 +INCLUDE "../common/transfer_data.asm" + ld hl, $5fff + LD_IND_HL Space_1 + API_0C7 Space_1 + + wait $80 + + SpriteHide SpriteHandlePtr + + DrawText RegionHandlePtr, TicketDelivered, 8, 4 + + API $08D + ld c, a + nop + +INCLUDE "../common/wrap_up.asm" + +INCLUDE "../common/word_shift_right.asm" + +SomeVar1: ; 1CA2 + db $FF,0 ; mark EOF +RegionHandlePtr: db 0 ; 1CA4 +SpriteHandlePtr: db 0,0 ; 1CA5 +SomeVar2: db 0,0 ; 1CA7 \ No newline at end of file diff --git a/ribbons/Makefile b/ribbons/Makefile new file mode 100644 index 0000000..7da7ecb --- /dev/null +++ b/ribbons/Makefile @@ -0,0 +1,40 @@ +all: 00-R000-EN.raw + + +ribbon-%.tx: ribbon.asm + python ../scripts/regionalize.py $< $@ $* $* +ribbon-%.o: ribbon-%.tx + ./rgbasm -o $@ $< +ribbon-%.gbc: ribbon-%.o + ./rgblink -o $@ $< +ribbon-%.bin: ribbon-%.gbc + python ../scripts/stripgbc.py $< $@ +ribbon-%.mev: ribbon-%.bin + python ../scripts/checksum.py $< $@ + +prologue-%.tx: prologue.asm + python ../scripts/regionalize.py $< $@ $* $* +prologue-%.o: prologue-%.tx + ./rgbasm -o $@ $< +prologue-%.gbc: prologue-%.o + ./rgblink -o $@ $< +prologue-%.bin: prologue-%.gbc + python ../scripts/stripgbc.py $< $@ + +00-R000-%.tx: 00-R000.asm ribbon-%.mev prologue-%.bin + python ../scripts/ereadertext.py $< $@ $* +00-R000-%.o: 00-R000-%.tx + ./rgbasm -o $@ $< +00-R000-%.gbc: 00-R000-%.o + ./rgblink -o $@ $< +00-R000-%.z80: 00-R000-%.gbc + python ../scripts/stripgbc.py $< $@ +00-R000-%.vpk: 00-R000-%.z80 + ./nevpk -c -i $< -o $@ +00-R000-%.raw: 00-R000-%.vpk + ./nedcmake -i $< -o $@ -type 1 -region 1 + mv $@-01.raw $@ + + +clean: + rm -f *.tx *.o *.gbc *.z80 *.bin *.mev *.vpk *.raw \ No newline at end of file diff --git a/ribbons/prologue.asm b/ribbons/prologue.asm new file mode 100644 index 0000000..0db33e1 --- /dev/null +++ b/ribbons/prologue.asm @@ -0,0 +1,15 @@ +INCLUDE "../macros.asm" +SECTION "prologue", ROM0[$100] + + db "GameFreak inc." + db 0,0,0,0,0,0 + dd 0 + Text "e reader" ; no string terminator + 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/ribbons/ribbon.asm b/ribbons/ribbon.asm new file mode 100644 index 0000000..6fdb3bd --- /dev/null +++ b/ribbons/ribbon.asm @@ -0,0 +1,19 @@ +INCLUDE "../macros.asm" +INCLUDE "../constants/scriptcommands.asm" +INCLUDE "../constants/ribbons.asm" + + Mystery_Event + + db CHECKSUM_CRC + dd 0 ; checksum placeholder + GBAPTR DataStart + GBAPTR DataEnd + +DataStart: + db AWARD_RIBBON + db MARINE_RIBBON ; Marine Ribbon + db $01 ; description $01=2003 REGIONAL TOURNEY CHAMPION RIBBON + db $02 ; end of chunks + +DataEnd: + EOF \ No newline at end of file diff --git a/ribbons/ticket.4bpp b/ribbons/ticket.4bpp new file mode 100644 index 0000000..678d42a --- /dev/null +++ b/ribbons/ticket.4bpp @@ -0,0 +1 @@ +DDDDDDDDDDDDDDD3DDD3DDD3DDD3DDD3DDDDDDDDDDDD33333333333333333333DDDDDDDDDDDD33333333333C333C333CDDDDDDDDDDDD33333333DDDDDDDDD433DDDDDDDDDDDD3333333343CD43DD33DDDDDDDDDDDDDD33333333DD43DDD33DD3DDDDDDDDDDDD33333333CD43CDD3CDD3DDDDDDDDDDDD33333333DD33DD33DD33DDDDDDDDDDDD3333333333CD33CD3333DDDDDDDDDDDD33333333DDDDDDDDCD43DDDDDDDDDDDD3333333343DD43DD33DDDDDDDDDDDDDD3333333333DD3CDD3CD4DDDDDDDDDDDD33333333DD33DD43CD43DDDDDDDDDDDD33333333DD3DDD3DDD3DDDDDDDDDDDDD33333333D3CDD3CDD3CDDDDDDDDDDDDD33333333DDD4DDD44333DDDDDDDDDDDD333333333DDD3DDD333DDDDDDDDDDDDD33333333DDD3DDD3D333DDDDDDDDDDDD33333333333333333333DDDDDDDDDDDD33333333333333333333DDDDDDDDDDDD3DDD3DDD3DDD3DDD3DDDDDD3DDD3DDD3DDD3DDD3DDD3DDD3DDD333333333333333333333333333333333333C333C333C333C333C333C333C333CD433D433DDD4DDD4D433D433D433DDDD33DD33DD33DD33DD33DD33DD33DD43DD3DD33DD33DD33DD33DD33DD33DD3DDD3CDD4CDD4CDDDCD4DCD4DCD4CCD4CCD43DD33DD33DD33DD33DD33DD33DD33DD3333333333333333333333333333333333CD43CD43CD43CD43CD43CD43CD43CD4333DD33DD33DD33DD33DD33DD33DD33DD3CD43CD43CD43CD43CD43CD43CD43CDDCD43CD4333333333CD43CD43CD43DD43DD3DDDCDDDDDDDDDDDCDDD3DDD3DDD3DD3CD43CD33CD33CD43CDD3CDD3CDD3CD43334333DD43DD43433343334333DDD4333D333D333D333D333D333D333D333DD333D333D333D333D333D333D333D33333333333333333333333333333333333333333333333333333333333333333333DDD3DDD3DDD3DDD3DDD3DDD3DDD3DDDDDD3DDD3DDD3DDD3DDD3DDD3DDD3DDD33333333333333DDD3DDD3333333333D4333C33333333DDDDDDDD333333333CDCDDDD33333333DDDDDDDD33333333D3CD43CD33333333DDDDDDDD33333333CD3DDD4333333333DDDDDDDD33333333D43DCD4333333333DDDDDDDD33333333D4CDDD3333333333DDDDDDDD33333333CDCD333333333333DDDDDDDD33333333D433CD4333333333DDDDDDDD33333333333333DD33333333DDDDDDDD33333333333333DD33333333DDDDDDDD33333333333DDD3333333333DDDDDDDD33333333D43DDD3D33333333DDDDDDDD33333333D4CDD3CD33333333DDDDDDDD33333333CDCDDDD433333333DDDDDDDD33333333DDCD333D33333333DDDDDDDD33333333CDCDD33333333333DDDDDDDD33333333D4DD333333333333DDDDDDDD33333333D3D4333333333333DDD3DDD333333333CD333DDD3DDD3DDD3DDD3DDD3DDD3DDD3DDDDDD3DDD3DDD3DDD3DDD3DDD3DDD3DDD333D433D433D433D433D433D433D433DD3CDC3CDC3CDC3CDC3CDC3CDC3CDCDCDCD3CDD3CDD3CDD3CDD33DD33CD33CDD4CCDCDCDCDCDCDCDCDD4CDD3CDD3CDD3CDDDCDCDCD33CD33CD33CD33CDCDCDDDCDDDCDCDCDCDCDCDCDCDCDCDCDCDCDDD3DCDCDCDCDCDCDCDCDCDCDCDCDCDCDD4CDD43333333333D333D33333333333D43333333333333333333333333C333C333333333333333333333333D333DD33CDD333CD33CD33CD333D333333CD33CD33CDDDCDCDCD43CDD4CDDDCDCDCDCDCDDDCDDDCDCDCDCDCDCDCDCDCDCDCDCDCDDDCDCDCDCD3CCD3CCD3CCD3CCD3CCD3CDD3CDDCDD3CDD3CDD3CDD3CDD3CDD3CDD3CDCDCDCDCDCDCDDDCDDDCDCDCDCDCDCDCDD4DD33D433D4D3D4D3DD33DD33D4D4D4D4D4D4DDD4DDD4DDD3DDD3D4D4D4D4D4CD33CD33CD33DD33DD33DD33DD33CD333DDD3DDD3DDD3DDD3DDD3DDD3DDD3DDDDDD3DDD3DDD3DDD3DDD3DDD3DDD3DDD333DD3333333333333333333333333333DCDC3333333333333333333333333333DD4C333333333DD4CDDDCDCDCD33CD33D33D33333333CDCDCDCDCD3CCD3CCD3CD43D33333333DDCDDDCDD3CDD3CDD3CDD43C33333333CD33CD33CD33CD33CD33D3CD3333333333333333333333333333D433333C333C333333333333333333333333DDDDDDDD33333333333C333C33333CDDDDDDDDDD3CDDCDD3DD33D3333333333D4333433333333333333333333333D43D3333333333333333333333333333D43D33333333D4CDD4DDD4D4D4DDD4CDD43C33333333D3D4D4D4D4D433D4D3D4D3CD3333333333DD3CDD3CDC3CDC3CDCCDCD333333334CD3DCD3DCD4DCD4DCDDD4D433333333D4DDD4DDD4D4D4D4D4D4D4D433333333D333D433D433D433D433CD3333333333333333333333333333333DDD3DDD3DDD3DDD3DDD3DDD3DDD3DDDDDD3DDD3DDD3DDD3DDD3DDD3DDD3DDD33333333333333333333333333333333333333333333333333333333333333333CD33CD33CDCDCDDD3DD4333333333333CD3CCD3CCD3CCD3CCD3C333333333333D33DD33CD33CD33CD33C333333333333D433D333D333D333D333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333D43CD4D4D4D4D4DDD4CD333333333333D4D4D4D4D4D4D4DDD3DD3333333333333CDD3CDD3CDCDCDCDCDC333333333333DCDDDCDCDCDCDCD3DCD3333333333333D4D4D4D4D4D4D4DDD4DD333333333333D433D433D433D433D333333333333333333333333333333333333333333333333DDD3DDD3DDD3DDD3DDD3DDD3DDD3DDDDDD3DDD3DDD3DDD3DDD3DDD3DDD3DDD33333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333DD3CDD3CDC3CD433DD333D3CDC3333433CD33DD33D333D433CD333D33D3333DD33DD434D43D333DD33CD434D43333333333333333333333333333333333333DDD4DDD43D433D433D433D433D433333D4DDD4DDD4D4D4D4D4D4D4D4D4D43333D3CDD4DDD4D4D4D4D4D4D4DDD4DD3333D3D4D4D4D4D4D4D4D4D4D4D4D4D43333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333DDD3DDD3DDD3DDD3DDD3DDD3DDD3DDDDDD3DDD3DDD3DDD3DDD3DDDDDDDDDDDD33333333333333333333DDDDDDDDDDDD33333333333333333333DDDDDDDDDDDD33333333333333333333DDDDDDDDDDDD33333333333333333333DDDDDDDDDDDD33333333333333333333DDDDDDDDDDDD3CDC3CDD33DD33333333DDDDDDDDDDDDD33DDC4D4C4C33333333DDDDDDDDDDDD4D43DD4DDD3D33333333DDDDDDDDDDDD33333333333333333333DDDDDDDDDDDD3D433D433D4333333333DDDDDDDDDDDDD4D4D4DDD4DD33333333DDDDDDDDDDDDD4D4D4D4D3D433333333DDDDDDDDDDDDD4D4D4DDD4DD33333333DDDDDDDDDDDD3333D333D33333333333DDDDDDDDDDDD33333333333333333333DDDDDDDDDDDD33333333333333333333DDDDDDDDDDDD33333333333333333333DDDDDDDDDDDD33333333333333333333DDDDDDDDDDDD33333333333333333333DDDDDDDDDDDD3DDD3DDD3DDD3DDD3DDDDDDDDDDDDDDD \ No newline at end of file diff --git a/ribbons/ticket.pal b/ribbons/ticket.pal new file mode 100644 index 0000000..c1a8373 --- /dev/null +++ b/ribbons/ticket.pal @@ -0,0 +1,5 @@ + RGB 18, 0, 0 + RGB 0, 0, 0 + RGB 31, 31, 31 + RGB 15, 31, 31 + RGB 6, 15, 29 \ No newline at end of file From a1e126d51b0593a8c37f7072e26a61f395a6288e Mon Sep 17 00:00:00 2001 From: Artrios Date: Sun, 18 Jul 2021 15:42:50 +0800 Subject: [PATCH 09/13] Begin translating series 2 --- battle-e/trainers/anthony.asm | 8 ++++++++ battle-e/trainers/chisa.asm | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/battle-e/trainers/anthony.asm b/battle-e/trainers/anthony.asm index 4cc23d1..04a0e7a 100644 --- a/battle-e/trainers/anthony.asm +++ b/battle-e/trainers/anthony.asm @@ -5,9 +5,14 @@ INCLUDE "trainers/macros.asm" BT_Level 0 db GENTLEMAN BT_Floor 0 + Text_EN "ANTHONY"8 Text_JP "アンソニー"8 OT_ID 00000, 00000 + Intro_EN $0a43, $1e0b, $0408, $1228, $102b, $100b + Win_EN $0a43, $1034, $020e, $1405, $0408, $100b + Loss_EN $0a1a, $1034, $020e, $1405, $0408, $100b + Intro_JP $0a43, $1e0b, $0408, $1228, $102b, $100b Win_JP $0a43, $1034, $020e, $1405, $0408, $100b Loss_JP $0a1a, $1034, $020e, $1405, $0408, $100b @@ -21,6 +26,7 @@ INCLUDE "trainers/macros.asm" OT_ID 00000, 00000 IVs 15,15,15,31,31,15, 0 PV $0000000F + Text_EN "ALAKAZAM"11 Text_JP "フーディン"11 Friendship 255 @@ -33,6 +39,7 @@ INCLUDE "trainers/macros.asm" OT_ID 00000, 00000 IVs 31,31,15,15,15,15, 0 PV $00000080 + Text_EN "HARIMYAMA"11 Text_JP "ハリテヤマ"11 Friendship 255 @@ -45,6 +52,7 @@ INCLUDE "trainers/macros.asm" OT_ID 00000, 00000 IVs 15,31,15,31,15,15, 0 PV $0000001C + Text_EN "SHEDINJA"11 Text_JP "ヌケニン"11 Friendship 255 diff --git a/battle-e/trainers/chisa.asm b/battle-e/trainers/chisa.asm index 3bba7e8..029c36c 100644 --- a/battle-e/trainers/chisa.asm +++ b/battle-e/trainers/chisa.asm @@ -5,9 +5,14 @@ INCLUDE "trainers/macros.asm" BT_Level 0 db SCHOOL_KID_F BT_Floor 0 + Text_EN "CHISA"8 Text_JP "チサ"8 OT_ID 00000, 00000 + Intro_EN $1428, $020e, $162c, $1616, $1602, $1033 + Win_EN $1428, $0418, $0e16, $100b, $142f, $103f + Loss_EN $0418, $0e16, $102b, $0a48, $1428, $020e + Intro_JP $1428, $020e, $162c, $1616, $1602, $1033 Win_JP $1428, $0418, $0e16, $100b, $142f, $103f Loss_JP $0418, $0e16, $102b, $0a48, $1428, $020e @@ -21,6 +26,7 @@ INCLUDE "trainers/macros.asm" OT_ID 00000, 00000 IVs 15,15,31,15,15,31, 0 PV $00000019 + Text_EN "AZURILL"11 Text_JP "ルリリ"11 Friendship 255 @@ -33,6 +39,7 @@ INCLUDE "trainers/macros.asm" OT_ID 00000, 00000 IVs 15,15,31,15,15,31, 0 PV $000000E0 + Text_EN "WYNAUT"11 Text_JP "ソーナノ"11 Friendship 255 @@ -45,6 +52,7 @@ INCLUDE "trainers/macros.asm" OT_ID 00000, 00000 IVs 15,15,15,31,31,15, 0 PV $000000E7 + Text_EN "PICHU"11 Text_JP "ピチュー"11 Friendship 255 From 63ee4c9c2512d3cd15aefc59d9d1090d279306ae Mon Sep 17 00:00:00 2001 From: Artrios Date: Sun, 18 Jul 2021 15:43:42 +0800 Subject: [PATCH 10/13] Changed nature constants cause I can't math --- constants/natures.asm | 48 +++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/constants/natures.asm b/constants/natures.asm index 98cf86e..d2aade9 100644 --- a/constants/natures.asm +++ b/constants/natures.asm @@ -81,27 +81,27 @@ SHINY_CAREFUL_FEMALE EQU $00170017 SHINY_QUIRKY_FEMALE EQU $00180018 ; MALE -SHINY_HARDY_MALE EQU $00E100E1 -SHINY_LONELY_MALE EQU $00E200E2 -SHINY_BRAVE_MALE EQU $00E300E3 -SHINY_ADAMANT_MALE EQU $00E400E4 -SHINY_NAUGHTY_MALE EQU $00E500E5 -SHINY_BOLD_MALE EQU $00E600E6 -SHINY_DOCILE_MALE EQU $00E700E7 -SHINY_RELAXED_MALE EQU $00E800E8 -SHINY_IMPISH_MALE EQU $00E900E9 -SHINY_LAX_MALE EQU $00EA00EA -SHINY_TIMID_MALE EQU $00EB00EB -SHINY_HASTY_MALE EQU $00EC00EC -SHINY_SERIOUS_MALE EQU $00ED00ED -SHINY_JOLLY_MALE EQU $00EE00EE -SHINY_NAIVE_MALE EQU $00EF00EF -SHINY_MODEST_MALE EQU $00F000F0 -SHINY_QUIET_MALE EQU $00F100F1 -SHINY_BASHFUL_MALE EQU $00F200F2 -SHINY_RASH_MALE EQU $00F300F3 -SHINY_CALM_MALE EQU $00F400F4 -SHINY_GENTLE_MALE EQU $00F500F5 -SHINY_SASSY_MALE EQU $00F600F6 -SHINY_CAREFUL_MALE EQU $00F700F7 -SHINY_QUIRKY_MALE EQU $00F800F8 \ No newline at end of file +SHINY_HASTY_MALE EQU $00E400E4 +SHINY_SERIOUS_MALE EQU $00E500E5 +SHINY_JOLLY_MALE EQU $00E600E6 +SHINY_NAIVE_MALE EQU $00E700E7 +SHINY_MODEST_MALE EQU $00E800E8 +SHINY_QUIET_MALE EQU $00E900E9 +SHINY_BASHFUL_MALE EQU $00EA00EA +SHINY_RASH_MALE EQU $00EB00EB +SHINY_CALM_MALE EQU $00EC00EC +SHINY_GENTLE_MALE EQU $00ED00ED +SHINY_SASSY_MALE EQU $00EE00EE +SHINY_CAREFUL_MALE EQU $00EF00EF +SHINY_QUIRKY_MALE EQU $00F000F0 +SHINY_HARDY_MALE EQU $00F100F1 +SHINY_LONELY_MALE EQU $00F200F2 +SHINY_BRAVE_MALE EQU $00F300F3 +SHINY_ADAMANT_MALE EQU $00F400F4 +SHINY_NAUGHTY_MALE EQU $00F500F5 +SHINY_BOLD_MALE EQU $00F600F6 +SHINY_DOCILE_MALE EQU $00F700F7 +SHINY_RELAXED_MALE EQU $00F800F8 +SHINY_IMPISH_MALE EQU $00F900F9 +SHINY_LAX_MALE EQU $00FA00FA +SHINY_TIMID_MALE EQU $00FB00FB \ No newline at end of file From c6cc5f9a5f337739f957caf8491fdd321bb57cec Mon Sep 17 00:00:00 2001 From: Artrios Date: Mon, 19 Jul 2021 18:52:19 +0800 Subject: [PATCH 11/13] Add gift pokemon card --- giftpokemon/00-G000.asm | 173 +++++++++++++++++++++++++++++ giftpokemon/Makefile | 42 ++++++++ giftpokemon/giftpokemon.asm | 62 +++++++++++ giftpokemon/macros.asm | 92 ++++++++++++++++ giftpokemon/prologue.asm | 15 +++ giftpokemon/ticket.4bpp | 1 + giftpokemon/ticket.pal | 5 + scripts/pokemonstructure.py | 210 ++++++++++++++++++++++++++++++++++++ 8 files changed, 600 insertions(+) create mode 100644 giftpokemon/00-G000.asm create mode 100644 giftpokemon/Makefile create mode 100644 giftpokemon/giftpokemon.asm create mode 100644 giftpokemon/macros.asm create mode 100644 giftpokemon/prologue.asm create mode 100644 giftpokemon/ticket.4bpp create mode 100644 giftpokemon/ticket.pal create mode 100644 scripts/pokemonstructure.py diff --git a/giftpokemon/00-G000.asm b/giftpokemon/00-G000.asm new file mode 100644 index 0000000..b985960 --- /dev/null +++ b/giftpokemon/00-G000.asm @@ -0,0 +1,173 @@ +INCLUDE "../macros.asm" +SECTION "eonticket",ROM0[$100] +jp Start +db $00 + +TicketSprite: ; 104 + INCBIN "ticket.4bpp" +TicketPalette: ; 1604 + INCLUDE "ticket.pal" + +Prologue: + INCBIN "prologue-{REGION_NAME}.bin" + +DataPacket: ; 164a + INCBIN "giftpokemon-{REGION_NAME}.mev" + db 0,0,0 ; padding + +INCLUDE "../common/mem_struct.asm" + +SpriteData: + dw TicketSprite,TicketPalette + db $15,$08,$01,$01,$01,$01,$01 ; width 15, height 8 + +Instructions1: ; 1921 + db "Link e-Reader to Pokémon Emerald\n" + db "and select Mystery Events on the\n" + db "game's main menu.\n" + db "Press the B Button to cancel.\0" + +Instructions2: ; 199d + db "Press the A Button on the Game Boy\n" + db "Advance containing Pokémon Emerald\n" + db "to receive a special Pokémon.\0" + +DeliveryInProcess: ; 1a0d + db "Pokémon delivery in Process...\0" + +TicketDelivered: ; 1a2f + db "Pokémon delivered!\n" + db "\n" + db "Press the A Button to resend.\n" + db "Press the B Button to cancel.\0" + +; this function is subtly different than the one +; on the Battle e cards, for no apparent reason +TransferData: + LD_IND_HL SomeVar1 + push de + ld hl, $bbbb + LD_IND_HL Space_1 + EX_DE_HL + LD_IND_HL Space_2 + API_0C7 Space_1 + + wait $01 + pop hl + inc hl + ld b, $01 + call WordShiftRight + + LD_IND_HL SomeVar2 +.asm_1aa1 + LD_HL_IND SomeVar2 + ld a, l + or h + ret z + + ld hl, $8888 + LD_IND_HL Space_1 + ld e, $01 + +.asm_1aaf + ld a, e + cp $08 + jr nc, .asm_1ad9 + + push de + LD_HL_IND SomeVar1 + ld c, [hl] + inc hl + ld b, [hl] + inc hl + LD_IND_HL SomeVar1 + ld l, e + ld h, $00 + add hl, hl + ld de, Space_1 + add hl, de + ld [hl], c + inc hl + ld [hl], b + pop de + LD_HL_IND SomeVar2 + dec hl + LD_IND_HL SomeVar2 + ld a, l + or h + jr z, .asm_1ad9 + + inc e + jr .asm_1aaf + +.asm_1ad9 + API_0C7 Space_1 + wait $01 + jr .asm_1aa1 + +Start: ; 1ae2 + API_121 + + CreateCustomSprite SpriteHandlePtr, $80, SpriteData + SetSpritePos SpriteHandlePtr, 120, 64 + SpriteHide SpriteHandlePtr + + CreateRegion RegionHandlePtr, 30, 6, 0, 14, 0, 4 + + ld h, a + ld l, $00 + SetTextSize + + API_09B RegionHandlePtr, $0102 + SetTextColor RegionHandlePtr, 2, 0 + SetRegionColor RegionHandlePtr, 0 + SetBackgroundPalette 16, $0040, TicketPalette + + FadeIn 16 + wait 16 + + API $0C6 + + DrawText RegionHandlePtr, Instructions1, 8, 4 + API $08D + +INCLUDE "../common/wait_for_link.asm" + + SpriteShow SpriteHandlePtr + + DrawText RegionHandlePtr, Instructions2, 8, 4 + API $08D + + ld a, b + nop + +UNKNOWN_VALUE EQU $0078 +INCLUDE "../common/wait_for_ready.asm" + + DrawText RegionHandlePtr, DeliveryInProcess, 8, 4 + +DATA_TRANSFER_LENGTH EQU 6144 +INCLUDE "../common/transfer_data.asm" + ld hl, $5fff + LD_IND_HL Space_1 + API_0C7 Space_1 + + wait $80 + + SpriteHide SpriteHandlePtr + + DrawText RegionHandlePtr, TicketDelivered, 8, 4 + + API $08D + ld c, a + nop + +INCLUDE "../common/wrap_up.asm" + +INCLUDE "../common/word_shift_right.asm" + +SomeVar1: ; 1CA2 + db $FF,0 ; mark EOF +RegionHandlePtr: db 0 ; 1CA4 +SpriteHandlePtr: db 0,0 ; 1CA5 +SomeVar2: db 0,0 ; 1CA7 \ No newline at end of file diff --git a/giftpokemon/Makefile b/giftpokemon/Makefile new file mode 100644 index 0000000..ae62005 --- /dev/null +++ b/giftpokemon/Makefile @@ -0,0 +1,42 @@ +all: 00-G000-EN.raw + + +giftpokemon-%.tx: giftpokemon.asm + python ../scripts/regionalize.py $< $@ $* $* +giftpokemon-%.o: giftpokemon-%.tx + ./rgbasm -o $@ $< +giftpokemon-%.gbc: giftpokemon-%.o + ./rgblink -o $@ $< +giftpokemon1-%.bin: giftpokemon-%.gbc + python ../scripts/stripgbc.py $< $@ +giftpokemon-%.bin: giftpokemon1-%.bin + python ../scripts/pokemonstructure.py $< $@ +giftpokemon-%.mev: giftpokemon-%.bin + python ../scripts/checksum.py $< $@ + +prologue-%.tx: prologue.asm + python ../scripts/regionalize.py $< $@ $* $* +prologue-%.o: prologue-%.tx + ./rgbasm -o $@ $< +prologue-%.gbc: prologue-%.o + ./rgblink -o $@ $< +prologue-%.bin: prologue-%.gbc + python ../scripts/stripgbc.py $< $@ + +00-G000-%.tx: 00-G000.asm giftpokemon-%.mev prologue-%.bin + python ../scripts/ereadertext.py $< $@ $* +00-G000-%.o: 00-G000-%.tx + ./rgbasm -o $@ $< +00-G000-%.gbc: 00-G000-%.o + ./rgblink -o $@ $< +00-G000-%.z80: 00-G000-%.gbc + python ../scripts/stripgbc.py $< $@ +00-G000-%.vpk: 00-G000-%.z80 + ./nevpk -c -i $< -o $@ +00-G000-%.raw: 00-G000-%.vpk + ./nedcmake -i $< -o $@ -type 1 -region 1 + mv $@-01.raw $@ + + +clean: + rm -f *.tx *.o *.gbc *.z80 *.bin *.mev *.vpk *.raw \ No newline at end of file diff --git a/giftpokemon/giftpokemon.asm b/giftpokemon/giftpokemon.asm new file mode 100644 index 0000000..5723941 --- /dev/null +++ b/giftpokemon/giftpokemon.asm @@ -0,0 +1,62 @@ +INCLUDE "./macros.asm" + + Mystery_Event + + db CHECKSUM_CRC + dd 0 ; checksum placeholder + GBAPTR DataStart + GBAPTR DataEnd + +DataStart: + db GIVE_POKEMON + GBAPTR PokemonStart + db $02 + +PokemonStart: + PV SHINY_ADAMANT_MALE + OT_ID 00000, 00000 + Text_EN "BELDUM"10 + Language $0202 ;Language $0201=JP $0202=EN $0203=FR $0204=IT $0205=DE $0206=KR $0607=ES $0601=EGG + Text_EN "STEVEN"7 + Markings 0 ;markings + dw 0 ;Checksum, will be computed later :) + dw 0 ;Unknown + +;Substruct1 + Pokemon BELDUM + Holds METAGROSSITE + dd 156 ;Experience + PP_Ups 0,0,0,0 ;PP_Ups + Friendship 0 ;Friendship + dw 0 ;Unknown + +;Substruct2 + Moves METEOR_MASH, SHADOW_BALL, EARTHQUAKE, SLUDGE_BOMB + PP 10, 15, 10, 15 + +;Substruct3 + EVs 0,255,0,0,255,0 + Condition 0,0,0,0,0,0 ;i.e. Contest Condition + +;Substruct4 + PokerusStatus 0 + MetLocation $FF + Origins 5,3,4,0 ;Lv met, Game of Origin, Ball, OT Gender + IVs 31,31,31,31,31,31, ABILITY1 + Ribbons 0 + + dd 0 ;Status condition + db 5 ;Lv + db 0 ;pokerus remaining + dw 20 ;Current HP + dw 20 ;Total HP + dw 16 ;Attack + dw 14 ;Def + dw 9 ;Speed + dw 9 ;Sp Atk + dw 15 ;Sp Def + + End_GiftPokemon ;Use End_GiftEgg if sending egg + +DataEnd: + EOF \ No newline at end of file diff --git a/giftpokemon/macros.asm b/giftpokemon/macros.asm new file mode 100644 index 0000000..eb50605 --- /dev/null +++ b/giftpokemon/macros.asm @@ -0,0 +1,92 @@ +INCLUDE "../macros.asm" +INCLUDE "../constants/abilities.asm" +INCLUDE "../constants/easychat.asm" +INCLUDE "../constants/items_expansion.asm" +INCLUDE "../constants/moves.asm" +INCLUDE "../constants/natures.asm" +INCLUDE "../constants/pokemon_expansion.asm" +INCLUDE "../constants/trainerclasses.asm" + +MOSSDEEP EQU 0 + +Battle_Trainer: MACRO + Section "battle",ROM0[$100] + 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 + +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 +Win_EN: MACRO + IF REGION == REGION_EN + dw \1, \2, \3, \4, \5, \6 + ENDC + ENDM +Loss_EN: MACRO + IF REGION == REGION_EN + dw \1, \2, \3, \4, \5, \6 + ENDC + ENDM +Intro_JP: MACRO + IF REGION == REGION_JP + dw \1, \2, \3, \4, \5, \6 + ENDC + ENDM +Win_JP: MACRO + IF REGION == REGION_JP + dw \1, \2, \3, \4, \5, \6 + ENDC + ENDM +Loss_JP: MACRO + IF REGION == REGION_JP + dw \1, \2, \3, \4, \5, \6 + ENDC + 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 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) + ENDM +PV: MACRO + dw (\1 & $FFFF), (\1 >> 16) + ENDM +Friendship EQUS "db" +Pokeball EQUS "dw" +Language EQUS "dw" +Markings EQUS "db" +PP EQUS "db" +Condition EQUS "db" +PokerusStatus EQUS "db" +MetLocation EQUS "db" +Origins: MACRO + dw \1 + (\2 << 7) + (\3 << 11) + (\4 << 15) + ENDM +Ribbons EQUS "dd" +Ability: MACRO + dd (\1 << 28) + ENDM +End_GiftPokemon: MACRO + db $01,$00,$02,$00,$03,$00,$04,$00,$05,$00,$06,$00,$07,$00,$08,$00,$09,$00,$BF,$C8,$C1,$C6,$C3,$CD,$C2,$FF,$0F,$27,$00,$00,$4A,$75,$82,$00,$00,$03 + ENDM + +End_GiftEgg: MACRO + db $00,$31,$00,$03,$49,$6A,$00,$03,$30,$06,$00,$00,$00,$31,$00,$03,$DF,$8F,$00,$08,$F0,$17,$00,$03,$A3,$07,$00,$08,$17,$00,$00,$00,$8C,$1D,$00,$03 + ENDM \ No newline at end of file diff --git a/giftpokemon/prologue.asm b/giftpokemon/prologue.asm new file mode 100644 index 0000000..0db33e1 --- /dev/null +++ b/giftpokemon/prologue.asm @@ -0,0 +1,15 @@ +INCLUDE "../macros.asm" +SECTION "prologue", ROM0[$100] + + db "GameFreak inc." + db 0,0,0,0,0,0 + dd 0 + Text "e reader" ; no string terminator + 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/giftpokemon/ticket.4bpp b/giftpokemon/ticket.4bpp new file mode 100644 index 0000000..678d42a --- /dev/null +++ b/giftpokemon/ticket.4bpp @@ -0,0 +1 @@ +DDDDDDDDDDDDDDD3DDD3DDD3DDD3DDD3DDDDDDDDDDDD33333333333333333333DDDDDDDDDDDD33333333333C333C333CDDDDDDDDDDDD33333333DDDDDDDDD433DDDDDDDDDDDD3333333343CD43DD33DDDDDDDDDDDDDD33333333DD43DDD33DD3DDDDDDDDDDDD33333333CD43CDD3CDD3DDDDDDDDDDDD33333333DD33DD33DD33DDDDDDDDDDDD3333333333CD33CD3333DDDDDDDDDDDD33333333DDDDDDDDCD43DDDDDDDDDDDD3333333343DD43DD33DDDDDDDDDDDDDD3333333333DD3CDD3CD4DDDDDDDDDDDD33333333DD33DD43CD43DDDDDDDDDDDD33333333DD3DDD3DDD3DDDDDDDDDDDDD33333333D3CDD3CDD3CDDDDDDDDDDDDD33333333DDD4DDD44333DDDDDDDDDDDD333333333DDD3DDD333DDDDDDDDDDDDD33333333DDD3DDD3D333DDDDDDDDDDDD33333333333333333333DDDDDDDDDDDD33333333333333333333DDDDDDDDDDDD3DDD3DDD3DDD3DDD3DDDDDD3DDD3DDD3DDD3DDD3DDD3DDD3DDD333333333333333333333333333333333333C333C333C333C333C333C333C333CD433D433DDD4DDD4D433D433D433DDDD33DD33DD33DD33DD33DD33DD33DD43DD3DD33DD33DD33DD33DD33DD33DD3DDD3CDD4CDD4CDDDCD4DCD4DCD4CCD4CCD43DD33DD33DD33DD33DD33DD33DD33DD3333333333333333333333333333333333CD43CD43CD43CD43CD43CD43CD43CD4333DD33DD33DD33DD33DD33DD33DD33DD3CD43CD43CD43CD43CD43CD43CD43CDDCD43CD4333333333CD43CD43CD43DD43DD3DDDCDDDDDDDDDDDCDDD3DDD3DDD3DD3CD43CD33CD33CD43CDD3CDD3CDD3CD43334333DD43DD43433343334333DDD4333D333D333D333D333D333D333D333DD333D333D333D333D333D333D333D33333333333333333333333333333333333333333333333333333333333333333333DDD3DDD3DDD3DDD3DDD3DDD3DDD3DDDDDD3DDD3DDD3DDD3DDD3DDD3DDD3DDD33333333333333DDD3DDD3333333333D4333C33333333DDDDDDDD333333333CDCDDDD33333333DDDDDDDD33333333D3CD43CD33333333DDDDDDDD33333333CD3DDD4333333333DDDDDDDD33333333D43DCD4333333333DDDDDDDD33333333D4CDDD3333333333DDDDDDDD33333333CDCD333333333333DDDDDDDD33333333D433CD4333333333DDDDDDDD33333333333333DD33333333DDDDDDDD33333333333333DD33333333DDDDDDDD33333333333DDD3333333333DDDDDDDD33333333D43DDD3D33333333DDDDDDDD33333333D4CDD3CD33333333DDDDDDDD33333333CDCDDDD433333333DDDDDDDD33333333DDCD333D33333333DDDDDDDD33333333CDCDD33333333333DDDDDDDD33333333D4DD333333333333DDDDDDDD33333333D3D4333333333333DDD3DDD333333333CD333DDD3DDD3DDD3DDD3DDD3DDD3DDD3DDDDDD3DDD3DDD3DDD3DDD3DDD3DDD3DDD333D433D433D433D433D433D433D433DD3CDC3CDC3CDC3CDC3CDC3CDC3CDCDCDCD3CDD3CDD3CDD3CDD33DD33CD33CDD4CCDCDCDCDCDCDCDCDD4CDD3CDD3CDD3CDDDCDCDCD33CD33CD33CD33CDCDCDDDCDDDCDCDCDCDCDCDCDCDCDCDCDCDCDDD3DCDCDCDCDCDCDCDCDCDCDCDCDCDCDD4CDD43333333333D333D33333333333D43333333333333333333333333C333C333333333333333333333333D333DD33CDD333CD33CD33CD333D333333CD33CD33CDDDCDCDCD43CDD4CDDDCDCDCDCDCDDDCDDDCDCDCDCDCDCDCDCDCDCDCDCDCDDDCDCDCDCD3CCD3CCD3CCD3CCD3CCD3CDD3CDDCDD3CDD3CDD3CDD3CDD3CDD3CDD3CDCDCDCDCDCDCDDDCDDDCDCDCDCDCDCDCDD4DD33D433D4D3D4D3DD33DD33D4D4D4D4D4D4DDD4DDD4DDD3DDD3D4D4D4D4D4CD33CD33CD33DD33DD33DD33DD33CD333DDD3DDD3DDD3DDD3DDD3DDD3DDD3DDDDDD3DDD3DDD3DDD3DDD3DDD3DDD3DDD333DD3333333333333333333333333333DCDC3333333333333333333333333333DD4C333333333DD4CDDDCDCDCD33CD33D33D33333333CDCDCDCDCD3CCD3CCD3CD43D33333333DDCDDDCDD3CDD3CDD3CDD43C33333333CD33CD33CD33CD33CD33D3CD3333333333333333333333333333D433333C333C333333333333333333333333DDDDDDDD33333333333C333C33333CDDDDDDDDDD3CDDCDD3DD33D3333333333D4333433333333333333333333333D43D3333333333333333333333333333D43D33333333D4CDD4DDD4D4D4DDD4CDD43C33333333D3D4D4D4D4D433D4D3D4D3CD3333333333DD3CDD3CDC3CDC3CDCCDCD333333334CD3DCD3DCD4DCD4DCDDD4D433333333D4DDD4DDD4D4D4D4D4D4D4D433333333D333D433D433D433D433CD3333333333333333333333333333333DDD3DDD3DDD3DDD3DDD3DDD3DDD3DDDDDD3DDD3DDD3DDD3DDD3DDD3DDD3DDD33333333333333333333333333333333333333333333333333333333333333333CD33CD33CDCDCDDD3DD4333333333333CD3CCD3CCD3CCD3CCD3C333333333333D33DD33CD33CD33CD33C333333333333D433D333D333D333D333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333D43CD4D4D4D4D4DDD4CD333333333333D4D4D4D4D4D4D4DDD3DD3333333333333CDD3CDD3CDCDCDCDCDC333333333333DCDDDCDCDCDCDCD3DCD3333333333333D4D4D4D4D4D4D4DDD4DD333333333333D433D433D433D433D333333333333333333333333333333333333333333333333DDD3DDD3DDD3DDD3DDD3DDD3DDD3DDDDDD3DDD3DDD3DDD3DDD3DDD3DDD3DDD33333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333DD3CDD3CDC3CD433DD333D3CDC3333433CD33DD33D333D433CD333D33D3333DD33DD434D43D333DD33CD434D43333333333333333333333333333333333333DDD4DDD43D433D433D433D433D433333D4DDD4DDD4D4D4D4D4D4D4D4D4D43333D3CDD4DDD4D4D4D4D4D4D4DDD4DD3333D3D4D4D4D4D4D4D4D4D4D4D4D4D43333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333DDD3DDD3DDD3DDD3DDD3DDD3DDD3DDDDDD3DDD3DDD3DDD3DDD3DDDDDDDDDDDD33333333333333333333DDDDDDDDDDDD33333333333333333333DDDDDDDDDDDD33333333333333333333DDDDDDDDDDDD33333333333333333333DDDDDDDDDDDD33333333333333333333DDDDDDDDDDDD3CDC3CDD33DD33333333DDDDDDDDDDDDD33DDC4D4C4C33333333DDDDDDDDDDDD4D43DD4DDD3D33333333DDDDDDDDDDDD33333333333333333333DDDDDDDDDDDD3D433D433D4333333333DDDDDDDDDDDDD4D4D4DDD4DD33333333DDDDDDDDDDDDD4D4D4D4D3D433333333DDDDDDDDDDDDD4D4D4DDD4DD33333333DDDDDDDDDDDD3333D333D33333333333DDDDDDDDDDDD33333333333333333333DDDDDDDDDDDD33333333333333333333DDDDDDDDDDDD33333333333333333333DDDDDDDDDDDD33333333333333333333DDDDDDDDDDDD33333333333333333333DDDDDDDDDDDD3DDD3DDD3DDD3DDD3DDDDDDDDDDDDDDD \ No newline at end of file diff --git a/giftpokemon/ticket.pal b/giftpokemon/ticket.pal new file mode 100644 index 0000000..c1a8373 --- /dev/null +++ b/giftpokemon/ticket.pal @@ -0,0 +1,5 @@ + RGB 18, 0, 0 + RGB 0, 0, 0 + RGB 31, 31, 31 + RGB 15, 31, 31 + RGB 6, 15, 29 \ No newline at end of file diff --git a/scripts/pokemonstructure.py b/scripts/pokemonstructure.py new file mode 100644 index 0000000..599e935 --- /dev/null +++ b/scripts/pokemonstructure.py @@ -0,0 +1,210 @@ +# -*- coding: utf-8 -*- +import struct +import sys + +data = "" +dataout="" +with open(sys.argv[1], 'rb') as f: + data = f.read() +f.closed + +pv=struct.unpack('> 24 +key3 = ((pv ^ otid) >> 16) & mask +key2 = ((pv ^ otid) >> 8) & mask +key1 = (pv ^ otid) & mask + +substructG=[struct.unpack('> 8) + data[66:] + +i=0 +while i < 12: + substructG[i] ^= key1 + substructA[i] ^= key1 + substructE[i] ^= key1 + substructM[i] ^= key1 + substructG[i+1] ^= key2 + substructA[i+1] ^= key2 + substructE[i+1] ^= key2 + substructM[i+1] ^= key2 + substructG[i+2] ^= key3 + substructA[i+2] ^= key3 + substructE[i+2] ^= key3 + substructM[i+2] ^= key3 + substructG[i+3] ^= key4 + substructA[i+3] ^= key4 + substructE[i+3] ^= key4 + substructM[i+3] ^= key4 + i+=4 + + +mod = pv % 24 +i=0 +if mod == 0: + for i in range(12): + data = data[0:68+i] + struct.pack(' Date: Mon, 19 Jul 2021 18:54:31 +0800 Subject: [PATCH 12/13] typo --- giftpokemon/giftpokemon.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/giftpokemon/giftpokemon.asm b/giftpokemon/giftpokemon.asm index 5723941..09a2ac4 100644 --- a/giftpokemon/giftpokemon.asm +++ b/giftpokemon/giftpokemon.asm @@ -16,7 +16,7 @@ PokemonStart: PV SHINY_ADAMANT_MALE OT_ID 00000, 00000 Text_EN "BELDUM"10 - Language $0202 ;Language $0201=JP $0202=EN $0203=FR $0204=IT $0205=DE $0206=KR $0607=ES $0601=EGG + Language $0202 ;Language $0201=JP $0202=EN $0203=FR $0204=IT $0205=DE $0206=KR $0207=ES $0601=EGG Text_EN "STEVEN"7 Markings 0 ;markings dw 0 ;Checksum, will be computed later :) From 05a6f5bb7e8e397416a0dbda8e6cd62a00dcf452 Mon Sep 17 00:00:00 2001 From: Artrios Date: Mon, 19 Jul 2021 19:03:39 +0800 Subject: [PATCH 13/13] Remove non-existing item --- giftpokemon/giftpokemon.asm | 4 ++-- giftpokemon/macros.asm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/giftpokemon/giftpokemon.asm b/giftpokemon/giftpokemon.asm index 09a2ac4..8531558 100644 --- a/giftpokemon/giftpokemon.asm +++ b/giftpokemon/giftpokemon.asm @@ -19,12 +19,12 @@ PokemonStart: Language $0202 ;Language $0201=JP $0202=EN $0203=FR $0204=IT $0205=DE $0206=KR $0207=ES $0601=EGG Text_EN "STEVEN"7 Markings 0 ;markings - dw 0 ;Checksum, will be computed later :) + dw 0 ;Checksum, computed later dw 0 ;Unknown ;Substruct1 Pokemon BELDUM - Holds METAGROSSITE + Holds ITEM_NONE dd 156 ;Experience PP_Ups 0,0,0,0 ;PP_Ups Friendship 0 ;Friendship diff --git a/giftpokemon/macros.asm b/giftpokemon/macros.asm index eb50605..2f02c3d 100644 --- a/giftpokemon/macros.asm +++ b/giftpokemon/macros.asm @@ -1,10 +1,10 @@ INCLUDE "../macros.asm" INCLUDE "../constants/abilities.asm" INCLUDE "../constants/easychat.asm" -INCLUDE "../constants/items_expansion.asm" +INCLUDE "../constants/items.asm" INCLUDE "../constants/moves.asm" INCLUDE "../constants/natures.asm" -INCLUDE "../constants/pokemon_expansion.asm" +INCLUDE "../constants/pokemon.asm" INCLUDE "../constants/trainerclasses.asm" MOSSDEEP EQU 0