Merge pull request #116 from yenatch/master

incbins, gfx and credits
This commit is contained in:
Bryan Bishop 2013-02-25 22:34:49 -08:00
commit 70a83f811f
15 changed files with 912 additions and 170 deletions

824
credits.asm Normal file

File diff suppressed because it is too large Load Diff

BIN
gfx/debug/color_test.2bpp Normal file

Binary file not shown.

BIN
gfx/evo/bubble.2bpp Normal file

Binary file not shown.

BIN
gfx/evo/bubble_large.2bpp Normal file

Binary file not shown.

BIN
gfx/misc/pack_f.2bpp Normal file

Binary file not shown.

BIN
gfx/misc/unown_font.2bpp Normal file

Binary file not shown.

BIN
gfx/ow/misc.2bpp Normal file

Binary file not shown.

View File

@ -0,0 +1 @@
00.>  <0F><>d$6ףב<D7A3><EFBFBD>÷<>_g?83<}__{jn <0C><1C>ננ<D7A0><20>¸<EFBFBD>ר00

BIN
gfx/special/celebi/2.2bpp Normal file

Binary file not shown.

BIN
gfx/special/celebi/3.2bpp Normal file

Binary file not shown.

BIN
gfx/special/celebi/4.2bpp Normal file

Binary file not shown.

Binary file not shown.

249
main.asm

File diff suppressed because it is too large Load Diff

View File

@ -654,8 +654,12 @@ OverworldMapEnd
ds 12
SECTION "gfx2",BSS[$cd20]
BGMapBuffer: ; cd20
ds 40
BGMapBuffer:
CreditsPos: ; cd20
ds 2
CreditsTimer: ; cd22
ds 1
ds 37
BGMapPalBuffer: ; cd48
ds 40