diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-24 20:29:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-24 20:29:55 -0500 |
| commit | c2a7216d9b8689591ede817015bf96f263396bb8 (patch) | |
| tree | 008635aac62c3fdbb446453d308c2255fb0554d9 /engine/battle_transition.asm | |
| parent | 0b8b6f9259bedacad55bb4667de5b2bbe6eafda7 (diff) | |
| parent | c6b12b07b302b82765181b2521e1e0f2ca5f7725 (diff) | |
Merge pull request #424 from roukaour/master
Rename a routine and some maps; remove all code from main.asm
Diffstat (limited to 'engine/battle_transition.asm')
| -rw-r--r-- | engine/battle_transition.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle_transition.asm b/engine/battle_transition.asm index 2af113ddd..bef74ad29 100644 --- a/engine/battle_transition.asm +++ b/engine/battle_transition.asm @@ -60,7 +60,7 @@ Predef_StartBattle: ; 8c20f call UpdateSprites call DelayFrame call .NonMobile_LoadPokeballTiles - call BattleStart_LoadEDTile + call BattleStart_CopyTilemapAtOnce jr .resume .mobile @@ -663,7 +663,7 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc) ld a, $1 ld [hCGBPalUpdate], a call DelayFrame - call BattleStart_LoadEDTile + call BattleStart_CopyTilemapAtOnce .nextscene ; 8c673 (23:4673) call StartTrainerBattle_NextScene |