diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-26 18:11:55 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-26 19:22:27 -0500 |
| commit | 2bd45ca574aab251b91c24837b102c9c2a5e76a0 (patch) | |
| tree | bd8c568b9e43f7467ff4822080c6228c29bca2b9 /battle/core.asm | |
| parent | f485a45cda5f84e6909997147b1e6c9a9a538d9b (diff) | |
Move effects; no more reloadmapmusic, returnafterbattle
Diffstat (limited to 'battle/core.asm')
| -rw-r--r-- | battle/core.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/battle/core.asm b/battle/core.asm index dcc4fe31d..7bc7d54f1 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -2098,7 +2098,7 @@ UpdateHPBar: ; 3cd3c xor a .ok push bc - ld [wd10a], a + ld [wWhichHPBar], a predef AnimateHPBar pop bc ret @@ -2494,7 +2494,7 @@ WinTrainerBattle: ; 3cfa4 jr nz, .skip_heal predef HealParty .skip_heal - ld a, [wc2cc] + ld a, [wMonStatusFlags] bit 0, a jr nz, .skip_win_loss_text call PrintWinLossText @@ -2888,7 +2888,7 @@ AskUseNextPokemon: ; 3d1f8 ForcePlayerMonChoice: ; 3d227 call EmptyBattleTextBox call LoadStandardMenuDataHeader - call Function3d2f7 + call SetUpBattlePartyMenu_NoLoop call ForcePickPartyMonInBattle ld a, [wLinkMode] and a @@ -2992,12 +2992,12 @@ IsMobileBattle: ; 3d2f1 ret ; 3d2f7 -Function3d2f7: ; 3d2f7 +SetUpBattlePartyMenu_NoLoop: ; 3d2f7 call ClearBGPalettes -Function3d2fa: ; switch to fullscreen menu? +SetUpBattlePartyMenu: ; switch to fullscreen menu? callba LoadPartyMenuGFX callba InitPartyMenuWithCancel - callba Function8e85 + callba InitBattlePartyMenuPals callba InitPartyMenuGFX ret ; 3d313 @@ -3113,7 +3113,7 @@ LostBattle: ; 3d38e ld c, 40 call DelayFrames - ld a, [wc2cc] + ld a, [wMonStatusFlags] bit 0, a jr nz, .skip_win_loss_text call PrintWinLossText @@ -3701,7 +3701,7 @@ OfferSwitch: ; 3d74b ld a, [wMenuCursorY] dec a jr nz, .said_no - call Function3d2f7 + call SetUpBattlePartyMenu_NoLoop call PickSwitchMonInBattle jr c, .canceled_switch ld a, [CurBattleMon] @@ -4563,14 +4563,14 @@ HandleHPHealingItem: ; 3dd2f ld a, [Buffer5] ld [de], a ld a, [hBattleTurn] - ld [wd10a], a + ld [wWhichHPBar], a and a hlcoord 2, 2 jr z, .got_hp_bar_coords hlcoord 10, 9 .got_hp_bar_coords - ld [wd10a], a + ld [wWhichHPBar], a predef AnimateHPBar UseOpponentItem: call RefreshBattleHuds @@ -5113,7 +5113,7 @@ DrawEnemyHUD: ; 3e043 .draw_bar xor a - ld [wd10a], a + ld [wWhichHPBar], a hlcoord 2, 2 ld b, 0 call DrawBattleHPBar @@ -5332,7 +5332,7 @@ Function3e290: call LoadStandardMenuDataHeader call ClearBGPalettes BattleMenuPKMN_Loop: - call Function3d2fa + call SetUpBattlePartyMenu xor a ld [PartyMenuActionText], a call Function3d313 |