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

6
home/map.asm
View File

@@ -1957,7 +1957,7 @@ CheckStandingOnXYTrigger:: ; 2ae7
FadeToMenu:: ; 2b29
xor a
ld [hBGMapMode], a
call Function1d6e
call LoadMenuDataHeader_0x1d75
callba FadeBlackBGMap
call ClearSprites
call DisableSpriteUpdates
@@ -1969,14 +1969,14 @@ Function2b3c:: ; 2b3c
call WhiteBGMap
call Function2bae
call UpdateSprites
call Function1d7d
call Call_ExitMenu
call Functiond90
jr Function2b5c
; 2b4d
Function2b4d:: ; 2b4d
call WhiteBGMap
call Function1d7d
call Call_ExitMenu
call Function2bae
call UpdateSprites
call Functiond90