diff options
| author | dannye <33dannye@gmail.com> | 2022-09-11 23:34:59 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2022-09-12 00:53:37 -0500 |
| commit | ecab35295aefb44227ba38f257dc40c8c10474e3 (patch) | |
| tree | d04160bc19180ee50a941d121f90cc7071e7a672 /engine/battle/init_battle.asm | |
| parent | Replace Hard-Coded Number With Constant (diff) | |
| parent | Add `UNUSED_TYPE`/`UNUSED_TYPE_END` constants (diff) | |
| download | pokeyellow-ecab35295aefb44227ba38f257dc40c8c10474e3.tar.gz pokeyellow-ecab35295aefb44227ba38f257dc40c8c10474e3.tar.xz pokeyellow-ecab35295aefb44227ba38f257dc40c8c10474e3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/battle/init_battle.asm')
| -rw-r--r-- | engine/battle/init_battle.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/battle/init_battle.asm b/engine/battle/init_battle.asm index 680befda..e7be112c 100644 --- a/engine/battle/init_battle.asm +++ b/engine/battle/init_battle.asm @@ -12,11 +12,11 @@ InitOpponent: DetermineWildOpponent: ld a, [wd732] bit 1, a - jr z, .asm_3ef2f + jr z, .notDebug ldh a, [hJoyHeld] - bit 1, a ; B button pressed? + bit BIT_B_BUTTON, a ret nz -.asm_3ef2f +.notDebug ld a, [wNumberOfNoRandomBattleStepsLeft] and a ret nz |