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

4
misc/crystal_misc.asm
View File

@@ -51,7 +51,7 @@ Function17a6a8: ; 17a6a8 (5e:66a8)
call Function17abcf
callba Function49409
callba Function49420
call Function32f9
call SetPalettes
call DelayFrame
ret
@@ -430,7 +430,7 @@ Function17a91e: ; 17a91e (5e:691e)
ret
.asm_17a92c
call Function1d6e
call LoadMenuDataHeader_0x1d75
call Function17a99e
ld hl, $d088
set 7, [hl]