Merge pull request #6 from gb-mobile:master

Trainer names / dialogue updates
This commit is contained in:
Paccy 2025-06-24 00:01:59 +08:00 committed by GitHub
commit 34eaefc957
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
58 changed files with 131 additions and 131 deletions

View File

@ -9,9 +9,9 @@ INCLUDE "trainers/macros.asm"
Text_JP "アンソニー"8
OT_ID 00000, 00000
Intro_EN MY, NEED, TO, WIN, IS, OVERWHELMING
Win_EN I, MUST_BE, THE, WINNER, _EX, $ffff
Loss_EN THIS, FEELING, WON_T, GO, AWAY, _ELIP
Intro_EN YOU, ARE, NO_MATCH, FOR, ME, _EX
Win_EN I, ALWAYS, WIN, IN, THIS, COLOR
Loss_EN _A, DREAM, THAT, WILL, LAST, FOREVER
Intro_JP $0a43, $1e0b, $0408, $1228, $102b, $100b
Win_JP $0a43, $1034, $020e, $1405, $0408, $100b

View File

@ -9,8 +9,8 @@ INCLUDE "trainers/macros.asm"
Text_JP "モモコ"8
OT_ID 00000, 00000
Intro_EN WE,ARE,READY,_FOR,MORE,_GROWTH
Win_EN WE,WILL,TRY,MORE,_FOR,_GROWTH
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
@ -56,4 +56,4 @@ INCLUDE "trainers/macros.asm"
Text_JP "ヨマワル"11
Friendship 255
End_Trainer
End_Trainer

View File

@ -9,9 +9,9 @@ INCLUDE "trainers/macros.asm"
Text_JP "チサ"8
OT_ID 00000, 00000
Intro_EN DO, YOU, LIKE, GRASS, POKEMON, _QU
Win_EN AREN_T, MY, GRASS, POKEMON, STRONG, _QU
Loss_EN MAYBE, SOME, _AROMATHERAPY, WOULD, BE, NICE
Intro_EN I, ADORE, MY, SMALL, POKEMON, OK_
Win_EN IT_S, NOT, JUST, SMALL, _AND, CUTE
Loss_EN MAYBE, MY, POKEMON, IS, ONLY, CUTE
Intro_JP $1428, $020e, $162c, $1616, $1602, $1033
Win_JP $1428, $0418, $0e16, $100b, $142f, $103f

View File

@ -10,8 +10,8 @@ INCLUDE "trainers/macros.asm"
OT_ID 00000, 00000
Intro_EN HEY, HEY, LOOK, AT, MY, POKEMON
Win_EN SO, SO, DID, I, SURPRISE, YOU
Loss_EN WAAAH, WAAAH, WHAT, _A, SURPRISE, _EX
Win_EN SO, DID, I, SURPRISE, YOU, _QU
Loss_EN OH_, OH_, WHAT, _A, SURPRISE, _EX
Intro_JP $0a14, $1034, $020e, $2017, $242c, $100e
Win_JP $0801, $0c00, $ffff, $2017, $0607, $100e

View File

@ -10,7 +10,7 @@ INCLUDE "trainers/macros.asm"
OT_ID 00000, 00000
Intro_EN I,CAN_T,WAIT,TO,BATTLE,_EX_EX
Win_EN _ICE_BEAM,WAS,TOO,COLD,_FOR,YOU
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
@ -56,4 +56,4 @@ INCLUDE "trainers/macros.asm"
Text_JP "レジアイス"11
Friendship 255
End_Trainer
End_Trainer

View File

@ -9,7 +9,7 @@ INCLUDE "trainers/macros.asm"
Text_JP "ファインズ"8
OT_ID 00000, 00000
Intro_EN I, HAVE, RARE, POKEMON, _EX, $ffff
Intro_EN I, HAVE, _A, RARE, POKEMON, _EX
Win_EN HAHAHA, DID, I, SURPRISE, YOU, _QU
Loss_EN EVEN_SO_, I, GOT, TO, SHOW, OFF

View File

@ -9,9 +9,9 @@ INCLUDE "trainers/macros.asm"
Text_JP "フクネ"8
OT_ID 00000, 00000
Intro_EN YOU, WILL, SHAKE, WITH, FEAR, _ELIP_EX
Win_EN CURSE, IS, _A, MYSTERY, _ELIP_EX, $ffff
Loss_EN DID, YOU, USE, CURSE, _ELIP, _QU
Intro_EN I, AM, SHAKY, WITH, FEAR, _ELIP_EX
Win_EN CURSE, IS, TRULY, _A, MYSTERY, _ELIP_EX
Loss_EN MY, POKEMON, HAS, _A, CURSE, _QU_EX
Intro_JP $1e0f, $1219, $0c04, $201a, $102d, $0c05
Win_JP $0e2d, $26ae, $1034, $143a, $102d, $0c05

View File

