summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorU-Daniel-PC\Daniel <corrnondacqb@yahoo.com>2014-07-24 22:17:47 -0500
committerU-Daniel-PC\Daniel <corrnondacqb@yahoo.com>2014-07-24 23:14:35 -0500
commit75db414ec3e4fa24e418e3e5bcd7f913388a4890 (patch)
tree6c39185505ed07ec42194a220ad3b27969a90f2f
parentf0e9be4ffaeacc880fe197e4ef37741b678a4a33 (diff)
Rename folder: trainers -> duelists
-rw-r--r--gfx.asm82
-rwxr-xr-xgfx/duelists/aaron.png (renamed from gfx/trainers/aaron.png)bin399 -> 399 bytes
-rwxr-xr-xgfx/duelists/adam.png (renamed from gfx/trainers/adam.png)bin432 -> 432 bytes
-rwxr-xr-xgfx/duelists/amanda.png (renamed from gfx/trainers/amanda.png)bin442 -> 442 bytes
-rwxr-xr-xgfx/duelists/amy.png (renamed from gfx/trainers/amy.png)bin555 -> 555 bytes
-rwxr-xr-xgfx/duelists/andrew.png (renamed from gfx/trainers/andrew.png)bin447 -> 447 bytes
-rwxr-xr-xgfx/duelists/brandon.png (renamed from gfx/trainers/brandon.png)bin451 -> 451 bytes
-rwxr-xr-xgfx/duelists/brittany.png (renamed from gfx/trainers/brittany.png)bin404 -> 404 bytes
-rwxr-xr-xgfx/duelists/chris.png (renamed from gfx/trainers/chris.png)bin466 -> 466 bytes
-rwxr-xr-xgfx/duelists/courtney.png (renamed from gfx/trainers/courtney.png)bin540 -> 540 bytes
-rwxr-xr-xgfx/duelists/daniel.png (renamed from gfx/trainers/daniel.png)bin473 -> 473 bytes
-rwxr-xr-xgfx/duelists/david.png (renamed from gfx/trainers/david.png)bin491 -> 491 bytes
-rwxr-xr-xgfx/duelists/erik.png (renamed from gfx/trainers/erik.png)bin435 -> 435 bytes
-rwxr-xr-xgfx/duelists/gene.png (renamed from gfx/trainers/gene.png)bin562 -> 562 bytes
-rwxr-xr-xgfx/duelists/heather.png (renamed from gfx/trainers/heather.png)bin400 -> 400 bytes
-rwxr-xr-xgfx/duelists/imakuni.png (renamed from gfx/trainers/imakuni.png)bin454 -> 454 bytes
-rwxr-xr-xgfx/duelists/isaac.png (renamed from gfx/trainers/isaac.png)bin521 -> 521 bytes
-rwxr-xr-xgfx/duelists/jack.png (renamed from gfx/trainers/jack.png)bin465 -> 465 bytes
-rwxr-xr-xgfx/duelists/jennifer.png (renamed from gfx/trainers/jennifer.png)bin462 -> 462 bytes
-rwxr-xr-xgfx/duelists/jessica.png (renamed from gfx/trainers/jessica.png)bin524 -> 524 bytes
-rwxr-xr-xgfx/duelists/john.png (renamed from gfx/trainers/john.png)bin391 -> 391 bytes
-rwxr-xr-xgfx/duelists/jonathan.png (renamed from gfx/trainers/jonathan.png)bin440 -> 440 bytes
-rwxr-xr-xgfx/duelists/joseph.png (renamed from gfx/trainers/joseph.png)bin397 -> 397 bytes
-rwxr-xr-xgfx/duelists/joshua.png (renamed from gfx/trainers/joshua.png)bin383 -> 383 bytes
-rwxr-xr-xgfx/duelists/ken.png (renamed from gfx/trainers/ken.png)bin511 -> 511 bytes
-rwxr-xr-xgfx/duelists/kristin.png (renamed from gfx/trainers/kristin.png)bin437 -> 437 bytes
-rwxr-xr-xgfx/duelists/matthew.png (renamed from gfx/trainers/matthew.png)bin480 -> 480 bytes
-rwxr-xr-xgfx/duelists/michael.png (renamed from gfx/trainers/michael.png)bin414 -> 414 bytes
-rwxr-xr-xgfx/duelists/mitch.png (renamed from gfx/trainers/mitch.png)bin510 -> 510 bytes
-rwxr-xr-xgfx/duelists/murray.png (renamed from gfx/trainers/murray.png)bin488 -> 488 bytes
-rwxr-xr-xgfx/duelists/nicholas.png (renamed from gfx/trainers/nicholas.png)bin438 -> 438 bytes
-rwxr-xr-xgfx/duelists/nikki.png (renamed from gfx/trainers/nikki.png)bin551 -> 551 bytes
-rwxr-xr-xgfx/duelists/player.png (renamed from gfx/trainers/player.png)bin444 -> 444 bytes
-rwxr-xr-xgfx/duelists/rick.png (renamed from gfx/trainers/rick.png)bin512 -> 512 bytes
-rwxr-xr-xgfx/duelists/robert.png (renamed from gfx/trainers/robert.png)bin408 -> 408 bytes
-rwxr-xr-xgfx/duelists/rod.png (renamed from gfx/trainers/rod.png)bin586 -> 586 bytes
-rwxr-xr-xgfx/duelists/ronald.png (renamed from gfx/trainers/ronald.png)bin528 -> 528 bytes
-rwxr-xr-xgfx/duelists/ryan.png (renamed from gfx/trainers/ryan.png)bin403 -> 403 bytes
-rwxr-xr-xgfx/duelists/sam.png (renamed from gfx/trainers/sam.png)bin412 -> 412 bytes
-rwxr-xr-xgfx/duelists/sara.png (renamed from gfx/trainers/sara.png)bin428 -> 428 bytes
-rwxr-xr-xgfx/duelists/stephanie.png (renamed from gfx/trainers/stephanie.png)bin412 -> 412 bytes
-rwxr-xr-xgfx/duelists/steve.png (renamed from gfx/trainers/steve.png)bin536 -> 536 bytes
42 files changed, 41 insertions, 41 deletions
diff --git a/gfx.asm b/gfx.asm
index fe81a7d..e9ab141 100644
--- a/gfx.asm
+++ b/gfx.asm
@@ -39,7 +39,7 @@ SolidTiles2: ; 87d3c (21:7d3c)
PlayerGfx: ; 87d7e (21:7d7e)
dw $24
- INCBIN "gfx/trainers/player.2bpp"
+ INCBIN "gfx/duelists/player.2bpp"
Unnamed1Gfx: ; 87fc0 (21:7fc0)
dw $2
@@ -197,7 +197,7 @@ Mystery2Gfx: ; 93540 (24:7540)
RonaldGfx: ; 93aa2 (24:7aa2)
dw $24
- INCBIN "gfx/trainers/ronald.2bpp"
+ INCBIN "gfx/duelists/ronald.2bpp"
CopyrightGfx: ; 93ce4 (24:7ce4)
dw $24
@@ -306,115 +306,115 @@ Unnamed7Gfx: ; 9bfee (26:7fee)
SECTION "bank27",ROMX,BANK[$27]
SamGfx: ; 9c000 (27:4000)
dw $24
- INCBIN "gfx/trainers/sam.2bpp"
+ INCBIN "gfx/duelists/sam.2bpp"
ImakuniGfx: ; 9c242 (27:4242)
dw $24
- INCBIN "gfx/trainers/imakuni.2bpp"
+ INCBIN "gfx/duelists/imakuni.2bpp"
NikkiGfx: ; 9c484 (27:4484)
dw $24
- INCBIN "gfx/trainers/nikki.2bpp"
+ INCBIN "gfx/duelists/nikki.2bpp"
RickGfx: ; 9c6c6 (27:46c6)
dw $24
- INCBIN "gfx/trainers/rick.2bpp"
+ INCBIN "gfx/duelists/rick.2bpp"
KenGfx: ; 9c908 (27:4908)
dw $24
- INCBIN "gfx/trainers/ken.2bpp"
+ INCBIN "gfx/duelists/ken.2bpp"
AmyGfx: ; 9cb4a (27:4b4a)
dw $24
- INCBIN "gfx/trainers/amy.2bpp"
+ INCBIN "gfx/duelists/amy.2bpp"
IsaacGfx: ; 9cd8c (27:4d8c)
dw $24
- INCBIN "gfx/trainers/isaac.2bpp"
+ INCBIN "gfx/duelists/isaac.2bpp"
MitchGfx: ; 9cfce (27:4fce)
dw $24
- INCBIN "gfx/trainers/mitch.2bpp"
+ INCBIN "gfx/duelists/mitch.2bpp"
GeneGfx: ; 9d210 (27:5210)
dw $24
- INCBIN "gfx/trainers/gene.2bpp"
+ INCBIN "gfx/duelists/gene.2bpp"
MurrayGfx: ; 9d452 (27:5452)
dw $24
- INCBIN "gfx/trainers/murray.2bpp"
+ INCBIN "gfx/duelists/murray.2bpp"
CourtneyGfx: ; 9d694 (27:5694)
dw $24
- INCBIN "gfx/trainers/courtney.2bpp"
+ INCBIN "gfx/duelists/courtney.2bpp"
SteveGfx: ; 9d8d6 (27:58d6)
dw $24
- INCBIN "gfx/trainers/steve.2bpp"
+ INCBIN "gfx/duelists/steve.2bpp"
JackGfx: ; 9db18 (27:5b18)
dw $24
- INCBIN "gfx/trainers/jack.2bpp"
+ INCBIN "gfx/duelists/jack.2bpp"
RodGfx: ; 9dd5a (27:5d5a)
dw $24
- INCBIN "gfx/trainers/rod.2bpp"
+ INCBIN "gfx/duelists/rod.2bpp"
JosephGfx: ; 9df9c (27:5f9c)
dw $24
- INCBIN "gfx/trainers/joseph.2bpp"
+ INCBIN "gfx/duelists/joseph.2bpp"
DavidGfx: ; 9e1de (27:61de)
dw $24
- INCBIN "gfx/trainers/david.2bpp"
+ INCBIN "gfx/duelists/david.2bpp"
ErikGfx: ; 9e420 (27:6420)
dw $24
- INCBIN "gfx/trainers/erik.2bpp"
+ INCBIN "gfx/duelists/erik.2bpp"
JohnGfx: ; 9e662 (27:6662)
dw $24
- INCBIN "gfx/trainers/john.2bpp"
+ INCBIN "gfx/duelists/john.2bpp"
AdamGfx: ; 9e8a4 (27:68a4)
dw $24
- INCBIN "gfx/trainers/adam.2bpp"
+ INCBIN "gfx/duelists/adam.2bpp"
JonathanGfx: ; 9eae6 (27:6ae6)
dw $24
- INCBIN "gfx/trainers/jonathan.2bpp"
+ INCBIN "gfx/duelists/jonathan.2bpp"
JoshuaGfx: ; 9ed28 (27:6d28)
dw $24
- INCBIN "gfx/trainers/joshua.2bpp"
+ INCBIN "gfx/duelists/joshua.2bpp"
NicholasGfx: ; 9ef6a (27:6f6a)
dw $24
- INCBIN "gfx/trainers/nicholas.2bpp"
+ INCBIN "gfx/duelists/nicholas.2bpp"
BrandonGfx: ; 9f1ac (27:71ac)
dw $24
- INCBIN "gfx/trainers/brandon.2bpp"
+ INCBIN "gfx/duelists/brandon.2bpp"
MatthewGfx: ; 9f3ee (27:73ee)
dw $24
- INCBIN "gfx/trainers/matthew.2bpp"
+ INCBIN "gfx/duelists/matthew.2bpp"
RyanGfx: ; 9f630 (27:7630)
dw $24
- INCBIN "gfx/trainers/ryan.2bpp"
+ INCBIN "gfx/duelists/ryan.2bpp"
AndrewGfx: ; 9f872 (27:7872)
dw $24
- INCBIN "gfx/trainers/andrew.2bpp"
+ INCBIN "gfx/duelists/andrew.2bpp"
ChrisGfx: ; 9fab4 (27:7ab4)
dw $24
- INCBIN "gfx/trainers/chris.2bpp"
+ INCBIN "gfx/duelists/chris.2bpp"
MichaelGfx: ; 9fcf6 (27:7cf6)
dw $24
- INCBIN "gfx/trainers/michael.2bpp"
+ INCBIN "gfx/duelists/michael.2bpp"
Unnamed8Gfx: ; 9ff38 (27:7f38)
dw $a
@@ -431,47 +431,47 @@ endr
SECTION "bank28",ROMX,BANK[$28]
DanielGfx: ; a0000 (28:4000)
dw $24
- INCBIN "gfx/trainers/daniel.2bpp"
+ INCBIN "gfx/duelists/daniel.2bpp"
RobertGfx: ; a0242 (28:4242)
dw $24
- INCBIN "gfx/trainers/robert.2bpp"
+ INCBIN "gfx/duelists/robert.2bpp"
BrittanyGfx: ; a0484 (28:4484)
dw $24
- INCBIN "gfx/trainers/brittany.2bpp"
+ INCBIN "gfx/duelists/brittany.2bpp"
KristinGfx: ; a06c6 (28:46c6)
dw $24
- INCBIN "gfx/trainers/kristin.2bpp"
+ INCBIN "gfx/duelists/kristin.2bpp"
HeatherGfx: ; a0908 (28:4908)
dw $24
- INCBIN "gfx/trainers/heather.2bpp"
+ INCBIN "gfx/duelists/heather.2bpp"
SaraGfx: ; a0b4a (28:4b4a)
dw $24
- INCBIN "gfx/trainers/sara.2bpp"
+ INCBIN "gfx/duelists/sara.2bpp"
AmandaGfx: ; a0d8c (28:4d8c)
dw $24
- INCBIN "gfx/trainers/amanda.2bpp"
+ INCBIN "gfx/duelists/amanda.2bpp"
JenniferGfx: ; a0fce (28:4fce)
dw $24
- INCBIN "gfx/trainers/jennifer.2bpp"
+ INCBIN "gfx/duelists/jennifer.2bpp"
JessicaGfx: ; a1210 (28:5210)
dw $24
- INCBIN "gfx/trainers/jessica.2bpp"
+ INCBIN "gfx/duelists/jessica.2bpp"
StephanieGfx: ; a1452 (28:5452)
dw $24
- INCBIN "gfx/trainers/stephanie.2bpp"
+ INCBIN "gfx/duelists/stephanie.2bpp"
AaronGfx: ; a1694 (28:5694)
dw $24
- INCBIN "gfx/trainers/aaron.2bpp"
+ INCBIN "gfx/duelists/aaron.2bpp"
OWSprite0: ; a18d6 (28:58d6)
dw $14
diff --git a/gfx/trainers/aaron.png b/gfx/duelists/aaron.png
index bbd8bbc..bbd8bbc 100755
--- a/gfx/trainers/aaron.png
+++ b/gfx/duelists/aaron.png
Binary files differ
diff --git a/gfx/trainers/adam.png b/gfx/duelists/adam.png
index 859bc86..859bc86 100755
--- a/gfx/trainers/adam.png
+++ b/gfx/duelists/adam.png
Binary files differ
diff --git a/gfx/trainers/amanda.png b/gfx/duelists/amanda.png
index be16167..be16167 100755
--- a/gfx/trainers/amanda.png
+++ b/gfx/duelists/amanda.png
Binary files differ
diff --git a/gfx/trainers/amy.png b/gfx/duelists/amy.png
index 0ca501d..0ca501d 100755
--- a/gfx/trainers/amy.png
+++ b/gfx/duelists/amy.png
Binary files differ
diff --git a/gfx/trainers/andrew.png b/gfx/duelists/andrew.png
index 45508af..45508af 100755
--- a/gfx/trainers/andrew.png
+++ b/gfx/duelists/andrew.png
Binary files differ
diff --git a/gfx/trainers/brandon.png b/gfx/duelists/brandon.png
index 32b1934..32b1934 100755
--- a/gfx/trainers/brandon.png
+++ b/gfx/duelists/brandon.png
Binary files differ
diff --git a/gfx/trainers/brittany.png b/gfx/duelists/brittany.png
index 4e5e2a0..4e5e2a0 100755
--- a/gfx/trainers/brittany.png
+++ b/gfx/duelists/brittany.png
Binary files differ
diff --git a/gfx/trainers/chris.png b/gfx/duelists/chris.png
index c645e12..c645e12 100755
--- a/gfx/trainers/chris.png
+++ b/gfx/duelists/chris.png
Binary files differ
diff --git a/gfx/trainers/courtney.png b/gfx/duelists/courtney.png
index fff4a8a..fff4a8a 100755
--- a/gfx/trainers/courtney.png
+++ b/gfx/duelists/courtney.png
Binary files differ
diff --git a/gfx/trainers/daniel.png b/gfx/duelists/daniel.png
index f3a36ac..f3a36ac 100755
--- a/gfx/trainers/daniel.png
+++ b/gfx/duelists/daniel.png
Binary files differ
diff --git a/gfx/trainers/david.png b/gfx/duelists/david.png
index f1de43e..f1de43e 100755
--- a/gfx/trainers/david.png
+++ b/gfx/duelists/david.png
Binary files differ
diff --git a/gfx/trainers/erik.png b/gfx/duelists/erik.png
index 287b615..287b615 100755
--- a/gfx/trainers/erik.png
+++ b/gfx/duelists/erik.png
Binary files differ
diff --git a/gfx/trainers/gene.png b/gfx/duelists/gene.png
index ee368c1..ee368c1 100755
--- a/gfx/trainers/gene.png
+++ b/gfx/duelists/gene.png
Binary files differ
diff --git a/gfx/trainers/heather.png b/gfx/duelists/heather.png
index 69baa70..69baa70 100755
--- a/gfx/trainers/heather.png
+++ b/gfx/duelists/heather.png
Binary files differ
diff --git a/gfx/trainers/imakuni.png b/gfx/duelists/imakuni.png
index 1c6e8a7..1c6e8a7 100755
--- a/gfx/trainers/imakuni.png
+++ b/gfx/duelists/imakuni.png
Binary files differ
diff --git a/gfx/trainers/isaac.png b/gfx/duelists/isaac.png
index 2aab212..2aab212 100755
--- a/gfx/trainers/isaac.png
+++ b/gfx/duelists/isaac.png
Binary files differ
diff --git a/gfx/trainers/jack.png b/gfx/duelists/jack.png
index e8c3799..e8c3799 100755
--- a/gfx/trainers/jack.png
+++ b/gfx/duelists/jack.png
Binary files differ
diff --git a/gfx/trainers/jennifer.png b/gfx/duelists/jennifer.png
index c218186..c218186 100755
--- a/gfx/trainers/jennifer.png
+++ b/gfx/duelists/jennifer.png
Binary files differ
diff --git a/gfx/trainers/jessica.png b/gfx/duelists/jessica.png
index 0460d52..0460d52 100755
--- a/gfx/trainers/jessica.png
+++ b/gfx/duelists/jessica.png
Binary files differ
diff --git a/gfx/trainers/john.png b/gfx/duelists/john.png
index 51ea430..51ea430 100755
--- a/gfx/trainers/john.png
+++ b/gfx/duelists/john.png
Binary files differ
diff --git a/gfx/trainers/jonathan.png b/gfx/duelists/jonathan.png
index 40d6593..40d6593 100755
--- a/gfx/trainers/jonathan.png
+++ b/gfx/duelists/jonathan.png
Binary files differ
diff --git a/gfx/trainers/joseph.png b/gfx/duelists/joseph.png
index 6ca588f..6ca588f 100755
--- a/gfx/trainers/joseph.png
+++ b/gfx/duelists/joseph.png
Binary files differ
diff --git a/gfx/trainers/joshua.png b/gfx/duelists/joshua.png
index 5dd8b7f..5dd8b7f 100755
--- a/gfx/trainers/joshua.png
+++ b/gfx/duelists/joshua.png
Binary files differ
diff --git a/gfx/trainers/ken.png b/gfx/duelists/ken.png
index 4da8ca2..4da8ca2 100755
--- a/gfx/trainers/ken.png
+++ b/gfx/duelists/ken.png
Binary files differ
diff --git a/gfx/trainers/kristin.png b/gfx/duelists/kristin.png
index d265ae3..d265ae3 100755
--- a/gfx/trainers/kristin.png
+++ b/gfx/duelists/kristin.png
Binary files differ
diff --git a/gfx/trainers/matthew.png b/gfx/duelists/matthew.png
index bd828e6..bd828e6 100755
--- a/gfx/trainers/matthew.png
+++ b/gfx/duelists/matthew.png
Binary files differ
diff --git a/gfx/trainers/michael.png b/gfx/duelists/michael.png
index 454cdc3..454cdc3 100755
--- a/gfx/trainers/michael.png
+++ b/gfx/duelists/michael.png
Binary files differ
diff --git a/gfx/trainers/mitch.png b/gfx/duelists/mitch.png
index 38c58fe..38c58fe 100755
--- a/gfx/trainers/mitch.png
+++ b/gfx/duelists/mitch.png
Binary files differ
diff --git a/gfx/trainers/murray.png b/gfx/duelists/murray.png
index 32bd818..32bd818 100755
--- a/gfx/trainers/murray.png
+++ b/gfx/duelists/murray.png
Binary files differ
diff --git a/gfx/trainers/nicholas.png b/gfx/duelists/nicholas.png
index 81f5b53..81f5b53 100755
--- a/gfx/trainers/nicholas.png
+++ b/gfx/duelists/nicholas.png
Binary files differ
diff --git a/gfx/trainers/nikki.png b/gfx/duelists/nikki.png
index 2c4e205..2c4e205 100755
--- a/gfx/trainers/nikki.png
+++ b/gfx/duelists/nikki.png
Binary files differ
diff --git a/gfx/trainers/player.png b/gfx/duelists/player.png
index 8b81fbe..8b81fbe 100755
--- a/gfx/trainers/player.png
+++ b/gfx/duelists/player.png
Binary files differ
diff --git a/gfx/trainers/rick.png b/gfx/duelists/rick.png
index 7dcbdc0..7dcbdc0 100755
--- a/gfx/trainers/rick.png
+++ b/gfx/duelists/rick.png
Binary files differ
diff --git a/gfx/trainers/robert.png b/gfx/duelists/robert.png
index 2172ae6..2172ae6 100755
--- a/gfx/trainers/robert.png
+++ b/gfx/duelists/robert.png
Binary files differ
diff --git a/gfx/trainers/rod.png b/gfx/duelists/rod.png
index 4c57dd7..4c57dd7 100755
--- a/gfx/trainers/rod.png
+++ b/gfx/duelists/rod.png
Binary files differ
diff --git a/gfx/trainers/ronald.png b/gfx/duelists/ronald.png
index 26a1245..26a1245 100755
--- a/gfx/trainers/ronald.png
+++ b/gfx/duelists/ronald.png
Binary files differ
diff --git a/gfx/trainers/ryan.png b/gfx/duelists/ryan.png
index ab0f84c..ab0f84c 100755
--- a/gfx/trainers/ryan.png
+++ b/gfx/duelists/ryan.png
Binary files differ
diff --git a/gfx/trainers/sam.png b/gfx/duelists/sam.png
index 7a52ac3..7a52ac3 100755
--- a/gfx/trainers/sam.png
+++ b/gfx/duelists/sam.png
Binary files differ
diff --git a/gfx/trainers/sara.png b/gfx/duelists/sara.png
index f6319bb..f6319bb 100755
--- a/gfx/trainers/sara.png
+++ b/gfx/duelists/sara.png
Binary files differ
diff --git a/gfx/trainers/stephanie.png b/gfx/duelists/stephanie.png
index a0a3ff8..a0a3ff8 100755
--- a/gfx/trainers/stephanie.png
+++ b/gfx/duelists/stephanie.png
Binary files differ
diff --git a/gfx/trainers/steve.png b/gfx/duelists/steve.png
index 216cee0..216cee0 100755
--- a/gfx/trainers/steve.png
+++ b/gfx/duelists/steve.png
Binary files differ