diff options
| author | Rangi <remy.oukaour+rangi@gmail.com> | 2018-05-30 16:35:54 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi@gmail.com> | 2018-05-30 16:35:54 -0400 |
| commit | 9ab9ea4ab59cc3c226a7fe15b4fcc92b4af57243 (patch) | |
| tree | 6c82528d2ba9cf3da04c624944cdc66725d05680 /main.asm | |
| parent | 0b20a757535ca11c2d57a93675a7f278f78036e1 (diff) | |
| parent | d687abcb776e5543437ef0686d4ce340136dffbd (diff) | |
Merge branch 'master' of https://git.sanqui.net/pret/pokegold-spaceworld
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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" |