diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-11-23 21:19:29 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-11-23 21:19:29 -0500 |
| commit | 7574e186e7505e237efc3ab0969fed60bec6eb9d (patch) | |
| tree | 527ec48412989e98cca7827c5e31d89cdf742b05 /engine/debug | |
| parent | Identify starter pikachu happiness boost medicine check (#72) (diff) | |
| parent | Use ~X instead of $ff ^ X (diff) | |
| download | pokeyellow-7574e186e7505e237efc3ab0969fed60bec6eb9d.tar.gz pokeyellow-7574e186e7505e237efc3ab0969fed60bec6eb9d.tar.xz pokeyellow-7574e186e7505e237efc3ab0969fed60bec6eb9d.zip | |
Merge remote-tracking branch 'remotes/pokered/master'
Diffstat (limited to 'engine/debug')
| -rw-r--r-- | engine/debug/debug_menu.asm | 2 | ||||
| -rw-r--r-- | engine/debug/debug_party.asm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engine/debug/debug_menu.asm b/engine/debug/debug_menu.asm index 4d31265b..83917823 100644 --- a/engine/debug/debug_menu.asm +++ b/engine/debug/debug_menu.asm @@ -25,7 +25,7 @@ IF DEF(_DEBUG) ld de, DebugMenuOptions call PlaceString - ld a, 3 ; medium speed + ld a, TEXT_DELAY_MEDIUM ld [wOptions], a ld a, A_BUTTON | B_BUTTON | START diff --git a/engine/debug/debug_party.asm b/engine/debug/debug_party.asm index 67a27710..1945950f 100644 --- a/engine/debug/debug_party.asm +++ b/engine/debug/debug_party.asm @@ -31,7 +31,7 @@ IF DEF(_DEBUG) ld [wTownVisitedFlag + 1], a ; Get all badges except Earth Badge. - ld a, $ff ^ (1 << BIT_EARTHBADGE) + ld a, ~(1 << BIT_EARTHBADGE) ld [wObtainedBadges], a call SetDebugTeam |