pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #388 from surskitty/master

Browse Source 
Moving a few images out of gfx/unknown
This commit is contained in:
yenatch
2017-09-17 17:07:22 -04:00
committed by GitHub
parent 7c6932fbae 7cd4ca1207
commit 1de1bdbce7
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -142,6 +142,7 @@ gfx/title/old_fg.2bpp: tools/gfx += --interleave --width=64
gfx/title/logo.2bpp: rgbgfx += -x 4 gfx/title/logo.2bpp: rgbgfx += -x 4
gfx/trade/ball.2bpp: tools/gfx += --remove-whitespace gfx/trade/ball.2bpp: tools/gfx += --remove-whitespace
gfx/trade/game_boy_n64.2bpp: tools/gfx += --trim-whitespace
gfx/slots_2.2bpp: tools/gfx += --interleave --width=16 gfx/slots_2.2bpp: tools/gfx += --interleave --width=16
gfx/slots_3.2bpp: tools/gfx += --interleave --width=24 --remove-duplicates --keep-whitespace --remove-xflip gfx/slots_3.2bpp: tools/gfx += --interleave --width=24 --remove-duplicates --keep-whitespace --remove-xflip
@@ -184,7 +185,6 @@ gfx/unknown/170d16.2bpp: tools/gfx += --trim-whitespace
gfx/unknown/1715a4.2bpp: tools/gfx += --trim-whitespace gfx/unknown/1715a4.2bpp: tools/gfx += --trim-whitespace
gfx/unknown/1715a4_nonmatching.2bpp: tools/gfx += --remove-duplicates --remove-xflip gfx/unknown/1715a4_nonmatching.2bpp: tools/gfx += --remove-duplicates --remove-xflip
gfx/unknown/171db1.2bpp: tools/gfx += --trim-whitespace gfx/unknown/171db1.2bpp: tools/gfx += --trim-whitespace
gfx/unknown/172f1f.2bpp: tools/gfx += --trim-whitespace
%.bin: ; %.bin: ;

2
event/field_moves.asm
View File

@@ -75,7 +75,7 @@ ShakeHeadbuttTree: ; 8c80a
; 8c893 ; 8c893
HeadbuttTreeGFX: ; 8c893 HeadbuttTreeGFX: ; 8c893
INCBIN "gfx/unknown/08c893.2bpp" INCBIN "gfx/overworld/headbutt_tree.2bpp"
; 8c913 ; 8c913
HideHeadbuttTree: ; 8c913 HideHeadbuttTree: ; 8c913

4
gfx/font.asm
View File

@@ -50,8 +50,8 @@ TownMapGFX: ; f8ba0
INCBIN "gfx/misc/town_map.2bpp.lz" INCBIN "gfx/misc/town_map.2bpp.lz"
; f8ea4 ; f8ea4
GFX_f8ea4: ; unused kanji WeekdayKanjiGFX: ; unused kanji
INCBIN "gfx/unknown/0f8ea4.2bpp" INCBIN "gfx/font/weekday_kanji.2bpp"
; f8f24 ; f8f24
OverworldPhoneIconGFX: ; f8f24 OverworldPhoneIconGFX: ; f8f24

0
gfx/unknown/0f8ea4.png → gfx/font/weekday_kanji.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 142 B

After

Width:  |  Height:  |  Size: 142 B

0
gfx/unknown/08c893.png → gfx/overworld/headbutt_tree.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 197 B

After

Width:  |  Height:  |  Size: 197 B

0
gfx/unknown/172f1f.png → gfx/trade/game_boy_n64.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 787 B

After

Width:  |  Height:  |  Size: 787 B

6
misc/mobile_5c.asm
View File

@@ -858,7 +858,7 @@ Function172e78: ; 172e78 (5c:6e78)
ld bc, $168 ld bc, $168
call ByteFill call ByteFill
call DisableLCD call DisableLCD
ld hl, GFX_172f1f ld hl, GameBoyN64GFX
ld de, VTiles2 tile $00 ld de, VTiles2 tile $00
ld bc, $610 ld bc, $610
call CopyBytes call CopyBytes
@@ -929,8 +929,8 @@ Palette_172edf:
RGB 0, 0, 0 RGB 0, 0, 0
RGB 0, 0, 0 RGB 0, 0, 0
GFX_172f1f: GameBoyN64GFX:
INCBIN "gfx/unknown/172f1f.2bpp" INCBIN "gfx/trade/game_boy_n64.2bpp"
Tilemap_1733af: Tilemap_1733af:
IF DEF(CRYSTAL11) IF DEF(CRYSTAL11)