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

Merge remote-tracking branch 'origin/master' into pngs-kind-of

Browse Source 
Conflicts:
	INSTALL.md
This commit is contained in:
yenatch
2015-10-26 01:34:08 -04:00
parent b8da3874bb 0d17d4a758
commit e638cdb74c
461 changed files with 22335 additions and 21207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/pics/animation.asm
View File

@@ -3,7 +3,7 @@
Functiond0000: ; d0000
hlcoord 12, 0
ld a, [IsInBattle]
ld a, [wBattleMode]
cp $1
jr z, .asm_d0012
ld e, $0