diff options
| author | yenatch <yenatch@gmail.com> | 2013-12-23 05:21:12 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2013-12-23 05:21:12 -0500 |
| commit | 5f0e279bfafbde621830561f7a2f78171746e9d4 (patch) | |
| tree | 7d0c56f3491c514d632e93e0209f973f37cf396f | |
| parent | 609e2d055298e86187456d0c8729d74fc8d4717b (diff) | |
| parent | 0fdbdb43a794358b5ed484114486e2992d520338 (diff) | |
Merge remote-tracking branch 'kanzure/master' into more-objects
Conflicts:
main.asm
| -rw-r--r-- | battle/core.asm | 2 | ||||
| -rw-r--r-- | main.asm | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/battle/core.asm b/battle/core.asm index aea371803..d8c87b0f8 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -5086,7 +5086,7 @@ Function3e192: ; 3e192 Function3e19b: ; 3e19b call Function3d2f1 jr z, .asm_3e1a8 - callba Function24ef2 + callba LoadBattleMenuDataHeader and a ret @@ -29799,8 +29799,8 @@ MenuData2_0x24edc: ; 24edc ; 24ef2 -Function24ef2: ; 4ef2 - ld hl, MenuDataHeader_0x24f2c +LoadBattleMenuDataHeader: ; 24ef2 + ld hl, BattleMenuDataHeader call LoadMenuDataHeader ld a, [$d0d2] ld [$cf88], a @@ -29836,7 +29836,7 @@ Function24f19: ; 24f19 ; 24f2c -MenuDataHeader_0x24f2c: ; 24f2c +BattleMenuDataHeader: ; 24f2c db $40 ; flags db 12, 08 ; start coords db 17, 19 ; end coords |