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

Fix merge conflicts

Browse Source
This commit is contained in:
PikalaxALT
2015-11-01 18:14:37 -05:00
parent 010b450834 25c126c69b
commit 6b2d0ae841
33 changed files with 717 additions and 641 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
misc/mobile_22_2.asm
View File

@@ -581,7 +581,7 @@ Function8b677: ; 8b677
call Function8b6ed
call EnableLCD
call Function891ab
call Function32f9
call SetPalettes
ret
; 8b690