Merge remote-tracking branch 'kanzure/master' into mergetastic

Conflicts:
	main.asm

68 files changed, 1 insertions, 0 deletions

diff --git a/gfx/AB.2bpp b/gfx/AB.2bpp
new file mode 100755
index 00000000..5116536b
--- /dev/null
+++ b/gfx/AB.2bpp
diff --git a/gfx/attack_anim_1.2bpp b/gfx/attack_anim_1.2bpp
new file mode 100755
index 00000000..55dcfef5
--- /dev/null
+++ b/gfx/attack_anim_1.2bpp
diff --git a/gfx/attack_anim_2.2bpp b/gfx/attack_anim_2.2bpp
new file mode 100755
index 00000000..51d87b27
--- /dev/null
+++ b/gfx/attack_anim_2.2bpp
diff --git a/gfx/badge_numbers.2bpp b/gfx/badge_numbers.2bpp
new file mode 100755
index 00000000..664758aa
--- /dev/null
+++ b/gfx/badge_numbers.2bpp
diff --git a/gfx/badges.2bpp b/gfx/badges.2bpp
new file mode 100755
index 00000000..8a717ff7
--- /dev/null
+++ b/gfx/badges.2bpp
diff --git a/gfx/battle_hud1.1bpp b/gfx/battle_hud1.1bpp
new file mode 100755
index 00000000..3d489cab
--- /dev/null
+++ b/gfx/battle_hud1.1bpp
diff --git a/gfx/battle_hud2.1bpp b/gfx/battle_hud2.1bpp
new file mode 100755
index 00000000..6ac1cb0b
--- /dev/null
+++ b/gfx/battle_hud2.1bpp
diff --git a/gfx/battle_hud3.1bpp b/gfx/battle_hud3.1bpp
new file mode 100755
index 00000000..0a43bdda
--- /dev/null
+++ b/gfx/battle_hud3.1bpp
diff --git a/gfx/battle_transition.2bpp b/gfx/battle_transition.2bpp
new file mode 100755
index 00000000..13ff23b1
--- /dev/null
+++ b/gfx/battle_transition.2bpp
@@ -0,0 +1 @@
+ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ
\ No newline at end of file
diff --git a/gfx/blank_leader_names.2bpp b/gfx/blank_leader_names.2bpp
new file mode 100755
index 00000000..2bdf7c63
--- /dev/null
+++ b/gfx/blank_leader_names.2bpp
diff --git a/gfx/blocksets/04.bst b/gfx/blocksets/04.bst
new file mode 100755
index 00000000..6c9f4749
--- /dev/null
+++ b/gfx/blocksets/04.bst
diff --git a/gfx/blocksets/06.bst b/gfx/blocksets/06.bst
new file mode 100755
index 00000000..a82460f5
--- /dev/null
+++ b/gfx/blocksets/06.bst
diff --git a/gfx/blocksets/07.bst b/gfx/blocksets/07.bst
new file mode 100755
index 00000000..48889bfa
--- /dev/null
+++ b/gfx/blocksets/07.bst
diff --git a/gfx/blocksets/0a.bst b/gfx/blocksets/0a.bst
new file mode 100755
index 00000000..e4c820a4
--- /dev/null
+++ b/gfx/blocksets/0a.bst
diff --git a/gfx/blocksets/0c.bst b/gfx/blocksets/0c.bst
new file mode 100755
index 00000000..e4c820a4
--- /dev/null
+++ b/gfx/blocksets/0c.bst
diff --git a/gfx/blue/introfight.2bpp b/gfx/blue/introfight.2bpp
index 76d7070a..4666bbf9 100644..100755
--- a/gfx/blue/introfight.2bpp
+++ b/gfx/blue/introfight.2bpp
diff --git a/gfx/circle_tile.2bpp b/gfx/circle_tile.2bpp
new file mode 100755
index 00000000..b06a180a
--- /dev/null
+++ b/gfx/circle_tile.2bpp
diff --git a/gfx/copyright.2bpp b/gfx/copyright.2bpp
new file mode 100755
index 00000000..1e7b762b
--- /dev/null
+++ b/gfx/copyright.2bpp
diff --git a/gfx/diagonal_lines.2bpp b/gfx/diagonal_lines.2bpp
new file mode 100755
index 00000000..ed8d1e78
--- /dev/null
+++ b/gfx/diagonal_lines.2bpp
diff --git a/gfx/emotion_bubbles.2bpp b/gfx/emotion_bubbles.2bpp
new file mode 100755
index 00000000..c8a13e2f
--- /dev/null
+++ b/gfx/emotion_bubbles.2bpp
diff --git a/gfx/falling_star.2bpp b/gfx/falling_star.2bpp
new file mode 100755
index 00000000..4cab94c8
--- /dev/null
+++ b/gfx/falling_star.2bpp
diff --git a/gfx/gamefreak.2bpp b/gfx/gamefreak.2bpp
new file mode 100755
index 00000000..6524eb2e
--- /dev/null
+++ b/gfx/gamefreak.2bpp
diff --git a/gfx/gamefreak_intro.2bpp b/gfx/gamefreak_intro.2bpp
new file mode 100755
index 00000000..fed4d67f
--- /dev/null
+++ b/gfx/gamefreak_intro.2bpp
diff --git a/gfx/intro_fight.2bpp b/gfx/intro_fight.2bpp
new file mode 100755
index 00000000..5672e387
--- /dev/null
+++ b/gfx/intro_fight.2bpp
diff --git a/gfx/ledge_hopping_shadow.1bpp b/gfx/ledge_hopping_shadow.1bpp
new file mode 100755
index 00000000..61d484f2
--- /dev/null
+++ b/gfx/ledge_hopping_shadow.1bpp
diff --git a/gfx/mon_ow_sprites.2bpp b/gfx/mon_ow_sprites.2bpp
new file mode 100755
index 00000000..b318eba5
--- /dev/null
+++ b/gfx/mon_ow_sprites.2bpp
diff --git a/gfx/player_title.2bpp b/gfx/player_title.2bpp
new file mode 100755
index 00000000..756cfcd5
--- /dev/null
+++ b/gfx/player_title.2bpp
diff --git a/gfx/pokeball.2bpp b/gfx/pokeball.2bpp
new file mode 100755
index 00000000..626c4e3e
--- /dev/null
+++ b/gfx/pokeball.2bpp
diff --git a/gfx/pokecenter_ball.2bpp b/gfx/pokecenter_ball.2bpp
new file mode 100755
index 00000000..292f6954
--- /dev/null
+++ b/gfx/pokecenter_ball.2bpp
diff --git a/gfx/pokedex.2bpp b/gfx/pokedex.2bpp
new file mode 100755
index 00000000..04a47d39
--- /dev/null
+++ b/gfx/pokedex.2bpp
diff --git a/gfx/red/introfight.2bpp b/gfx/red/introfight.2bpp
index 62c20894..bbed4572 100644..100755
--- a/gfx/red/introfight.2bpp
+++ b/gfx/red/introfight.2bpp
diff --git a/gfx/red_fishing.2bpp b/gfx/red_fishing.2bpp
new file mode 100755
index 00000000..11da1073
--- /dev/null
+++ b/gfx/red_fishing.2bpp
diff --git a/gfx/spinner_arrow.2bpp b/gfx/spinner_arrow.2bpp
new file mode 100755
index 00000000..5c0d27c6
--- /dev/null
+++ b/gfx/spinner_arrow.2bpp
diff --git a/gfx/sprites/cycling.2bpp b/gfx/sprites/cycling.2bpp
new file mode 100755
index 00000000..7a92c2ba
--- /dev/null
+++ b/gfx/sprites/cycling.2bpp
diff --git a/gfx/tilesets/00.png b/gfx/tilesets/00.png
new file mode 100755
index 00000000..f264d943
--- /dev/null
+++ b/gfx/tilesets/00.png
diff --git a/gfx/tilesets/01.png b/gfx/tilesets/01.png
new file mode 100755
index 00000000..0b7c3a21
--- /dev/null
+++ b/gfx/tilesets/01.png
diff --git a/gfx/tilesets/02.png b/gfx/tilesets/02.png
new file mode 100755
index 00000000..970e457b
--- /dev/null
+++ b/gfx/tilesets/02.png
diff --git a/gfx/tilesets/03.png b/gfx/tilesets/03.png
new file mode 100755
index 00000000..4aeab369
--- /dev/null
+++ b/gfx/tilesets/03.png
diff --git a/gfx/tilesets/04.png b/gfx/tilesets/04.png
new file mode 100755
index 00000000..0b7c3a21
--- /dev/null
+++ b/gfx/tilesets/04.png
diff --git a/gfx/tilesets/05.png b/gfx/tilesets/05.png
new file mode 100755
index 00000000..ca4b0669
--- /dev/null
+++ b/gfx/tilesets/05.png
diff --git a/gfx/tilesets/06.png b/gfx/tilesets/06.png
new file mode 100755
index 00000000..970e457b
--- /dev/null
+++ b/gfx/tilesets/06.png
diff --git a/gfx/tilesets/07.png b/gfx/tilesets/07.png
new file mode 100755
index 00000000..ca4b0669
--- /dev/null
+++ b/gfx/tilesets/07.png
diff --git a/gfx/tilesets/08.png b/gfx/tilesets/08.png
new file mode 100755
index 00000000..f9bc9020
--- /dev/null
+++ b/gfx/tilesets/08.png
diff --git a/gfx/tilesets/09.png b/gfx/tilesets/09.png
new file mode 100755
index 00000000..fa3f8c9d
--- /dev/null
+++ b/gfx/tilesets/09.png
diff --git a/gfx/tilesets/0a.png b/gfx/tilesets/0a.png
new file mode 100755
index 00000000..fa3f8c9d
--- /dev/null
+++ b/gfx/tilesets/0a.png
diff --git a/gfx/tilesets/0b.png b/gfx/tilesets/0b.png
new file mode 100755
index 00000000..b017ccd7
--- /dev/null
+++ b/gfx/tilesets/0b.png
diff --git a/gfx/tilesets/0c.png b/gfx/tilesets/0c.png
new file mode 100755
index 00000000..fa3f8c9d
--- /dev/null
+++ b/gfx/tilesets/0c.png
diff --git a/gfx/tilesets/0d.png b/gfx/tilesets/0d.png
new file mode 100755
index 00000000..e3095f7d
--- /dev/null
+++ b/gfx/tilesets/0d.png
diff --git a/gfx/tilesets/0e.png b/gfx/tilesets/0e.png
new file mode 100755
index 00000000..b931bc50
--- /dev/null
+++ b/gfx/tilesets/0e.png
diff --git a/gfx/tilesets/0f.png b/gfx/tilesets/0f.png
new file mode 100755
index 00000000..cd5b3649
--- /dev/null
+++ b/gfx/tilesets/0f.png
diff --git a/gfx/tilesets/10.png b/gfx/tilesets/10.png
new file mode 100755
index 00000000..a48f1d84
--- /dev/null
+++ b/gfx/tilesets/10.png
diff --git a/gfx/tilesets/11.png b/gfx/tilesets/11.png
new file mode 100755
index 00000000..32166273
--- /dev/null
+++ b/gfx/tilesets/11.png
diff --git a/gfx/tilesets/12.png b/gfx/tilesets/12.png
new file mode 100755
index 00000000..4b47b393
--- /dev/null
+++ b/gfx/tilesets/12.png
diff --git a/gfx/tilesets/13.png b/gfx/tilesets/13.png
new file mode 100755
index 00000000..2ec8f928
--- /dev/null
+++ b/gfx/tilesets/13.png
diff --git a/gfx/tilesets/14.png b/gfx/tilesets/14.png
new file mode 100755
index 00000000..aac7064f
--- /dev/null
+++ b/gfx/tilesets/14.png
diff --git a/gfx/tilesets/15.png b/gfx/tilesets/15.png
new file mode 100755
index 00000000..7d0b5ea9
--- /dev/null
+++ b/gfx/tilesets/15.png
diff --git a/gfx/tilesets/16.png b/gfx/tilesets/16.png
new file mode 100755
index 00000000..5d69fec8
--- /dev/null
+++ b/gfx/tilesets/16.png
diff --git a/gfx/tilesets/17.png b/gfx/tilesets/17.png
new file mode 100755
index 00000000..a4df8b6f
--- /dev/null
+++ b/gfx/tilesets/17.png
diff --git a/gfx/tilesets/flower/flower1.2bpp b/gfx/tilesets/flower/flower1.2bpp
new file mode 100644
index 00000000..156bb6a3
--- /dev/null
+++ b/gfx/tilesets/flower/flower1.2bpp
diff --git a/gfx/tilesets/flower/flower2.2bpp b/gfx/tilesets/flower/flower2.2bpp
new file mode 100644
index 00000000..bac3ed27
--- /dev/null
+++ b/gfx/tilesets/flower/flower2.2bpp
diff --git a/gfx/tilesets/flower/flower3.2bpp b/gfx/tilesets/flower/flower3.2bpp
new file mode 100644
index 00000000..67a3dffe
--- /dev/null
+++ b/gfx/tilesets/flower/flower3.2bpp
diff --git a/gfx/town_map.2bpp b/gfx/town_map.2bpp
new file mode 100755
index 00000000..54e45869
--- /dev/null
+++ b/gfx/town_map.2bpp
diff --git a/gfx/town_map.rle b/gfx/town_map.rle
new file mode 100755
index 00000000..f9ede0ec
--- /dev/null
+++ b/gfx/town_map.rle
diff --git a/gfx/town_map_cursor.1bpp b/gfx/town_map_cursor.1bpp
new file mode 100755
index 00000000..46328979
--- /dev/null
+++ b/gfx/town_map_cursor.1bpp
diff --git a/gfx/trade.2bpp b/gfx/trade.2bpp
new file mode 100755
index 00000000..e7c18503
--- /dev/null
+++ b/gfx/trade.2bpp
diff --git a/gfx/trade2.2bpp b/gfx/trade2.2bpp
new file mode 100755
index 00000000..975f4da0
--- /dev/null
+++ b/gfx/trade2.2bpp
diff --git a/gfx/trainer_info.2bpp b/gfx/trainer_info.2bpp
new file mode 100755
index 00000000..4baf4888
--- /dev/null
+++ b/gfx/trainer_info.2bpp
diff --git a/gfx/up_arrow.1bpp b/gfx/up_arrow.1bpp
new file mode 100755
index 00000000..a3c69389
--- /dev/null
+++ b/gfx/up_arrow.1bpp