ref: 5f0e279bfafbde621830561f7a2f78171746e9d4
parent: 609e2d055298e86187456d0c8729d74fc8d4717b
parent: 0fdbdb43a794358b5ed484114486e2992d520338
author: yenatch <[email protected]>
date: Mon Dec 23 00:21:12 EST 2013
Merge remote-tracking branch 'kanzure/master' into more-objects Conflicts: main.asm
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -5086,7 +5086,7 @@
Function3e19b: ; 3e19b
call Function3d2f1
jr z, .asm_3e1a8
- callba Function24ef2
+ callba LoadBattleMenuDataHeader
and a
ret
--- a/main.asm
+++ b/main.asm
@@ -29799,8 +29799,8 @@
; 24ef2
-Function24ef2: ; 4ef2
- ld hl, MenuDataHeader_0x24f2c
+LoadBattleMenuDataHeader: ; 24ef2
+ ld hl, BattleMenuDataHeader
call LoadMenuDataHeader
ld a, [$d0d2]
ld [$cf88], a
@@ -29836,7 +29836,7 @@
; 24f2c
-MenuDataHeader_0x24f2c: ; 24f2c
+BattleMenuDataHeader: ; 24f2c
db $40 ; flags
db 12, 08 ; start coords
db 17, 19 ; end coords