From b857320dc90c1c3eda696a50b445606deef0a303 Mon Sep 17 00:00:00 2001 From: Artrios Date: Tue, 24 Jun 2025 00:16:19 +0800 Subject: [PATCH] Post merge tidy up 2 --- battle-e/trainers/anthony.asm | 2 +- battle-e/trainers/candice.asm | 4 ++-- battle-e/trainers/fay.asm | 2 +- battle-e/trainers/irazu.asm | 2 +- battle-e/trainers/jo.asm | 2 +- battle-e/trainers/maggie.asm | 2 +- battle-e/trainers/natasha.asm | 2 +- battle-e/trainers/ryo.asm | 2 +- battle-e/trainers/yasuo.asm | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/battle-e/trainers/anthony.asm b/battle-e/trainers/anthony.asm index 7ded7c3..59d1286 100644 --- a/battle-e/trainers/anthony.asm +++ b/battle-e/trainers/anthony.asm @@ -9,7 +9,7 @@ INCLUDE "trainers/macros.asm" Text_JP "アンソニー"8 OT_ID 00000, 00000 - Intro_EN YOU, ARE, NO_MATCH, FOR, ME, _EX + 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 diff --git a/battle-e/trainers/candice.asm b/battle-e/trainers/candice.asm index 4f0d4c2..9a418d1 100644 --- a/battle-e/trainers/candice.asm +++ b/battle-e/trainers/candice.asm @@ -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 diff --git a/battle-e/trainers/fay.asm b/battle-e/trainers/fay.asm index 800abd5..3fe6c19 100644 --- a/battle-e/trainers/fay.asm +++ b/battle-e/trainers/fay.asm @@ -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 diff --git a/battle-e/trainers/irazu.asm b/battle-e/trainers/irazu.asm index 445599c..14245ff 100644 --- a/battle-e/trainers/irazu.asm +++ b/battle-e/trainers/irazu.asm @@ -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 diff --git a/battle-e/trainers/jo.asm b/battle-e/trainers/jo.asm index 670f480..ede14f0 100644 --- a/battle-e/trainers/jo.asm +++ b/battle-e/trainers/jo.asm @@ -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, _A, VICTORY, _EX_EX + 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 diff --git a/battle-e/trainers/maggie.asm b/battle-e/trainers/maggie.asm index 34f02ac..6a37de9 100644 --- a/battle-e/trainers/maggie.asm +++ b/battle-e/trainers/maggie.asm @@ -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 diff --git a/battle-e/trainers/natasha.asm b/battle-e/trainers/natasha.asm index 4b432fc..8e1c5f6 100644 --- a/battle-e/trainers/natasha.asm +++ b/battle-e/trainers/natasha.asm @@ -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 diff --git a/battle-e/trainers/ryo.asm b/battle-e/trainers/ryo.asm index a6edefc..0d3667d 100644 --- a/battle-e/trainers/ryo.asm +++ b/battle-e/trainers/ryo.asm @@ -9,7 +9,7 @@ INCLUDE "trainers/macros.asm" Text_JP "リョウ"8 OT_ID 00000, 00000 - Intro_EN I, WILL, AIM, FOR, 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 diff --git a/battle-e/trainers/yasuo.asm b/battle-e/trainers/yasuo.asm index 9f4b263..03d10a8 100644 --- a/battle-e/trainers/yasuo.asm +++ b/battle-e/trainers/yasuo.asm @@ -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