Add misc graphics

add exes to gitignore for those on windows

20 files changed, 30 insertions, 9 deletions

diff --git a/.gitignore b/.gitignore
index 83dc203..dadc3ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ shim.asm
 *~
 
 ; binaries
+*.exe
 tools/scan_includes
 tools/pkmncompress
 pret/
diff --git a/gfx/alphabet.png b/gfx/alphabet.png
new file mode 100644
index 0000000..6e73442
--- /dev/null
+++ b/gfx/alphabet.png
diff --git a/gfx/annon_alphabet.png b/gfx/annon_alphabet.png
new file mode 100644
index 0000000..4fd46d4
--- /dev/null
+++ b/gfx/annon_alphabet.png
diff --git a/gfx/battle_hud_1.png b/gfx/battle_hud_1.png
new file mode 100644
index 0000000..7c3f7ee
--- /dev/null
+++ b/gfx/battle_hud_1.png
diff --git a/gfx/battle_hud_2.png b/gfx/battle_hud_2.png
new file mode 100644
index 0000000..b2017a5
--- /dev/null
+++ b/gfx/battle_hud_2.png
diff --git a/gfx/exp_bar.png b/gfx/exp_bar.png
new file mode 100644
index 0000000..304d62d
--- /dev/null
+++ b/gfx/exp_bar.png
diff --git a/gfx/font_extra.png b/gfx/font_extra.png
new file mode 100644
index 0000000..d0eb38f
--- /dev/null
+++ b/gfx/font_extra.png
diff --git a/gfx/gfx_f8fc2.png b/gfx/gfx_f8fc2.png
new file mode 100644
index 0000000..54195df
--- /dev/null
+++ b/gfx/gfx_f8fc2.png
diff --git a/gfx/gfx_f9322.png b/gfx/gfx_f9322.png
new file mode 100644
index 0000000..e386063
--- /dev/null
+++ b/gfx/gfx_f9322.png
diff --git a/gfx/m_kg.png b/gfx/m_kg.png
new file mode 100644
index 0000000..e26dada
--- /dev/null
+++ b/gfx/m_kg.png
diff --git a/gfx/mon_nest_icon.png b/gfx/mon_nest_icon.png
new file mode 100644
index 0000000..87c644d
--- /dev/null
+++ b/gfx/mon_nest_icon.png
diff --git a/gfx/pack_icons.png b/gfx/pack_icons.png
new file mode 100644
index 0000000..5dc1a41
--- /dev/null
+++ b/gfx/pack_icons.png
diff --git a/gfx/pokedex.png b/gfx/pokedex.png
new file mode 100644
index 0000000..143835e
--- /dev/null
+++ b/gfx/pokedex.png
diff --git a/gfx/status_screen.png b/gfx/status_screen.png
new file mode 100644
index 0000000..84aa59c
--- /dev/null
+++ b/gfx/status_screen.png
diff --git a/gfx/status_screen_separator.png b/gfx/status_screen_separator.png
new file mode 100644
index 0000000..b847b97
--- /dev/null
+++ b/gfx/status_screen_separator.png
diff --git a/gfx/text_box_borders.png b/gfx/text_box_borders.png
new file mode 100644
index 0000000..9cc73b9
--- /dev/null
+++ b/gfx/text_box_borders.png
diff --git a/gfx/town_map.png b/gfx/town_map.png
new file mode 100644
index 0000000..7889b09
--- /dev/null
+++ b/gfx/town_map.png
diff --git a/gfx/town_map_cursor.png b/gfx/town_map_cursor.png
new file mode 100644
index 0000000..9eea705
--- /dev/null
+++ b/gfx/town_map_cursor.png
diff --git a/main.asm b/main.asm
index 7e58761..e68b601 100644
--- a/main.asm
+++ b/main.asm
@@ -9,9 +9,6 @@ INCLUDE "engine/title.asm"
 SECTION "Predef pointers", ROMX[$62B0],BANK[$01]
 INCLUDE "engine/predef.asm"
 
-SECTION "Font GFX", ROMX[$4362], BANK[$3e]
-	INCBIN "gfx/font.1bpp"
-
 SECTION "Main Menu Definition", ROMX[$5418], BANK[$01]
 MainMenuHeader:
 	db $40
@@ -35,6 +32,9 @@ MainMenuStrings: ; 01:5428
     db "じかんセット@"
 ; 01:5457
 
+SECTION "Nest Icon", ROMX[$4A0F], BANK[$02]
+	INCBIN "gfx/mon_nest_icon.1bpp"
+
 SECTION "TM/HM Moves", ROMX[$52D1],BANK[$04]
 INCLUDE "data/moves/tmhm_moves.asm"
 
@@ -60,3 +60,29 @@ INCLUDE "gfx/pokemon/pkmn_pics.asm"
 SECTION "Annon Pic Ptrs and Pics", ROMX[$4d6a], BANK[$1f]
 INCLUDE "gfx/pokemon/annon_pic_ptrs.asm"
 INCLUDE "gfx/pokemon/annon_pics.asm"
+
+SECTION "Misc GFX", ROMX[$4162], BANK[$3E]
+FontExtraGfx::
+	INCBIN "gfx/font_extra.2bpp"
+	INCBIN "gfx/font.1bpp"
+FontBattleExtraGfx::
+	INCBIN "gfx/battle_hud_1.2bpp"
+BorderGfx::
+	INCBIN "gfx/text_box_borders.1bpp"
+	INCBIN "gfx/status_screen_separator.2bpp"
+	INCBIN "gfx/status_screen.2bpp"
+	INCBIN "gfx/battle_hud_2.1bpp"
+	INCBIN "gfx/exp_bar.2bpp"
+	INCBIN "gfx/m_kg.2bpp"
+	INCBIN "gfx/pokedex.2bpp"
+	INCBIN "gfx/town_map.2bpp"
+	INCBIN "gfx/gfx_f8fc2.2bpp"
+BoldFontGfx::
+	INCBIN "gfx/alphabet.1bpp"
+	INCBIN "gfx/annon_alphabet.1bpp"
+	INCBIN "gfx/gfx_f9322.1bpp"
+PackIconGfx::
+	INCBIN "gfx/pack_icons.2bpp"
+
+SECTION "Town Map Cursor", ROMX[$506F], BANK[$3F]
+	INCBIN "gfx/town_map_cursor.2bpp"
diff --git a/shim.sym b/shim.sym
index f536db6..7a1d48c 100644
--- a/shim.sym
+++ b/shim.sym
@@ -109,12 +109,6 @@
 3A:4F6C LoadMusicByte
 3A:52C7 Music
 
-3e:4162 FontExtraGfx
-3e:4762 FontBattleExtraGfx
-3e:4962 BorderGfx
-3e:5052 BoldFontGfx
-3e:533a PackIconGfx
-
 3f:64ce MonsterTest
 3f:654e PicTest
 3f:6750 PicTestMenu