diff options
| author | yenatch <yenatch@gmail.com> | 2014-06-06 16:03:47 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-06-06 16:03:47 -0700 |
| commit | 35493bef27ba0425860a0f419c64371b824b6981 (patch) | |
| tree | b57de4968c66fc768f404e3dd03849b1fd64eace /engine/battle/core.asm | |
| parent | Explicit sections for pics, sprites and misc graphics. (diff) | |
| parent | Relabel a few missed map scripts and TheEndTextString (diff) | |
| download | pokeyellow-35493bef27ba0425860a0f419c64371b824b6981.tar.gz pokeyellow-35493bef27ba0425860a0f419c64371b824b6981.tar.xz pokeyellow-35493bef27ba0425860a0f419c64371b824b6981.zip | |
Merge remote-tracking branch 'danny/master'
Diffstat (limited to 'engine/battle/core.asm')
| -rwxr-xr-x | engine/battle/core.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index c1041bca..b6d8b78e 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -6213,7 +6213,7 @@ Func_3ec32: ; 3ec32 (f:6c32) .asm_3ec4d call DelayFrame ld a, $30 - call Predef ; indirect jump to Func_7096d (7096d (1c:496d)) + call Predef ; indirect jump to BattleTransition (7096d (1c:496d)) callab Func_3ee58 ld a, $1 ld [H_AUTOBGTRANSFERENABLED], a ; $ffba |