@ -10,8 +10,8 @@ INCLUDE "trainers/macros.asm"
OT_ID 00000, 00000
Intro_EN I, WILL, SHOW, YOU, MY, _ARMALDO
Win_EN SMOOTH, _SURF, _ELIP, SMOOTH, BATTLE, _ELIP
Loss_EN AIYEEH, _EX, MY, _ARMALDO, _ELIP, _ELIP
Win_EN SMOOTH, _SURF, SMOOTH, BATTLE, $ffff, $ffff
Loss_EN AIYEEH, _EX, NOT, MY, _ARMALDO, _ELIP
Intro_JP $0a02, $0175, $1222, $0c03, $1642, $1602
Win_JP $2639, $042c, $0c06, $0628, $042c, $0c06

View File

@ -14,7 +14,7 @@ INCLUDE "trainers/macros.asm"
Loss_JP $123a, $0408, $0e1f, $062e, $102f, $0c06
Intro_EN MY, POKEMON, HAVE, NICE, COLOR, _EX
Win_EN I, SAID, THEY, HAVE, NICE, COLOR
Win_EN THEY, HAVE, A, NICE, COLOR, HUH_
Loss_EN IT, SEEMS, COLOR, WASN_T, ENOUGH, _ELIP
Pokemon SEAKING

View File

@ -11,7 +11,7 @@ INCLUDE "trainers/macros.asm"
Intro_EN MY, GUARD, CAN_T, BE, DEFEATED, _EX
Win_EN BELIEVE, IN, YOUR, OWN, STRENGTH, _EX
Loss_EN IT, SEEMS, MY, GUARD, WAS, WEAK
Loss_EN MY, GUARD, CAN, BE, WEAK, TOO
Intro_JP $0a48, $061d, $0e1d, $0e1a, $142a, $1042
Win_JP $1e1b, $0c03, $ffff, $142a, $1010, $1021

View File

@ -13,8 +13,8 @@ INCLUDE "trainers/macros.asm"
Win_JP $040b, $2444, $0c05, $1e0d, $1017, $ffff
Loss_JP $0e2f, $2444, $0c05, $161a, $164a, $0c04
Intro_EN LOOK, AT, MY, AWESOME, STRATEGY, _EX_EX
Win_EN THAT_S, THE, BEAUTY, OF, THE, _COUNTER, _EX
Intro_EN AN, INCREDIBLE, MOVE, _ELIP_EX, HERE_I_COME, _EX_EX
Win_EN _A, BEAUTIFUL, _COUNTER, THIS_IS_IT_, $ffff, $ffff
Loss_EN MY, _COUNTER, ATTACK, DIDN_T, WORK, _ELIP
Pokemon VIGOROTH

View File

@ -9,9 +9,9 @@ INCLUDE "trainers/macros.asm"
Text_JP "イハラ"8
OT_ID 00000, 00000
Intro_EN MY, POKEMON, _AND, I, WORK, TOGETHER
Win_EN YOU_RE, NOT, READY, TO, UNDERSTAND, POKEMON
Loss_EN MY, LOSS, WAS, ON, ME, _ELIP
Intro_EN MY, POKEMON, RETURN, IN, KIND, _EX
Win_EN YOU_RE, NOT, READY, AS, A, TRAINER
Loss_EN I, CAN, FEEL, THEIR, FRUSTRATION, _ELIP
Intro_JP $0a1b, $0606, $0e0c, $142f, $1023, $0e08
Win_JP $24cf, $0605, $1034, $1404, $061d, $1020

View File

@ -9,7 +9,7 @@ INCLUDE "trainers/macros.asm"
Text_JP "コシキ"8
OT_ID 00000, 00000
Intro_EN MY,POKEMON,THANKS,ME,_FOR,CARE
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
@ -56,4 +56,4 @@ INCLUDE "trainers/macros.asm"
Text_JP "レジスチル"11
Friendship 255
End_Trainer
End_Trainer

View File

@ -10,7 +10,7 @@ INCLUDE "trainers/macros.asm"
OT_ID 00000, 00000
Intro_EN WHAT, _A, NICE, _SUNNY_DAY, IT, IS
Win_EN _A, _SUNNY_DAY, _FOR, VICTORY, _EX_EX, $ffff
Win_EN _A, _SUNNY_DAY, FOR, _A, VICTORY, _EX_EX
Loss_EN SEEMS, THE, _SUNNY_DAY, WASN_T, SO, NICE
Intro_JP $141f, $26f1, $0c00, $201f, $26f1, $0c00
@ -56,4 +56,4 @@ INCLUDE "trainers/macros.asm"
Text_JP "バクーダ"11
Friendship 255
End_Trainer
End_Trainer

View File

@ -11,7 +11,7 @@ INCLUDE "trainers/macros.asm"
Intro_EN I, COLLECT, POKEMON, WITH, DIFFERENT, LOOKS
Win_EN _SURSKIT, HAS, _A, NICE, LOOK, _EX
Loss_EN YOU, NEED, POKEMON, WITH, DIFFERENT, LOOKS
Loss_EN I, WILL, COLLECT, MORE, DIFFERENT, LOOKS
Intro_JP $0467, $1034, $1429, $020e, $1606, $1028
Win_JP $0467, $1429, $0134, $1232, $102d, $0c00

View File

