diff options
Diffstat (limited to 'battle')
| -rw-r--r-- | battle/core.asm | 12 | ||||
| -rw-r--r-- | battle/effect_commands.asm | 26 |
2 files changed, 19 insertions, 19 deletions
diff --git a/battle/core.asm b/battle/core.asm index 4dd60c891..471f21dc5 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -2365,7 +2365,7 @@ Function3cf14: ; 3cf14 ld de, SFX_KINESIS call PlaySFX call Function3d432 - ld de, SFX_UNKNOWN_2A + ld de, SFX_FAINT call PlaySFX hlcoord 1, 0 lb bc, 4, 10 @@ -4388,7 +4388,7 @@ Function3dc5b: ; 3dc5b ld de, SFX_KINESIS call PlaySFX call WaitSFX - ld de, SFX_UNKNOWN_2A + ld de, SFX_FAINT call PlaySFX call WaitSFX call Function3d432 @@ -8441,7 +8441,7 @@ Function3f54e: ; 3f54e ld a, [OtherTrainerClass] and a jr nz, .asm_3f55a - ld a, [wd22e] + ld a, [TempWildMonSpecies] ld [CurPartySpecies], a .asm_3f55a @@ -8658,7 +8658,7 @@ Function3f6d0: ; 3f6d0 ld [IsInBattle], a ld [BattleType], a ld [AttackMissed], a - ld [wd22e], a + ld [TempWildMonSpecies], a ld [OtherTrainerClass], a ld [wd266], a ld [wd267], a @@ -8824,9 +8824,9 @@ Function3f836: ; 3f836 call GetSRAMBank call Function3f85f call CloseSRAM - ld hl, AttrMap + hlcoord 0, 0, AttrMap xor a - ld bc, $0168 + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call ByteFill call Function3200 ld b, $8 diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index d162e1c37..4d53eec08 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -6448,7 +6448,7 @@ BattleCommand8c: ; 363b8 jp BattleTextBox .stat - TX_FAR UnknownText_0x1c0cc6 + text_jump UnknownText_0x1c0cc6 start_asm ld hl, .up @@ -6459,11 +6459,11 @@ BattleCommand8c: ; 363b8 ret .wayup - TX_FAR UnknownText_0x1c0cd0 + text_jump UnknownText_0x1c0cd0 db "@" .up - TX_FAR UnknownText_0x1c0ce0 + text_jump UnknownText_0x1c0ce0 db "@" ; 363e9 @@ -6482,7 +6482,7 @@ BattleCommand8d: ; 363e9 jp BattleTextBox .stat - TX_FAR UnknownText_0x1c0ceb + text_jump UnknownText_0x1c0ceb start_asm ld hl, .fell @@ -6493,10 +6493,10 @@ BattleCommand8d: ; 363e9 ret .sharplyfell - TX_FAR UnknownText_0x1c0cf5 + text_jump UnknownText_0x1c0cf5 db "@" .fell - TX_FAR UnknownText_0x1c0d06 + text_jump UnknownText_0x1c0d06 db "@" ; 3641a @@ -7804,7 +7804,7 @@ BattleCommand39: ; 36b4d jp EndMoveEffect .UsedText - TX_FAR UnknownText_0x1c0d0e ; "[USER]" + text_jump UnknownText_0x1c0d0e ; "[USER]" start_asm ld a, BATTLE_VARS_MOVE_ANIM @@ -7837,32 +7837,32 @@ BattleCommand39: ; 36b4d .RazorWind ; 'made a whirlwind!' - TX_FAR UnknownText_0x1c0d12 + text_jump UnknownText_0x1c0d12 db "@" .Solarbeam ; 'took in sunlight!' - TX_FAR UnknownText_0x1c0d26 + text_jump UnknownText_0x1c0d26 db "@" .SkullBash ; 'lowered its head!' - TX_FAR UnknownText_0x1c0d3a + text_jump UnknownText_0x1c0d3a db "@" .SkyAttack ; 'is glowing!' - TX_FAR UnknownText_0x1c0d4e + text_jump UnknownText_0x1c0d4e db "@" .Fly ; 'flew up high!' - TX_FAR UnknownText_0x1c0d5c + text_jump UnknownText_0x1c0d5c db "@" .Dig ; 'dug a hole!' - TX_FAR UnknownText_0x1c0d6c + text_jump UnknownText_0x1c0d6c db "@" ; 36c2c |