diff options
| author | YamaArashi <shadow962@live.com> | 2016-06-11 17:51:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-11 17:51:03 -0700 |
| commit | 54143d33fc1211fb0c949ba62633d1c8d94f2717 (patch) | |
| tree | 9176ffc5b6384a48eb32ea8f33ac97d1d67f6865 /engine/overworld/step_functions.asm | |
| parent | db0ac16b6b4f257de338d1aaac561e681ca8723a (diff) | |
| parent | 7e112672b436afee27f1a5a0d6e7a5964e7829b2 (diff) | |
Merge pull request #13 from YamaArashi/master
remove address comments
Diffstat (limited to 'engine/overworld/step_functions.asm')
| -rw-r--r-- | engine/overworld/step_functions.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/overworld/step_functions.asm b/engine/overworld/step_functions.asm index bc1a74aa..84b09291 100644 --- a/engine/overworld/step_functions.asm +++ b/engine/overworld/step_functions.asm @@ -1,4 +1,4 @@ -ApplyOutOfBattlePoisonDamage: ; c3de (3:43de) +ApplyOutOfBattlePoisonDamage: ld a, [wd730] add a jp c, .noBlackOut ; no black out if joypad states are being simulated @@ -124,7 +124,7 @@ ApplyOutOfBattlePoisonDamage: ; c3de (3:43de) ld [wOutOfBattleBlackout], a ret -Func_c4c7: ; c4c7 (3:44c7) +Func_c4c7: ld a, [wStepCounter] and a jr nz, .asm_c4de @@ -148,4 +148,4 @@ Func_c4c7: ; c4c7 (3:44c7) .asm_c4ef xor a ld [wd49c], a - ret
\ No newline at end of file + ret |