@ -14,8 +14,8 @@ INCLUDE "trainers/macros.asm"
Loss_JP $201e, $0c06, $ffff, $0632, $122d, $0c06
Intro_EN WITH, MY, INNER_FOCUS, I, NEVER, GIVE_UP
Win_EN HAVE, YOUR, GUARD, UP, NEXT, TIME
Loss_EN I, DIDN_T, _PROTECT, MYSELF, ENOUGH, _ELIP
Win_EN WHEN, IT_S, TOUGH, I, _PROTECT, MYSELF
Loss_EN I, DIDN_T, GUARD, MYSELF, ENOUGH, _ELIP
Pokemon LUDICOLO
Holds LEFTOVERS

View File

@ -9,7 +9,7 @@ INCLUDE "trainers/macros.asm"
Text_JP "キヨシ"8
OT_ID 00000, 00000
Intro_EN I, SENSE, _A, POWER, _EX_EX, $ffff
Intro_EN I, SENSE, _A, MYSTERY, POWER, _EX_EX
Win_EN I, LISTEN, TO, MY, _EXTRASENSORY, _EX_EX
Loss_EN MY, _EXTRASENSORY, WAS, NO, GOOD, _ELIP

View File

@ -11,7 +11,7 @@ INCLUDE "trainers/macros.asm"
Intro_EN LOOK, AT, MY, STRONG, ATTACK, _EX
Win_EN _DRAGON_CLAW, DID, _A, PERFECT, HIT, _EX_EX
Loss_EN HUH_, _ELIP, $ffff, MY, _DRAGON_CLAW, $ffff
Loss_EN HUH_, _ELIP, MY, _DRAGON_CLAW, $ffff, $ffff
Intro_JP $1624, $1034, $063e, $1643, $1007, $0c00
Win_JP $142b, $1034, $2751, $0e2a, $1011, $0c00

View File

@ -9,7 +9,7 @@ INCLUDE "trainers/macros.asm"
Text_JP "キョウヘイ"8
OT_ID 00000, 00000
Intro_EN HEAR, ME, ROAR, WROOOAAR_, _EX_EX, $ffff
Intro_EN HEAR, MY, GREAT, ROAR, WROOOAAR_, _EX_EX
Win_EN WHOAH, _EX, THAT_S, MY, SPIKES, SONG
Loss_EN THIS, IS, _A, SAD, SONG, $ffff

View File

@ -7,9 +7,9 @@ INCLUDE "../constants/natures.asm"
INCLUDE "../constants/pokemon.asm"
INCLUDE "../constants/trainerclasses.asm"
DEF MOSSDEEP EQU 0
MOSSDEEP EQU 0
MACRO Battle_Trainer
Battle_Trainer: MACRO
Section "battle",ROM0[$100]
db $01
dd $02000000
@ -19,58 +19,58 @@ MACRO Battle_Trainer
db $02,$00
ENDM
DEF BT_Level EQUS "db"
DEF Class EQUS "db"
DEF BT_Floor EQUS "dw" ; the byte after it is 00, but apparently means something…
MACRO Intro_EN
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
MACRO Win_EN
Win_EN: MACRO
IF REGION == REGION_EN
dw \1, \2, \3, \4, \5, \6
ENDC
ENDM
MACRO Loss_EN
Loss_EN: MACRO
IF REGION == REGION_EN
dw \1, \2, \3, \4, \5, \6
ENDC
ENDM
MACRO Intro_JP
Intro_JP: MACRO
IF REGION == REGION_JP
dw \1, \2, \3, \4, \5, \6
ENDC
ENDM
MACRO Win_JP
Win_JP: MACRO
IF REGION == REGION_JP
dw \1, \2, \3, \4, \5, \6
ENDC
ENDM
MACRO Loss_JP
Loss_JP: MACRO
IF REGION == REGION_JP
dw \1, \2, \3, \4, \5, \6
ENDC
ENDM
DEF Pokemon EQUS "dw"
DEF Holds EQUS "dw"
DEF Moves EQUS "dw"
DEF Level EQUS "db"
MACRO PP_Ups
Pokemon EQUS "dw"
Holds EQUS "dw"
Moves EQUS "dw"
Level EQUS "db"
PP_Ups: MACRO
db (\1) + (\2 << 2) + (\3 << 4) + (\4 << 6)
ENDM
DEF EVs EQUS "db"
DEF OT_ID EQUS "dw"
MACRO IVs
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
MACRO PV
PV: MACRO
dw (\1 & $FFFF), (\1 >> 16)
ENDM
DEF Friendship EQUS "db"
Friendship EQUS "db"
MACRO End_Trainer
End_Trainer: MACRO
db 0,0,0,0
EOF
ENDM
ENDM

View File

@ -11,7 +11,7 @@ INCLUDE "trainers/macros.asm"
Intro_EN LOOK,AT,MY,CUTE,POKEMON,_EX
Win_EN MY,POKEMON,ARE,SO,CUTE,_EX
Loss_EN YOU,BETTER,CARE,_FOR,MY,POKEMON
Loss_EN YOU,BETTER,CARE,FOR,MY,POKEMON
Intro_JP $1643, $0c00, $ffff, $0a48, $0418, $020e
Win_JP $0a45, $1034, $020e, $0418, $0418, $0c00
@ -56,4 +56,4 @@ INCLUDE "trainers/macros.asm"
Text_JP "ピカチュウ"11
Friendship 255
End_Trainer
End_Trainer

