diff options
| author | dannye <33dannye@gmail.com> | 2026-04-15 12:05:52 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2026-04-15 12:05:52 -0500 |
| commit | bfa7170107eea23b89febb60bfb2ce39173bf2e1 (patch) | |
| tree | 9796ec9b20b065c8935f54ef4f7cbf1d5a821ecc /engine | |
| parent | Merge branch 'master' of https://github.com/pret/pokered (diff) | |
| parent | Relabel SFX_SILPH_SCOPE to SFX_TRAINER_APPEARED (#580) (diff) | |
| download | pokeyellow-bfa7170107eea23b89febb60bfb2ce39173bf2e1.tar.gz pokeyellow-bfa7170107eea23b89febb60bfb2ce39173bf2e1.tar.xz pokeyellow-bfa7170107eea23b89febb60bfb2ce39173bf2e1.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/common_text.asm | 2 | ||||
| -rw-r--r-- | engine/debug/debug_party.asm | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm index 76b2269d..8a07b382 100644 --- a/engine/battle/common_text.asm +++ b/engine/battle/common_text.asm @@ -80,7 +80,7 @@ PrintBeginningBattleText: ld [wFrequencyModifier], a ld a, $80 ld [wTempoModifier], a - ld a, SFX_SILPH_SCOPE + ld a, SFX_TRAINER_APPEARED call PlaySound jp WaitForSoundToFinish .done diff --git a/engine/debug/debug_party.asm b/engine/debug/debug_party.asm index 407875e7..de61b091 100644 --- a/engine/debug/debug_party.asm +++ b/engine/debug/debug_party.asm @@ -94,13 +94,17 @@ IF DEF(_DEBUG) ret DebugSetPokedexEntries: - ld b, wPokedexOwnedEnd - wPokedexOwned - 1 +IF NUM_POKEMON / 8 != 0 + ld b, NUM_POKEMON / 8 ; 151 / 8 == 18 ld a, %11111111 .loop ld [hli], a dec b jr nz, .loop - ld [hl], %01111111 +ENDC +IF NUM_POKEMON % 8 != 0 + ld [hl], (1 << (NUM_POKEMON % 8)) - 1 ; (1 << 151 % 8)) - 1 == %01111111 +ENDC ret DebugNewGameItemsList: |