diff options
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/get_trainer_name.asm | 1 | ||||
| -rw-r--r-- | engine/battle/moveEffects/reflect_light_screen_effect.asm | 2 | ||||
| -rwxr-xr-x | engine/battle/safari_zone.asm | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/engine/battle/get_trainer_name.asm b/engine/battle/get_trainer_name.asm index d32b80b9..d393b800 100644 --- a/engine/battle/get_trainer_name.asm +++ b/engine/battle/get_trainer_name.asm @@ -18,6 +18,7 @@ GetTrainerName_: ; f67a5 (3d:67a5) ld [wPredefBank], a call GetName ld hl, wcd6d +.foundName .rival ld de, W_TRAINERNAME ld bc, $d diff --git a/engine/battle/moveEffects/reflect_light_screen_effect.asm b/engine/battle/moveEffects/reflect_light_screen_effect.asm index c12c6018..83a97486 100644 --- a/engine/battle/moveEffects/reflect_light_screen_effect.asm +++ b/engine/battle/moveEffects/reflect_light_screen_effect.asm @@ -41,5 +41,5 @@ ReflectGainedArmorText: ; f64a2 (3d:64a2) db "@" Bankswitch3DtoF: ; f64a7 (3d:64a7) - ld b, BANK(BattleCore) + ld b, $f ; BANK(BattleCore) jp Bankswitch diff --git a/engine/battle/safari_zone.asm b/engine/battle/safari_zone.asm index e195966d..00627d74 100755 --- a/engine/battle/safari_zone.asm +++ b/engine/battle/safari_zone.asm @@ -5,7 +5,7 @@ PrintSafariZoneBattleText: ; 4111 (1:4111) jr z, .asm_411e dec [hl] ld hl, SafariZoneEatingText - jr .asm_429f + jr .asm_4138 .asm_411e dec hl ld a, [hl] @@ -13,7 +13,7 @@ PrintSafariZoneBattleText: ; 4111 (1:4111) ret z dec [hl] ld hl, SafariZoneAngryText - jr nz, .asm_4139 + jr nz, .asm_4138 push hl ld a, [wEnemyMonSpecies] ld [wd0b5], a |