View File

@ -9,7 +9,7 @@ INCLUDE "trainers/macros.asm"
Text_JP "マキオ"8
OT_ID 00000, 00000
Intro_EN ARE, MY, POKEMON, SCARY, _QU, $ffff
Intro_EN POKEMON, LIKE, THIS, ARE, SCARY, HUH_
Win_EN I, ADORE, _SCARY_FACE, IT_S, INCREDIBLE, _EX_EX
Loss_EN IT, LOOKS, LIKE, _SCARY_FACE, WASN_T, ENOUGH

View File

@ -9,8 +9,8 @@ INCLUDE "trainers/macros.asm"
Text_JP "マサル"8
OT_ID 00000, 00000
Intro_EN WHOAH, _EX_EX, $ffff, POWER, IS, LIFE
Win_EN WHOAH, _EX_EX, $ffff, GUTS, CHARGE, _EX_EX
Intro_EN WHOAH, _EX_EX, POWER, IS, LIFE, _EX_EX
Win_EN WHOAH, _EX, MY, GUTS, CHARGE, _EX_EX
Loss_EN REALLY, _QU, I, LOST, POWER, _QU
Intro_JP $0c11, $0c01, $ffff, $061e, $2808, $0c01

View File

@ -10,7 +10,7 @@ INCLUDE "trainers/macros.asm"
OT_ID 00000, 00000
Intro_EN CUTE, POKEMON, ARE, THE, BEST, _EX
Win_EN SEEMS, YOUR, POKEMON, AREN_T, SO, GREAT
Win_EN YOUR, POKEMON, ARE, TOTALLY, USELESS, _EX
Loss_EN I, WILL, MAKE, MY, POKEMON, STRONG
Intro_JP $0e31, $0418, $020e, $0e0b, $0602, $0c00

View File

@ -13,9 +13,9 @@ INCLUDE "trainers/macros.asm"
Win_JP $020e, $0618, $0e1d, $122a, $1032, $0c01
Loss_JP $244a, $1621, $0e08, $061f, $1628, $100e
Intro_EN ALTHOUGH, WITHOUT, EVOLUTION, THEY_RE, STRONG, _EX
Intro_EN THEY, DIDN_T, EVOLVE, BUT, THEY_RE, STRONG
Win_EN _A, POKEMON, BATTLE, IS, EXCITING, HUH_
Loss_EN I, WILL, TRAIN, _AND, GET, BETTER
Loss_EN I, WILL, TRAIN, _AND, CHALLENGE, YOU
Pokemon TREECKO
Holds MIRACLE_SEED

View File

@ -10,8 +10,8 @@ INCLUDE "trainers/macros.asm"
OT_ID 00000, 00000
Intro_EN DO, YOU, LIKE, GRASS, POKEMON, _QU
Win_EN AREN_T, MY, GRASS, POKEMON, STRONG, _QU
Loss_EN MAYBE, SOME, _AROMATHERAPY, WOULD, BE, NICE
Win_EN JUST, ANOTHER, GRASS, TYPE, BATTLE, HUH_
Loss_EN _AROMATHERAPY, IS, NICE, ISN_T_IT_, $ffff, $ffff
Intro_JP $0a02, $041c, $020e, $1222, $1004, $0c03
Win_JP $041c, $020e, $1443, $061d, $1014, $1021

View File

@ -9,9 +9,9 @@ INCLUDE "trainers/macros.asm"
Text_JP "モエ"8
OT_ID 00000, 00000
Intro_EN MY, POKEMON, WILL, _SWEET_SCENT, YOU, _EX
Win_EN FUFUFU, _EX, ISN_T, _SWEET_SCENT, AWESOME, _QU
Loss_EN YOU, CAN_T, WIN, WITH, JUST, _SWEET_SCENT
Intro_EN MY, POKEMON, GIVES, OFF, _A, _SWEET_SCENT
Win_EN FUFUFU, _EX, ISN_T, _SWEET_SCENT, NICE, _QU
Loss_EN _SWEET_SCENT, JUST, WASN_T, ENOUGH, TO, WIN
Intro_JP $244a, $1e11, $0a48, $020e, $1643, $080a
Win_JP $0619, $1034, $1439, $0204, $1026, $ffff

View File

@ -9,8 +9,8 @@ INCLUDE "trainers/macros.asm"
Text_JP "モモコ"8
OT_ID 00000, 00000
Intro_EN MY, POKEMON, HAVE, VERY, THICK_FAT, _EX
Win_EN MY, POKEMON, DON_T, NEED, TO, DIET
Intro_EN MY, THICK_FAT, POKEMON, CAUSE, AN, EARTHQUAKE
Win_EN MY, POKEMON, REFUSE, TO, DIET, _EX
Loss_EN MAYBE, MY, POKEMON, SHOULD, DIET, _QU
Intro_JP $1c1b, $0204, $0c01, $020e, $1643, $1032

View File

@ -11,7 +11,7 @@ INCLUDE "trainers/macros.asm"
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
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
@ -56,4 +56,4 @@ INCLUDE "trainers/macros.asm"
Text_JP "ジュカイン"11
Friendship 255
End_Trainer
End_Trainer

