diff options
Diffstat (limited to 'battle/core.asm')
| -rw-r--r-- | battle/core.asm | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/battle/core.asm b/battle/core.asm index 56587ca75..3696b2bb5 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -129,18 +129,18 @@ Function3c0e5: ; 3c0e5 ld [wd0ee], a ld a, [InLinkBattle] and a - ld hl, BattleText_0x807bd + ld hl, BattleText_WildFled jr z, .asm_3c115 ld a, [wd0ee] and $c0 ld [wd0ee], a - ld hl, BattleText_0x807cf + ld hl, BattleText_EnemyFled call Function3d2e0 jr nc, .asm_3c115 ld hl, wcd2a bit 4, [hl] jr nz, .asm_3c118 - ld hl, BattleText_0x81863 + ld hl, BattleText_LinkErrorBattleCanceled .asm_3c115 call StdBattleTextBox @@ -160,6 +160,7 @@ Function3c0e5: ; 3c0e5 ret ; 3c12f + Function3c12f: ; 3c12f .loop call Function3c1bf @@ -939,7 +940,7 @@ Function3c5fe: ; 3c5fe call SetEnemyTurn ld a, $1 ld [wc70f], a - callab Function38000 + callab AI_SwitchOrTryItem jr c, .asm_3c62f call Function3c6de call Function3d2e0 @@ -980,7 +981,7 @@ Function3c664: ; 3c664 xor a ld [wc70f], a call SetEnemyTurn - callab Function38000 + callab AI_SwitchOrTryItem push af call Function3c6cf pop bc @@ -3280,7 +3281,7 @@ Function3d4c3: ; 3d4c3 call Function3d7a0 call NewEnemyMonStatus call ResetEnemyStatLevels - call Function3d7c7 + call Function_SetEnemyPkmnAndSendOutAnimation call BreakAttraction call Function3d57a ret @@ -3299,8 +3300,8 @@ Function3d4e1: ; 3d4e1 call Function3d74b push af call Function3d7a0 - call Function3d7b8 - call Function3d7c7 + call Function_BattleTextEnemySentOut + call Function_SetEnemyPkmnAndSendOutAnimation pop af ret c xor a @@ -3323,8 +3324,8 @@ Function3d517: ; 3d517 ld a, 1 ld [wEnemyIsSwitching], a call Function3d7a0 - call Function3d7b8 - jp Function3d7c7 + call Function_BattleTextEnemySentOut + jp Function_SetEnemyPkmnAndSendOutAnimation ; 3d533 Function3d533: ; 3d533 @@ -3697,14 +3698,14 @@ Function3d7a0: ; 3d7a0 jp Function3ee27 ; 3d7b8 -Function3d7b8: ; 3d7b8 +Function_BattleTextEnemySentOut: ; 3d7b8 callab Battle_GetTrainerName - ld hl, BattleText_0x80af8 + ld hl, BattleText_EnemySentOut call StdBattleTextBox jp WaitBGMap ; 3d7c7 -Function3d7c7: ; 3d7c7 +Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7 ld a, [TempEnemyMonSpecies] ld [CurPartySpecies], a ld [CurSpecies], a @@ -4013,7 +4014,7 @@ Function3d8b3: ; 3d8b3 ld hl, wcd2a bit 4, [hl] jr nz, .asm_3da05 - ld hl, BattleText_0x81863 + ld hl, BattleText_LinkErrorBattleCanceled call StdBattleTextBox .asm_3da05 @@ -5160,7 +5161,7 @@ LoadBattleMenu2: ; 3e19b ld hl, wcd2a bit 4, [hl] jr nz, .error - ld hl, BattleText_0x81863 + ld hl, BattleText_LinkErrorBattleCanceled call StdBattleTextBox ld c, 60 call DelayFrames @@ -7327,9 +7328,11 @@ Function3ee3b: ; 3ee3b ld a, [InLinkBattle] and a ret nz + ld a, [wcfc0] bit 0, a ret nz + call Function3f0d4 xor a ld [CurPartyMon], a |