pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fix gfx/misc

Browse Source
This commit is contained in:
yenatch 2017-06-24 16:30:12 -04:00
parent a749057b27
commit a20664d415
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -159,8 +159,9 @@ gfx/misc/kris.2bpp: rgbgfx += -h
gfx/misc/kris_card.2bpp: rgbgfx += -h gfx/misc/kris_card.2bpp: rgbgfx += -h
gfx/misc/kris_back.2bpp: rgbgfx += -h gfx/misc/kris_back.2bpp: rgbgfx += -h
gfx/misc/dude.2bpp: rgbgfx += -h gfx/misc/dude.2bpp: rgbgfx += -h
gfx/misc/unknown_egg.2bpp: rgbgfx += -h
gfx/misc/player.2bpp: rgbgfx += -h gfx/misc/player.2bpp: rgbgfx += -h
gfx/misc/pokegear.2bpp: tools/gfx += --trim-whitespace gfx/misc/pokegear.2bpp: rgbgfx += -x2
gfx/misc/pokegear_sprites.2bpp: tools/gfx += --trim-whitespace gfx/misc/pokegear_sprites.2bpp: tools/gfx += --trim-whitespace
gfx/unknown/0e0ea8.2bpp: tools/gfx += --remove-whitespace gfx/unknown/0e0ea8.2bpp: tools/gfx += --remove-whitespace

4
engine/trainer_card.asm
View File

@ -608,8 +608,8 @@ TrainerCard_JohtoBadgesOAM: ; 254c9
CardStatusGFX: INCBIN "gfx/misc/card_status.2bpp" CardStatusGFX: INCBIN "gfx/misc/card_status.2bpp"
LeaderGFX: INCBIN "gfx/misc/leaders.w24.2bpp" LeaderGFX: INCBIN "gfx/misc/leaders.2bpp"
LeaderGFX2: INCBIN "gfx/misc/leaders.w24.2bpp" LeaderGFX2: INCBIN "gfx/misc/leaders.2bpp"
BadgeGFX: INCBIN "gfx/misc/badges.2bpp" BadgeGFX: INCBIN "gfx/misc/badges.2bpp"
BadgeGFX2: INCBIN "gfx/misc/badges.2bpp" BadgeGFX2: INCBIN "gfx/misc/badges.2bpp"

16
main.asm
View File

@ -1178,10 +1178,10 @@ INCLUDE "engine/wildmons.asm"
INCLUDE "battle/link_result.asm" INCLUDE "battle/link_result.asm"
ChrisBackpic: ; 2ba1a ChrisBackpic: ; 2ba1a
INCBIN "gfx/misc/player.6x6.2bpp.lz" INCBIN "gfx/misc/player.2bpp.lz"
DudeBackpic: ; 2bbaa DudeBackpic: ; 2bbaa
INCBIN "gfx/misc/dude.6x6.2bpp.lz" INCBIN "gfx/misc/dude.2bpp.lz"
SECTION "bankB", ROMX, BANK[$B] SECTION "bankB", ROMX, BANK[$B]
@ -4664,7 +4664,7 @@ Unknown_53d84: ; unreferenced
UnknownEggPic:: ; 53d9c UnknownEggPic:: ; 53d9c
; Another egg pic. This is shifted up a few pixels. ; Another egg pic. This is shifted up a few pixels.
INCBIN "gfx/misc/unknown_egg.5x5.2bpp.lz" INCBIN "gfx/misc/unknown_egg.2bpp.lz"
SECTION "bank19", ROMX, BANK[$19] SECTION "bank19", ROMX, BANK[$19]
@ -4857,10 +4857,10 @@ GetCardPic: ; 8833e
ret ret
ChrisCardPic: ; 88365 ChrisCardPic: ; 88365
INCBIN "gfx/misc/chris_card.5x7.2bpp" INCBIN "gfx/misc/chris_card.2bpp"
KrisCardPic: ; 88595 KrisCardPic: ; 88595
INCBIN "gfx/misc/kris_card.5x7.2bpp" INCBIN "gfx/misc/kris_card.2bpp"
CardGFX: ; 887c5 CardGFX: ; 887c5
INCBIN "gfx/misc/trainer_card.2bpp" INCBIN "gfx/misc/trainer_card.2bpp"
@ -4943,10 +4943,10 @@ DrawIntroPlayerPic: ; 88874
ret ret
ChrisPic: ; 888a9 ChrisPic: ; 888a9
INCBIN "gfx/misc/chris.7x7.2bpp" INCBIN "gfx/misc/chris.2bpp"
KrisPic: ; 88bb9 KrisPic: ; 88bb9
INCBIN "gfx/misc/kris.7x7.2bpp" INCBIN "gfx/misc/kris.2bpp"
GetKrisBackpic: ; 88ec9 GetKrisBackpic: ; 88ec9
; Kris's backpic is uncompressed. ; Kris's backpic is uncompressed.
@ -4957,7 +4957,7 @@ GetKrisBackpic: ; 88ec9
ret ret
KrisBackpic: ; 88ed6 KrisBackpic: ; 88ed6
INCBIN "gfx/misc/kris_back.6x6.2bpp" INCBIN "gfx/misc/kris_back.2bpp"
String_89116: String_89116:
db "-----@" db "-----@"

2
misc/gbc_only.asm
View File

@ -145,5 +145,5 @@ GBCOnlyString: ; 4eb38
GBCOnlyGFX: ; 4eb76 GBCOnlyGFX: ; 4eb76
INCBIN "gfx/misc/gbc_only.w112.2bpp.lz" INCBIN "gfx/misc/gbc_only.2bpp.lz"
; 4f0bc ; 4f0bc