Merge pull request #247 from yenatch/master

Color test debug menus and assorted incbins.
This commit is contained in:
yenatch 2014-04-18 13:41:40 -04:00
commit 6b7c196dfb
7 changed files with 1991 additions and 122 deletions

Binary file not shown.

BIN
gfx/shrink1.2bpp.lz Normal file

Binary file not shown.

BIN
gfx/shrink2.2bpp.lz Normal file

Binary file not shown.

View File

@ -1901,7 +1901,7 @@ GetBaseData:: ; 3856
.egg .egg
; ???? ; ????
ld de, $7d9c ld de, UnknownEggPic
; Sprite dimensions ; Sprite dimensions
ld b, $55 ; 5x5 ld b, $55 ; 5x5

2101
main.asm

File diff suppressed because it is too large Load Diff

View File

@ -153,11 +153,12 @@ SlowpokeScript_0x1980cb: ; 0x1980cb
end end
; 0x1980da ; 0x1980da
UnknownScript_0x1980da: ; 0x1980da WoosterScript: ; 0x1980da
; unused
faceplayer faceplayer
loadfont loadfont
2writetext UnknownText_0x1985cd 2writetext WoosterText
cry $00c3 cry QUAGSIRE
closetext closetext
loadmovesprites loadmovesprites
end end
@ -421,7 +422,7 @@ UnknownText_0x1985c3: ; 0x1985c3
done done
; 0x1985cd ; 0x1985cd
UnknownText_0x1985cd: ; 0x1985cd WoosterText: ; 0x1985cd
text "WOOSTER: Gugyoo…" text "WOOSTER: Gugyoo…"
done done
; 0x1985df ; 0x1985df

View File

@ -307,6 +307,7 @@ IconPointers:
dw SudowoodoIcon dw SudowoodoIcon
dw BigmonIcon dw BigmonIcon
Icons:
NullIcon: NullIcon:
PoliwagIcon: INCBIN "gfx/icon/poliwag.2bpp" ; 0x8ec0d PoliwagIcon: INCBIN "gfx/icon/poliwag.2bpp" ; 0x8ec0d
JigglypuffIcon: INCBIN "gfx/icon/jigglypuff.2bpp" ; 0x8ec8d JigglypuffIcon: INCBIN "gfx/icon/jigglypuff.2bpp" ; 0x8ec8d