View File

@ -10,7 +10,7 @@ INCLUDE "trainers/macros.asm"
OT_ID 00000, 00000
Intro_EN ALWAYS, DIVE, WITH, GOOD, SPIRIT, _EX
Win_EN YOU, CAN, SEE, A_LOT, OF, POKEMON
Win_EN DIVE, _AND, GET, A_LOT, OF, POKEMON
Loss_EN IT, WAS, _A, RARE, COLOR, _ELIP
Intro_JP $2723, $1628, $0e29, $141b, $0e0b, $1225

View File

@ -9,7 +9,7 @@ INCLUDE "trainers/macros.asm"
Text_JP "ノリコ"8
OT_ID 00000, 00000
Intro_EN HOW, ABOUT, _A, POKEMON, BATTLE, _QU_EX
Intro_EN HERE_IT_IS, _EX, _A, POKEMON, BATTLE, _EX
Win_EN I, WON, ALTHOUGH, I_AM, YOUNG, _EX
Loss_EN I_AM, WORKING, HARD, TO, GET, BETTER

View File

@ -15,7 +15,7 @@ INCLUDE "trainers/macros.asm"
Intro_EN GOOD, STRATEGY, IS, IMPORTANT, IN, BATTLE
Win_EN THE, EARLY_BIRD, GETS, THE, BERRY, _EX
Loss_EN THIS, IS, _A, _NIGHTMARE, _EX, $ffff
Loss_EN YOU, DEFEATED, MY, SLEEP, STRATEGY, _EX_EX
Pokemon TORKOAL
Holds CHESTO_BERRY

View File

@ -9,9 +9,9 @@ INCLUDE "trainers/macros.asm"
Text_JP "ノゾム"8
OT_ID 00000, 00000
Intro_EN AREN_T, MY, POKEMON, COOL, _QU, $ffff
Win_EN NO, NEED, TO, BE, DISAPPOINTED, _EX
Loss_EN THEY_RE, COOL, BUT, NEED, TO, TRAIN
Intro_EN HUH_, AREN_T, MY, POKEMON, INCREDIBLE, _QU
Win_EN THERE, IS, NO, NEED, TO, BE, GO_EASY
Loss_EN THEY_RE, STRONG, BUT, I_AM, NOT, SERIOUS
Intro_JP $2013, $1a15, $1a34, $1c28, $1c0a, $1011
Win_JP $1643, $1007, $103e, $0a3a, $020e, $0c00

View File

@ -10,8 +10,8 @@ INCLUDE "trainers/macros.asm"
OT_ID 00000, 00000
Intro_EN GO, _EX, MY, FLYING, FRIEND, _EX_EX
Win_EN PERFECT, _EX, $ffff, THEY_RE, ALL, INCREDIBLE
Loss_EN THEY, WERE, SPIRALING, DOWN, _ELIP, $ffff
Win_EN OH_KAY, PERFECT, THEY_RE, ALL, INCREDIBLE, _EX_EX
Loss_EN UH_OH, THEY, WERE, SPIRALING, DOWN, _ELIP
Intro_JP $0601, $0c00, $0a3a, $2413, $0a34, $0c01
Win_JP $0c37, $1419, $0c00, $0a3d, $1421, $100f

View File

@ -9,8 +9,8 @@ INCLUDE "trainers/macros.asm"
Text_JP "レイナ"8
OT_ID 00000, 00000
Intro_EN WANT, TO, SEE, _A, TRICK, _QU
Win_EN WASN_T, MY, TRICK, GREAT, _QU, $ffff
Intro_EN COME_OVER, I_AM, _A, TRICK, PSYCHIC
Win_EN MY, TRICK, IS, FABULOUS, ISN_T_IT_, $ffff
Loss_EN THAT, TRICK, IS, HARD, WORK, _EX
Intro_JP $1a2b, $0e28, $0e14, $1236, $063e, $1017

View File

@ -13,9 +13,9 @@ INCLUDE "trainers/macros.asm"
Win_JP $1c06, $140b, $140f, $0e08, $0609, $0e21
Loss_JP $201e, $103e, $ffff, $0e36, $1210, $0c3d
Intro_EN MY, POKEMON, IS, MY, FRIEND, _EX_EX
Win_EN WE, ARE, ALWAYS, TOGETHER, _EX, $ffff
Loss_EN WE, WILL, WORK, HARD, _EX_EX, $ffff
Intro_EN MY, POKEMON, IS, MY, FRIEND, FOREVER
Win_EN WE, WILL, ALWAYS, WIN, TOGETHER, _EX
Loss_EN I, WILL, TRY, REALLY, HARD, _EX_EX
Pokemon LINOONE
Holds CHESTO_BERRY
@ -32,7 +32,7 @@ INCLUDE "trainers/macros.asm"
Pokemon PELIPPER
Holds CHERI_BERRY
Moves SURF, FLY, SHOCK_WAVE, AERIAL_ACE
Moves SURF, FLY, SHOCK_WAVE, AERIAL_ACE
Level 92
PP_Ups 0,0,0,0
EVs 0,0,0,6,252,252

