diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-13 18:48:26 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-13 18:48:26 -0400 |
| commit | 75035a71a544821de0b397cfd5bacad5cf4da8fd (patch) | |
| tree | a6f0321c5bb59c2e5bae7d26d20fe7c8e4ff4e88 /engine/battle | |
| parent | 0d683ea0c72c3d86736cd08667f14d6abe5964c3 (diff) | |
Label some mobile addresses, and revise some comments
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/check_battle_scene.asm | 4 | ||||
| -rw-r--r-- | engine/battle/core.asm | 4 | ||||
| -rw-r--r-- | engine/battle/effect_commands.asm | 2 | ||||
| -rw-r--r-- | engine/battle/move_effects/rollout.asm | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/engine/battle/check_battle_scene.asm b/engine/battle/check_battle_scene.asm index 13d0c665e..ca6b94289 100644 --- a/engine/battle/check_battle_scene.asm +++ b/engine/battle/check_battle_scene.asm @@ -19,9 +19,9 @@ CheckBattleScene: and a jr nz, .from_wram - ld a, 4 ; MBC30 bank used by JP Crystal; inaccessible by MBC3 + ld a, BANK(s4_a60c) ; MBC30 bank used by JP Crystal; inaccessible by MBC3 call GetSRAMBank - ld a, [$a60c] ; address of MBC30 bank + ld a, [s4_a60c] ld c, a call CloseSRAM diff --git a/engine/battle/core.asm b/engine/battle/core.asm index d51e4cdd5..9805ec958 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -230,9 +230,9 @@ BattleTurn: Stubbed_Function3c1bf: ret - ld a, 5 ; MBC30 bank used by JP Crystal; inaccessible by MBC3 + ld a, BANK(s5_a89b) ; MBC30 bank used by JP Crystal; inaccessible by MBC3 call GetSRAMBank - ld hl, $a89b ; address of MBC30 bank + ld hl, s5_a89b ; address of MBC30 bank inc [hl] jr nz, .finish dec hl diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 266a5073f..31ab1dd3e 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -1543,7 +1543,7 @@ BattleCommand_DamageVariation: call Multiply ; ...divide by 100%... - ld a, $ff ; 100% + ld a, 100 percent ldh [hDivisor], a ld b, $4 call Divide diff --git a/engine/battle/move_effects/rollout.asm b/engine/battle/move_effects/rollout.asm index e2f810e6a..64d66ad62 100644 --- a/engine/battle/move_effects/rollout.asm +++ b/engine/battle/move_effects/rollout.asm @@ -14,7 +14,7 @@ BattleCommand_CheckCurl: bit SUBSTATUS_ROLLOUT, a jr z, .reset - ld b, $4 ; doturn + ld b, doturn_command jp SkipToBattleCommand .reset |