Merge branch 'master' of https://github.com/ZetaNull/jep-hack
27
gfx/pics.asm
|
|
@ -742,18 +742,6 @@ TangrowthBackpic: INCBIN "gfx/pokemon/tangrowth/back.2bpp.lz"
|
|||
JungelaFrontpic: INCBIN "gfx/pokemon/jungela/front.animated.2bpp.lz"
|
||||
JungelaBackpic: INCBIN "gfx/pokemon/jungela/back.2bpp.lz"
|
||||
|
||||
; RBY/unused trainer Pics
|
||||
ChannelerPic: INCBIN "gfx/trainers/channeler.2bpp.lz"
|
||||
CueBallPic: INCBIN "gfx/trainers/cue_ball.2bpp.lz"
|
||||
EngineerPic: INCBIN "gfx/trainers/engineer.2bpp.lz"
|
||||
RockerPic: INCBIN "gfx/trainers/rocker.2bpp.lz"
|
||||
TamerPic: INCBIN "gfx/trainers/tamer.2bpp.lz"
|
||||
FirefighterPic: INCBIN "gfx/trainers/firefighter.2bpp.lz"
|
||||
TeacherMPic: INCBIN "gfx/trainers/teacherm.2bpp.lz"
|
||||
PainterPic: INCBIN "gfx/trainers/painter.2bpp.lz"
|
||||
SoldierPic: INCBIN "gfx/trainers/soldier.2bpp.lz"
|
||||
SportsmanPic: INCBIN "gfx/trainers/sportsman.2bpp.lz"
|
||||
|
||||
|
||||
SECTION "Pics 20", ROMX
|
||||
|
||||
|
|
@ -1045,3 +1033,18 @@ KurtPic: INCBIN "gfx/trainers/kurt.2bpp.lz"
|
|||
ArianaPic: INCBIN "gfx/trainers/ariana.2bpp.lz"
|
||||
ArcherPic: INCBIN "gfx/trainers/archer.2bpp.lz"
|
||||
ProfBluePic: INCBIN "gfx/trainers/blue_professor.2bpp.lz"
|
||||
ElderPic: INCBIN "gfx/trainers/elder.2bpp.lz"
|
||||
|
||||
SECTION "Pics 26", ROMX
|
||||
|
||||
; RBY/unused trainer Pics
|
||||
ChannelerPic: INCBIN "gfx/trainers/channeler.2bpp.lz"
|
||||
CueBallPic: INCBIN "gfx/trainers/cue_ball.2bpp.lz"
|
||||
EngineerPic: INCBIN "gfx/trainers/engineer.2bpp.lz"
|
||||
RockerPic: INCBIN "gfx/trainers/rocker.2bpp.lz"
|
||||
TamerPic: INCBIN "gfx/trainers/tamer.2bpp.lz"
|
||||
FirefighterPic: INCBIN "gfx/trainers/firefighter.2bpp.lz"
|
||||
TeacherMPic: INCBIN "gfx/trainers/teacherm.2bpp.lz"
|
||||
PainterPic: INCBIN "gfx/trainers/painter.2bpp.lz"
|
||||
SoldierPic: INCBIN "gfx/trainers/soldier.2bpp.lz"
|
||||
SportsmanPic: INCBIN "gfx/trainers/sportsman.2bpp.lz"
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
RGB 16, 17, 30
|
||||
RGB 05, 07, 11
|
||||
RGB 28, 00, 29
|
||||
RGB 16, 09, 28
|
||||
|
Before Width: | Height: | Size: 304 B After Width: | Height: | Size: 338 B |
|
Before Width: | Height: | Size: 315 B After Width: | Height: | Size: 478 B |
|
|
@ -1,2 +1,4 @@
|
|||
RGB 22, 22, 12
|
||||
RGB 07, 15, 25
|
||||
|
||||
RGB 31, 19, 00
|
||||
RGB 16, 09, 28
|
||||
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 315 B After Width: | Height: | Size: 624 B |
BIN
gfx/pokemon/dudunsparce/front2.png
Normal file
|
After Width: | Height: | Size: 547 B |
|
|
@ -1,2 +1,4 @@
|
|||
RGB 22, 22, 12
|
||||
RGB 07, 15, 25
|
||||
|
||||
RGB 31, 24, 06
|
||||
RGB 31, 05, 21
|
||||
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 860 B After Width: | Height: | Size: 836 B |
|
|
@ -1 +1,15 @@
|
|||
endanim
|
||||
frame 0, 08
|
||||
frame 1, 15
|
||||
frame 2, 08
|
||||
frame 3, 15
|
||||
frame 4, 08
|
||||
frame 5, 08
|
||||
frame 6, 08
|
||||
frame 5, 08
|
||||
frame 4, 08
|
||||
frame 2, 08
|
||||
frame 1, 08
|
||||
frame 7, 08
|
||||
frame 1, 08
|
||||
frame 7, 08
|
||||
endanim
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 304 B After Width: | Height: | Size: 520 B |
|
Before Width: | Height: | Size: 315 B After Width: | Height: | Size: 794 B |
|
|
@ -1,2 +1,2 @@
|
|||
RGB 22, 22, 12
|
||||
RGB 07, 15, 25
|
||||
RGB 31, 31, 05
|
||||
RGB 28, 10, 05
|
||||
|
Before Width: | Height: | Size: 315 B After Width: | Height: | Size: 532 B |
|
|
@ -1,2 +1,2 @@
|
|||
RGB 22, 22, 12
|
||||
RGB 07, 15, 25
|
||||
RGB 18, 21, 30
|
||||
RGB 15, 15, 16
|
||||
|
Before Width: | Height: | Size: 452 B After Width: | Height: | Size: 279 B |
|
Before Width: | Height: | Size: 766 B After Width: | Height: | Size: 636 B |
|
|
@ -1,2 +1,4 @@
|
|||
RGB 22, 22, 12
|
||||
RGB 07, 15, 25
|
||||
|
||||
RGB 27, 22, 11
|
||||
RGB 09, 07, 31
|
||||
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 796 B After Width: | Height: | Size: 674 B |
|
Before Width: | Height: | Size: 315 B After Width: | Height: | Size: 628 B |
|
|
@ -1,2 +1,2 @@
|
|||
RGB 22, 22, 12
|
||||
RGB 07, 15, 25
|
||||
RGB 31, 17, 31
|
||||
RGB 18, 06, 21
|
||||
|
|
@ -1 +1,21 @@
|
|||
endanim
|
||||
frame 0, 06
|
||||
frame 1, 06
|
||||
frame 2, 12
|
||||
frame 3, 06
|
||||
frame 4, 12
|
||||
frame 5, 06
|
||||
frame 6, 04
|
||||
frame 7, 10
|
||||
frame 7, 06
|
||||
frame 8, 10
|
||||
frame 8, 06
|
||||
frame 7, 10
|
||||
frame 7, 06
|
||||
frame 8, 10
|
||||
frame 8, 06
|
||||
frame 7, 10
|
||||
frame 6, 08
|
||||
frame 4, 08
|
||||
frame 2, 08
|
||||
frame 0, 06
|
||||
endanim
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 453 B After Width: | Height: | Size: 464 B |
|
Before Width: | Height: | Size: 525 B After Width: | Height: | Size: 1.9 KiB |
|
|
@ -1,2 +1,2 @@
|
|||
RGB 22, 22, 12
|
||||
RGB 07, 15, 25
|
||||
RGB 18, 15, 20
|
||||
RGB 11, 08, 12
|
||||
|
Before Width: | Height: | Size: 315 B After Width: | Height: | Size: 664 B |
|
|
@ -1,2 +1,4 @@
|
|||
RGB 22, 22, 12
|
||||
RGB 07, 15, 25
|
||||
|
||||
RGB 25, 20, 08
|
||||
RGB 27, 10, 05
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1,15 @@
|
|||
endanim
|
||||
frame 0, 18
|
||||
frame 1, 18
|
||||
frame 2, 10
|
||||
frame 3, 20
|
||||
frame 4, 10
|
||||
frame 5, 10
|
||||
frame 6, 10
|
||||
frame 7, 10
|
||||
frame 8, 10
|
||||
frame 9, 10
|
||||
frame 10, 10
|
||||
frame 11, 10
|
||||
frame 1, 10
|
||||
frame 12, 18
|
||||
endanim
|
||||
|
|
|
|||
|
|
@ -1 +1,4 @@
|
|||
frame 0, 18
|
||||
frame 1, 18
|
||||
frame 12, 18
|
||||
endanim
|
||||
|
Before Width: | Height: | Size: 304 B After Width: | Height: | Size: 8.8 KiB |
|
Before Width: | Height: | Size: 315 B After Width: | Height: | Size: 934 B |
|
|
@ -1,2 +1,2 @@
|
|||
RGB 22, 22, 12
|
||||
RGB 07, 15, 25
|
||||
RGB 15, 18, 30
|
||||
RGB 31, 06, 04
|
||||
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 5 KiB |
|
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 4.3 KiB |
|
Before Width: | Height: | Size: 534 B After Width: | Height: | Size: 514 B |
|
Before Width: | Height: | Size: 431 B After Width: | Height: | Size: 599 B |
|
Before Width: | Height: | Size: 430 B After Width: | Height: | Size: 757 B |
BIN
gfx/trainers/chief.png
Normal file
|
After Width: | Height: | Size: 431 B |
|
Before Width: | Height: | Size: 430 B After Width: | Height: | Size: 770 B |
BIN
gfx/trainers/elder.png
Normal file
|
After Width: | Height: | Size: 385 B |
|
Before Width: | Height: | Size: 430 B After Width: | Height: | Size: 625 B |
|
Before Width: | Height: | Size: 599 B After Width: | Height: | Size: 588 B |
BIN
gfx/trainers/jack.png
Normal file
|
After Width: | Height: | Size: 807 B |
BIN
gfx/trainers/jessiejames.png
Normal file
|
After Width: | Height: | Size: 641 B |
|
Before Width: | Height: | Size: 615 B After Width: | Height: | Size: 634 B |
|
Before Width: | Height: | Size: 430 B After Width: | Height: | Size: 629 B |
|
Before Width: | Height: | Size: 385 B After Width: | Height: | Size: 376 B |
BIN
gfx/trainers/student.png
Normal file
|
After Width: | Height: | Size: 718 B |
|
Before Width: | Height: | Size: 489 B After Width: | Height: | Size: 471 B |
|
Before Width: | Height: | Size: 430 B After Width: | Height: | Size: 727 B |
BIN
gfx/trainers/yujirou.png
Normal file
|
After Width: | Height: | Size: 802 B |