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

Merge remote-tracking branch 'kanzure/master' into more-objects

Browse Source 
Conflicts:
	main.asm
This commit is contained in:
yenatch
2013-12-23 05:21:12 -05:00
parent 609e2d0552 0fdbdb43a7
commit 5f0e279bfa
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
battle/core.asm
View File

@@ -5086,7 +5086,7 @@ Function3e192: ; 3e192
Function3e19b: ; 3e19b
call Function3d2f1
jr z, .asm_3e1a8
callba Function24ef2
callba LoadBattleMenuDataHeader
and a
ret