View File

@ -9,9 +9,9 @@ INCLUDE "trainers/macros.asm"
Text_JP "ルイゾウ"8
OT_ID 00000, 00000
Intro_EN YAY, _EX, $ffff, TIME, TO, TRAIN
Intro_EN YAY, _EX, IT_S, TIME, TO, TRAIN
Win_EN YOU, COULDN_T, BEAT, MY, _CRUSH_CLAW, HUH_
Loss_EN AWW, $ffff, $ffff, MY, _CRUSH_CLAW, _ELIP
Loss_EN AWW, _EX, NOT, MY, _CRUSH_CLAW, _ELIP
Intro_JP $2805, $0c00, $ffff, $180f, $1621, $1037
Win_JP $0632, $162d, $1022, $2732, $1422, $0c00

View File

@ -9,9 +9,9 @@ INCLUDE "trainers/macros.asm"
Text_JP "リョウ"8
OT_ID 00000, 00000
Intro_EN I, WILL, AIM, _FOR, WEAK, POINTS
Win_EN I, HIT, YOUR, WEAK, POINTS, _EX
Loss_EN I, COULDN_T, SEE, THE, WEAK, POINTS
Intro_EN I, WILL, AIM, FOR, WEAK, POINTS
Win_EN SO, YOU, DID, HAVE, WEAK, POINTS
Loss_EN URGH, _ELIP, NOT, MY, WEAK, POINTS
Intro_JP $0a2c, $1643, $0c04, $0a3a, $1234, $020e
Win_JP $0c37, $0c01, $1e0b, $020e, $1232, $1015
@ -56,4 +56,4 @@ INCLUDE "trainers/macros.asm"
Text_JP "ポリゴン2"11
Friendship 255
End_Trainer
End_Trainer

View File

@ -14,7 +14,7 @@ INCLUDE "trainers/macros.asm"
Loss_JP $0e38, $1606, $1010, $020e, $081b, $0c06
Intro_EN LOOK, AT, MY, POKEMON, COLLECTION, _EX
Win_EN AREN_T, MY, POKEMON, AWESOME, _QU, $ffff
Win_EN MY, POKEMON, ARE, TRULY, INCREDIBLE, _EX
Loss_EN THEY, WERE, HARD, TO, COLLECT, _ELIP
Pokemon REGIROCK

View File

@ -10,7 +10,7 @@ INCLUDE "trainers/macros.asm"
OT_ID 00000, 00000
Intro_EN I, GOT, THESE, POKEMON, WITH, POKEBLOCK
Win_EN MY, POKEMON, NEED, MORE, POKEBLOCK, _EX
Win_EN I, WILL, GET, MORE, WITH, POKEBLOCK
Loss_EN I, AM, OUT, OF, POKEBLOCK, _ELIP
Intro_JP $26b6, $0e0c, $0e1d, $0e12, $1225, $103e

View File

@ -9,9 +9,9 @@ INCLUDE "trainers/macros.asm"
Text_JP "シゲコ"8
OT_ID 00000, 00000
Intro_EN AREN_T, MY, POKEMON, CUTE, _QU, $ffff
Intro_EN HEY, AREN_T, MY, POKEMON, CUTE, _QU
Win_EN THEY, LOOK, LIKE, _A, PLUSH_DOLL, _EX
Loss_EN I, LOST, _ELIP, EVEN_SO_, THEY_RE, CUTE, _EX
Loss_EN I, LOST, BUT, EVEN_SO_, THEY_RE, CUTE, _EX
Intro_JP $0e1b, $1e14, $020e, $0418, $100b, $142f
Win_JP $1e0a, $1034, $020e, $1a24, $1239, $1021

View File

@ -5,13 +5,13 @@ INCLUDE "trainers/macros.asm"
BT_Level 0
db PKMN_BREEDER_M
BT_Floor 0
Text_EN "CANDICE"8
Text_EN "LOUIS"8
Text_JP "シゲノブ"8
OT_ID 00000, 00000
Intro_EN YOUR, MOVE, WILL, HIT, YOU, BACK
Win_EN _COUNTER, ATTACK, _EX, ARE, YOU, OK_
Loss_EN DISASTER, _EX, YOU, BEAT, MY, _COUNTER
Win_EN I, HIT, _A, _COUNTER, ATTACK, OK_,
Loss_EN GENIUS, _EX, YOU, BEAT, MY, _COUNTER
Intro_JP $020e, $2204, $1c17, $0a3a, $2200, $1643
Win_JP $020e, $2204, $0619, $1e04, $0c03, $1429

View File

@ -11,7 +11,7 @@ INCLUDE "trainers/macros.asm"
Intro_EN I_AM, QUITE, DIFFERENT, FROM, BEFORE, _EX
Win_EN CAN, YOU, SEE, THE, GROWTH, _QU
Loss_EN HUH_, NOT, DIFFERENT, ENOUGH, _QU, $ffff
Loss_EN HUH_, NOT, DIFFERENT, ENOUGH, IT, SEEMS
Intro_JP $1c12, $1034, $0a3b, $0e07, $1429, $100e
Win_JP $1e1b, $244a, $1e11, $1002, $164c, $0c03

