Merge branch 'master' of https://git.sanqui.net/pret/pokegold-spaceworld

3 files changed, 4 insertions, 0 deletions

diff --git a/gfx/pokemon/egg.asm b/gfx/pokemon/egg.asm
new file mode 100644
index 0000000..ed41fed
--- /dev/null
+++ b/gfx/pokemon/egg.asm
@@ -0,0 +1,2 @@
+SECTION "PKMN Egg Pic", ROMX[$696a], BANK[$1f]
+EggPicFront:: INCBIN "gfx/pokemon/egg/front.pic"   ; 0x07e96a--0x07e9c9
diff --git a/gfx/pokemon/egg/front.png b/gfx/pokemon/egg/front.png
new file mode 100644
index 0000000..44292be
--- /dev/null
+++ b/gfx/pokemon/egg/front.png
diff --git a/main.asm b/main.asm
index 410a911..b6f3200 100644
--- a/main.asm
+++ b/main.asm
@@ -227,6 +227,8 @@ SECTION "Annon Pic Ptrs and Pics", ROMX[$4d6a], BANK[$1f]
 INCLUDE "gfx/pokemon/annon_pic_ptrs.asm"
 INCLUDE "gfx/pokemon/annon_pics.asm"
 
+INCLUDE "gfx/pokemon/egg.asm"
+
 SECTION "Attack Animation GFX", ROMX[$4000], BANK[$21]
 INCBIN "gfx/battle_anims/attack_animations.2bpp"