diff options
Diffstat (limited to 'engine')
| -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 | ||||
| -rw-r--r-- | engine/battle_anims/bg_effects.asm | 4 | ||||
| -rw-r--r-- | engine/link/mystery_gift.asm | 6 | ||||
| -rw-r--r-- | engine/menus/save.asm | 16 |
7 files changed, 19 insertions, 19 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 diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm index 6116056b9..c74560232 100644 --- a/engine/battle_anims/bg_effects.asm +++ b/engine/battle_anims/bg_effects.asm @@ -1510,10 +1510,10 @@ Tackle_BGEffect25_2d_two: Functionc88a5: push af - ld a, [wFXAnimID + 1] ; FXAnimID + 1 + ld a, [wFXAnimID + 1] or a jr nz, .not_rollout - ld a, [wFXAnimID] ; FXAnimID + ld a, [wFXAnimID] cp ROLLOUT jr z, .rollout .not_rollout diff --git a/engine/link/mystery_gift.asm b/engine/link/mystery_gift.asm index 5f09cd2a0..6cdad03ed 100644 --- a/engine/link/mystery_gift.asm +++ b/engine/link/mystery_gift.asm @@ -1537,12 +1537,12 @@ Function10578c: ld a, [sCrystalData + 0] ld [de], a inc de - ld a, 4 ; MBC30 bank used by JP Crystal; inaccessible by MBC3 + ld a, BANK(s4_a603) ; aka BANK(s4_a007) ; MBC30 bank used by JP Crystal; inaccessible by MBC3 call GetSRAMBank - ld hl, $a603 ; address of MBC30 bank + ld hl, s4_a603 ; address of MBC30 bank ld bc, $8 call CopyBytes - ld hl, $a007 ; address of MBC30 bank + ld hl, s4_a007 ; address of MBC30 bank ld bc, $c call CopyBytes call CloseSRAM diff --git a/engine/menus/save.asm b/engine/menus/save.asm index ef9926fe9..dc677c8ca 100644 --- a/engine/menus/save.asm +++ b/engine/menus/save.asm @@ -422,9 +422,9 @@ SaveData: ret Unreferenced_Function14d6c: - ld a, 4 ; MBC30 bank used by JP Crystal; inaccessible by MBC3 + ld a, BANK(s4_a60b) ; MBC30 bank used by JP Crystal; inaccessible by MBC3 call GetSRAMBank - ld a, [$a60b] ; address of MBC30 bank + ld a, [s4_a60b] ; address of MBC30 bank ld b, $0 and a jr z, .ok @@ -432,24 +432,24 @@ Unreferenced_Function14d6c: .ok ld a, b - ld [$a60b], a ; address of MBC30 bank + ld [s4_a60b], a ; address of MBC30 bank call CloseSRAM ret Unreferenced_Function14d83: - ld a, 4 ; MBC30 bank used by JP Crystal; inaccessible by MBC3 + ld a, BANK(s4_a60c) ; aka BANK(s4_a60d) ; MBC30 bank used by JP Crystal; inaccessible by MBC3 call GetSRAMBank xor a - ld [$a60c], a ; address of MBC30 bank - ld [$a60d], a ; address of MBC30 bank + ld [s4_a60c], a ; address of MBC30 bank + ld [s4_a60d], a ; address of MBC30 bank call CloseSRAM ret Unreferenced_Function14d93: - ld a, 7 ; MBC30 bank used by JP Crystal; inaccessible by MBC3 + ld a, BANK(s7_a000) ; MBC30 bank used by JP Crystal; inaccessible by MBC3 call GetSRAMBank xor a - ld [$a000], a ; address of MBC30 bank + ld [s7_a000], a ; address of MBC30 bank call CloseSRAM ret |