ref: 01888c742d6d748d56757de9a54b9f8d590b5205
parent: ade61943598dcda0e517ae9da1a70ab7df579cd7
author: yenatch <yenatch@gmail.com>
date: Sat Apr 5 12:41:36 EDT 2014
Convert pngs in gfx/ to 1bpp and 2bpp. All graphics are now png. Some files were split out of necessity: - gfx/trade.2bpp -> gfx/game_boy.norepeat.png gfx/link_cable.png - gfx/red/introfight.2bpp -> gfx/red/intro_nido_{1,2,3}.6x6.png - gfx/blue/introfight.2bpp -> gfx/blue/intro_purin_{1,2,3}.6x6.png
binary files a/gfx/AB.2bpp /dev/null differ
binary files /dev/null b/gfx/AB.png differ
--- a/gfx/ED_tile.1bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-�����
\ No newline at end of file
binary files /dev/null b/gfx/ED_tile.png differ
binary files a/gfx/attack_anim_1.2bpp /dev/null differ
binary files /dev/null b/gfx/attack_anim_1.png differ
binary files a/gfx/attack_anim_2.2bpp /dev/null differ
binary files /dev/null b/gfx/attack_anim_2.png differ
binary files a/gfx/badge_numbers.2bpp /dev/null differ
binary files /dev/null b/gfx/badge_numbers.png differ
binary files a/gfx/badges.2bpp /dev/null differ
binary files /dev/null b/gfx/badges.w16.png differ
binary files a/gfx/battle_hud1.1bpp /dev/null differ
binary files /dev/null b/gfx/battle_hud1.png differ
binary files a/gfx/battle_hud2.1bpp /dev/null differ
binary files /dev/null b/gfx/battle_hud2.png differ
binary files a/gfx/battle_hud3.1bpp /dev/null differ
binary files /dev/null b/gfx/battle_hud3.png differ
--- a/gfx/battle_transition.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-�������������
\ No newline at end of file
binary files /dev/null b/gfx/battle_transition.png differ
binary files a/gfx/blank_leader_names.2bpp /dev/null differ
binary files /dev/null b/gfx/blank_leader_names.png differ
binary files a/gfx/blue/blueversion.1bpp /dev/null differ
binary files /dev/null b/gfx/blue/blueversion.h8.png differ
binary files /dev/null b/gfx/blue/intro_purin_1.6x6.png differ
binary files /dev/null b/gfx/blue/intro_purin_2.6x6.png differ
binary files /dev/null b/gfx/blue/intro_purin_3.6x6.png differ
binary files a/gfx/blue/introfight.2bpp /dev/null differ
binary files a/gfx/blue/sgbborder.2bpp /dev/null differ
binary files /dev/null b/gfx/blue/sgbborder.w128.png differ
binary files a/gfx/blue/slotmachine1.2bpp /dev/null differ
binary files /dev/null b/gfx/blue/slotmachine1.png differ
binary files a/gfx/blue/slotmachine2.2bpp /dev/null differ
binary files /dev/null b/gfx/blue/slotmachine2.png differ
binary files a/gfx/circle_tile.2bpp /dev/null differ
binary files /dev/null b/gfx/circle_tile.png differ
binary files a/gfx/copyright.2bpp /dev/null differ
binary files /dev/null b/gfx/copyright.h8.png differ
binary files a/gfx/diagonal_lines.2bpp /dev/null differ
binary files /dev/null b/gfx/diagonal_lines.png differ
binary files a/gfx/emotion_bubbles.2bpp /dev/null differ
binary files /dev/null b/gfx/emotion_bubbles.w16.png differ
binary files a/gfx/falling_star.2bpp /dev/null differ
binary files /dev/null b/gfx/falling_star.png differ
binary files a/gfx/font.1bpp /dev/null differ
binary files /dev/null b/gfx/font.w128.png differ
binary files /dev/null b/gfx/game_boy.norepeat.png differ
binary files a/gfx/gamefreak.2bpp /dev/null differ
binary files /dev/null b/gfx/gamefreak.h8.png differ
binary files a/gfx/gamefreak_intro.2bpp /dev/null differ
binary files /dev/null b/gfx/gamefreak_intro.h8.png differ
binary files /dev/null b/gfx/gamefreak_logo.png differ
binary files a/gfx/hp_bar_and_status.2bpp /dev/null differ
binary files /dev/null b/gfx/hp_bar_and_status.png differ
binary files /dev/null b/gfx/hp_bar_and_status.w80.png differ
binary files a/gfx/intro_fight.2bpp /dev/null differ
binary files /dev/null b/gfx/intro_fight.png differ
binary files a/gfx/ledge_hopping_shadow.1bpp /dev/null differ
binary files /dev/null b/gfx/ledge_hopping_shadow.png differ
binary files /dev/null b/gfx/link_cable.png differ
--- a/gfx/minimized_mon_sprite.1bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-<~<$
\ No newline at end of file
binary files /dev/null b/gfx/minimized_mon_sprite.h5.png differ
binary files /dev/null b/gfx/minimized_mon_sprite.png differ
--- a/gfx/mon_nest_icon.1bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-Bf���
\ No newline at end of file
binary files /dev/null b/gfx/mon_nest_icon.png differ
binary files a/gfx/mon_ow_sprites.2bpp /dev/null differ
binary files /dev/null b/gfx/mon_ow_sprites.png differ
binary files a/gfx/p_tile.1bpp /dev/null differ
binary files /dev/null b/gfx/p_tile.png differ
binary files a/gfx/player_title.2bpp /dev/null differ
binary files /dev/null b/gfx/player_title.png differ
binary files a/gfx/pokeball.2bpp /dev/null differ
binary files /dev/null b/gfx/pokeball.png differ
binary files a/gfx/pokecenter_ball.2bpp /dev/null differ
binary files /dev/null b/gfx/pokecenter_ball.png differ
binary files a/gfx/pokedex.2bpp /dev/null differ
binary files /dev/null b/gfx/pokedex.png differ
binary files a/gfx/pokemon_logo.2bpp /dev/null differ
binary files /dev/null b/gfx/pokemon_logo.w128.png differ
binary files /dev/null b/gfx/red/intro_nido_1.6x6.png differ
binary files /dev/null b/gfx/red/intro_nido_2.6x6.png differ
binary files /dev/null b/gfx/red/intro_nido_3.6x6.png differ
binary files a/gfx/red/introfight.2bpp /dev/null differ
binary files a/gfx/red/redgreenversion.1bpp /dev/null differ
binary files /dev/null b/gfx/red/redgreenversion.h8.png differ
binary files a/gfx/red/sgbborder.2bpp /dev/null differ
binary files /dev/null b/gfx/red/sgbborder.w128.png differ
binary files a/gfx/red/slotmachine1.2bpp /dev/null differ
binary files /dev/null b/gfx/red/slotmachine1.png differ
binary files a/gfx/red/slotmachine2.2bpp /dev/null differ
binary files /dev/null b/gfx/red/slotmachine2.png differ
--- a/gfx/red_fishing_tile_back.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-?3,?+?��4����x8����
\ No newline at end of file
binary files /dev/null b/gfx/red_fishing_tile_back.png differ
--- a/gfx/red_fishing_tile_front.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-?2/?'?�L����������
\ No newline at end of file
binary files /dev/null b/gfx/red_fishing_tile_front.png differ
--- a/gfx/red_fishing_tile_side.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-����??<'?'��`0�p���p� ��
\ No newline at end of file
binary files /dev/null b/gfx/red_fishing_tile_side.png differ
binary files a/gfx/red_fishingrod_tiles.2bpp /dev/null differ
binary files /dev/null b/gfx/red_fishingrod_tiles.png differ
binary files a/gfx/spinner_arrow.2bpp /dev/null differ
binary files /dev/null b/gfx/spinner_arrow.png differ
binary files a/gfx/sprites/agatha.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/agatha.png differ
--- a/gfx/sprites/balding_guy.2bpp
+++ /dev/null
@@ -1,3 +1,0 @@
-?0PFB�����8��-�b�B?0>9OyN0?�|����r�����pp????WSoP��������������-p?8w_p_8?����������pp ������|��|�|�L�H��`���0�0�����
\ No newline at end of file
binary files /dev/null b/gfx/sprites/balding_guy.png differ
binary files a/gfx/sprites/ball.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/ball.png differ
--- a/gfx/sprites/bike_shop_guy.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-????{q^~_�������������z~�/>>1O}N;<�||����r�<���pp????__����������������?3?<[X69���<���l��x��pp���������������� ��p���(�0�����
\ No newline at end of file
binary files /dev/null b/gfx/sprites/bike_shop_guy.png differ
--- a/gfx/sprites/biker.2bpp
+++ /dev/null
@@ -1,2 +1,0 @@
-???:?0ToR���������\��*�J?0?'<'�x���<��x������??????_o_����������������?0?/</����<���������
-�����������~�<�$?9gc??��0������c���??t`��ߤ������������T��`<3OxO?<��0��xȰ�����``??��߿����������������`?0_x_7???��0��x�������``???7?4�������������x�H+</3s����~99��`��������|
\ No newline at end of file
binary files /dev/null b/gfx/sprites/biker.png differ
binary files a/gfx/sprites/bird.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/bird.png differ
binary files a/gfx/sprites/black_hair_boy_1.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/black_hair_boy_1.png differ
binary files a/gfx/sprites/black_hair_boy_2.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/black_hair_boy_2.png differ
binary files a/gfx/sprites/blackbelt.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/blackbelt.png differ
binary files a/gfx/sprites/blue.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/blue.png differ
binary files a/gfx/sprites/book_map_dex.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/book_map_dex.png differ
--- a/gfx/sprites/boulder.2bpp
+++ /dev/null
@@ -1,2 +1,0 @@
-? @@�����������������ߠ��UjB}%?���V�
-�T��
\ No newline at end of file
binary files /dev/null b/gfx/sprites/boulder.png differ
binary files a/gfx/sprites/brunette_girl.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/brunette_girl.png differ
binary files a/gfx/sprites/bruno.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/bruno.png differ
binary files a/gfx/sprites/bug_catcher.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/bug_catcher.png differ
--- a/gfx/sprites/cable_club_woman.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
- ?"?'=Ox����0���D�����G��ny �Ov�����������`` ? ? ?@����0���������h ��8���������``(?>3�� �������>�~�����`�������
\ No newline at end of file
binary files /dev/null b/gfx/sprites/cable_club_woman.png differ
binary files a/gfx/sprites/clefairy.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/clefairy.png differ
binary files a/gfx/sprites/clipboard.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/clipboard.png differ
binary files a/gfx/sprites/cook.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/cook.png differ
binary files a/gfx/sprites/cycling.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/cycling.png differ
binary files a/gfx/sprites/daisy.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/daisy.png differ
binary files a/gfx/sprites/erika.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/erika.png differ
binary files a/gfx/sprites/fat_bald_guy.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/fat_bald_guy.png differ
--- a/gfx/sprites/fisher.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-p��pOoR���0�������J?0>9wO~I6?�|���~�l����ppp��pOoW���0��������?3?8WwX0?����������pp?0pO?0����������,��p�����0� ���
\ No newline at end of file
binary files /dev/null b/gfx/sprites/fisher.png differ
binary files a/gfx/sprites/fisher2.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/fisher2.png differ
binary files a/gfx/sprites/foulard_woman.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/foulard_woman.png differ
binary files a/gfx/sprites/gambler.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/gambler.png differ
--- a/gfx/sprites/gameboy_kid.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-?7S@oR��������������J?3 ��p����(�0����pp????_Oo_����������������;7</?+��<����������pp???9��������������|� ��p����(�0���
\ No newline at end of file
binary files /dev/null b/gfx/sprites/gameboy_kid.png differ
binary files a/gfx/sprites/gentleman.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/gentleman.png differ
binary files a/gfx/sprites/giovanni.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/giovanni.png differ
binary files a/gfx/sprites/girl.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/girl.png differ
--- a/gfx/sprites/guard.2bpp
+++ /dev/null
@@ -1,2 +1,0 @@
-8??7RB���x�x�����J�B?0??gyN?�x������r����xx????xW@��������������?0??x?������������xx#?G>1��������������8
-�0�@���`�`�`���
\ No newline at end of file
binary files /dev/null b/gfx/sprites/guard.png differ
--- a/gfx/sprites/gym_helper.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-?&?9V@��������d���j�.1=&?'t���d��X�����pp????o_uO��������������^�?0????��8����(�����pp�����������|���X��`��� � �����
\ No newline at end of file
binary files /dev/null b/gfx/sprites/gym_helper.png differ
binary files a/gfx/sprites/hiker.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/hiker.png differ
binary files a/gfx/sprites/lance.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/lance.png differ
--- a/gfx/sprites/lapras_giver.2bpp
+++ /dev/null
@@ -1,2 +1,0 @@
-???7P@oV���������-��j?0>9OyO<?�|�����<�����pp????_Oo_����������������?7?8_p_8?�����������pp??�����������x���P�`�����0�0�
\ No newline at end of file
binary files /dev/null b/gfx/sprites/lapras_giver.png differ
binary files a/gfx/sprites/lass.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/lass.png differ
binary files a/gfx/sprites/little_girl.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/little_girl.png differ
binary files a/gfx/sprites/lorelei.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/lorelei.png differ
binary files a/gfx/sprites/lying_old_man.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/lying_old_man.png differ
--- a/gfx/sprites/mart_guy.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-?0VIoY����������j����?6>9OyO<?�l|�����<�����pp??_OoS����������������?0?8_p_0?����������pp?3?<�������������<�<�8�p��P��0� ���
\ No newline at end of file
binary files /dev/null b/gfx/sprites/mart_guy.png differ
binary files a/gfx/sprites/medium.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/medium.png differ
--- a/gfx/sprites/mom.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-??;<78b��������|��<��Fr~yw<'?(�N~���<���8�0��??????�����x����������??:-������\��xH����7;=3?4���������������� ��������Ԭ�
\ No newline at end of file
binary files /dev/null b/gfx/sprites/mom.png differ
--- a/gfx/sprites/mom_geisha.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-;>?8���������|��H�H ?/?(?<p���������<�8��;?=?��p���������x���?/_X~���������~����>?=3�����������������x�p������������;>?8���������|��H�H ?/?(?<p���������<�8��;?=?��p���������x���?/_X~���������x����7?=7?1������������������0��`��p����
\ No newline at end of file
binary files /dev/null b/gfx/sprites/mom_geisha.png differ
--- a/gfx/sprites/mr_fuji.2bpp
+++ /dev/null
@@ -1,7 +1,0 @@
-(7P@oR���`0���-��J?0/9M~^??9???����~z��������/0PP@���`0���--�?0_xW~Os?39?>>���~����8���||>!? ? ?(��� p�����d�? �x�����������(7P@oR���`0���-��J?0Oy_~??����~����8�0���/0P@oP���`0���-�-?0_x_~Os?3���~����8�0��� #<}B@@P���@� ������(@>1=#�(��p� �p���p
\ No newline at end of file
binary files /dev/null b/gfx/sprites/mr_fuji.png differ
--- a/gfx/sprites/mr_masterball.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-?6yoYF>1�����l�����b|�x����?????/������������xx??_O?0�������������wx����?????/�������������xx�����<�|����������8�8����
\ No newline at end of file
binary files /dev/null b/gfx/sprites/mr_masterball.png differ
binary files a/gfx/sprites/nurse.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/nurse.png differ
binary files a/gfx/sprites/oak.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/oak.png differ
binary files a/gfx/sprites/oak_aide.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/oak_aide.png differ
binary files a/gfx/sprites/old_amber.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/old_amber.png differ
--- a/gfx/sprites/old_medium_woman.2bpp
+++ /dev/null
@@ -1,2 +1,0 @@
-? ?!?&_x?&���08�����d��d </?'�p������x<�����? ? ? _`? ���08������
-</?'��0��P�X�<�����? ?,?3?0���08��������?#��0�� ���8���
\ No newline at end of file
binary files /dev/null b/gfx/sprites/old_medium_woman.png differ
--- a/gfx/sprites/old_person.2bpp
+++ /dev/null
@@ -1,3 +1,0 @@
-(7oVIoY���08����j����?6?9_~_??9?>>�l���~�������||/0PP@���08���--�?0_xW~Os?39?>>���~����8���||>!?8<'?$���0x�����d|�?8�x��������
\ No newline at end of file
binary files /dev/null b/gfx/sprites/old_person.png differ
binary files a/gfx/sprites/omanyte.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/omanyte.png differ
binary files a/gfx/sprites/paper_sheet.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/paper_sheet.png differ
binary files a/gfx/sprites/red.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/red.png differ
binary files a/gfx/sprites/rocker.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/rocker.png differ
binary files a/gfx/sprites/rocket.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/rocket.png differ
binary files a/gfx/sprites/sailor.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/sailor.png differ
binary files a/gfx/sprites/seel.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/seel.png differ
binary files a/gfx/sprites/slowbro.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/slowbro.png differ
binary files a/gfx/sprites/snorlax.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/snorlax.png differ
--- a/gfx/sprites/ss_captain.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-7???wXF��x�x��������b>1=:LL?:|��\�2�2�\����pp0???p_pO�������������87?8__??������������pp????������������� h���`���0�0�
\ No newline at end of file
binary files /dev/null b/gfx/sprites/ss_captain.png differ
binary files a/gfx/sprites/swimmer.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/swimmer.png differ
binary files a/gfx/sprites/waiter.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/waiter.png differ
--- a/gfx/sprites/warden.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-?6poR@>1�����l��J�|�x����|3?,?3/������>��4���xx??_O?0�������������wx����|3?>?3/�����>��|���xx�����<�|�|��������(�(����
\ No newline at end of file
binary files /dev/null b/gfx/sprites/warden.png differ
--- a/gfx/sprites/white_player.2bpp
+++ /dev/null
@@ -1,3 +1,0 @@
-;<?7PB����8��<��-�B?0>9OI?8�|�������x��pp?0?8_O�����������?7?8_P?8����-��x��pp;4}B??��������������`���0�0�� ��
\ No newline at end of file
binary files /dev/null b/gfx/sprites/white_player.png differ
binary files a/gfx/sprites/young_boy.2bpp /dev/null differ
binary files /dev/null b/gfx/sprites/young_boy.png differ
binary files a/gfx/ss_anne_smoke_puff.2bpp /dev/null differ
binary files /dev/null b/gfx/ss_anne_smoke_puff.png differ
binary files a/gfx/text_box.2bpp /dev/null differ
binary files /dev/null b/gfx/text_box.png differ
--- a/gfx/theend.2bpp
+++ /dev/null
@@ -1,1 +1,0 @@
-������<<<<<<<<<<<<<<<<<<<<<<<<((�����������������������������祥�������������������������������������������������������������㣣�����������������������������
\ No newline at end of file
binary files /dev/null b/gfx/theend.w40.interleave.png differ
binary files a/gfx/tilesets/cavern.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/cavern.w128.t14.png differ
binary files a/gfx/tilesets/cemetery.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/cemetery.w128.t4.png differ
binary files a/gfx/tilesets/club.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/club.w128.t5.png differ
binary files a/gfx/tilesets/facility.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/facility.w128.png differ
binary files a/gfx/tilesets/flower/flower1.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/flower/flower1.png differ
binary files a/gfx/tilesets/flower/flower2.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/flower/flower2.png differ
binary files a/gfx/tilesets/flower/flower3.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/flower/flower3.png differ
binary files a/gfx/tilesets/forest.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/forest.w128.png differ
binary files a/gfx/tilesets/gate.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/gate.w128.t1.png differ
binary files a/gfx/tilesets/gym.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/gym.w128.png differ
binary files a/gfx/tilesets/house.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/house.w128.png differ
binary files a/gfx/tilesets/interior.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/interior.w128.t1.png differ
binary files a/gfx/tilesets/lab.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/lab.w128.t4.png differ
binary files a/gfx/tilesets/lobby.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/lobby.w128.t2.png differ
binary files a/gfx/tilesets/mansion.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/mansion.w128.t2.png differ
binary files a/gfx/tilesets/overworld.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/overworld.w128.t2.png differ
binary files a/gfx/tilesets/plateau.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/plateau.w128.t10.png differ
binary files a/gfx/tilesets/pokecenter.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/pokecenter.w128.png differ
binary files a/gfx/tilesets/reds_house.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/reds_house.w128.t7.png differ
binary files a/gfx/tilesets/ship.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/ship.w128.t6.png differ
binary files a/gfx/tilesets/ship_port.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/ship_port.w128.png differ
binary files a/gfx/tilesets/underground.2bpp /dev/null differ
binary files /dev/null b/gfx/tilesets/underground.w128.t7.png differ
binary files a/gfx/town_map.2bpp /dev/null differ
binary files /dev/null b/gfx/town_map.png differ
binary files a/gfx/town_map_cursor.1bpp /dev/null differ
binary files /dev/null b/gfx/town_map_cursor.png differ
binary files a/gfx/trade.2bpp /dev/null differ
binary files a/gfx/trade2.2bpp /dev/null differ
binary files /dev/null b/gfx/trade2.png differ
binary files a/gfx/trainer_info.2bpp /dev/null differ
binary files /dev/null b/gfx/trainer_info.png differ
binary files a/gfx/up_arrow.1bpp /dev/null differ
binary files /dev/null b/gfx/up_arrow.png differ
--- a/main.asm
+++ b/main.asm
@@ -27447,7 +27447,7 @@
db $20, $28, $30, $38, $40, $48, $50, $58
GymLeaderFaceAndBadgeTileGraphics: ; ea9e (3:6a9e)
- INCBIN "gfx/badges.2bpp"
+ INCBIN "gfx/badges.w16.2bpp"
Func_ee9e: ; ee9e (3:6e9e)
call Load16BitRegisters
@@ -29734,9 +29734,10 @@
INCBIN "gfx/sprites/lying_old_man.2bpp" ; was $11340
PokemonLogoGraphics: ; 11380 (4:5380)
- INCBIN "gfx/pokemon_logo.2bpp"
+ INCBIN "gfx/pokemon_logo.w128.2bpp"
+
FontGraphics: ; 11a80 (4:5a80)
- INCBIN "gfx/font.1bpp"
+ INCBIN "gfx/font.w128.1bpp"
ABTiles: ; 11e80 (4:5e80)
INCBIN "gfx/AB.2bpp"
@@ -29754,10 +29755,10 @@
INCBIN "gfx/battle_hud3.1bpp"
NintendoCopyrightLogoGraphics: ; 120c8 (4:60c8)
- INCBIN "gfx/copyright.2bpp"
+ INCBIN "gfx/copyright.h8.2bpp"
GamefreakLogoGraphics: ; 121f8 (4:61f8)
- INCBIN "gfx/gamefreak.2bpp"
+ INCBIN "gfx/gamefreak.h8.2bpp"
TextBoxGraphics: ; 12288 (4:6288)
INCBIN "gfx/text_box.2bpp"
@@ -33228,7 +33229,7 @@
db $FA,$00,$FB,$00
EmotionBubbles: ; 17cbd (5:7cbd)
- INCBIN "gfx/emotion_bubbles.2bpp"
+ INCBIN "gfx/emotion_bubbles.w16.2bpp"
Func_17d7d: ; 17d7d (5:7d7d)
ld a, [wPlayerMonAccuracyMod] ; $cd1e
@@ -53235,7 +53236,8 @@
; tiles for gameboy and link cable graphics used for trading sequence animation
TradingAnimationGraphics: ; 3a9be (e:69be)
- INCBIN "gfx/trade.2bpp"
+ INCBIN "gfx/game_boy.norepeat.2bpp"
+ INCBIN "gfx/link_cable.2bpp"
; 4 tiles for actual wire transfer animation (pokeball wandering inside wire)
TradingAnimationGraphics2: ; 3acce (e:6cce)
@@ -68161,7 +68163,9 @@
db $50 ; list terminator
GameFreakIntro: ; 41959 (10:5959)
- INCBIN "gfx/gamefreak_intro.2bpp"
+ INCBIN "gfx/gamefreak_intro.h8.2bpp"
+ INCBIN "gfx/gamefreak_logo.2bpp"
+ ds $10 ; blank tile
FightIntroBackMon: ; 41a99 (10:5a99)
INCBIN "gfx/intro_fight.2bpp"
@@ -68169,10 +68173,16 @@
FightIntroFrontMon: ; 42099 (10:6099)
IF _RED
- INCBIN "gfx/red/introfight.2bpp"
+ INCBIN "gfx/red/intro_nido_1.6x6.2bpp"
+ INCBIN "gfx/red/intro_nido_2.6x6.2bpp"
+ INCBIN "gfx/red/intro_nido_3.6x6.2bpp"
+ ds $10 ; blank tile
ENDC
IF _BLUE
- INCBIN "gfx/blue/introfight.2bpp"
+ INCBIN "gfx/blue/intro_purin_1.6x6.2bpp"
+ INCBIN "gfx/blue/intro_purin_2.6x6.2bpp"
+ INCBIN "gfx/blue/intro_purin_3.6x6.2bpp"
+ ds $10 ; blank tile
ENDC
; XXX what do these do
@@ -98031,33 +98041,33 @@
SECTION "bank19",ROMX,BANK[$19]
Overworld_GFX: ; 64000 (19:4000)
- INCBIN "gfx/tilesets/overworld.2bpp"
+ INCBIN "gfx/tilesets/overworld.w128.t2.2bpp"
Overworld_Block: ; 645e0 (19:45e0)
INCBIN "gfx/blocksets/overworld.bst"
RedsHouse1_GFX:
RedsHouse2_GFX: ; 64de0 (19:4de0)
- INCBIN "gfx/tilesets/reds_house.2bpp"
+ INCBIN "gfx/tilesets/reds_house.w128.t7.2bpp"
RedsHouse1_Block:
RedsHouse2_Block: ; 65270 (19:5270)
INCBIN "gfx/blocksets/reds_house.bst"
House_GFX: ; 653a0 (19:53a0)
- INCBIN "gfx/tilesets/house.2bpp"
+ INCBIN "gfx/tilesets/house.w128.2bpp"
House_Block: ; 65980 (19:5980)
INCBIN "gfx/blocksets/house.bst"
Mansion_GFX: ; 65bb0 (19:5bb0)
- INCBIN "gfx/tilesets/mansion.2bpp"
+ INCBIN "gfx/tilesets/mansion.w128.t2.2bpp"
Mansion_Block: ; 66190 (19:6190)
INCBIN "gfx/blocksets/mansion.bst"
ShipPort_GFX: ; 66610 (19:6610)
- INCBIN "gfx/tilesets/ship_port.2bpp"
+ INCBIN "gfx/tilesets/ship_port.w128.2bpp"
ShipPort_Block: ; 66bf0 (19:6bf0)
INCBIN "gfx/blocksets/ship_port.bst"
Interior_GFX: ; 66d60 (19:6d60)
- INCBIN "gfx/tilesets/interior.2bpp"
+ INCBIN "gfx/tilesets/interior.w128.t1.2bpp"
Interior_Block: ; 67350 (19:7350)
INCBIN "gfx/blocksets/interior.bst"
Plateau_GFX: ; 676f0 (19:76f0)
- INCBIN "gfx/tilesets/plateau.2bpp"
+ INCBIN "gfx/tilesets/plateau.w128.t10.2bpp"
Plateau_Block: ; 67b50 (19:7b50)
INCBIN "gfx/blocksets/plateau.bst"
@@ -98106,23 +98116,23 @@
Version_GFX: ; 6802f (1a:402f)
IF _RED
- INCBIN "gfx/red/redgreenversion.1bpp"
+ INCBIN "gfx/red/redgreenversion.h8.1bpp"
; 80 bytes
ENDC
IF _BLUE
- INCBIN "gfx/blue/blueversion.1bpp"
+ INCBIN "gfx/blue/blueversion.h8.1bpp"
; 64 bytes
ENDC
Dojo_GFX:
Gym_GFX: ; 6807f (1a:407f)
- INCBIN "gfx/tilesets/gym.2bpp"
+ INCBIN "gfx/tilesets/gym.w128.2bpp"
Dojo_Block:
Gym_Block: ; 6867f (1a:467f)
INCBIN "gfx/blocksets/gym.bst"
Mart_GFX:
Pokecenter_GFX: ; 68dbf (1a:4dbf)
- INCBIN "gfx/tilesets/pokecenter.2bpp"
+ INCBIN "gfx/tilesets/pokecenter.w128.2bpp"
Mart_Block:
Pokecenter_Block: ; 693bf (1a:53bf)
INCBIN "gfx/blocksets/pokecenter.bst"
@@ -98129,17 +98139,17 @@
ForestGate_GFX:
Museum_GFX:
Gate_GFX: ; 6960f (1a:560f)
- INCBIN "gfx/tilesets/gate.2bpp"
+ INCBIN "gfx/tilesets/gate.w128.t1.2bpp"
ForestGate_Block:
Museum_Block:
Gate_Block: ; 69bff (1a:5bff)
INCBIN "gfx/blocksets/gate.bst"
Forest_GFX: ; 6a3ff (1a:63ff)
- INCBIN "gfx/tilesets/forest.2bpp"
+ INCBIN "gfx/tilesets/forest.w128.2bpp"
Forest_Block: ; 6a9ff (1a:69ff)
INCBIN "gfx/blocksets/forest.bst"
Facility_GFX: ; 6b1ff (1a:71ff)
- INCBIN "gfx/tilesets/facility.2bpp"
+ INCBIN "gfx/tilesets/facility.w128.2bpp"
Facility_Block: ; 6b7ff (1a:77ff)
INCBIN "gfx/blocksets/facility.bst"
@@ -98146,31 +98156,31 @@
SECTION "bank1B",ROMX,BANK[$1B]
Cemetery_GFX: ; 6c000 (1b:4000)
- INCBIN "gfx/tilesets/cemetery.2bpp"
+ INCBIN "gfx/tilesets/cemetery.w128.t4.2bpp"
Cemetery_Block: ; 6c5c0 (1b:45c0)
INCBIN "gfx/blocksets/cemetery.bst"
Cavern_GFX: ; 6cca0 (1b:4ca0)
- INCBIN "gfx/tilesets/cavern.2bpp"
+ INCBIN "gfx/tilesets/cavern.w128.t14.2bpp"
Cavern_Block: ; 6d0c0 (1b:50c0)
INCBIN "gfx/blocksets/cavern.bst"
Lobby_GFX: ; 6d8c0 (1b:58c0)
- INCBIN "gfx/tilesets/lobby.2bpp"
+ INCBIN "gfx/tilesets/lobby.w128.t2.2bpp"
Lobby_Block: ; 6dea0 (1b:5ea0)
INCBIN "gfx/blocksets/lobby.bst"
Ship_GFX: ; 6e390 (1b:6390)
- INCBIN "gfx/tilesets/ship.2bpp"
+ INCBIN "gfx/tilesets/ship.w128.t6.2bpp"
Ship_Block: ; 6e930 (1b:6930)
INCBIN "gfx/blocksets/ship.bst"
Lab_GFX: ; 6ed10 (1b:6d10)
- INCBIN "gfx/tilesets/lab.2bpp"
+ INCBIN "gfx/tilesets/lab.w128.t4.2bpp"
Lab_Block: ; 6f2d0 (1b:72d0)
INCBIN "gfx/blocksets/lab.bst"
Club_GFX: ; 6f670 (1b:7670)
- INCBIN "gfx/tilesets/club.2bpp"
+ INCBIN "gfx/tilesets/club.w128.t5.2bpp"
Club_Block: ; 6fb20 (1b:7b20)
INCBIN "gfx/blocksets/club.bst"
Underground_GFX: ; 6fd60 (1b:7d60)
- INCBIN "gfx/tilesets/underground.2bpp"
+ INCBIN "gfx/tilesets/underground.w128.t7.2bpp"
Underground_Block: ; 6fef0 (1b:7ef0)
INCBIN "gfx/blocksets/underground.bst"
@@ -103063,10 +103073,10 @@
SGBBorderGraphics: ; 72fe8 (1c:6fe8)
IF _RED
- INCBIN "gfx/red/sgbborder.2bpp"
+ INCBIN "gfx/red/sgbborder.w128.2bpp"
ENDC
IF _BLUE
- INCBIN "gfx/blue/sgbborder.2bpp"
+ INCBIN "gfx/blue/sgbborder.w128.2bpp"
ENDC
LoadSAV: ; 735e8 (1c:75e8)
@@ -104307,7 +104317,7 @@
db -5, "PAAD TESTING@"
TheEndGfx: ; 7473e (1d:473e) ; 473E (473F on blue)
- INCBIN "gfx/theend.2bpp"
+ INCBIN "gfx/theend.w40.interleave.2bpp"
PrintStatusAilment: ; 747de (1d:47de)
ld a, [de]