diff options
| author | Daniel Harding <33dannye@gmail.com> | 2018-04-22 14:29:01 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-22 14:29:01 -0500 |
| commit | 9881745b964b35c9118874ca3f1be690181473b8 (patch) | |
| tree | f39017a607f384c766bcc245a599ead54bf7c45a /scripts | |
| parent | 8836e3e5166fa93b5c83a122317b0e53a97d6868 (diff) | |
| parent | cfec16566e41ced2faa97a3a5314ba5bbc0d0395 (diff) | |
Merge pull request #32 from pret/fix-bank-constants
Fix bank constants and use a macro for pcm data
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/mtmoon3.asm | 3 | ||||
| -rwxr-xr-x | scripts/ssanne7.asm | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/scripts/mtmoon3.asm b/scripts/mtmoon3.asm index e86d6d37..aaa29825 100755 --- a/scripts/mtmoon3.asm +++ b/scripts/mtmoon3.asm @@ -493,7 +493,8 @@ MtMoon3Text1: TX_ASM CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD jr z, .asm_4a02f - and $81 ; CheckEitherEventSetReuseA EVENT_GOT_DOME_FOSSIL, EVENT_GOT_HELIX_FOSSIL + ; CheckEitherEventSetReuseA EVENT_GOT_DOME_FOSSIL, EVENT_GOT_HELIX_FOSSIL + and (1 << (EVENT_GOT_DOME_FOSSIL % 8)) | (1 << (EVENT_GOT_HELIX_FOSSIL % 8)) jr nz, .asm_4a057 ld hl, MtMoon3Text_4a116 call PrintText diff --git a/scripts/ssanne7.asm b/scripts/ssanne7.asm index 06789cd5..1f53d1be 100755 --- a/scripts/ssanne7.asm +++ b/scripts/ssanne7.asm @@ -45,11 +45,11 @@ SSAnne7RubText: TX_FAR _SSAnne7RubText TX_ASM ld a, [wAudioROMBank] - cp AUDIO_3 + cp BANK(AudioEngine3) ld [wAudioSavedROMBank], a jr nz, .asm_61908 call StopAllMusic - ld a, Bank(Music_PkmnHealed) + ld a, BANK(Music_PkmnHealed) ld [wAudioROMBank], a .asm_61908 ld a, MUSIC_PKMN_HEALED |