View File

@ -10,8 +10,8 @@ INCLUDE "trainers/macros.asm"
OT_ID 00000, 00000
Intro_EN FUFUFU, _ELIP_EX, LOOK, AT, MY, MOVE
Win_EN ANY, TYPE, OF, MOVE, WORKS, _EX
Loss_EN HUH_, MY, ATTACK, DIDN_T, WORK, _QU
Win_EN I, CAN, USE, ANY, MOVE, TYPE
Loss_EN HUH_, YOU, LOST, _A, MOVE, BATTLE
Intro_JP $0c13, $0c04, $063e, $140c, $1642, $1602
Win_JP $1e21, $0432, $1034, $063e, $0e1f, $0e2a

View File

@ -14,8 +14,8 @@ INCLUDE "trainers/macros.asm"
Loss_JP $1028, $280b, $0e1d, $1234, $1e11, $0c03
Intro_EN I, _LEER, AT, YOU, WITH, KEEN_EYE
Win_EN DID, I, INTIMIDATE, YOU, _QU, $ffff
Loss_EN SHOW, A_TINY_BIT, OF, SURPRISE, _ELIP, $ffff
Win_EN SO, DID, I, INTIMIDATE, YOU, _QU
Loss_EN WELL, _QU, WERE, YOU, SHOCKED, _QU
Pokemon MASQUERAIN
Holds QUICK_CLAW

View File

@ -9,7 +9,7 @@ INCLUDE "trainers/macros.asm"
Text_JP "スエキチ"8
OT_ID 00000, 00000
Intro_EN HOW, ABOUT, SOME, WATER, POKEMON, _EX_EX
Intro_EN HERE_I_COME, WITH, INCREDIBLE, WATER, POKEMON, _EX_EX
Win_EN DO, YOU, LIKE, MY, POKEMON, _QU
Loss_EN EXCUSE_ME, _EX, MY, POKEMON, ARE, GREAT

View File

@ -9,7 +9,7 @@ INCLUDE "trainers/macros.asm"
Text_JP "スエノ"8
OT_ID 00000, 00000
Intro_EN YOU, SHOULD, RUN_AWAY, NOW, _EX, $ffff
Intro_EN JUST, THIS, ONCE, _EX, RUN_AWAY, _EX
Win_EN I, SAID, YOU, SHOULD, RUN_AWAY, _EX
Loss_EN YOU, DIDN_T, RUN_AWAY, YOU, WON, _ELIP

View File

@ -15,7 +15,7 @@ INCLUDE "trainers/macros.asm"
Intro_EN MY, POWER, LEVEL, IS, MASTER, RANK
Win_EN SEE, THE, POWER, OF, _MIRROR_COAT, _QU
Loss_EN _MIRROR_COAT, WAS, NO_MATCH, _FOR, YOU, _ELIP
Loss_EN WHY, DO, YOU, REJECT, _MIRROR_COAT, _ELIP
Pokemon MILOTIC
Holds LEFTOVERS
@ -56,4 +56,4 @@ INCLUDE "trainers/macros.asm"
Text_JP "ラグラージ"11
Friendship 255
End_Trainer
End_Trainer

View File

@ -13,9 +13,9 @@ INCLUDE "trainers/macros.asm"
Win_JP $2006, $1628, $0e1d, $122f, $1041, $0c01
Loss_JP $0a46, $2006, $1009, $102b, $1032, $0c06
Intro_EN _CONFUSE_RAY, WILL, MAKE, YOU, CONFUSED, _EX
Win_EN BEING, CONFUSED, REALLY, IS, TERRIBLE, _EX_EX
Loss_EN SEEMS, I, WAS, CONFUSED, INSTEAD, _ELIP
Intro_EN _CONFUSE_RAY, WILL, HAVE, YOU, TWIRLING, _EX
Win_EN TWIRLING, AROUND, IS, TERRIBLE, ISN_T_IT_, $ffff
Loss_EN SEEMS, I, WAS, TWIRLING, INSTEAD, _ELIP
Pokemon GRUMPIG
Holds WHITE_HERB

View File

@ -11,7 +11,7 @@ INCLUDE "trainers/macros.asm"
Intro_EN THIS, MOVE, IS, ABSOLUTELY, GENIUS, _EX
Win_EN _TOXIC, _EX, PRETTY, GOOD, RIGHT, _QU
Loss_EN I, CAN_T, BEAT, YOU, _ELIP, $ffff
Loss_EN EVEN_SO_, I, CAN_T, BEAT, YOU, _ELIP
Intro_JP $0a05, $020e, $ffff, $1643, $1602, $0c00
Win_JP $0a1d, $020e, $ffff, $1409, $1403, $0c00

View File

@ -10,9 +10,9 @@ INCLUDE "trainers/macros.asm"
OT_ID 00000, 00000
Intro_EN HERE, I, AM, LET_S, GO, _EX
Win_EN IT_S, _A, _TOXIC, VICTORY, _EX_EX, $ffff
Loss_EN HOW, DID, _TOXIC, LOSE, _ELIP, _QU
Win_EN IT, IS, _A, VICTORY, _TOXIC, _EX_EX
Loss_EN ALTHOUGH, I_AM, USING, _TOXIC, I_AM, TIRED
Intro_JP $0812, $102d, $0c00, $1e15, $0c00, $ffff
Win_JP $265c, $1034, $0619, $102d, $0c00, $ffff
Loss_JP $265c, $0e1f, $0c04, $201c, $102d, $0c04

