From 07e8efee7ea19a5ae09ccceb193e1f7e8dec64b1 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 7 Aug 2022 00:38:08 -0400 Subject: [PATCH] Fix some whitespace --- engine/battle/ai/scoring.asm | 4 ++-- engine/battle/battle_transition.asm | 2 +- engine/battle/effect_commands.asm | 2 +- engine/events/overworld.asm | 6 +++--- mobile/mobile_40.asm | 9 ++++++--- mobile/mobile_41.asm | 24 ++++++++++++++++-------- 6 files changed, 29 insertions(+), 18 deletions(-) diff --git a/engine/battle/ai/scoring.asm b/engine/battle/ai/scoring.asm index 2646a4b5f..ac40f4a51 100644 --- a/engine/battle/ai/scoring.asm +++ b/engine/battle/ai/scoring.asm @@ -904,7 +904,7 @@ AI_Smart_ResetStats: ret ; Discourage this move if neither: -; Any of enemy's stat levels is lower than -2. +; Any of enemy's stat levels is lower than -2. ; Any of player's stat levels is higher than +2. .discourage pop hl @@ -2321,7 +2321,7 @@ AI_Smart_HiddenPower: cp EFFECTIVE jr c, .bad -; Discourage Hidden Power if its base power is lower than 50. +; Discourage Hidden Power if its base power is lower than 50. ld a, d cp 50 jr c, .bad diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index 1240ecc13..74c5304ee 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -767,7 +767,7 @@ StartTrainerBattle_DrawSineWave: calc_sine_wave StartTrainerBattle_ZoomToBlack: - vc_hook Stop_reducing_battle_transition_flashing_ZoomToBlack + vc_hook Stop_reducing_battle_transition_flashing_ZoomToBlack farcall RespawnPlayerAndOpponent ld de, .boxes diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index bc96d1cf5..e22a3b2b3 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -1401,7 +1401,7 @@ BattleCheckTypeMatchup: and a jr z, CheckTypeMatchup ld hl, wBattleMonType1 - ; fallthrough + ; fallthrough CheckTypeMatchup: ; BUG: AI makes a false assumption about CheckTypeMatchup (see docs/bugs_and_glitches.md) push hl diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index 50eebaa7d..3b043ae86 100644 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -552,9 +552,9 @@ FlyFunction: ret .Jumptable: - dw .TryFly - dw .DoFly - dw .FailFly + dw .TryFly + dw .DoFly + dw .FailFly .TryFly: ld de, ENGINE_STORMBADGE diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index c9544d5bf..7f14c4725 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -3644,17 +3644,20 @@ setcharmap ascii Unknown_10186f: db .end - @ db $19, $73, $09, $13, "trade_crystal" -.end db 0 +.end + db 0 Unknown_101882: db .end - @ db $19, $67, $10, $01, "free__crystal" -.end db 0 +.end + db 0 Unknown_101895: db .end - @ db $19, $67, $10, $01, "limit_crystal" -.end db 0 +.end + db 0 popc diff --git a/mobile/mobile_41.asm b/mobile/mobile_41.asm index 1546b2c14..5c9fe6260 100644 --- a/mobile/mobile_41.asm +++ b/mobile/mobile_41.asm @@ -697,14 +697,22 @@ endr pop bc ret -._9 dd 1000000000 -._8 dd 100000000 -._7 dd 10000000 -._6 dd 1000000 -._5 dd 100000 -._4 dd 10000 -._3 dd 1000 -._2 dd 100 +._9 + dd 1000000000 +._8 + dd 100000000 +._7 + dd 10000000 +._6 + dd 1000000 +._5 + dd 100000 +._4 + dd 10000 +._3 + dd 1000 +._2 + dd 100 .Function1062b2: ld c, $0