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 /battle/core.asm | |
| parent | 609e2d055298e86187456d0c8729d74fc8d4717b (diff) | |
| parent | 0fdbdb43a794358b5ed484114486e2992d520338 (diff) | |
Merge remote-tracking branch 'kanzure/master' into more-objects
Conflicts:
main.asm
Diffstat (limited to 'battle/core.asm')
| -rw-r--r-- | battle/core.asm | 2 |
1 files changed, 1 insertions, 1 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 |