pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -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
commit 5f0e279bfa
2 changed files with 4 additions and 4 deletions
Show Stats 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 Function3e19b: ; 3e19b
call Function3d2f1 call Function3d2f1
jr z, .asm_3e1a8 jr z, .asm_3e1a8
callba Function24ef2 callba LoadBattleMenuDataHeader
and a and a
ret ret

6
main.asm
View File

@ -29799,8 +29799,8 @@ MenuData2_0x24edc: ; 24edc
; 24ef2 ; 24ef2
Function24ef2: ; 4ef2 LoadBattleMenuDataHeader: ; 24ef2
ld hl, MenuDataHeader_0x24f2c ld hl, BattleMenuDataHeader
call LoadMenuDataHeader call LoadMenuDataHeader
ld a, [$d0d2] ld a, [$d0d2]
ld [$cf88], a ld [$cf88], a
@ -29836,7 +29836,7 @@ Function24f19: ; 24f19
; 24f2c ; 24f2c
MenuDataHeader_0x24f2c: ; 24f2c BattleMenuDataHeader: ; 24f2c
db $40 ; flags db $40 ; flags
db 12, 08 ; start coords db 12, 08 ; start coords
db 17, 19 ; end coords db 17, 19 ; end coords