View File

@ -9,9 +9,9 @@ INCLUDE "trainers/macros.asm"
Text_JP "ウマミ"8
OT_ID 00000, 00000
Intro_EN MY, POKEMON, WON_T, LOSE, TO, YOU
Intro_EN YOU, WILL, NEVER, BEAT, MY, POKEMON
Win_EN THAT, BATTLE, WASN_T, GOOD, ENOUGH, _EX
Loss_EN I, SHOULD, NOT, HAVE, LOST, _ELIP_EX
Loss_EN I, LOST, AT, MY, LEVEL _ELIP_EX
Intro_JP $0a48, $020e, $0e28, $0e14, $060a, $1044
Win_JP $0c04, $103c, $122d, $0628, $1014, $0c3d

View File

@ -13,7 +13,7 @@ INCLUDE "trainers/macros.asm"
Win_JP $1205, $0e08, $ffff, $140b, $2699, $0c01
Loss_JP $1217, $0e08, $ffff, $0a1f, $26c2, $0c01
Intro_EN HERE_I_COME, _EX_EX, TIME, _FOR, BATTLE, _EX_EX
Intro_EN HERE_I_COME, _EX_EX, TIME, FOR, BATTLE, _EX_EX
Win_EN DID, YOU, SEE, THAT, _EXPLOSION, _QU_EX
Loss_EN ALWAYS, _DESTINY_BOND, WITH, MY, POKEMON, _ELIP
@ -56,4 +56,4 @@ INCLUDE "trainers/macros.asm"
Text_JP "マタドガス"11
Friendship 255
End_Trainer
End_Trainer

View File

@ -10,8 +10,8 @@ INCLUDE "trainers/macros.asm"
OT_ID 00000, 00000
Intro_EN LOOK, _EX, ISN_T, IT, CUTE, _QU
Win_EN DON_T, YOU, JUST, ADORE, CUTENESS, _QU
Loss_EN AWW, IT_S, CRIES, ARE, CUTE, _EX
Win_EN DON_T, YOU, ADORE, THE, CUTENESS, _QU
Loss_EN WAAAH, MY, CRIES, ARE, CUTE, _EX
Intro_JP $081c, $1643, $1643, $0e2a, $0418, $1021
Win_JP $0c32, $1032, $0c03, $0419, $26d5, $1021

View File

@ -10,7 +10,7 @@ INCLUDE "trainers/macros.asm"
OT_ID 00000, 00000
Intro_EN ISN_T, _SLUDGE_BOMB, GREAT, _QU_EX, $ffff, $ffff
Win_EN HEHE, _ELIP, $ffff, NEED, _A, BATH, QU
Win_EN HEHE, _ELIP, BATH, TIME, _QU, $ffff, $ffff
Loss_EN MY, POKEMON, DISLIKE, TO, BATH, _EX
Intro_JP $26bc, $0e1d, $ffff, $1232, $1017, $ffff

View File

@ -13,8 +13,8 @@ INCLUDE "trainers/macros.asm"
Win_JP $1e10, $0e0c, $100b, $201e, $103e, $ffff
Loss_JP $0c0e, $0c01, $0a46, $0603, $122d, $1239
Intro_EN HEY, YOU, _EX_EX, GET, READY, _EX_EX
Win_EN LOOKS, LIKE, YOU, WEREN_T, READY, _EX
Intro_EN COME_ON, _EX, GET, READY, $ffff, $ffff
Win_EN YOU, JUST, WEREN_T, READY, ENOUGH, _EX
Loss_EN URGH, _EX_EX, SEEMS, I, WASN_T, READY
Pokemon GARDEVOIR

View File

@ -10,8 +10,8 @@ INCLUDE "trainers/macros.asm"
OT_ID 00000, 00000
Intro_EN MY, FASHION, WILL, MAKE, ME, SHINE
Win_EN SHOULD, I, SHINE, SOME, MORE, _QU
Loss_EN YOU, NEED, TO, SHINE, MORE, _EX
Win_EN WHY, NOT, SHINE, SOME, MORE, _QU
Loss_EN I, NEED, TO, SHINE, MORE, _EX
Intro_JP $044a, $1a2a, $ffff, $1228, $102e, $0c00
Win_JP $0e36, $044a, $103c, $1606, $0e19, $0c03

View File

@ -10,7 +10,7 @@ INCLUDE "trainers/macros.asm"
OT_ID 00000, 00000
Intro_EN SEE, THE, POWER, OF, BUG, POKEMON
Win_EN I, SHOULD, GET, MORE, BUG, POKEMON
Win_EN I, WILL, USE, MORE, BUG, POKEMON
Loss_EN WAAAH, _EX, MY, BUG, POKEMON, CAN_T_WIN
Intro_JP $0461, $020e, $1034, $061e, $1642, $1602