ref: 384788f3700a5c429dfa86c6ec673a648b4b1c42
parent: cd3d125861d25ab60393e29e991f55f26a3874f4
author: yenatch <yenatch@gmail.com>
date: Sat Jun 17 20:13:03 EDT 2017
pngs in gfx/mail
--- a/Makefile
+++ b/Makefile
@@ -124,6 +124,9 @@
gfx/trainers/%.2bpp: gfx/trainers/%.png
rgbgfx -h -o $@ $<
+gfx/mail/%.1bpp: gfx/mail/%.png
+ rgbgfx -d1 -o $@ $<
+ tools/gfx -d1 --remove-whitespace -o $@ $@
%.bin: ;
%.blk: ;
--- a/gfx/mail.asm
+++ b/gfx/mail.asm
@@ -226,7 +226,7 @@
ld de, EonMailBorder1GFX
ld c, 1 * 8
call LoadMailGFX_Color2
- ld de, EonMailBorder3GFX
+ ld de, SurfMailBorderGFX + 6 * 8
ld c, 1 * 8
call LoadMailGFX_Color2
ld de, MailEeveeGFX
@@ -329,13 +329,13 @@
ld hl, VTiles2 tile $31
ld bc, 5 * 8
call MailGFX_GenerateMonochromeTilesColor2
- ld de, MorphMailBorderGFX
+ ld de, MorphMailBorderCornerGFX + 3 * 8
ld c, 1 * 8
call LoadMailGFX_Color2
- ld de, MorphMailBorderCorner1GFX
+ ld de, MorphMailBorderCornerGFX
ld c, 1 * 8
call LoadMailGFX_Color2
- ld de, MorphMailBorderCorner2GFX
+ ld de, MorphMailBorderGFX
ld c, 1 * 8
call LoadMailGFX_Color2
ld de, EonMailBorder1GFX
@@ -418,16 +418,16 @@
ld de, MailCloudGFX
ld c, 6 * 8
call LoadMailGFX_Color1
- ld de, FlowerMailSenderUnderlineGFX
+ ld de, FlowerMailBorderGFX + 6 * 8
ld c, 1 * 8
call LoadMailGFX_Color1
ld de, MailCloudGFX
ld c, 1 * 8
call LoadMailGFX_Color1
- ld de, MailCloud2GFX
+ ld de, MailCloudGFX + 2 * 8
ld c, 2 * 8
call LoadMailGFX_Color1
- ld de, MailCloud3GFX
+ ld de, MailCloudGFX + 5 * 8
ld c, 1 * 8
call LoadMailGFX_Color1
@@ -497,10 +497,10 @@
ld de, MailOddishGFX
ld c, 4 * 8
call LoadMailGFX_Color3
- ld de, FlowerMailSenderUnderlineGFX
+ ld de, FlowerMailBorderGFX + 6 * 8
ld c, 1 * 8
call LoadMailGFX_Color2
- ld de, FlowerMailLargeFlowerGFX
+ ld de, FlowerMailFlowerGFX
ld c, 4 * 8
call LoadMailGFX_Color1
ld c, 4 * 8
@@ -580,7 +580,7 @@
ld de, MusicMailBorderGFX
ld c, 4 * 8
call LoadMailGFX_Color2
- ld de, MorphMailBorderCorner2GFX
+ ld de, MorphMailBorderGFX
ld c, 2 * 8
call LoadMailGFX_Color2
ld de, MailNatuGFX
@@ -628,10 +628,10 @@
ld de, MailMewGFX
ld c, 18 * 8
call LoadMailGFX_Color2
- ld de, MirageMailTopDividerGFX
+ ld de, LiteBlueMailBorderGFX + 1 * 8
ld c, 1 * 8
call LoadMailGFX_Color1
- ld de, MirageMailBottomDividerGFX
+ ld de, LiteBlueMailBorderGFX + 6 * 8
ld c, 1 * 8
call LoadMailGFX_Color1
@@ -947,7 +947,7 @@
PortraitMailSmallPokeballGFX: ; b9936
INCBIN "gfx/mail/0b9936.1bpp"
-MorphMailBorderCorner2GFX: ; b993e
+MorphMailBorderGFX: ; b993e
INCBIN "gfx/mail/0b993e.1bpp"
MusicMailSmallNoteGFX: ; b9946
@@ -1016,20 +1016,14 @@
LovelyMailLargeHeartGFX: ; b9c5e
INCBIN "gfx/mail/0b9c5e.1bpp"
-MorphMailBorderCorner1GFX: ; b9c7e
+MorphMailBorderCornerGFX: ; b9c7e
INCBIN "gfx/mail/0b9c7e.1bpp"
-MorphMailBorderGFX: ; b9c96
-INCBIN "gfx/mail/0b9c96.1bpp"
-
MailLargeCircleGFX: ; b9c9e
INCBIN "gfx/mail/0b9c9e.1bpp"
-FlowerMailLargeFlowerGFX: ; b9cbe
+FlowerMailFlowerGFX: ; b9cbe
INCBIN "gfx/mail/0b9cbe.1bpp"
-
-FlowerMailSmallFlowerGFX: ; b9cde
-; indirectly referenced
INCBIN "gfx/mail/0b9cde.1bpp"
MusicMailLargeNoteGFX: ; b9cfe
@@ -1038,32 +1032,14 @@
MailCloudGFX: ; b9d16
INCBIN "gfx/mail/0b9d16.1bpp"
-MailCloud2GFX: ; b9d26
-INCBIN "gfx/mail/0b9d26.1bpp"
-
-MailCloud3GFX: ; b9d3e
-INCBIN "gfx/mail/0b9d3e.1bpp"
-
SurfMailBorderGFX: ; b9d46
INCBIN "gfx/mail/0b9d46.1bpp"
-EonMailBorder3GFX: ; b9d76
-INCBIN "gfx/mail/0b9d76.1bpp"
-
FlowerMailBorderGFX: ; b9d86
INCBIN "gfx/mail/0b9d86.1bpp"
-FlowerMailSenderUnderlineGFX: ; b9db6
-INCBIN "gfx/mail/0b9db6.1bpp"
-
LiteBlueMailBorderGFX: ; b9dc6
INCBIN "gfx/mail/0b9dc6.1bpp"
-
-MirageMailTopDividerGFX: ; b9dce
-INCBIN "gfx/mail/0b9dce.1bpp"
-
-MirageMailBottomDividerGFX: ; b9df6
-INCBIN "gfx/mail/0b9df6.1bpp"
MusicMailBorderGFX: ; b9e06
INCBIN "gfx/mail/0b9e06.1bpp"
binary files a/gfx/mail/0b9926.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9926.png differ
--- a/gfx/mail/0b992e.1bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-�HLm}
\ No newline at end of file
binary files /dev/null b/gfx/mail/0b992e.png differ
--- a/gfx/mail/0b9936.1bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-<~���~<
\ No newline at end of file
binary files /dev/null b/gfx/mail/0b9936.png differ
binary files a/gfx/mail/0b993e.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b993e.png differ
--- a/gfx/mail/0b9946.1bpp
+++ /dev/null
@@ -1,1 +1,0 @@
- p
\ No newline at end of file
binary files /dev/null b/gfx/mail/0b9946.png differ
binary files a/gfx/mail/0b994e.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b994e.png differ
binary files a/gfx/mail/0b995e.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b995e.png differ
binary files a/gfx/mail/0b9966.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9966.png differ
binary files a/gfx/mail/0b996e.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b996e.png differ
binary files a/gfx/mail/0b9976.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9976.png differ
binary files a/gfx/mail/0b997e.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b997e.png differ
--- a/gfx/mail/0b998e.1bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-<~���
\ No newline at end of file
binary files /dev/null b/gfx/mail/0b998e.png differ
binary files a/gfx/mail/0b9996.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9996.png differ
binary files a/gfx/mail/0b99c6.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b99c6.png differ
binary files a/gfx/mail/0b99f6.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b99f6.png differ
binary files a/gfx/mail/0b9a26.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9a26.png differ
binary files a/gfx/mail/0b9a56.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9a56.png differ
binary files a/gfx/mail/0b9a86.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9a86.png differ
binary files a/gfx/mail/0b9ab6.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9ab6.png differ
binary files a/gfx/mail/0b9b46.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9b46.png differ
binary files a/gfx/mail/0b9bce.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9bce.png differ
--- a/gfx/mail/0b9bee.1bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-�KKm}�������
\ No newline at end of file
binary files /dev/null b/gfx/mail/0b9bee.png differ
binary files a/gfx/mail/0b9bfe.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9bfe.png differ
binary files a/gfx/mail/0b9c1e.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9c1e.png differ
binary files a/gfx/mail/0b9c3e.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9c3e.png differ
binary files a/gfx/mail/0b9c5e.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9c5e.png differ
binary files a/gfx/mail/0b9c7e.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9c7e.png differ
--- a/gfx/mail/0b9c96.1bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-������
\ No newline at end of file
binary files a/gfx/mail/0b9c9e.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9c9e.png differ
binary files a/gfx/mail/0b9cbe.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9cbe.png differ
binary files a/gfx/mail/0b9cde.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9cde.png differ
binary files a/gfx/mail/0b9cfe.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9cfe.png differ
binary files a/gfx/mail/0b9d16.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9d16.png differ
binary files a/gfx/mail/0b9d26.1bpp /dev/null differ
binary files a/gfx/mail/0b9d3e.1bpp /dev/null differ
binary files a/gfx/mail/0b9d46.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9d46.png differ
binary files a/gfx/mail/0b9d76.1bpp /dev/null differ
binary files a/gfx/mail/0b9d86.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9d86.png differ
binary files a/gfx/mail/0b9db6.1bpp /dev/null differ
--- a/gfx/mail/0b9dc6.1bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-�������
\ No newline at end of file
binary files /dev/null b/gfx/mail/0b9dc6.png differ
binary files a/gfx/mail/0b9dce.1bpp /dev/null differ
binary files a/gfx/mail/0b9df6.1bpp /dev/null differ
binary files a/gfx/mail/0b9e06.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9e06.png differ
--- a/gfx/mail/0b9e26.1bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-�Ù������������<��������<�������χ��
\ No newline at end of file
binary files /dev/null b/gfx/mail/0b9e26.png differ
binary files a/gfx/mail/0b9e4e.1bpp /dev/null differ
binary files /dev/null b/gfx/mail/0b9e4e.png differ