diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-24 17:39:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-24 17:39:50 -0500 |
| commit | e400fe5142731422b0f542749d913d569997159e (patch) | |
| tree | 004b17f7b444c4bbc8bbb80e3b189a48287ed4b7 /engine/start_battle.asm | |
| parent | 70e6b5947b5cc9ca9fd93c720c7f97d9e018da2d (diff) | |
| parent | 3e7f3bbeb6dd2d3cff6343dea2298502faa14185 (diff) | |
Merge pull request #423 from roukaour/master
Fix issues #262, #345, #347, #396, #408, and #412
Diffstat (limited to 'engine/start_battle.asm')
| -rw-r--r-- | engine/start_battle.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/start_battle.asm b/engine/start_battle.asm index 51f46b3f2..d23fe1f15 100644 --- a/engine/start_battle.asm +++ b/engine/start_battle.asm @@ -5,7 +5,7 @@ ShowLinkBattleParticipants: ; 2ee18 and a ret z - callba _ShowLinkBattleParticipants + farcall _ShowLinkBattleParticipants ld c, 150 call DelayFrames call ClearTileMap @@ -34,7 +34,7 @@ FindFirstAliveMonAndStartBattle: ; 2ee2f ld a, [hl] ld [BattleMonLevel], a predef Predef_StartBattle - callba _LoadBattleFontsHPBar + farcall _LoadBattleFontsHPBar ld a, 1 ld [hBGMapMode], a call ClearSprites @@ -70,7 +70,7 @@ PlayBattleMusic: ; 2ee6c and a jr nz, .trainermusic - callba RegionCheck + farcall RegionCheck ld a, e and a jr nz, .kantowild @@ -101,11 +101,11 @@ PlayBattleMusic: ; 2ee6c jr z, .done ld de, MUSIC_KANTO_GYM_LEADER_BATTLE - callba IsKantoGymLeader + farcall IsKantoGymLeader jr c, .done ld de, MUSIC_JOHTO_GYM_LEADER_BATTLE - callba IsJohtoGymLeader + farcall IsJohtoGymLeader jr c, .done ld de, MUSIC_RIVAL_BATTLE @@ -126,7 +126,7 @@ PlayBattleMusic: ; 2ee6c and a jr nz, .johtotrainer - callba RegionCheck + farcall RegionCheck ld a, e and a jr nz, .kantotrainer @@ -186,7 +186,7 @@ ClearBattleRAM: ; 2ef18 xor a call ByteFill - callab ResetEnemyStatLevels + callfar ResetEnemyStatLevels call ClearWindowData |