Leahnaya/pokecarde
1
0
Fork 0
mirror of https://github.com/Artrios/pokecarde.git synced 2026-09-12 02:35:37 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

More series 2 changes

Browse Source
This commit is contained in:
Artrios
2021-07-21 20:17:15 +08:00
parent fcae511cfc
commit eebfef6302
8 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
battle-e/08-B030.asm
View File

@@ -1,4 +1,4 @@
INCLUDE "../macros.asm"
CLASS EQUS "pokefan_m"
TRAINER EQUS "makia"
TRAINER EQUS "makio"
INCLUDE "battletrainer-{REGION_NAME}.tx"

2
battle-e/trainers/daikichi.asm
View File

@@ -9,7 +9,7 @@ INCLUDE "trainers/macros.asm"
Text_JP "ダイキチ"8
OT_ID 00000, 00000
Intro_ $0a14, $1034, $020e, $2017, $242c, $100e
Intro_EN $0a14, $1034, $020e, $2017, $242c, $100e
Win_EN $0801, $0c00, $ffff, $2017, $0607, $100e
Loss_EN $0811, $0c00, $ffff, $1400, $0628, $1014

6
battle-e/trainers/danpei.asm
View File

@@ -26,7 +26,7 @@ INCLUDE "trainers/macros.asm"
OT_ID 00000, 00000
IVs 31,31,15,15,15,15, 1
PV $0000001C
Text_JP "LAIRON"11
Text_EN "LAIRON"11
Text_JP "コドラ"11
Friendship 255
@@ -39,7 +39,7 @@ INCLUDE "trainers/macros.asm"
OT_ID 00000, 00000
IVs 30,31,14,15,15,14, 0
PV $000000E4
Text_JP "GRAVELER"11
Text_EN "GRAVELER"11
Text_JP "ゴローン"11
Friendship 255
@@ -52,7 +52,7 @@ INCLUDE "trainers/macros.asm"
OT_ID 00000, 00000
IVs 31,31,15,15,15,15, 0
PV $0000001C
Text_JP "SHELGON"11
Text_EN "SHELGON"11
Text_JP "コモルー"11
Friendship 255

6
battle-e/trainers/fiennes.asm
View File

@@ -26,7 +26,7 @@ INCLUDE "trainers/macros.asm"
OT_ID 00000, 00000
IVs 15,15,15,31,31,15, 1
PV $00000087
Text_JP "GIRAFARIG"11
Text_EN "GIRAFARIG"11
Text_JP "キリンリキ"11
Friendship 255
@@ -39,7 +39,7 @@ INCLUDE "trainers/macros.asm"
OT_ID 00000, 00000
IVs 31,15,15,15,15,31, 0
PV $00000084
Text_JP "WOBBUFFET"11
Text_EN "WOBBUFFET"11
Text_JP "ソーナンス"11
Friendship 255
@@ -52,7 +52,7 @@ INCLUDE "trainers/macros.asm"
OT_ID 00000, 00000
IVs 31,15,15,31,15,15, 0
PV $0000000F
Text_JP "TYPHLOSION"11
Text_EN "TYPHLOSION"11
Text_JP "バクフーン"11
Friendship 255

6
battle-e/trainers/fugen.asm
View File

@@ -26,7 +26,7 @@ INCLUDE "trainers/macros.asm"
OT_ID 00000, 00000
IVs 20,20,20,31,31,20, 0
PV $0000001D
Text_JP "RAICHU"11
Text_EN "RAICHU"11
Text_JP "ライチュウ"11
Friendship 255
@@ -39,7 +39,7 @@ INCLUDE "trainers/macros.asm"
OT_ID 00000, 00000
IVs 31,20,20,31,20,20, 0
PV $00000080
Text_JP "MEDICHAM"11
Text_EN "MEDICHAM"11
Text_JP "チャーレム"11
Friendship 255
@@ -52,7 +52,7 @@ INCLUDE "trainers/macros.asm"
OT_ID 00000, 00000
IVs 20,31,20,31,20,20, 0
PV $000000E2
Text_JP "BLAZIKEN"11
Text_EN "BLAZIKEN"11
Text_JP "バシャーモ"11
Friendship 255

4
battle-e/trainers/fukune.asm
View File

@@ -39,7 +39,7 @@ INCLUDE "trainers/macros.asm"
OT_ID 00000, 00000
IVs 31,20,20,20,20,31, 0
PV $00000016
Text_JP "TORKOAL"11
Text_EN "TORKOAL"11
Text_JP "コータス"11
Friendship 255
@@ -52,7 +52,7 @@ INCLUDE "trainers/macros.asm"
OT_ID 00000, 00000
IVs 31,20,20,20,20,31, 0
PV $00000080
Text_JP "SWAMPERT"11
Text_EN "SWAMPERT"11
Text_JP "ラグラージ"11
Friendship 255

2
battle-e/trainers/masaru.asm
View File

@@ -9,7 +9,7 @@ INCLUDE "trainers/macros.asm"
Text_JP "マサル"8
OT_ID 00000, 00000
Intro_JEN $0c11, $0c01, $ffff, $061e, $2808, $0c01
Intro_EN $0c11, $0c01, $ffff, $061e, $2808, $0c01
Win_EN $0c10, $ffff, $ffff, $0421, $250c, $0c01
Loss_EN $0e2c, $1002, $0c03, $061e, $062e, $0c03

4
battle-e/trainers/shigeko.asm
View File

@@ -39,7 +39,7 @@ INCLUDE "trainers/macros.asm"
OT_ID 00000, 00000
IVs 31,31,15,15,15,15, 1
PV $000000E0
Text_JP "SEEDOT"11
Text_EN "SEEDOT"11
Text_JP "タネボー"11
Friendship 255
@@ -52,7 +52,7 @@ INCLUDE "trainers/macros.asm"
OT_ID 00000, 00000
IVs 15,15,15,31,31,15, 0
PV $00000013
Text_JP "PIKACHU"11
Text_EN "PIKACHU"11
Text_JP "ピカチュウ"11
Friendship 255