This commit is contained in:
dannye 2022-12-28 17:38:38 -06:00
commit 3f691fcb21
970 changed files with 15106 additions and 11361 deletions

3
.gitattributes vendored
View file

@ -15,3 +15,6 @@
*.wav binary
*.blk binary
*.pic binary
# Declare files that will always have CRLF line endings on checkout.
*.patch.template text eol=crlf linguist-language=INI

4
.github/ISSUE_TEMPLATE/blank_issue.md vendored Normal file
View file

@ -0,0 +1,4 @@
---
name: Update to pokered
about: Suggest a possible change to pokered itself.
---

5
.github/ISSUE_TEMPLATE/config.yml vendored Normal file
View file

@ -0,0 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: pret Discord
url: https://discord.gg/d5dubZ3
about: If you need help with using pokered, or just have general questions about it, ask in our Discord server!

13
.github/webhook.sh vendored Executable file
View file

@ -0,0 +1,13 @@
#!/bin/sh
set -e
# Report unnamed symbols
content="$(tools/unnamed.py -r . pokered.sym | head)"
curl -H 'Content-Type: application/json' -X POST "$DISCORD_WEBHOOK_URL" -d@- << EOF
{
"username": "OK",
"avatar_url": "https://i.imgur.com/38BQHdd.png",
"content": "\`\`\`$(echo "$content" | sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g')\`\`\`"
}
EOF

77
.github/workflows/main.yml vendored Normal file
View file

@ -0,0 +1,77 @@
name: CI
on:
push:
branches: [ master ]
pull_request:
jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@master
- name: Checkout rgbds
uses: actions/checkout@master
with:
path: rgbds
ref: v0.6.1
repository: gbdev/rgbds
- name: Install rgbds
working-directory: rgbds
run: |
sudo make install
- name: Remove rgbds
run: |
rm -rf rgbds
- name: Compare
if: ${{ github.repository_owner == 'pret' }}
run: |
make DEBUG=1 -j$(nproc) compare
if ! git diff-index --quiet HEAD --; then
echo 'Uncommitted changes detected:'
git diff-index HEAD --
return 1
fi
- name: Make
if: ${{ github.repository_owner != 'pret' }}
run: |
make -j$(nproc)
if ! git diff-index --quiet HEAD --; then
echo 'Uncommitted changes detected:'
git diff-index HEAD --
return 1
fi
- name: Discord webhook
if: ${{ github.event_name == 'push' && github.repository_owner == 'pret' }}
env:
DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
run: |
.github/webhook.sh
- name: Checkout symbols
if: ${{ github.event_name == 'push' && github.repository_owner == 'pret' }}
uses: actions/checkout@master
with:
path: symbols
ref: symbols
- name: Move symbols
if: ${{ github.event_name == 'push' && github.repository_owner == 'pret' }}
run: |
cp -v *.sym symbols/
- name: Update symbols
if: ${{ github.event_name == 'push' && github.repository_owner == 'pret' }}
uses: EndBug/add-and-commit@v7
with:
branch: symbols
cwd: "./symbols"
add: "*.sym"
message: ${{ github.event.commits[0].message }}

1
.gitignore vendored
View file

@ -9,6 +9,7 @@
# compiled roms
*.gbc
*.gb
*.patch
# rgbds extras
*.map

View file

@ -1,28 +0,0 @@
language: c
os:
- linux
- osx
install:
- |-
( cd
git clone -b v0.4.2 --depth=1 https://github.com/gbdev/rgbds
sudo make -C rgbds install
rm -rf rgbds
)
before_script:
- |-
function check_status() {
if ! git diff-index --quiet --ignore-submodules=all HEAD --; then
echo 'Uncommitted changes detected:';
git diff-index HEAD --;
return 1;
fi;
}
script:
- make DEBUG=1 -j2 compare
- check_status
after_success:
- |-
if [ "$TRAVIS_BRANCH" = master -a "$TRAVIS_PULL_REQUEST" = false -a "$TRAVIS_OS_NAME" = linux ]; then
./.travis/webhook.sh
fi

View file

@ -1,15 +0,0 @@
#!/bin/sh
set -e
root="$(readlink -e "$(dirname "$0")/..")"
# Report unnamed symbols
content="$("$root/tools/unnamed.py" -r "$root" "$root/pokered.sym" | head)"
curl -H 'Content-Type: application/json' -X POST "$POKERED_DISCORD_WEBHOOK_URL" -d@- << EOF
{
"username": "$POKERED_DISCORD_WEBHOOK_USERNAME",
"avatar_url": "$POKERED_DISCORD_WEBHOOK_AVATAR_URL",
"content": "\`\`\`$(echo "$content" | sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g')\`\`\`"
}
EOF

View file

@ -42,9 +42,9 @@ Run setup and leave the default settings. At the "**Select Packages**" step, cho
Double click on the text that says "**Skip**" next to each package to select the most recent version to install.
Then follow the [**rgbds** install instructions](https://rgbds.gbdev.io/install/windows) for Windows with Cygwin to install **rgbds 0.4.2**.
Then follow the [**rgbds** install instructions](https://rgbds.gbdev.io/install#pre-built) for Windows with Cygwin to install **rgbds 0.6.1**.
**Note:** If you already have an older rgbds, you will need to update to 0.4.2. Ignore this if you have never installed rgbds before. If a version newer than 0.4.2 does not work, try downloading 0.4.2.
**Note:** If you already have an installed rgbds older than 0.6.0, you will need to update to 0.6.0 or 0.6.1. Ignore this if you have never installed rgbds before. If a version newer than 0.6.1 does not work, try downloading 0.6.1.
Now open the **Cygwin terminal** and enter the following commands.
@ -67,7 +67,7 @@ Install [**Homebrew**](https://brew.sh/). Follow the official instructions.
Open **Terminal** and prepare to enter commands.
Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/macos) for macOS to install **rgbds 0.4.2**.
Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#pre-built) for macOS to install **rgbds 0.6.1**.
Now you're ready to [build **pokered**](#build-pokered).
@ -84,7 +84,7 @@ To install the software required for **pokered**:
sudo apt-get install make gcc git
```
Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.4.2** from source.
Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.6.1** from source.
### OpenSUSE
@ -94,7 +94,7 @@ To install the software required for **pokered**:
sudo zypper install make gcc git
```
Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.4.2** from source.
Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.6.1** from source.
### Arch Linux
@ -104,9 +104,9 @@ To install the software required for **pokered**:
sudo pacman -S make gcc git
```
Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/arch) for Arch Linux to install **rgbds 0.4.2**.
Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#pre-built) for Arch Linux to install **rgbds 0.6.1**.
If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.4.2** from source.
If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.6.1** from source.
### Termux
@ -122,7 +122,7 @@ To install **rgbds**:
sudo apt install rgbds
```
If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.4.2** from source.
If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.6.1** from source.
### Other distros
@ -133,7 +133,7 @@ If your distro is not listed here, try to find the required software in its repo
- `git`
- `rgbds`
If `rgbds` is not available, you'll need to follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.4.2** from source.
If `rgbds` is not available, you'll need to follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.6.1** from source.
Now you're ready to [build **pokered**](#build-pokered).
@ -152,3 +152,11 @@ To build **pokered.gbc** and **pokeblue.gbc**:
```bash
make
```
### Build with a local rgbds version
If you have different projects that require different versions of `rgbds`, it might not be convenient to install rgbds 0.6.1 globally. Instead, you can put its files in a directory within pokered, such as `pokered/rgbds-0.6.1/`. Then specify it when you run `make`:
```bash
make RGBDS=rgbds-0.6.1/
```

105
Makefile
View file

@ -1,19 +1,27 @@
roms := pokered.gbc pokeblue.gbc pokeblue_debug.gbc
roms := \
pokered.gbc \
pokeblue.gbc \
pokeblue_debug.gbc
patches := \
pokered.patch \
pokeblue.patch
rom_obj := \
audio.o \
home.o \
main.o \
maps.o \
text.o \
wram.o \
gfx/pics.o \
gfx/sprites.o \
gfx/tilesets.o
audio.o \
home.o \
main.o \
maps.o \
ram.o \
text.o \
gfx/pics.o \
gfx/sprites.o \
gfx/tilesets.o
pokered_obj := $(rom_obj:.o=_red.o)
pokeblue_obj := $(rom_obj:.o=_blue.o)
pokeblue_debug_obj := $(rom_obj:.o=_blue_debug.o)
pokered_vc_obj := $(rom_obj:.o=_red_vc.o)
pokeblue_vc_obj := $(rom_obj:.o=_blue_vc.o)
### Build tools
@ -43,22 +51,41 @@ all: $(roms)
red: pokered.gbc
blue: pokeblue.gbc
blue_debug: pokeblue_debug.gbc
red_vc: pokered.patch
blue_vc: pokeblue.patch
clean: tidy
find gfx \( -iname '*.1bpp' -o -iname '*.2bpp' -o -iname '*.pic' \) -delete
find gfx \
\( -iname '*.1bpp' \
-o -iname '*.2bpp' \
-o -iname '*.pic' \) \
-delete
tidy:
rm -f $(roms) $(pokered_obj) $(pokeblue_obj) $(pokeblue_debug_obj) $(roms:.gbc=.map) $(roms:.gbc=.sym) rgbdscheck.o
$(RM) $(roms) \
$(roms:.gbc=.sym) \
$(roms:.gbc=.map) \
$(patches) \
$(patches:.patch=_vc.gbc) \
$(patches:.patch=_vc.sym) \
$(patches:.patch=_vc.map) \
$(patches:%.patch=vc/%.constants.sym) \
$(pokered_obj) \
$(pokeblue_obj) \
$(pokered_vc_obj) \
$(pokeblue_vc_obj) \
$(pokeblue_debug_obj) \
rgbdscheck.o
$(MAKE) clean -C tools/
compare: $(roms)
compare: $(roms) $(patches)
@$(SHA1) -c roms.sha1
tools:
$(MAKE) -C tools/
RGBASMFLAGS = -h -L -Weverything
RGBASMFLAGS = -hL -Q8 -P includes.asm -Weverything -Wnumeric-string=2 -Wtruncation=1
# Create a sym/map for debug purposes if `make` run with `DEBUG=1`
ifeq ($(DEBUG),1)
RGBASMFLAGS += -E
@ -67,28 +94,40 @@ endif
$(pokered_obj): RGBASMFLAGS += -D _RED
$(pokeblue_obj): RGBASMFLAGS += -D _BLUE
$(pokeblue_debug_obj): RGBASMFLAGS += -D _BLUE -D _DEBUG
$(pokered_vc_obj): RGBASMFLAGS += -D _RED -D _RED_VC
$(pokeblue_vc_obj): RGBASMFLAGS += -D _BLUE -D _BLUE_VC
%.patch: vc/%.constants.sym %_vc.gbc %.gbc vc/%.patch.template
tools/make_patch $*_vc.sym $^ $@
rgbdscheck.o: rgbdscheck.asm
$(RGBASM) -o $@ $<
# The dep rules have to be explicit or else missing files won't be reported.
# As a side effect, they're evaluated immediately instead of when the rule is invoked.
# It doesn't look like $(shell) can be deferred so there might not be a better way.
define DEP
$1: $2 $$(shell tools/scan_includes $2) | rgbdscheck.o
$$(RGBASM) $$(RGBASMFLAGS) -o $$@ $$<
endef
# Build tools when building the rom.
# This has to happen before the rules are processed, since that's when scan_includes is run.
ifeq (,$(filter clean tidy tools,$(MAKECMDGOALS)))
$(info $(shell $(MAKE) -C tools))
# The dep rules have to be explicit or else missing files won't be reported.
# As a side effect, they're evaluated immediately instead of when the rule is invoked.
# It doesn't look like $(shell) can be deferred so there might not be a better way.
preinclude_deps := includes.asm $(shell tools/scan_includes includes.asm)
define DEP
$1: $2 $$(shell tools/scan_includes $2) $(preinclude_deps) | rgbdscheck.o
$$(RGBASM) $$(RGBASMFLAGS) -o $$@ $$<
endef
# Dependencies for objects (drop _red and _blue from asm file basenames)
$(foreach obj, $(pokered_obj), $(eval $(call DEP,$(obj),$(obj:_red.o=.asm))))
$(foreach obj, $(pokeblue_obj), $(eval $(call DEP,$(obj),$(obj:_blue.o=.asm))))
$(foreach obj, $(pokeblue_debug_obj), $(eval $(call DEP,$(obj),$(obj:_blue_debug.o=.asm))))
$(foreach obj, $(pokered_vc_obj), $(eval $(call DEP,$(obj),$(obj:_red_vc.o=.asm))))
$(foreach obj, $(pokeblue_vc_obj), $(eval $(call DEP,$(obj),$(obj:_blue_vc.o=.asm))))
# Dependencies for VC files that need to run scan_includes
%.constants.sym: %.constants.asm $(shell tools/scan_includes %.constants.asm) $(preinclude_deps) | rgbdscheck.o
$(RGBASM) $(RGBASMFLAGS) $< > $@
endif
@ -98,11 +137,15 @@ endif
pokered_pad = 0x00
pokeblue_pad = 0x00
pokered_vc_pad = 0x00
pokeblue_vc_pad = 0x00
pokeblue_debug_pad = 0xff
pokered_opt = -jsv -n 0 -k 01 -l 0x33 -m 0x13 -r 03 -t "POKEMON RED"
pokeblue_opt = -jsv -n 0 -k 01 -l 0x33 -m 0x13 -r 03 -t "POKEMON BLUE"
pokeblue_debug_opt = -jsv -n 0 -k 01 -l 0x33 -m 0x13 -r 03 -t "POKEMON BLUE"
pokered_vc_opt = -jsv -n 0 -k 01 -l 0x33 -m 0x13 -r 03 -t "POKEMON RED"
pokeblue_vc_opt = -jsv -n 0 -k 01 -l 0x33 -m 0x13 -r 03 -t "POKEMON BLUE"
%.gbc: $$(%_obj) layout.link
$(RGBLINK) -p $($*_pad) -d -m $*.map -n $*.sym -l layout.link -o $@ $(filter %.o,$^)
@ -111,16 +154,16 @@ pokeblue_debug_opt = -jsv -n 0 -k 01 -l 0x33 -m 0x13 -r 03 -t "POKEMON BLUE"
### Misc file-specific graphics rules
gfx/battle/attack_anim_1.2bpp: tools/gfx += --trim-whitespace
gfx/battle/attack_anim_2.2bpp: tools/gfx += --trim-whitespace
gfx/battle/move_anim_0.2bpp: tools/gfx += --trim-whitespace
gfx/battle/move_anim_1.2bpp: tools/gfx += --trim-whitespace
gfx/intro/blue_jigglypuff_1.2bpp: rgbgfx += -h
gfx/intro/blue_jigglypuff_2.2bpp: rgbgfx += -h
gfx/intro/blue_jigglypuff_3.2bpp: rgbgfx += -h
gfx/intro/red_nidorino_1.2bpp: rgbgfx += -h
gfx/intro/red_nidorino_2.2bpp: rgbgfx += -h
gfx/intro/red_nidorino_3.2bpp: rgbgfx += -h
gfx/intro/gengar.2bpp: rgbgfx += -h
gfx/intro/blue_jigglypuff_1.2bpp: rgbgfx += -Z
gfx/intro/blue_jigglypuff_2.2bpp: rgbgfx += -Z
gfx/intro/blue_jigglypuff_3.2bpp: rgbgfx += -Z
gfx/intro/red_nidorino_1.2bpp: rgbgfx += -Z
gfx/intro/red_nidorino_2.2bpp: rgbgfx += -Z
gfx/intro/red_nidorino_3.2bpp: rgbgfx += -Z
gfx/intro/gengar.2bpp: rgbgfx += -Z
gfx/intro/gengar.2bpp: tools/gfx += --remove-duplicates --preserve=0x19,0x76
gfx/credits/the_end.2bpp: tools/gfx += --interleave --png=$<

View file

@ -1,4 +1,4 @@
# Pokémon Red and Blue [![Build Status][travis-badge]][travis]
# Pokémon Red and Blue [![Build Status][ci-badge]][ci]
This is a disassembly of Pokémon Red and Blue.
@ -7,14 +7,18 @@ It builds the following ROMs:
- Pokemon Red (UE) [S][!].gb `sha1: ea9bcae617fdf159b045185467ae58b2e4a48b9a`
- Pokemon Blue (UE) [S][!].gb `sha1: d7037c83e1ae5b39bde3c30787637ba1d4c48ce2`
- BLUEMONS.GB (debug build) `sha1: 5b1456177671b79b263c614ea0e7cc9ac542e9c4`
- dmgapae0.e69.patch `sha1: 0fb5f743696adfe1dbb2e062111f08f9bc5a293a`
- dmgapee0.e68.patch `sha1: ed4be94dc29c64271942c87f2157bca9ca1019c7`
To set up the repository, see [**INSTALL.md**](INSTALL.md).
## See also
- [**Wiki**][wiki] (includes [tutorials][tutorials])
- [**Symbols**][symbols]
- **Discord:** [pret][discord]
- **IRC:** [freenode#pret][irc]
- **IRC:** [libera#pret][irc]
Other disassembly projects:
@ -35,7 +39,10 @@ Other disassembly projects:
[pokeruby]: https://github.com/pret/pokeruby
[pokefirered]: https://github.com/pret/pokefirered
[pokeemerald]: https://github.com/pret/pokeemerald
[wiki]: https://github.com/pret/pokered/wiki
[tutorials]: https://github.com/pret/pokered/wiki/Tutorials
[symbols]: https://github.com/pret/pokered/tree/symbols
[discord]: https://discord.gg/d5dubZ3
[irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret
[travis]: https://travis-ci.org/pret/pokered
[travis-badge]: https://travis-ci.org/pret/pokered.svg?branch=master
[irc]: https://web.libera.chat/?#pret
[ci]: https://github.com/pret/pokered/actions
[ci-badge]: https://github.com/pret/pokered/actions/workflows/main.yml/badge.svg

View file

@ -1,4 +1,3 @@
INCLUDE "constants.asm"
INCLUDE "crysaudio/macros.asm"
INCLUDE "crysaudio/audio_constants.asm"
INCLUDE "crysaudio/cry_constants.asm"

View file

@ -4,13 +4,13 @@ Music_RivalAlternateStart::
ld a, MUSIC_MEET_RIVAL
call PlayMusic
ld hl, wChannel1MusicAddress
ld de, Music_MeetRival_branch_b1a2
ld de, Music_MeetRival_Ch1_AlternateStart
call Audio1_OverwriteChannelPointer
ld hl, wChannel2MusicAddress
ld de, Music_MeetRival_branch_b21d
ld de, Music_MeetRival_Ch2_AlternateStart
call Audio1_OverwriteChannelPointer
ld hl, wChannel3MusicAddress
ld de, Music_MeetRival_branch_b2b5
ld de, Music_MeetRival_Ch3_AlternateStart
Audio1_OverwriteChannelPointer:
ld a, e
@ -25,14 +25,14 @@ Music_RivalAlternateTempo::
ld a, MUSIC_MEET_RIVAL
call PlayMusic
ld hl, wChannel1MusicAddress
ld de, Music_MeetRival_branch_b119
ld de, Music_MeetRival_Ch1_AlternateTempo
jp Audio1_OverwriteChannelPointer
; applies both the alternate start and alternate tempo
Music_RivalAlternateStartAndTempo::
call Music_RivalAlternateStart
ld hl, wChannel1MusicAddress
ld de, Music_MeetRival_branch_b19b
ld de, Music_MeetRival_Ch1_AlternateStartAndTempo
jp Audio1_OverwriteChannelPointer
; an alternate tempo for Cities1 which is used for the Hall of Fame room
@ -47,5 +47,5 @@ Music_Cities1AlternateTempo::
ld a, MUSIC_CITIES1
call PlayMusic
ld hl, wChannel1MusicAddress
ld de, Music_Cities1_branch_aa6f
ld de, Music_Cities1_Ch1_AlternateTempo
jp Audio1_OverwriteChannelPointer

View file

@ -1,7 +1,7 @@
; The first of three duplicated sound engines.
Audio1_UpdateMusic::
ld c, Ch1
ld c, CHAN1
.loop
ld b, 0
ld hl, wChannelSoundIDs
@ -10,7 +10,7 @@ Audio1_UpdateMusic::
and a
jr z, .nextChannel
ld a, c
cp Ch5
cp CHAN5
jr nc, .applyAffects ; if sfx channel
ld a, [wMuteAudioAndPauseMusic]
and a
@ -30,7 +30,7 @@ Audio1_UpdateMusic::
.nextChannel
ld a, c
inc c ; inc channel number
cp Ch8
cp CHAN8
jr nz, .loop
ret
@ -46,9 +46,9 @@ Audio1_ApplyMusicAffects:
dec a ; otherwise, decrease the delay timer
ld [hl], a
ld a, c
cp Ch5
cp CHAN5
jr nc, .startChecks ; if a sfx channel
ld hl, wChannelSoundIDs + Ch5
ld hl, wChannelSoundIDs + CHAN5
add hl, bc
ld a, [hl]
and a
@ -171,7 +171,7 @@ Audio1_sound_ret:
bit BIT_SOUND_CALL, [hl]
jr nz, .returnFromCall
ld a, c
cp Ch4
cp CHAN4
jr nc, .noiseOrSfxChannel
jr .disableChannelOutput
.noiseOrSfxChannel
@ -179,7 +179,7 @@ Audio1_sound_ret:
ld hl, wChannelFlags2
add hl, bc
res BIT_EXECUTE_MUSIC, [hl]
cp Ch7
cp CHAN7
jr nz, .skipSfxChannel3
; restart hardware channel 3 (wave channel) output
ld a, $0
@ -223,19 +223,19 @@ Audio1_sound_ret:
and [hl]
ldh [rNR51], a
.afterDisable
ld a, [wChannelSoundIDs + Ch5]
ld a, [wChannelSoundIDs + CHAN5]
cp CRY_SFX_START
jr nc, .maybeCry
jr .skipCry
.maybeCry
ld a, [wChannelSoundIDs + Ch5]
ld a, [wChannelSoundIDs + CHAN5]
cp CRY_SFX_END
jr z, .skipCry
jr c, .cry
jr .skipCry
.cry
ld a, c
cp Ch5
cp CHAN5
jr z, .skipRewind
call Audio1_GoBackOneCommandIfCry
ret c
@ -336,14 +336,14 @@ Audio1_note_type:
add hl, bc
ld [hl], a ; store low nibble as speed
ld a, c
cp Ch4
cp CHAN4
jr z, .noiseChannel ; noise channel has 0 params
call Audio1_GetNextMusicByte
ld d, a
ld a, c
cp Ch3
cp CHAN3
jr z, .musicChannel3
cp Ch7
cp CHAN7
jr nz, .skipChannel3
ld hl, wSfxWaveInstrument
jr .channel3
@ -477,7 +477,7 @@ Audio1_tempo:
cp tempo_cmd
jr nz, Audio1_stereo_panning
ld a, c
cp Ch5
cp CHAN5
jr nc, .sfxChannel
call Audio1_GetNextMusicByte
ld [wMusicTempo], a ; store first param
@ -520,10 +520,10 @@ Audio1_unknownmusic0xef:
ld a, [wDisableChannelOutputWhenSfxEnds]
and a
jr nz, .skip
ld a, [wChannelSoundIDs + Ch8]
ld a, [wChannelSoundIDs + CHAN8]
ld [wDisableChannelOutputWhenSfxEnds], a
xor a
ld [wChannelSoundIDs + Ch8], a
ld [wChannelSoundIDs + CHAN8], a
.skip
jp Audio1_sound_ret
@ -577,7 +577,7 @@ Audio1_sfx_note:
cp sfx_note_cmd
jr nz, Audio1_pitch_sweep
ld a, c
cp Ch4 ; is this a noise or sfx channel?
cp CHAN4 ; is this a noise or sfx channel?
jr c, Audio1_pitch_sweep ; no
ld b, 0
ld hl, wChannelFlags2
@ -607,7 +607,7 @@ Audio1_sfx_note:
call Audio1_GetNextMusicByte
ld e, a
ld a, c
cp Ch8
cp CHAN8
ld a, 0
jr z, .skip
; Channels 1 through 3 have 2 registers that control frequency, but the noise
@ -627,7 +627,7 @@ Audio1_sfx_note:
Audio1_pitch_sweep:
ld a, c
cp Ch5
cp CHAN5
jr c, Audio1_note ; if not a sfx
ld a, d
cp pitch_sweep_cmd
@ -643,7 +643,7 @@ Audio1_pitch_sweep:
Audio1_note:
ld a, c
cp Ch4
cp CHAN4
jr nz, Audio1_note_length ; if not noise channel
ld a, d
and $f0
@ -701,7 +701,7 @@ Audio1_note_length:
ld l, b
call Audio1_MultiplyAdd
ld a, c
cp Ch5
cp CHAN5
jr nc, .sfxChannel
ld a, [wMusicTempo]
ld d, a
@ -711,7 +711,7 @@ Audio1_note_length:
.sfxChannel
ld d, $1
ld e, $0
cp Ch8
cp CHAN8
jr z, .skip ; if noise channel
call Audio1_SetSfxTempo
ld a, [wSfxTempo]
@ -751,10 +751,10 @@ Audio1_note_pitch:
cp rest_cmd
jr nz, .notRest
ld a, c
cp Ch5
cp CHAN5
jr nc, .next
; If this isn't an SFX channel, try the corresponding SFX channel.
ld hl, wChannelSoundIDs + Ch5
ld hl, wChannelSoundIDs + CHAN5
add hl, bc
ld a, [hl]
and a
@ -762,9 +762,9 @@ Audio1_note_pitch:
; fall through
.next
ld a, c
cp Ch3
cp CHAN3
jr z, .channel3
cp Ch7
cp CHAN7
jr nz, .notChannel3
.channel3
ld b, 0
@ -800,10 +800,10 @@ Audio1_note_pitch:
.skipPitchSlide
push de
ld a, c
cp Ch5
cp CHAN5
jr nc, .sfxChannel ; if sfx channel
; If this isn't an SFX channel, try the corresponding SFX channel.
ld hl, wChannelSoundIDs + Ch5
ld hl, wChannelSoundIDs + CHAN5
ld d, 0
ld e, a
add hl, de
@ -848,12 +848,12 @@ Audio1_EnableChannelOutput:
or [hl] ; set this channel's bits
ld d, a
ld a, c
cp Ch8
cp CHAN8
jr z, .noiseChannelOrNoSfx
cp Ch5
cp CHAN5
jr nc, .skip ; if sfx channel
; If this isn't an SFX channel, try the corresponding SFX channel.
ld hl, wChannelSoundIDs + Ch5
ld hl, wChannelSoundIDs + CHAN5
add hl, bc
ld a, [hl]
and a
@ -883,9 +883,9 @@ Audio1_ApplyDutyCycleAndSoundLength:
add hl, bc
ld d, [hl]
ld a, c
cp Ch3
cp CHAN3
jr z, .skipDuty ; if music channel 3
cp Ch7
cp CHAN7
jr z, .skipDuty ; if sfx channel 3
; include duty cycle (except on channel 3 which doesn't have it)
ld a, d
@ -904,15 +904,15 @@ Audio1_ApplyDutyCycleAndSoundLength:
Audio1_ApplyWavePatternAndFrequency:
ld a, c
cp Ch3
cp CHAN3
jr z, .channel3
cp Ch7
cp CHAN7
jr nz, .notChannel3
; fall through
.channel3
push de
ld de, wMusicWaveInstrument
cp Ch3
cp CHAN3
jr z, .next
ld de, wSfxWaveInstrument
.next
@ -1016,7 +1016,7 @@ Audio1_GoBackOneCommandIfCry:
Audio1_IsCry:
; Returns whether the currently playing audio is a cry in carry.
ld a, [wChannelSoundIDs + Ch5]
ld a, [wChannelSoundIDs + CHAN5]
cp CRY_SFX_START
jr nc, .next
jr .no
@ -1453,7 +1453,7 @@ Audio1_PlaySound::
and a
jr z, .playChannel
ld a, e
cp Ch8
cp CHAN8
jr nz, .notNoiseChannel
ld a, [wSoundID]
cp NOISE_INSTRUMENTS_END
@ -1552,7 +1552,7 @@ Audio1_PlaySound::
add hl, de
ld [hl], a
ld a, e
cp Ch5
cp CHAN5
jr nz, .skipSweepDisable
ld a, $8
ldh [rNR10], a ; sweep off
@ -1654,7 +1654,7 @@ Audio1_PlaySound::
ld a, [wSoundID]
ld [hl], a
pop af
cp Ch4
cp CHAN4
jr c, .skipSettingFlag
ld hl, wChannelFlags1
add hl, bc
@ -1686,12 +1686,12 @@ Audio1_PlaySound::
jr c, .cry
jr .done
.cry
ld hl, wChannelSoundIDs + Ch5
ld hl, wChannelSoundIDs + CHAN5
ld [hli], a
ld [hli], a
ld [hli], a
ld [hl], a
ld hl, wChannelCommandPointers + Ch7 * 2 ; sfx wave channel pointer
ld hl, wChannelCommandPointers + CHAN7 * 2 ; sfx wave channel pointer
ld de, Audio1_CryRet
ld [hl], e
inc hl

View file

@ -3,7 +3,7 @@
; and the low health alarm that plays in battle
Audio2_UpdateMusic::
ld c, Ch1
ld c, CHAN1
.loop
ld b, 0
ld hl, wChannelSoundIDs
@ -12,7 +12,7 @@ Audio2_UpdateMusic::
and a
jr z, .nextChannel
ld a, c
cp Ch5
cp CHAN5
jr nc, .applyAffects ; if sfx channel
ld a, [wMuteAudioAndPauseMusic]
and a
@ -32,7 +32,7 @@ Audio2_UpdateMusic::
.nextChannel
ld a, c
inc c ; inc channel number
cp Ch8
cp CHAN8
jr nz, .loop
ret
@ -48,9 +48,9 @@ Audio2_ApplyMusicAffects:
dec a ; otherwise, decrease the delay timer
ld [hl], a
ld a, c
cp Ch5
cp CHAN5
jr nc, .startChecks ; if a sfx channel
ld hl, wChannelSoundIDs + Ch5
ld hl, wChannelSoundIDs + CHAN5
add hl, bc
ld a, [hl]
and a
@ -161,7 +161,7 @@ Audio2_PlayNextNote:
res BIT_PITCH_SLIDE_DECREASING, [hl]
; --- this section is only present in this copy of the sound engine
ld a, c
cp Ch5
cp CHAN5
jr nz, .beginChecks
ld a, [wLowHealthAlarm] ; low health alarm enabled?
bit 7, a
@ -182,7 +182,7 @@ Audio2_sound_ret:
bit BIT_SOUND_CALL, [hl]
jr nz, .returnFromCall
ld a, c
cp Ch4
cp CHAN4
jr nc, .noiseOrSfxChannel
jr .disableChannelOutput
.noiseOrSfxChannel
@ -190,7 +190,7 @@ Audio2_sound_ret:
ld hl, wChannelFlags2
add hl, bc
res BIT_EXECUTE_MUSIC, [hl]
cp Ch7
cp CHAN7
jr nz, .skipSfxChannel3
; restart hardware channel 3 (wave channel) output
ld a, $0
@ -234,19 +234,19 @@ Audio2_sound_ret:
and [hl]
ldh [rNR51], a
.afterDisable
ld a, [wChannelSoundIDs + Ch5]
ld a, [wChannelSoundIDs + CHAN5]
cp CRY_SFX_START
jr nc, .maybeCry
jr .skipCry
.maybeCry
ld a, [wChannelSoundIDs + Ch5]
ld a, [wChannelSoundIDs + CHAN5]
cp CRY_SFX_END
jr z, .skipCry
jr c, .cry
jr .skipCry
.cry
ld a, c
cp Ch5
cp CHAN5
jr z, .skipRewind
call Audio2_GoBackOneCommandIfCry
ret c
@ -347,14 +347,14 @@ Audio2_note_type:
add hl, bc
ld [hl], a ; store low nibble as speed
ld a, c
cp Ch4
cp CHAN4
jr z, .noiseChannel ; noise channel has 0 params
call Audio2_GetNextMusicByte
ld d, a
ld a, c
cp Ch3
cp CHAN3
jr z, .musicChannel3
cp Ch7
cp CHAN7
jr nz, .skipChannel3
ld hl, wSfxWaveInstrument
jr .channel3
@ -488,7 +488,7 @@ Audio2_tempo:
cp tempo_cmd
jr nz, Audio2_stereo_panning
ld a, c
cp Ch5
cp CHAN5
jr nc, .sfxChannel
call Audio2_GetNextMusicByte
ld [wMusicTempo], a ; store first param
@ -531,10 +531,10 @@ Audio2_unknownmusic0xef:
ld a, [wDisableChannelOutputWhenSfxEnds]
and a
jr nz, .skip
ld a, [wChannelSoundIDs + Ch8]
ld a, [wChannelSoundIDs + CHAN8]
ld [wDisableChannelOutputWhenSfxEnds], a
xor a
ld [wChannelSoundIDs + Ch8], a
ld [wChannelSoundIDs + CHAN8], a
.skip
jp Audio2_sound_ret
@ -588,7 +588,7 @@ Audio2_sfx_note:
cp sfx_note_cmd
jr nz, Audio2_pitch_sweep
ld a, c
cp Ch4 ; is this a noise or sfx channel?
cp CHAN4 ; is this a noise or sfx channel?
jr c, Audio2_pitch_sweep ; no
ld b, 0
ld hl, wChannelFlags2
@ -618,7 +618,7 @@ Audio2_sfx_note:
call Audio2_GetNextMusicByte
ld e, a
ld a, c
cp Ch8
cp CHAN8
ld a, 0
jr z, .skip
; Channels 1 through 3 have 2 registers that control frequency, but the noise
@ -638,7 +638,7 @@ Audio2_sfx_note:
Audio2_pitch_sweep:
ld a, c
cp Ch5
cp CHAN5
jr c, Audio2_note ; if not a sfx
ld a, d
cp pitch_sweep_cmd
@ -654,7 +654,7 @@ Audio2_pitch_sweep:
Audio2_note:
ld a, c
cp Ch4
cp CHAN4
jr nz, Audio2_note_length ; if not noise channel
ld a, d
and $f0
@ -712,7 +712,7 @@ Audio2_note_length:
ld l, b
call Audio2_MultiplyAdd
ld a, c
cp Ch5
cp CHAN5
jr nc, .sfxChannel
ld a, [wMusicTempo]
ld d, a
@ -722,7 +722,7 @@ Audio2_note_length:
.sfxChannel
ld d, $1
ld e, $0
cp Ch8
cp CHAN8
jr z, .skip ; if noise channel
call Audio2_SetSfxTempo
ld a, [wSfxTempo]
@ -762,10 +762,10 @@ Audio2_note_pitch:
cp rest_cmd
jr nz, .notRest
ld a, c
cp Ch5
cp CHAN5
jr nc, .next
; If this isn't an SFX channel, try the corresponding SFX channel.
ld hl, wChannelSoundIDs + Ch5
ld hl, wChannelSoundIDs + CHAN5
add hl, bc
ld a, [hl]
and a
@ -773,9 +773,9 @@ Audio2_note_pitch:
; fall through
.next
ld a, c
cp Ch3
cp CHAN3
jr z, .channel3
cp Ch7
cp CHAN7
jr nz, .notChannel3
.channel3
ld b, 0
@ -811,10 +811,10 @@ Audio2_note_pitch:
.skipPitchSlide
push de
ld a, c
cp Ch5
cp CHAN5
jr nc, .sfxChannel ; if sfx channel
; If this isn't an SFX channel, try the corresponding SFX channel.
ld hl, wChannelSoundIDs + Ch5
ld hl, wChannelSoundIDs + CHAN5
ld d, 0
ld e, a
add hl, de
@ -859,12 +859,12 @@ Audio2_EnableChannelOutput:
or [hl] ; set this channel's bits
ld d, a
ld a, c
cp Ch8
cp CHAN8
jr z, .noiseChannelOrNoSfx
cp Ch5
cp CHAN5
jr nc, .skip ; if sfx channel
; If this isn't an SFX channel, try the corresponding SFX channel.
ld hl, wChannelSoundIDs + Ch5
ld hl, wChannelSoundIDs + CHAN5
add hl, bc
ld a, [hl]
and a
@ -894,9 +894,9 @@ Audio2_ApplyDutyCycleAndSoundLength:
add hl, bc
ld d, [hl]
ld a, c
cp Ch3
cp CHAN3
jr z, .skipDuty ; if music channel 3
cp Ch7
cp CHAN7
jr z, .skipDuty ; if sfx channel 3
; include duty cycle (except on channel 3 which doesn't have it)
ld a, d
@ -915,15 +915,15 @@ Audio2_ApplyDutyCycleAndSoundLength:
Audio2_ApplyWavePatternAndFrequency:
ld a, c
cp Ch3
cp CHAN3
jr z, .channel3
cp Ch7
cp CHAN7
jr nz, .notChannel3
; fall through
.channel3
push de
ld de, wMusicWaveInstrument
cp Ch3
cp CHAN3
jr z, .next
ld de, wSfxWaveInstrument
.next
@ -963,7 +963,7 @@ Audio2_ApplyWavePatternAndFrequency:
ld [hl], d ; store frequency high byte
; --- this section is only present in this copy of the sound engine
ld a, c
cp Ch5
cp CHAN5
jr c, .musicChannel
call Audio2_ApplyFrequencyModifier
.musicChannel
@ -974,7 +974,7 @@ Audio2_ApplyWavePatternAndFrequency:
; unused
Audio2_ResetCryModifiers:
ld a, c
cp Ch5
cp CHAN5
jr nz, .skip
ld a, [wLowHealthAlarm]
bit 7, a
@ -1056,7 +1056,7 @@ Audio2_GoBackOneCommandIfCry:
Audio2_IsCry:
; Returns whether the currently playing audio is a cry in carry.
ld a, [wChannelSoundIDs + Ch5]
ld a, [wChannelSoundIDs + CHAN5]
cp CRY_SFX_START
jr nc, .next
jr .no
@ -1074,10 +1074,10 @@ Audio2_IsCry:
; --- this section is only present in this copy of the sound engine
Audio2_IsBattleSFX:
; Returns whether the currently playing audio is a cry in carry.
ld a, [wChannelSoundIDs + Ch8]
; Returns whether the currently playing audio is a battle sfx in carry.
ld a, [wChannelSoundIDs + CHAN8]
ld b, a
ld a, [wChannelSoundIDs + Ch5]
ld a, [wChannelSoundIDs + CHAN5]
or b
cp BATTLE_SFX_START
jr nc, .next
@ -1516,7 +1516,7 @@ Audio2_PlaySound::
and a
jr z, .playChannel
ld a, e
cp Ch8
cp CHAN8
jr nz, .notNoiseChannel
ld a, [wSoundID]
cp NOISE_INSTRUMENTS_END
@ -1615,7 +1615,7 @@ Audio2_PlaySound::
add hl, de
ld [hl], a
ld a, e
cp Ch5
cp CHAN5
jr nz, .skipSweepDisable
ld a, $8
ldh [rNR10], a ; sweep off
@ -1717,7 +1717,7 @@ Audio2_PlaySound::
ld a, [wSoundID]
ld [hl], a
pop af
cp Ch4
cp CHAN4
jr c, .skipSettingFlag
ld hl, wChannelFlags1
add hl, bc
@ -1749,12 +1749,12 @@ Audio2_PlaySound::
jr c, .cry
jr .done
.cry
ld hl, wChannelSoundIDs + Ch5
ld hl, wChannelSoundIDs + CHAN5
ld [hli], a
ld [hli], a
ld [hli], a
ld [hl], a
ld hl, wChannelCommandPointers + Ch7 * 2 ; sfx wave channel pointer
ld hl, wChannelCommandPointers + CHAN7 * 2 ; sfx wave channel pointer
ld de, Audio2_CryRet
ld [hl], e
inc hl

View file

@ -1,7 +1,7 @@
; The third of three duplicated sound engines.
Audio3_UpdateMusic::
ld c, Ch1
ld c, CHAN1
.loop
ld b, 0
ld hl, wChannelSoundIDs
@ -10,7 +10,7 @@ Audio3_UpdateMusic::
and a
jr z, .nextChannel
ld a, c
cp Ch5
cp CHAN5
jr nc, .applyAffects ; if sfx channel
ld a, [wMuteAudioAndPauseMusic]
and a
@ -30,7 +30,7 @@ Audio3_UpdateMusic::
.nextChannel
ld a, c
inc c ; inc channel number
cp Ch8
cp CHAN8
jr nz, .loop
ret
@ -46,9 +46,9 @@ Audio3_ApplyMusicAffects:
dec a ; otherwise, decrease the delay timer
ld [hl], a
ld a, c
cp Ch5
cp CHAN5
jr nc, .startChecks ; if a sfx channel
ld hl, wChannelSoundIDs + Ch5
ld hl, wChannelSoundIDs + CHAN5
add hl, bc
ld a, [hl]
and a
@ -171,7 +171,7 @@ Audio3_sound_ret:
bit BIT_SOUND_CALL, [hl]
jr nz, .returnFromCall
ld a, c
cp Ch4
cp CHAN4
jr nc, .noiseOrSfxChannel
jr .disableChannelOutput
.noiseOrSfxChannel
@ -179,7 +179,7 @@ Audio3_sound_ret:
ld hl, wChannelFlags2
add hl, bc
res BIT_EXECUTE_MUSIC, [hl]
cp Ch7
cp CHAN7
jr nz, .skipSfxChannel3
; restart hardware channel 3 (wave channel) output
ld a, $0
@ -223,19 +223,19 @@ Audio3_sound_ret:
and [hl]
ldh [rNR51], a
.afterDisable
ld a, [wChannelSoundIDs + Ch5]
ld a, [wChannelSoundIDs + CHAN5]
cp CRY_SFX_START
jr nc, .maybeCry
jr .skipCry
.maybeCry
ld a, [wChannelSoundIDs + Ch5]
ld a, [wChannelSoundIDs + CHAN5]
cp CRY_SFX_END
jr z, .skipCry
jr c, .cry
jr .skipCry
.cry
ld a, c
cp Ch5
cp CHAN5
jr z, .skipRewind
call Audio3_GoBackOneCommandIfCry
ret c
@ -336,14 +336,14 @@ Audio3_note_type:
add hl, bc
ld [hl], a ; store low nibble as speed
ld a, c
cp Ch4
cp CHAN4
jr z, .noiseChannel ; noise channel has 0 params
call Audio3_GetNextMusicByte
ld d, a
ld a, c
cp Ch3
cp CHAN3
jr z, .musicChannel3
cp Ch7
cp CHAN7
jr nz, .skipChannel3
ld hl, wSfxWaveInstrument
jr .channel3
@ -477,7 +477,7 @@ Audio3_tempo:
cp tempo_cmd
jr nz, Audio3_stereo_panning
ld a, c
cp Ch5
cp CHAN5
jr nc, .sfxChannel
call Audio3_GetNextMusicByte
ld [wMusicTempo], a ; store first param
@ -520,10 +520,10 @@ Audio3_unknownmusic0xef:
ld a, [wDisableChannelOutputWhenSfxEnds]
and a
jr nz, .skip
ld a, [wChannelSoundIDs + Ch8]
ld a, [wChannelSoundIDs + CHAN8]
ld [wDisableChannelOutputWhenSfxEnds], a
xor a
ld [wChannelSoundIDs + Ch8], a
ld [wChannelSoundIDs + CHAN8], a
.skip
jp Audio3_sound_ret
@ -577,7 +577,7 @@ Audio3_sfx_note:
cp sfx_note_cmd
jr nz, Audio3_pitch_sweep
ld a, c
cp Ch4 ; is this a noise or sfx channel?
cp CHAN4 ; is this a noise or sfx channel?
jr c, Audio3_pitch_sweep ; no
ld b, 0
ld hl, wChannelFlags2
@ -607,7 +607,7 @@ Audio3_sfx_note:
call Audio3_GetNextMusicByte
ld e, a
ld a, c
cp Ch8
cp CHAN8
ld a, 0
jr z, .skip
; Channels 1 through 3 have 2 registers that control frequency, but the noise
@ -627,7 +627,7 @@ Audio3_sfx_note:
Audio3_pitch_sweep:
ld a, c
cp Ch5
cp CHAN5
jr c, Audio3_note ; if not a sfx
ld a, d
cp pitch_sweep_cmd
@ -643,7 +643,7 @@ Audio3_pitch_sweep:
Audio3_note:
ld a, c
cp Ch4
cp CHAN4
jr nz, Audio3_note_length ; if not noise channel
ld a, d
and $f0
@ -701,7 +701,7 @@ Audio3_note_length:
ld l, b
call Audio3_MultiplyAdd
ld a, c
cp Ch5
cp CHAN5
jr nc, .sfxChannel
ld a, [wMusicTempo]
ld d, a
@ -711,7 +711,7 @@ Audio3_note_length:
.sfxChannel
ld d, $1
ld e, $0
cp Ch8
cp CHAN8
jr z, .skip ; if noise channel
call Audio3_SetSfxTempo
ld a, [wSfxTempo]
@ -751,10 +751,10 @@ Audio3_note_pitch:
cp rest_cmd
jr nz, .notRest
ld a, c
cp Ch5
cp CHAN5
jr nc, .next
; If this isn't an SFX channel, try the corresponding SFX channel.
ld hl, wChannelSoundIDs + Ch5
ld hl, wChannelSoundIDs + CHAN5
add hl, bc
ld a, [hl]
and a
@ -762,9 +762,9 @@ Audio3_note_pitch:
; fall through
.next
ld a, c
cp Ch3
cp CHAN3
jr z, .channel3
cp Ch7
cp CHAN7
jr nz, .notChannel3
.channel3
ld b, 0
@ -800,10 +800,10 @@ Audio3_note_pitch:
.skipPitchSlide
push de
ld a, c
cp Ch5
cp CHAN5
jr nc, .sfxChannel ; if sfx channel
; If this isn't an SFX channel, try the corresponding SFX channel.
ld hl, wChannelSoundIDs + Ch5
ld hl, wChannelSoundIDs + CHAN5
ld d, 0
ld e, a
add hl, de
@ -848,12 +848,12 @@ Audio3_EnableChannelOutput:
or [hl] ; set this channel's bits
ld d, a
ld a, c
cp Ch8
cp CHAN8
jr z, .noiseChannelOrNoSfx
cp Ch5
cp CHAN5
jr nc, .skip ; if sfx channel
; If this isn't an SFX channel, try the corresponding SFX channel.
ld hl, wChannelSoundIDs + Ch5
ld hl, wChannelSoundIDs + CHAN5
add hl, bc
ld a, [hl]
and a
@ -883,9 +883,9 @@ Audio3_ApplyDutyCycleAndSoundLength:
add hl, bc
ld d, [hl]
ld a, c
cp Ch3
cp CHAN3
jr z, .skipDuty ; if music channel 3
cp Ch7
cp CHAN7
jr z, .skipDuty ; if sfx channel 3
; include duty cycle (except on channel 3 which doesn't have it)
ld a, d
@ -904,15 +904,15 @@ Audio3_ApplyDutyCycleAndSoundLength:
Audio3_ApplyWavePatternAndFrequency:
ld a, c
cp Ch3
cp CHAN3
jr z, .channel3
cp Ch7
cp CHAN7
jr nz, .notChannel3
; fall through
.channel3
push de
ld de, wMusicWaveInstrument
cp Ch3
cp CHAN3
jr z, .next
ld de, wSfxWaveInstrument
.next
@ -1016,7 +1016,7 @@ Audio3_GoBackOneCommandIfCry:
Audio3_IsCry:
; Returns whether the currently playing audio is a cry in carry.
ld a, [wChannelSoundIDs + Ch5]
ld a, [wChannelSoundIDs + CHAN5]
cp CRY_SFX_START
jr nc, .next
jr .no
@ -1453,7 +1453,7 @@ Audio3_PlaySound::
and a
jr z, .playChannel
ld a, e
cp Ch8
cp CHAN8
jr nz, .notNoiseChannel
ld a, [wSoundID]
cp NOISE_INSTRUMENTS_END
@ -1552,7 +1552,7 @@ Audio3_PlaySound::
add hl, de
ld [hl], a
ld a, e
cp Ch5
cp CHAN5
jr nz, .skipSweepDisable
ld a, $8
ldh [rNR10], a ; sweep off
@ -1654,7 +1654,7 @@ Audio3_PlaySound::
ld a, [wSoundID]
ld [hl], a
pop af
cp Ch4
cp CHAN4
jr c, .skipSettingFlag
ld hl, wChannelFlags1
add hl, bc
@ -1686,12 +1686,12 @@ Audio3_PlaySound::
jr c, .cry
jr .done
.cry
ld hl, wChannelSoundIDs + Ch5
ld hl, wChannelSoundIDs + CHAN5
ld [hli], a
ld [hli], a
ld [hli], a
ld [hl], a
ld hl, wChannelCommandPointers + Ch7 * 2 ; sfx wave channel pointer
ld hl, wChannelCommandPointers + CHAN7 * 2 ; sfx wave channel pointer
ld de, Audio3_CryRet
ld [hl], e
inc hl

View file

@ -1,66 +1,135 @@
Music_PalletTown::
audio_header Music_PalletTown, Ch1, Ch2, Ch3
channel_count 3
channel 1, Music_PalletTown_Ch1
channel 2, Music_PalletTown_Ch2
channel 3, Music_PalletTown_Ch3
Music_Pokecenter::
audio_header Music_Pokecenter, Ch1, Ch2, Ch3
channel_count 3
channel 1, Music_Pokecenter_Ch1
channel 2, Music_Pokecenter_Ch2
channel 3, Music_Pokecenter_Ch3
Music_Gym::
audio_header Music_Gym, Ch1, Ch2, Ch3
channel_count 3
channel 1, Music_Gym_Ch1
channel 2, Music_Gym_Ch2
channel 3, Music_Gym_Ch3
; Viridian City, Pewter City, Saffron City
Music_Cities1::
audio_header Music_Cities1, Ch1, Ch2, Ch3, Ch4
channel_count 4
channel 1, Music_Cities1_Ch1
channel 2, Music_Cities1_Ch2
channel 3, Music_Cities1_Ch3
channel 4, Music_Cities1_Ch4
; Cerulean City, Fuchsia City
Music_Cities2::
audio_header Music_Cities2, Ch1, Ch2, Ch3
channel_count 3
channel 1, Music_Cities2_Ch1
channel 2, Music_Cities2_Ch2
channel 3, Music_Cities2_Ch3
Music_Celadon::
audio_header Music_Celadon, Ch1, Ch2, Ch3
channel_count 3
channel 1, Music_Celadon_Ch1
channel 2, Music_Celadon_Ch2
channel 3, Music_Celadon_Ch3
Music_Cinnabar::
audio_header Music_Cinnabar, Ch1, Ch2, Ch3
channel_count 3
channel 1, Music_Cinnabar_Ch1
channel 2, Music_Cinnabar_Ch2
channel 3, Music_Cinnabar_Ch3
Music_Vermilion::
audio_header Music_Vermilion, Ch1, Ch2, Ch3, Ch4
channel_count 4
channel 1, Music_Vermilion_Ch1
channel 2, Music_Vermilion_Ch2
channel 3, Music_Vermilion_Ch3
channel 4, Music_Vermilion_Ch4
Music_Lavender::
audio_header Music_Lavender, Ch1, Ch2, Ch3, Ch4
channel_count 4
channel 1, Music_Lavender_Ch1
channel 2, Music_Lavender_Ch2
channel 3, Music_Lavender_Ch3
channel 4, Music_Lavender_Ch4
Music_SSAnne::
audio_header Music_SSAnne, Ch1, Ch2, Ch3
channel_count 3
channel 1, Music_SSAnne_Ch1
channel 2, Music_SSAnne_Ch2
channel 3, Music_SSAnne_Ch3
Music_MeetProfOak::
audio_header Music_MeetProfOak, Ch1, Ch2, Ch3
channel_count 3
channel 1, Music_MeetProfOak_Ch1
channel 2, Music_MeetProfOak_Ch2
channel 3, Music_MeetProfOak_Ch3
Music_MeetRival::
audio_header Music_MeetRival, Ch1, Ch2, Ch3
channel_count 3
channel 1, Music_MeetRival_Ch1
channel 2, Music_MeetRival_Ch2
channel 3, Music_MeetRival_Ch3
Music_MuseumGuy::
audio_header Music_MuseumGuy, Ch1, Ch2, Ch3, Ch4
channel_count 4
channel 1, Music_MuseumGuy_Ch1
channel 2, Music_MuseumGuy_Ch2
channel 3, Music_MuseumGuy_Ch3
channel 4, Music_MuseumGuy_Ch4
Music_SafariZone::
audio_header Music_SafariZone, Ch1, Ch2, Ch3
channel_count 3
channel 1, Music_SafariZone_Ch1
channel 2, Music_SafariZone_Ch2
channel 3, Music_SafariZone_Ch3
Music_PkmnHealed::
audio_header Music_PkmnHealed, Ch1, Ch2, Ch3
channel_count 3
channel 1, Music_PkmnHealed_Ch1
channel 2, Music_PkmnHealed_Ch2
channel 3, Music_PkmnHealed_Ch3
; Routes 1 and 2
Music_Routes1::
audio_header Music_Routes1, Ch1, Ch2, Ch3, Ch4
channel_count 4
channel 1, Music_Routes1_Ch1
channel 2, Music_Routes1_Ch2
channel 3, Music_Routes1_Ch3
channel 4, Music_Routes1_Ch4
; Routes 24 and 25
Music_Routes2::
audio_header Music_Routes2, Ch1, Ch2, Ch3, Ch4
channel_count 4
channel 1, Music_Routes2_Ch1
channel 2, Music_Routes2_Ch2
channel 3, Music_Routes2_Ch3
channel 4, Music_Routes2_Ch4
; Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22
Music_Routes3::
audio_header Music_Routes3, Ch1, Ch2, Ch3, Ch4
channel_count 4
channel 1, Music_Routes3_Ch1
channel 2, Music_Routes3_Ch2
channel 3, Music_Routes3_Ch3
channel 4, Music_Routes3_Ch4
; Routes 11, 12, 13, 14, 15
Music_Routes4::
audio_header Music_Routes4, Ch1, Ch2, Ch3, Ch4
channel_count 4
channel 1, Music_Routes4_Ch1
channel 2, Music_Routes4_Ch2
channel 3, Music_Routes4_Ch3
channel 4, Music_Routes4_Ch4
; Route 23, Indigo Plateau
Music_IndigoPlateau::
audio_header Music_IndigoPlateau, Ch1, Ch2, Ch3, Ch4
channel_count 4
channel 1, Music_IndigoPlateau_Ch1
channel 2, Music_IndigoPlateau_Ch2
channel 3, Music_IndigoPlateau_Ch3
channel 4, Music_IndigoPlateau_Ch4

View file

@ -1,20 +1,41 @@
Music_GymLeaderBattle::
audio_header Music_GymLeaderBattle, Ch1, Ch2, Ch3
channel_count 3
channel 1, Music_GymLeaderBattle_Ch1
channel 2, Music_GymLeaderBattle_Ch2
channel 3, Music_GymLeaderBattle_Ch3
Music_TrainerBattle::
audio_header Music_TrainerBattle, Ch1, Ch2, Ch3
channel_count 3
channel 1, Music_TrainerBattle_Ch1
channel 2, Music_TrainerBattle_Ch2
channel 3, Music_TrainerBattle_Ch3
Music_WildBattle::
audio_header Music_WildBattle, Ch1, Ch2, Ch3
channel_count 3
channel 1, Music_WildBattle_Ch1
channel 2, Music_WildBattle_Ch2
channel 3, Music_WildBattle_Ch3
Music_FinalBattle::
audio_header Music_FinalBattle, Ch1, Ch2, Ch3
channel_count 3
channel 1, Music_FinalBattle_Ch1
channel 2, Music_FinalBattle_Ch2
channel 3, Music_FinalBattle_Ch3
Music_DefeatedTrainer::
audio_header Music_DefeatedTrainer, Ch1, Ch2, Ch3
channel_count 3
channel 1, Music_DefeatedTrainer_Ch1
channel 2, Music_DefeatedTrainer_Ch2
channel 3, Music_DefeatedTrainer_Ch3
Music_DefeatedWildMon::
audio_header Music_DefeatedWildMon, Ch1, Ch2, Ch3
channel_count 3
channel 1, Music_DefeatedWildMon_Ch1
channel 2, Music_DefeatedWildMon_Ch2
channel 3, Music_DefeatedWildMon_Ch3
Music_DefeatedGymLeader::
audio_header Music_DefeatedGymLeader, Ch1, Ch2, Ch3
channel_count 3
channel 1, Music_DefeatedGymLeader_Ch1
channel 2, Music_DefeatedGymLeader_Ch2
channel 3, Music_DefeatedGymLeader_Ch3

View file

@ -1,56 +1,116 @@
Music_TitleScreen::
audio_header Music_TitleScreen, Ch1, Ch2, Ch3, Ch4
channel_count 4
channel 1, Music_TitleScreen_Ch1
channel 2, Music_TitleScreen_Ch2
channel 3, Music_TitleScreen_Ch3
channel 4, Music_TitleScreen_Ch4
Music_Credits::
audio_header Music_Credits, Ch1, Ch2, Ch3
channel_count 3
channel 1, Music_Credits_Ch1
channel 2, Music_Credits_Ch2
channel 3, Music_Credits_Ch3
Music_HallOfFame::
audio_header Music_HallOfFame, Ch1, Ch2, Ch3
channel_count 3
channel 1, Music_HallOfFame_Ch1
channel 2, Music_HallOfFame_Ch2
channel 3, Music_HallOfFame_Ch3
Music_OaksLab::
audio_header Music_OaksLab, Ch1, Ch2, Ch3
channel_count 3
channel 1, Music_OaksLab_Ch1
channel 2, Music_OaksLab_Ch2
channel 3, Music_OaksLab_Ch3
Music_JigglypuffSong::
audio_header Music_JigglypuffSong, Ch1, Ch2
channel_count 2
channel 1, Music_JigglypuffSong_Ch1
channel 2, Music_JigglypuffSong_Ch2
Music_BikeRiding::
audio_header Music_BikeRiding, Ch1, Ch2, Ch3, Ch4
channel_count 4
channel 1, Music_BikeRiding_Ch1
channel 2, Music_BikeRiding_Ch2
channel 3, Music_BikeRiding_Ch3
channel 4, Music_BikeRiding_Ch4
Music_Surfing::
audio_header Music_Surfing, Ch1, Ch2, Ch3
channel_count 3
channel 1, Music_Surfing_Ch1
channel 2, Music_Surfing_Ch2
channel 3, Music_Surfing_Ch3
Music_GameCorner::
audio_header Music_GameCorner, Ch1, Ch2, Ch3
channel_count 3
channel 1, Music_GameCorner_Ch1
channel 2, Music_GameCorner_Ch2
channel 3, Music_GameCorner_Ch3
Music_IntroBattle::
audio_header Music_IntroBattle, Ch1, Ch2, Ch3, Ch4
channel_count 4
channel 1, Music_IntroBattle_Ch1
channel 2, Music_IntroBattle_Ch2
channel 3, Music_IntroBattle_Ch3
channel 4, Music_IntroBattle_Ch4
; Power Plant, Cerulean Cave, Rocket HQ
Music_Dungeon1::
audio_header Music_Dungeon1, Ch1, Ch2, Ch3, Ch4
channel_count 4
channel 1, Music_Dungeon1_Ch1
channel 2, Music_Dungeon1_Ch2
channel 3, Music_Dungeon1_Ch3
channel 4, Music_Dungeon1_Ch4
; Viridian Forest, Seafoam Islands
Music_Dungeon2::
audio_header Music_Dungeon2, Ch1, Ch2, Ch3, Ch4
channel_count 4
channel 1, Music_Dungeon2_Ch1
channel 2, Music_Dungeon2_Ch2
channel 3, Music_Dungeon2_Ch3
channel 4, Music_Dungeon2_Ch4
; Mt. Moon, Rock Tunnel, Victory Road
Music_Dungeon3::
audio_header Music_Dungeon3, Ch1, Ch2, Ch3, Ch4
channel_count 4
channel 1, Music_Dungeon3_Ch1
channel 2, Music_Dungeon3_Ch2
channel 3, Music_Dungeon3_Ch3
channel 4, Music_Dungeon3_Ch4
Music_CinnabarMansion::
audio_header Music_CinnabarMansion, Ch1, Ch2, Ch3, Ch4
channel_count 4
channel 1, Music_CinnabarMansion_Ch1
channel 2, Music_CinnabarMansion_Ch2
channel 3, Music_CinnabarMansion_Ch3
channel 4, Music_CinnabarMansion_Ch4
Music_PokemonTower::
audio_header Music_PokemonTower, Ch1, Ch2, Ch3
channel_count 3
channel 1, Music_PokemonTower_Ch1
channel 2, Music_PokemonTower_Ch2
channel 3, Music_PokemonTower_Ch3
Music_SilphCo::
audio_header Music_SilphCo, Ch1, Ch2, Ch3
channel_count 3
channel 1, Music_SilphCo_Ch1
channel 2, Music_SilphCo_Ch2
channel 3, Music_SilphCo_Ch3
Music_MeetEvilTrainer::
audio_header Music_MeetEvilTrainer, Ch1, Ch2, Ch3
channel_count 3
channel 1, Music_MeetEvilTrainer_Ch1
channel 2, Music_MeetEvilTrainer_Ch2
channel 3, Music_MeetEvilTrainer_Ch3
Music_MeetFemaleTrainer::
audio_header Music_MeetFemaleTrainer, Ch1, Ch2, Ch3
channel_count 3
channel 1, Music_MeetFemaleTrainer_Ch1
channel 2, Music_MeetFemaleTrainer_Ch2
channel 3, Music_MeetFemaleTrainer_Ch3
Music_MeetMaleTrainer::
audio_header Music_MeetMaleTrainer, Ch1, Ch2, Ch3
channel_count 3
channel 1, Music_MeetMaleTrainer_Ch1
channel 2, Music_MeetMaleTrainer_Ch2
channel 3, Music_MeetMaleTrainer_Ch3

View file

@ -1,114 +1,166 @@
SFX_Get_Item1_1::
audio_header SFX_Get_Item1_1, Ch5, Ch6, Ch7
channel_count 3
channel 5, SFX_Get_Item1_1_Ch5
channel 6, SFX_Get_Item1_1_Ch6
channel 7, SFX_Get_Item1_1_Ch7
SFX_Get_Item2_1::
audio_header SFX_Get_Item2_1, Ch5, Ch6, Ch7
channel_count 3
channel 5, SFX_Get_Item2_1_Ch5
channel 6, SFX_Get_Item2_1_Ch6
channel 7, SFX_Get_Item2_1_Ch7
SFX_Tink_1::
audio_header SFX_Tink_1, Ch5
channel_count 1
channel 5, SFX_Tink_1_Ch5
SFX_Heal_HP_1::
audio_header SFX_Heal_HP_1, Ch5
channel_count 1
channel 5, SFX_Heal_HP_1_Ch5
SFX_Heal_Ailment_1::
audio_header SFX_Heal_Ailment_1, Ch5
channel_count 1
channel 5, SFX_Heal_Ailment_1_Ch5
SFX_Start_Menu_1::
audio_header SFX_Start_Menu_1, Ch8
channel_count 1
channel 8, SFX_Start_Menu_1_Ch8
SFX_Press_AB_1::
audio_header SFX_Press_AB_1, Ch5
channel_count 1
channel 5, SFX_Press_AB_1_Ch5
SFX_Pokedex_Rating_1::
audio_header SFX_Pokedex_Rating_1, Ch5, Ch6, Ch7
channel_count 3
channel 5, SFX_Pokedex_Rating_1_Ch5
channel 6, SFX_Pokedex_Rating_1_Ch6
channel 7, SFX_Pokedex_Rating_1_Ch7
SFX_Get_Key_Item_1::
audio_header SFX_Get_Key_Item_1, Ch5, Ch6, Ch7
channel_count 3
channel 5, SFX_Get_Key_Item_1_Ch5
channel 6, SFX_Get_Key_Item_1_Ch6
channel 7, SFX_Get_Key_Item_1_Ch7
SFX_Poisoned_1::
audio_header SFX_Poisoned_1, Ch5
channel_count 1
channel 5, SFX_Poisoned_1_Ch5
SFX_Trade_Machine_1::
audio_header SFX_Trade_Machine_1, Ch5
channel_count 1
channel 5, SFX_Trade_Machine_1_Ch5
SFX_Turn_On_PC_1::
audio_header SFX_Turn_On_PC_1, Ch5
channel_count 1
channel 5, SFX_Turn_On_PC_1_Ch5
SFX_Turn_Off_PC_1::
audio_header SFX_Turn_Off_PC_1, Ch5
channel_count 1
channel 5, SFX_Turn_Off_PC_1_Ch5
SFX_Enter_PC_1::
audio_header SFX_Enter_PC_1, Ch5
channel_count 1
channel 5, SFX_Enter_PC_1_Ch5
SFX_Shrink_1::
audio_header SFX_Shrink_1, Ch5
channel_count 1
channel 5, SFX_Shrink_1_Ch5
SFX_Switch_1::
audio_header SFX_Switch_1, Ch5
channel_count 1
channel 5, SFX_Switch_1_Ch5
SFX_Healing_Machine_1::
audio_header SFX_Healing_Machine_1, Ch5
channel_count 1
channel 5, SFX_Healing_Machine_1_Ch5
SFX_Teleport_Exit1_1::
audio_header SFX_Teleport_Exit1_1, Ch5
channel_count 1
channel 5, SFX_Teleport_Exit1_1_Ch5
SFX_Teleport_Enter1_1::
audio_header SFX_Teleport_Enter1_1, Ch5
channel_count 1
channel 5, SFX_Teleport_Enter1_1_Ch5
SFX_Teleport_Exit2_1::
audio_header SFX_Teleport_Exit2_1, Ch5
channel_count 1
channel 5, SFX_Teleport_Exit2_1_Ch5
SFX_Ledge_1::
audio_header SFX_Ledge_1, Ch5
channel_count 1
channel 5, SFX_Ledge_1_Ch5
SFX_Teleport_Enter2_1::
audio_header SFX_Teleport_Enter2_1, Ch8
channel_count 1
channel 8, SFX_Teleport_Enter2_1_Ch8
SFX_Fly_1::
audio_header SFX_Fly_1, Ch8
channel_count 1
channel 8, SFX_Fly_1_Ch8
SFX_Denied_1::
audio_header SFX_Denied_1, Ch5, Ch6
channel_count 2
channel 5, SFX_Denied_1_Ch5
channel 6, SFX_Denied_1_Ch6
SFX_Arrow_Tiles_1::
audio_header SFX_Arrow_Tiles_1, Ch5
channel_count 1
channel 5, SFX_Arrow_Tiles_1_Ch5
SFX_Push_Boulder_1::
audio_header SFX_Push_Boulder_1, Ch8
channel_count 1
channel 8, SFX_Push_Boulder_1_Ch8
SFX_SS_Anne_Horn_1::
audio_header SFX_SS_Anne_Horn_1, Ch5, Ch6
channel_count 2
channel 5, SFX_SS_Anne_Horn_1_Ch5
channel 6, SFX_SS_Anne_Horn_1_Ch6
SFX_Withdraw_Deposit_1::
audio_header SFX_Withdraw_Deposit_1, Ch5
channel_count 1
channel 5, SFX_Withdraw_Deposit_1_Ch5
SFX_Cut_1::
audio_header SFX_Cut_1, Ch8
channel_count 1
channel 8, SFX_Cut_1_Ch8
SFX_Go_Inside_1::
audio_header SFX_Go_Inside_1, Ch8
channel_count 1
channel 8, SFX_Go_Inside_1_Ch8
SFX_Swap_1::
audio_header SFX_Swap_1, Ch5, Ch6
channel_count 2
channel 5, SFX_Swap_1_Ch5
channel 6, SFX_Swap_1_Ch6
SFX_59_1::
audio_header SFX_59_1, Ch5, Ch6
channel_count 2
channel 5, SFX_59_1_Ch5
channel 6, SFX_59_1_Ch6
SFX_Purchase_1::
audio_header SFX_Purchase_1, Ch5, Ch6
channel_count 2
channel 5, SFX_Purchase_1_Ch5
channel 6, SFX_Purchase_1_Ch6
SFX_Collision_1::
audio_header SFX_Collision_1, Ch5
channel_count 1
channel 5, SFX_Collision_1_Ch5
SFX_Go_Outside_1::
audio_header SFX_Go_Outside_1, Ch8
channel_count 1
channel 8, SFX_Go_Outside_1_Ch8
SFX_Save_1::
audio_header SFX_Save_1, Ch5, Ch6
channel_count 2
channel 5, SFX_Save_1_Ch5
channel 6, SFX_Save_1_Ch6
; the Pokeflute sound effect directly hijacks channel 3 (not anymore)
SFX_Pokeflute::
audio_header SFX_Pokeflute, Ch7
channel_count 1
channel 7, SFX_Pokeflute_Ch7
SFX_Safari_Zone_PA::
audio_header SFX_Safari_Zone_PA, Ch5
channel_count 1
channel 5, SFX_Safari_Zone_PA_Ch5

View file

@ -1,170 +1,265 @@
SFX_Level_Up::
audio_header SFX_Level_Up, Ch5, Ch6, Ch7
channel_count 3
channel 5, SFX_Level_Up_Ch5
channel 6, SFX_Level_Up_Ch6
channel 7, SFX_Level_Up_Ch7
SFX_Ball_Toss::
audio_header SFX_Ball_Toss, Ch5, Ch6
channel_count 2
channel 5, SFX_Ball_Toss_Ch5
channel 6, SFX_Ball_Toss_Ch6
SFX_Ball_Poof::
audio_header SFX_Ball_Poof, Ch5, Ch8
channel_count 2
channel 5, SFX_Ball_Poof_Ch5
channel 8, SFX_Ball_Poof_Ch8
SFX_Faint_Thud::
audio_header SFX_Faint_Thud, Ch5, Ch8
channel_count 2
channel 5, SFX_Faint_Thud_Ch5
channel 8, SFX_Faint_Thud_Ch8
SFX_Run::
audio_header SFX_Run, Ch8
channel_count 1
channel 8, SFX_Run_Ch8
SFX_Dex_Page_Added::
audio_header SFX_Dex_Page_Added, Ch5, Ch6
channel_count 2
channel 5, SFX_Dex_Page_Added_Ch5
channel 6, SFX_Dex_Page_Added_Ch6
SFX_Caught_Mon::
audio_header SFX_Caught_Mon, Ch5, Ch6, Ch7
channel_count 3
channel 5, SFX_Caught_Mon_Ch5
channel 6, SFX_Caught_Mon_Ch6
channel 7, SFX_Caught_Mon_Ch7
SFX_Peck::
audio_header SFX_Peck, Ch8
channel_count 1
channel 8, SFX_Peck_Ch8
SFX_Faint_Fall::
audio_header SFX_Faint_Fall, Ch5
channel_count 1
channel 5, SFX_Faint_Fall_Ch5
SFX_Battle_09::
audio_header SFX_Battle_09, Ch5
channel_count 1
channel 5, SFX_Battle_09_Ch5
SFX_Pound::
audio_header SFX_Pound, Ch8
channel_count 1
channel 8, SFX_Pound_Ch8
SFX_Battle_0B::
audio_header SFX_Battle_0B, Ch8
channel_count 1
channel 8, SFX_Battle_0B_Ch8
SFX_Battle_0C::
audio_header SFX_Battle_0C, Ch8
channel_count 1
channel 8, SFX_Battle_0C_Ch8
SFX_Battle_0D::
audio_header SFX_Battle_0D, Ch8
channel_count 1
channel 8, SFX_Battle_0D_Ch8
SFX_Battle_0E::
audio_header SFX_Battle_0E, Ch8
channel_count 1
channel 8, SFX_Battle_0E_Ch8
SFX_Battle_0F::
audio_header SFX_Battle_0F, Ch8
channel_count 1
channel 8, SFX_Battle_0F_Ch8
SFX_Damage::
audio_header SFX_Damage, Ch8
channel_count 1
channel 8, SFX_Damage_Ch8
SFX_Not_Very_Effective::
audio_header SFX_Not_Very_Effective, Ch8
channel_count 1
channel 8, SFX_Not_Very_Effective_Ch8
SFX_Battle_12::
audio_header SFX_Battle_12, Ch8
channel_count 1
channel 8, SFX_Battle_12_Ch8
SFX_Battle_13::
audio_header SFX_Battle_13, Ch8
channel_count 1
channel 8, SFX_Battle_13_Ch8
SFX_Battle_14::
audio_header SFX_Battle_14, Ch8
channel_count 1
channel 8, SFX_Battle_14_Ch8
SFX_Vine_Whip::
audio_header SFX_Vine_Whip, Ch8
channel_count 1
channel 8, SFX_Vine_Whip_Ch8
SFX_Battle_16::
audio_header SFX_Battle_16, Ch8
channel_count 1
channel 8, SFX_Battle_16_Ch8
SFX_Battle_17::
audio_header SFX_Battle_17, Ch8
channel_count 1
channel 8, SFX_Battle_17_Ch8
SFX_Battle_18::
audio_header SFX_Battle_18, Ch8
channel_count 1
channel 8, SFX_Battle_18_Ch8
SFX_Battle_19::
audio_header SFX_Battle_19, Ch8
channel_count 1
channel 8, SFX_Battle_19_Ch8
SFX_Super_Effective::
audio_header SFX_Super_Effective, Ch8
channel_count 1
channel 8, SFX_Super_Effective_Ch8
SFX_Battle_1B::
audio_header SFX_Battle_1B, Ch8
channel_count 1
channel 8, SFX_Battle_1B_Ch8
SFX_Battle_1C::
audio_header SFX_Battle_1C, Ch8
channel_count 1
channel 8, SFX_Battle_1C_Ch8
SFX_Doubleslap::
audio_header SFX_Doubleslap, Ch8
channel_count 1
channel 8, SFX_Doubleslap_Ch8
SFX_Battle_1E::
audio_header SFX_Battle_1E, Ch5, Ch8
channel_count 2
channel 5, SFX_Battle_1E_Ch5
channel 8, SFX_Battle_1E_Ch8
SFX_Horn_Drill::
audio_header SFX_Horn_Drill, Ch8
channel_count 1
channel 8, SFX_Horn_Drill_Ch8
SFX_Battle_20::
audio_header SFX_Battle_20, Ch8
channel_count 1
channel 8, SFX_Battle_20_Ch8
SFX_Battle_21::
audio_header SFX_Battle_21, Ch8
channel_count 1
channel 8, SFX_Battle_21_Ch8
SFX_Battle_22::
audio_header SFX_Battle_22, Ch8
channel_count 1
channel 8, SFX_Battle_22_Ch8
SFX_Battle_23::
audio_header SFX_Battle_23, Ch8
channel_count 1
channel 8, SFX_Battle_23_Ch8
SFX_Battle_24::
audio_header SFX_Battle_24, Ch5, Ch8
channel_count 2
channel 5, SFX_Battle_24_Ch5
channel 8, SFX_Battle_24_Ch8
SFX_Battle_25::
audio_header SFX_Battle_25, Ch8
channel_count 1
channel 8, SFX_Battle_25_Ch8
SFX_Battle_26::
audio_header SFX_Battle_26, Ch8
channel_count 1
channel 8, SFX_Battle_26_Ch8
SFX_Battle_27::
audio_header SFX_Battle_27, Ch5, Ch6, Ch8
channel_count 3
channel 5, SFX_Battle_27_Ch5
channel 6, SFX_Battle_27_Ch6
channel 8, SFX_Battle_27_Ch8
SFX_Battle_28::
audio_header SFX_Battle_28, Ch5, Ch6, Ch8
channel_count 3
channel 5, SFX_Battle_28_Ch5
channel 6, SFX_Battle_28_Ch6
channel 8, SFX_Battle_28_Ch8
SFX_Battle_29::
audio_header SFX_Battle_29, Ch5, Ch8
channel_count 2
channel 5, SFX_Battle_29_Ch5
channel 8, SFX_Battle_29_Ch8
SFX_Battle_2A::
audio_header SFX_Battle_2A, Ch5, Ch6, Ch8
channel_count 3
channel 5, SFX_Battle_2A_Ch5
channel 6, SFX_Battle_2A_Ch6
channel 8, SFX_Battle_2A_Ch8
SFX_Battle_2B::
audio_header SFX_Battle_2B, Ch5, Ch8
channel_count 2
channel 5, SFX_Battle_2B_Ch5
channel 8, SFX_Battle_2B_Ch8
SFX_Battle_2C::
audio_header SFX_Battle_2C, Ch5, Ch6, Ch8
channel_count 3
channel 5, SFX_Battle_2C_Ch5
channel 6, SFX_Battle_2C_Ch6
channel 8, SFX_Battle_2C_Ch8
SFX_Psybeam::
audio_header SFX_Psybeam, Ch5, Ch6, Ch8
channel_count 3
channel 5, SFX_Psybeam_Ch5
channel 6, SFX_Psybeam_Ch6
channel 8, SFX_Psybeam_Ch8
SFX_Battle_2E::
audio_header SFX_Battle_2E, Ch5, Ch6, Ch8
channel_count 3
channel 5, SFX_Battle_2E_Ch5
channel 6, SFX_Battle_2E_Ch6
channel 8, SFX_Battle_2E_Ch8
SFX_Battle_2F::
audio_header SFX_Battle_2F, Ch5, Ch6, Ch8
channel_count 3
channel 5, SFX_Battle_2F_Ch5
channel 6, SFX_Battle_2F_Ch6
channel 8, SFX_Battle_2F_Ch8
SFX_Psychic_M::
audio_header SFX_Psychic_M, Ch5, Ch6, Ch8
channel_count 3
channel 5, SFX_Psychic_M_Ch5
channel 6, SFX_Psychic_M_Ch6
channel 8, SFX_Psychic_M_Ch8
SFX_Battle_31::
audio_header SFX_Battle_31, Ch5, Ch6
channel_count 2
channel 5, SFX_Battle_31_Ch5
channel 6, SFX_Battle_31_Ch6
SFX_Battle_32::
audio_header SFX_Battle_32, Ch5, Ch6
channel_count 2
channel 5, SFX_Battle_32_Ch5
channel 6, SFX_Battle_32_Ch6
SFX_Battle_33::
audio_header SFX_Battle_33, Ch5, Ch6
channel_count 2
channel 5, SFX_Battle_33_Ch5
channel 6, SFX_Battle_33_Ch6
SFX_Battle_34::
audio_header SFX_Battle_34, Ch5, Ch6, Ch8
channel_count 3
channel 5, SFX_Battle_34_Ch5
channel 6, SFX_Battle_34_Ch6
channel 8, SFX_Battle_34_Ch8
SFX_Battle_35::
audio_header SFX_Battle_35, Ch5, Ch6
channel_count 2
channel 5, SFX_Battle_35_Ch5
channel 6, SFX_Battle_35_Ch6
SFX_Battle_36::
audio_header SFX_Battle_36, Ch5, Ch6, Ch8
channel_count 3
channel 5, SFX_Battle_36_Ch5
channel 6, SFX_Battle_36_Ch6
channel 8, SFX_Battle_36_Ch8
SFX_Silph_Scope::
audio_header SFX_Silph_Scope, Ch5
channel_count 1
channel 5, SFX_Silph_Scope_Ch5
SFX_PokefluteInBattle::
audio_header SFX_PokefluteInBattle, Ch5, Ch6, Ch7
channel_count 3
channel 5, SFX_PokefluteInBattle_Ch5
channel 6, SFX_PokefluteInBattle_Ch6
channel 7, SFX_PokefluteInBattle_Ch7

View file

@ -1,29 +1,40 @@
SFX_Intro_Lunge::
audio_header SFX_Intro_Lunge, Ch8
channel_count 1
channel 8, SFX_Intro_Lunge_Ch8
SFX_Intro_Hip::
audio_header SFX_Intro_Hip, Ch5
channel_count 1
channel 5, SFX_Intro_Hip_Ch5
SFX_Intro_Hop::
audio_header SFX_Intro_Hop, Ch5
channel_count 1
channel 5, SFX_Intro_Hop_Ch5
SFX_Intro_Raise::
audio_header SFX_Intro_Raise, Ch8
channel_count 1
channel 8, SFX_Intro_Raise_Ch8
SFX_Intro_Crash::
audio_header SFX_Intro_Crash, Ch8
channel_count 1
channel 8, SFX_Intro_Crash_Ch8
SFX_Intro_Whoosh::
audio_header SFX_Intro_Whoosh, Ch8
channel_count 1
channel 8, SFX_Intro_Whoosh_Ch8
SFX_Slots_Stop_Wheel::
audio_header SFX_Slots_Stop_Wheel, Ch5
channel_count 1
channel 5, SFX_Slots_Stop_Wheel_Ch5
SFX_Slots_Reward::
audio_header SFX_Slots_Reward, Ch5
channel_count 1
channel 5, SFX_Slots_Reward_Ch5
SFX_Slots_New_Spin::
audio_header SFX_Slots_New_Spin, Ch5, Ch6
channel_count 2
channel 5, SFX_Slots_New_Spin_Ch5
channel 6, SFX_Slots_New_Spin_Ch6
SFX_Shooting_Star::
audio_header SFX_Shooting_Star, Ch5
channel_count 1
channel 5, SFX_Shooting_Star_Ch5

View file

@ -7,25 +7,25 @@ Music_DoLowHealthAlarm::
ret z ;nope
and $7f ;low 7 bits are the timer.
jr nz, .asm_21383 ;if timer > 0, play low tone.
jr nz, .notToneHi ;if timer > 0, play low tone.
call .playToneHi
ld a, 30 ;keep this tone for 30 frames.
jr .asm_21395 ;reset the timer.
jr .resetTimer
.asm_21383
.notToneHi
cp 20
jr nz, .asm_2138a ;if timer == 20,
call .playToneLo ;actually set the sound registers.
jr nz, .noTone ;if timer == 20,
call .playToneLo ;actually set the sound registers.
.asm_2138a
.noTone
ld a, $86
ld [wChannelSoundIDs + Ch5], a ;disable sound channel?
ld [wChannelSoundIDs + CHAN5], a ;disable sound channel?
ld a, [wLowHealthAlarm]
and $7f ;decrement alarm timer.
dec a
.asm_21395
.resetTimer
; reset the timer and enable flag.
set 7, a
ld [wLowHealthAlarm], a
@ -34,7 +34,7 @@ Music_DoLowHealthAlarm::
.disableAlarm
xor a
ld [wLowHealthAlarm], a ;disable alarm
ld [wChannelSoundIDs + Ch5], a ;re-enable sound channel?
ld [wChannelSoundIDs + CHAN5], a ;re-enable sound channel?
ld de, .toneDataSilence
jr .playTone
@ -61,7 +61,7 @@ Music_DoLowHealthAlarm::
jr nz, .copyLoop
ret
alarm_tone: MACRO
MACRO alarm_tone
db \1 ; length
db \2 ; envelope
dw \3 ; frequency

View file

@ -6,8 +6,7 @@ Music_BikeRiding_Ch1::
note_type 12, 11, 5
octave 3
note G_, 2
Music_BikeRiding_branch_7dbc9::
.mainloop:
octave 4
note C_, 4
note D_, 4
@ -150,8 +149,7 @@ Music_BikeRiding_branch_7dbc9::
note G_, 12
note_type 12, 11, 5
vibrato 8, 1, 4
sound_loop 0, Music_BikeRiding_branch_7dbc9
sound_loop 0, .mainloop
Music_BikeRiding_Ch2::
duty_cycle 2
@ -159,8 +157,7 @@ Music_BikeRiding_Ch2::
note_type 12, 12, 3
octave 4
note C_, 2
Music_BikeRiding_branch_7dc75::
.mainloop:
note E_, 4
note F_, 4
note G_, 4
@ -299,14 +296,12 @@ Music_BikeRiding_branch_7dc75::
note_type 12, 12, 7
note B_, 12
note_type 12, 12, 3
sound_loop 0, Music_BikeRiding_branch_7dc75
sound_loop 0, .mainloop
Music_BikeRiding_Ch3::
note_type 12, 1, 3
rest 2
Music_BikeRiding_branch_7dd17::
.mainloop:
octave 4
note C_, 1
rest 1
@ -640,36 +635,34 @@ Music_BikeRiding_branch_7dd17::
octave 4
note F_, 1
rest 1
sound_loop 0, Music_BikeRiding_branch_7dd17
sound_loop 0, .mainloop
Music_BikeRiding_Ch4::
drum_speed 12
rest 2
.mainloop:
sound_call .sub1
sound_call .sub2
sound_call .sub1
sound_call .sub3
sound_call .sub2
sound_call .sub2
sound_call .sub1
sound_call .sub1
sound_call .sub1
sound_call .sub1
sound_call .sub2
sound_call .sub1
sound_call .sub3
sound_call .sub1
sound_call .sub2
sound_call .sub1
sound_call .sub1
sound_call .sub1
sound_call .sub1
sound_loop 0, .mainloop
Music_BikeRiding_branch_7de6a::
sound_call Music_BikeRiding_branch_7dea7
sound_call Music_BikeRiding_branch_7deb4
sound_call Music_BikeRiding_branch_7dea7
sound_call Music_BikeRiding_branch_7dec2
sound_call Music_BikeRiding_branch_7deb4
sound_call Music_BikeRiding_branch_7deb4
sound_call Music_BikeRiding_branch_7dea7
sound_call Music_BikeRiding_branch_7dea7
sound_call Music_BikeRiding_branch_7dea7
sound_call Music_BikeRiding_branch_7dea7
sound_call Music_BikeRiding_branch_7deb4
sound_call Music_BikeRiding_branch_7dea7
sound_call Music_BikeRiding_branch_7dec2
sound_call Music_BikeRiding_branch_7dea7
sound_call Music_BikeRiding_branch_7deb4
sound_call Music_BikeRiding_branch_7dea7
sound_call Music_BikeRiding_branch_7dea7
sound_call Music_BikeRiding_branch_7dea7
sound_call Music_BikeRiding_branch_7dea7
sound_loop 0, Music_BikeRiding_branch_7de6a
Music_BikeRiding_branch_7dea7::
.sub1:
rest 2
drum_note 16, 2
rest 2
@ -680,7 +673,7 @@ Music_BikeRiding_branch_7dea7::
drum_note 16, 2
sound_ret
Music_BikeRiding_branch_7deb4::
.sub2:
rest 2
drum_note 16, 2
rest 2
@ -691,7 +684,7 @@ Music_BikeRiding_branch_7deb4::
drum_note 16, 2
sound_ret
Music_BikeRiding_branch_7dec2::
.sub3:
rest 2
drum_note 16, 2
rest 2

View file

@ -7,8 +7,7 @@ Music_Celadon_Ch1::
rest 8
octave 3
note D_, 8
Music_Celadon_branch_b6d4::
.mainloop:
duty_cycle 2
note_type 12, 11, 2
note G_, 4
@ -104,8 +103,7 @@ Music_Celadon_branch_b6d4::
note G_, 4
note F#, 4
note A_, 4
sound_loop 0, Music_Celadon_branch_b6d4
sound_loop 0, .mainloop
Music_Celadon_Ch2::
duty_cycle 3
@ -121,8 +119,7 @@ Music_Celadon_Ch2::
note G_, 1
note_type 12, 10, 0
note A_, 8
Music_Celadon_branch_b74a::
.mainloop:
duty_cycle 2
note_type 12, 12, 2
octave 4
@ -223,8 +220,7 @@ Music_Celadon_branch_b74a::
note D_, 2
note E_, 2
note D_, 8
sound_loop 0, Music_Celadon_branch_b74a
sound_loop 0, .mainloop
Music_Celadon_Ch3::
note_type 12, 1, 3
@ -238,8 +234,7 @@ Music_Celadon_Ch3::
note E_, 1
note F#, 1
note G_, 1
Music_Celadon_branch_b7c1::
.mainloop:
octave 4
note D_, 2
note B_, 2
@ -408,4 +403,4 @@ Music_Celadon_branch_b7c1::
note G_, 2
note F#, 2
note E_, 2
sound_loop 0, Music_Celadon_branch_b7c1
sound_loop 0, .mainloop

View file

@ -4,8 +4,7 @@ Music_Cinnabar_Ch1::
duty_cycle 3
vibrato 12, 3, 4
toggle_perfect_pitch
Music_Cinnabar_branch_b878::
.mainloop:
note_type 12, 11, 5
rest 4
octave 3
@ -82,14 +81,12 @@ Music_Cinnabar_branch_b878::
note G_, 8
note F#, 4
note E_, 4
sound_loop 0, Music_Cinnabar_branch_b878
sound_loop 0, .mainloop
Music_Cinnabar_Ch2::
duty_cycle 3
vibrato 10, 2, 3
Music_Cinnabar_branch_b8d9::
.mainloop:
note_type 12, 12, 7
octave 3
note G_, 6
@ -176,13 +173,11 @@ Music_Cinnabar_branch_b8d9::
octave 3
note B_, 2
note A_, 6
sound_loop 0, Music_Cinnabar_branch_b8d9
sound_loop 0, .mainloop
Music_Cinnabar_Ch3::
note_type 12, 1, 0
Music_Cinnabar_branch_b93f::
.mainloop:
octave 4
note G_, 1
rest 3
@ -351,4 +346,4 @@ Music_Cinnabar_branch_b93f::
octave 5
note C_, 1
rest 1
sound_loop 0, Music_Cinnabar_branch_b93f
sound_loop 0, .mainloop

View file

@ -3,8 +3,8 @@ Music_CinnabarMansion_Ch1::
volume 7, 7
vibrato 11, 2, 5
duty_cycle 2
Music_CinnabarMansion_branch_7ed19::
.mainloop:
.loop1:
note_type 12, 6, 2
octave 5
note E_, 1
@ -25,7 +25,7 @@ Music_CinnabarMansion_branch_7ed19::
octave 5
note B_, 1
rest 2
sound_loop 14, Music_CinnabarMansion_branch_7ed19
sound_loop 14, .loop1
note_type 12, 10, 5
rest 16
rest 16
@ -35,26 +35,22 @@ Music_CinnabarMansion_branch_7ed19::
octave 5
note B_, 1
note B_, 2
sound_loop 0, Music_CinnabarMansion_branch_7ed19
sound_loop 0, .mainloop
Music_CinnabarMansion_Ch2::
duty_cycle 2
toggle_perfect_pitch
vibrato 10, 2, 4
note_type 12, 12, 2
Music_CinnabarMansion_branch_7ed48::
.introloop:
rest 16
rest 16
sound_loop 4, Music_CinnabarMansion_branch_7ed48
Music_CinnabarMansion_branch_7ed4e::
sound_loop 4, .introloop
.mainloop:
note_type 12, 12, 2
Music_CinnabarMansion_branch_7ed50::
sound_call Music_CinnabarMansion_branch_7ed6c
sound_loop 3, Music_CinnabarMansion_branch_7ed50
.loop1:
sound_call .sub1
sound_loop 3, .loop1
octave 3
note E_, 4
note D#, 4
@ -72,9 +68,9 @@ Music_CinnabarMansion_branch_7ed50::
note G#, 4
note G_, 4
note D#, 4
sound_loop 0, Music_CinnabarMansion_branch_7ed4e
sound_loop 0, .mainloop
Music_CinnabarMansion_branch_7ed6c::
.sub1:
octave 3
note E_, 4
note D#, 4
@ -94,11 +90,10 @@ Music_CinnabarMansion_branch_7ed6c::
note A#, 4
sound_ret
Music_CinnabarMansion_Ch3::
note_type 12, 1, 1
Music_CinnabarMansion_branch_7ed80::
.mainloop:
.loop1:
octave 2
note B_, 2
rest 2
@ -134,14 +129,13 @@ Music_CinnabarMansion_branch_7ed80::
rest 2
note D#, 2
rest 2
sound_loop 8, Music_CinnabarMansion_branch_7ed80
sound_loop 8, .loop1
note E_, 16
note D#, 16
note G_, 16
note G#, 8
note D#, 8
sound_loop 0, Music_CinnabarMansion_branch_7ed80
sound_loop 0, .mainloop
Music_CinnabarMansion_Ch4::
drum_speed 6
@ -149,8 +143,7 @@ Music_CinnabarMansion_Ch4::
rest 16
rest 16
rest 16
Music_CinnabarMansion_branch_7edb5::
.mainloop:
drum_note 12, 2
drum_note 12, 2
drum_note 13, 4
@ -169,4 +162,4 @@ Music_CinnabarMansion_branch_7edb5::
rest 10
rest 8
drum_note 14, 8
sound_loop 0, Music_CinnabarMansion_branch_7edb5
sound_loop 0, .mainloop

View file

@ -1,16 +1,14 @@
Music_Cities1_branch_aa6f::
Music_Cities1_Ch1_AlternateTempo::
tempo 232
sound_loop 0, Music_Cities1_branch_aa79
sound_loop 0, Music_Cities1_Ch1.body
Music_Cities1_Ch1::
tempo 144
Music_Cities1_branch_aa79::
.body:
volume 7, 7
vibrato 8, 2, 4
duty_cycle 3
Music_Cities1_branch_aa80::
.mainloop:
note_type 12, 12, 5
octave 3
note G#, 4
@ -39,7 +37,7 @@ Music_Cities1_branch_aa80::
octave 2
note B_, 4
note_type 12, 12, 5
sound_call Music_Cities1_branch_ab7d
sound_call .sub1
octave 3
note D#, 6
note E_, 2
@ -90,7 +88,7 @@ Music_Cities1_branch_aa80::
note B_, 2
note B_, 4
note_type 12, 12, 5
sound_call Music_Cities1_branch_ab7d
sound_call .sub1
octave 3
note D#, 4
note D#, 2
@ -114,7 +112,7 @@ Music_Cities1_branch_aa80::
note C#, 2
note E_, 4
note_type 12, 11, 3
sound_call Music_Cities1_branch_ab8a
sound_call .sub2
note A_, 2
note B_, 2
note A_, 2
@ -142,8 +140,7 @@ Music_Cities1_branch_aa80::
octave 2
note B_, 2
octave 3
Music_Cities1_branch_ab12::
.loop1:
note C#, 2
note D#, 2
note C#, 2
@ -153,7 +150,7 @@ Music_Cities1_branch_ab12::
octave 3
note C#, 2
note D#, 2
sound_loop 2, Music_Cities1_branch_ab12
sound_loop 2, .loop1
note E_, 2
octave 2
note B_, 4
@ -180,7 +177,7 @@ Music_Cities1_branch_ab12::
octave 2
note B_, 2
octave 3
sound_call Music_Cities1_branch_ab8a
sound_call .sub2
note A_, 2
note E_, 2
note A_, 2
@ -240,9 +237,9 @@ Music_Cities1_branch_ab12::
octave 3
note E_, 2
note F#, 2
sound_loop 0, Music_Cities1_branch_aa80
sound_loop 0, .mainloop
Music_Cities1_branch_ab7d::
.sub1:
octave 3
note F#, 2
note D#, 4
@ -257,7 +254,7 @@ Music_Cities1_branch_ab7d::
note C#, 2
sound_ret
Music_Cities1_branch_ab8a::
.sub2:
note A_, 2
note E_, 2
note C#, 2
@ -267,10 +264,10 @@ Music_Cities1_branch_ab8a::
note E_, 2
sound_ret
Music_Cities1_Ch2::
.mainloop:
vibrato 5, 1, 5
sound_call Music_Cities1_branch_ac00
sound_call .sub1
octave 4
note G#, 2
note_type 12, 12, 4
@ -283,7 +280,7 @@ Music_Cities1_Ch2::
note E_, 6
note F#, 6
note G#, 4
sound_call Music_Cities1_branch_ac00
sound_call .sub1
octave 4
note G#, 2
note_type 12, 12, 4
@ -357,9 +354,9 @@ Music_Cities1_Ch2::
note G#, 1
note_type 12, 10, 4
note A_, 1
sound_loop 0, Music_Cities1_Ch2
sound_loop 0, .mainloop
Music_Cities1_branch_ac00::
.sub1:
duty_cycle 2
note_type 12, 12, 3
octave 4
@ -400,17 +397,15 @@ Music_Cities1_branch_ac00::
note F#, 2
sound_ret
Music_Cities1_Ch3::
note_type 12, 1, 1
toggle_perfect_pitch
Music_Cities1_branch_ac35::
.mainloop:
vibrato 0, 0, 0
octave 4
sound_call Music_Cities1_branch_acc5
sound_call Music_Cities1_branch_acc5
sound_call Music_Cities1_branch_acce
sound_call .sub1
sound_call .sub1
sound_call .sub2
note G#, 2
note E_, 2
note F#, 2
@ -419,7 +414,7 @@ Music_Cities1_branch_ac35::
note E_, 2
note F#, 2
note G#, 2
sound_call Music_Cities1_branch_acc5
sound_call .sub1
note B_, 2
note E_, 2
note F#, 2
@ -428,8 +423,8 @@ Music_Cities1_branch_ac35::
note E_, 2
note F#, 2
note G#, 2
sound_call Music_Cities1_branch_acc5
sound_call Music_Cities1_branch_acce
sound_call .sub1
sound_call .sub2
note G#, 2
note E_, 2
note F#, 2
@ -530,9 +525,9 @@ Music_Cities1_branch_ac35::
note A_, 2
note G#, 2
note F#, 2
sound_loop 0, Music_Cities1_branch_ac35
sound_loop 0, .mainloop
Music_Cities1_branch_acc5::
.sub1:
rest 2
note E_, 2
note F#, 2
@ -543,7 +538,7 @@ Music_Cities1_branch_acc5::
note G#, 2
sound_ret
Music_Cities1_branch_acce::
.sub2:
note A_, 2
note F#, 2
note G#, 2
@ -578,27 +573,26 @@ Music_Cities1_branch_acce::
note F#, 2
sound_ret
Music_Cities1_Ch4::
.mainloop:
drum_speed 12
sound_call Music_Cities1_branch_ad36
Music_Cities1_branch_acf3::
sound_call Music_Cities1_branch_ad36
sound_call Music_Cities1_branch_ad45
sound_call Music_Cities1_branch_ad45
sound_loop 2, Music_Cities1_branch_acf3
sound_call Music_Cities1_branch_ad36
sound_call Music_Cities1_branch_ad5f
sound_call Music_Cities1_branch_ad52
sound_call .sub1
.loop1:
sound_call .sub1
sound_call .sub2
sound_call .sub2
sound_loop 2, .loop1
sound_call .sub1
sound_call .sub4
sound_call .sub3
drum_note 6, 6
drum_note 6, 6
drum_note 7, 4
sound_call Music_Cities1_branch_ad6e
sound_call Music_Cities1_branch_ad5f
sound_call Music_Cities1_branch_ad52
sound_call Music_Cities1_branch_ad6e
sound_call Music_Cities1_branch_ad52
sound_call .sub5
sound_call .sub4
sound_call .sub3
sound_call .sub5
sound_call .sub3
drum_note 6, 6
drum_note 6, 6
drum_note 7, 2
@ -609,9 +603,9 @@ Music_Cities1_branch_acf3::
drum_note 6, 6
drum_note 8, 6
drum_note 8, 4
sound_loop 0, Music_Cities1_Ch4
sound_loop 0, .mainloop
Music_Cities1_branch_ad36::
.sub1:
drum_note 8, 6
drum_note 8, 6
drum_note 8, 4
@ -621,7 +615,7 @@ Music_Cities1_branch_ad36::
drum_note 8, 2
sound_ret
Music_Cities1_branch_ad45::
.sub2:
drum_note 8, 6
drum_note 8, 6
drum_note 8, 4
@ -630,7 +624,7 @@ Music_Cities1_branch_ad45::
drum_note 8, 4
sound_ret
Music_Cities1_branch_ad52::
.sub3:
drum_note 6, 6
drum_note 6, 6
drum_note 7, 4
@ -639,7 +633,7 @@ Music_Cities1_branch_ad52::
drum_note 7, 4
sound_ret
Music_Cities1_branch_ad5f::
.sub4:
drum_note 6, 6
drum_note 6, 6
drum_note 7, 4
@ -649,7 +643,7 @@ Music_Cities1_branch_ad5f::
drum_note 6, 2
sound_ret
Music_Cities1_branch_ad6e::
.sub5:
drum_note 6, 6
drum_note 6, 6
drum_note 7, 2

View file

@ -14,8 +14,7 @@ Music_Cities2_Ch1::
octave 2
note B_, 2
rest 14
Music_Cities2_branch_b51a::
.mainloop:
octave 3
note B_, 4
octave 4
@ -91,8 +90,7 @@ Music_Cities2_branch_b51a::
note F#, 4
note E_, 2
rest 14
sound_loop 0, Music_Cities2_branch_b51a
sound_loop 0, .mainloop
Music_Cities2_Ch2::
duty_cycle 3
@ -123,8 +121,7 @@ Music_Cities2_Ch2::
note F#, 1
note G#, 1
note A_, 1
Music_Cities2_branch_b58b::
.mainloop:
note_type 12, 10, 6
note G#, 6
note_type 12, 12, 2
@ -277,8 +274,7 @@ Music_Cities2_branch_b58b::
note F#, 1
note G#, 1
note A_, 1
sound_loop 0, Music_Cities2_branch_b58b
sound_loop 0, .mainloop
Music_Cities2_Ch3::
note_type 12, 1, 1
@ -292,8 +288,7 @@ Music_Cities2_Ch3::
note G#, 2
note E_, 2
note G#, 2
Music_Cities2_branch_b64c::
.mainloop:
note F#, 2
note A_, 2
note F#, 2
@ -413,4 +408,4 @@ Music_Cities2_branch_b64c::
note G#, 2
note E_, 2
note G#, 2
sound_loop 0, Music_Cities2_branch_b64c
sound_loop 0, .mainloop

View file

@ -283,7 +283,6 @@ Music_Credits_Ch1::
note A_, 8
sound_ret
Music_Credits_Ch2::
duty_cycle 3
vibrato 10, 2, 5
@ -573,7 +572,6 @@ Music_Credits_Ch2::
note A_, 8
sound_ret
Music_Credits_Ch3::
note_type 12, 1, 0
octave 5
@ -597,9 +595,9 @@ Music_Credits_Ch3::
note A_, 1
rest 15
rest 16
sound_call Music_Credits_branch_7ffa4
sound_call Music_Credits_branch_7ffae
sound_call Music_Credits_branch_7ffa4
sound_call .sub1
sound_call .sub2
sound_call .sub1
octave 4
note E_, 2
note A_, 2
@ -609,13 +607,13 @@ Music_Credits_Ch3::
note F#, 2
note G_, 2
note A_, 2
sound_call Music_Credits_branch_7ffa4
sound_call Music_Credits_branch_7ffae
sound_call Music_Credits_branch_7ffa4
sound_call Music_Credits_branch_7ffa4
sound_call Music_Credits_branch_7ffb8
sound_call Music_Credits_branch_7ffb8
sound_call Music_Credits_branch_7ffc1
sound_call .sub1
sound_call .sub2
sound_call .sub1
sound_call .sub1
sound_call .sub3
sound_call .sub3
sound_call .sub4
octave 4
note A_, 2
octave 5
@ -631,34 +629,34 @@ Music_Credits_Ch3::
octave 4
note B_, 2
note A_, 2
sound_call Music_Credits_branch_7ffb8
sound_call Music_Credits_branch_7ffb8
sound_call Music_Credits_branch_7ffc1
sound_call Music_Credits_branch_7ffc1
sound_call .sub3
sound_call .sub3
sound_call .sub4
sound_call .sub4
octave 4
note G_, 4
note A_, 4
note B_, 4
octave 5
note D_, 4
sound_call Music_Credits_branch_7ffa4
sound_call Music_Credits_branch_7ffa4
sound_call Music_Credits_branch_7ffa4
sound_call Music_Credits_branch_7ffa4
sound_call Music_Credits_branch_7ffa4
sound_call Music_Credits_branch_7ffa4
sound_call Music_Credits_branch_7ffae
sound_call Music_Credits_branch_7ffae
sound_call Music_Credits_branch_7ffa4
sound_call .sub1
sound_call .sub1
sound_call .sub1
sound_call .sub1
sound_call .sub1
sound_call .sub1
sound_call .sub2
sound_call .sub2
sound_call .sub1
note E_, 4
note A_, 2
note E_, 4
note A_, 2
note E_, 2
note A_, 2
sound_call Music_Credits_branch_7ffae
sound_call Music_Credits_branch_7ffae
sound_call Music_Credits_branch_7ffa4
sound_call .sub2
sound_call .sub2
sound_call .sub1
note E_, 2
note A_, 2
note E_, 2
@ -667,10 +665,10 @@ Music_Credits_Ch3::
note A_, 2
note G#, 2
note A_, 2
sound_call Music_Credits_branch_7ffd2
sound_call Music_Credits_branch_7ffd2
sound_call Music_Credits_branch_7ffdb
sound_call Music_Credits_branch_7ffdb
sound_call .sub5
sound_call .sub5
sound_call .sub6
sound_call .sub6
note F_, 2
note A_, 2
note F_, 2
@ -687,8 +685,8 @@ Music_Credits_Ch3::
note D_, 2
note E_, 2
note F_, 2
sound_call Music_Credits_branch_7ffb8
sound_call Music_Credits_branch_7ffb8
sound_call .sub3
sound_call .sub3
note E_, 4
note A_, 4
note E_, 4
@ -697,16 +695,16 @@ Music_Credits_Ch3::
note A_, 4
note E_, 4
note A_, 4
sound_call Music_Credits_branch_7ffa4
sound_call Music_Credits_branch_7ffa4
sound_call Music_Credits_branch_7ffe4
sound_call Music_Credits_branch_7ffe4
sound_call Music_Credits_branch_7ffa4
sound_call Music_Credits_branch_7ffa4
sound_call Music_Credits_branch_7ffb8
sound_call Music_Credits_branch_7ffb8
sound_call Music_Credits_branch_7ffed
sound_call Music_Credits_branch_7ffed
sound_call .sub1
sound_call .sub1
sound_call .sub7
sound_call .sub7
sound_call .sub1
sound_call .sub1
sound_call .sub3
sound_call .sub3
sound_call .sub8
sound_call .sub8
note A_, 1
rest 1
note A_, 1
@ -717,7 +715,7 @@ Music_Credits_Ch3::
rest 7
sound_ret
Music_Credits_branch_7ffa4::
.sub1:
octave 4
note E_, 2
note A_, 2
@ -729,7 +727,7 @@ Music_Credits_branch_7ffa4::
note A_, 2
sound_ret
Music_Credits_branch_7ffae::
.sub2:
octave 4
note D_, 2
note G_, 2
@ -741,7 +739,7 @@ Music_Credits_branch_7ffae::
note G_, 2
sound_ret
Music_Credits_branch_7ffb8::
.sub3:
note G_, 2
note B_, 2
note G_, 2
@ -752,7 +750,7 @@ Music_Credits_branch_7ffb8::
note B_, 2
sound_ret
Music_Credits_branch_7ffc1::
.sub4:
octave 4
note A_, 2
octave 5
@ -771,7 +769,7 @@ Music_Credits_branch_7ffc1::
note C#, 2
sound_ret
Music_Credits_branch_7ffd2::
.sub5:
note D_, 2
note A_, 2
note D_, 2
@ -782,7 +780,7 @@ Music_Credits_branch_7ffd2::
note A_, 2
sound_ret
Music_Credits_branch_7ffdb::
.sub6:
note E_, 2
note G#, 2
note E_, 2
@ -793,7 +791,7 @@ Music_Credits_branch_7ffdb::
note G#, 2
sound_ret
Music_Credits_branch_7ffe4::
.sub7:
note E_, 2
note B_, 2
note E_, 2
@ -804,7 +802,7 @@ Music_Credits_branch_7ffe4::
note B_, 2
sound_ret
Music_Credits_branch_7ffed::
.sub8:
note A_, 1
rest 1
note A_, 1

View file

@ -19,8 +19,7 @@ Music_DefeatedGymLeader_Ch1::
note A_, 8
note_type 12, 10, 7
note A_, 8
Music_DefeatedGymLeader_branch_23ccc::
.mainloop:
note_type 12, 11, 2
octave 3
note A_, 2
@ -159,8 +158,7 @@ Music_DefeatedGymLeader_branch_23ccc::
note_type 12, 10, 7
note G_, 8
note E_, 8
sound_loop 0, Music_DefeatedGymLeader_branch_23ccc
sound_loop 0, .mainloop
Music_DefeatedGymLeader_Ch2::
duty_cycle 2
@ -180,8 +178,7 @@ Music_DefeatedGymLeader_Ch2::
note F#, 8
note_type 12, 11, 7
note F#, 8
Music_DefeatedGymLeader_branch_23d84::
.mainloop:
note_type 12, 12, 2
octave 4
note D_, 2
@ -349,8 +346,7 @@ Music_DefeatedGymLeader_branch_23d84::
note B_, 1
octave 4
note C#, 1
sound_loop 0, Music_DefeatedGymLeader_branch_23d84
sound_loop 0, .mainloop
Music_DefeatedGymLeader_Ch3::
note_type 12, 1, 0
@ -369,8 +365,7 @@ Music_DefeatedGymLeader_Ch3::
octave 5
note D_, 1
note F#, 8
Music_DefeatedGymLeader_branch_23e65::
.mainloop:
octave 4
note F#, 1
rest 1
@ -604,4 +599,4 @@ Music_DefeatedGymLeader_branch_23e65::
note A_, 2
note G_, 2
note E_, 2
sound_loop 0, Music_DefeatedGymLeader_branch_23e65
sound_loop 0, .mainloop

View file

@ -20,8 +20,7 @@ Music_DefeatedTrainer_Ch1::
note F#, 12
duty_cycle 1
tempo 224
Music_DefeatedTrainer_branch_23a76::
.mainloop:
note_type 4, 6, 3
octave 3
note A_, 6
@ -92,8 +91,7 @@ Music_DefeatedTrainer_branch_23a76::
note G_, 3
note A_, 3
note B_, 3
sound_loop 0, Music_DefeatedTrainer_branch_23a76
sound_loop 0, .mainloop
Music_DefeatedTrainer_Ch2::
duty_cycle 2
@ -109,8 +107,7 @@ Music_DefeatedTrainer_Ch2::
note C#, 2
note_type 4, 12, 4
note D_, 12
Music_DefeatedTrainer_branch_23ad2::
.mainloop:
note_type 4, 8, 5
octave 4
note D_, 6
@ -169,8 +166,7 @@ Music_DefeatedTrainer_branch_23ad2::
note E_, 12
note_type 4, 6, 7
note E_, 12
sound_loop 0, Music_DefeatedTrainer_branch_23ad2
sound_loop 0, .mainloop
Music_DefeatedTrainer_Ch3::
note_type 4, 1, 0
@ -185,8 +181,7 @@ Music_DefeatedTrainer_Ch3::
note G_, 2
note A_, 12
note_type 4, 2, 1
Music_DefeatedTrainer_branch_23b24::
.mainloop:
note F#, 3
rest 3
note F#, 3
@ -263,4 +258,4 @@ Music_DefeatedTrainer_branch_23b24::
note C#, 3
octave 4
note A_, 3
sound_loop 0, Music_DefeatedTrainer_branch_23b24
sound_loop 0, .mainloop

View file

@ -13,8 +13,7 @@ Music_DefeatedWildMon_Ch1::
note G#, 1
note F#, 1
note E_, 12
Music_DefeatedWildMon_branch_23b8b::
.mainloop:
note_type 12, 6, 2
note E_, 2
note F#, 2
@ -64,8 +63,7 @@ Music_DefeatedWildMon_branch_23b8b::
note A#, 2
note A#, 4
note A_, 8
sound_loop 0, Music_DefeatedWildMon_branch_23b8b
sound_loop 0, .mainloop
Music_DefeatedWildMon_Ch2::
execute_music
@ -78,8 +76,7 @@ Music_DefeatedWildMon_Ch2::
note A_, 1
note_type 12, 12, 7
note B_, 12
Music_DefeatedWildMon_branch_23bce::
.mainloop:
note_type 12, 8, 2
octave 3
note B_, 2
@ -139,8 +136,7 @@ Music_DefeatedWildMon_branch_23bce::
note D_, 2
note D_, 4
note C_, 8
sound_loop 0, Music_DefeatedWildMon_branch_23bce
sound_loop 0, .mainloop
Music_DefeatedWildMon_Ch3::
execute_music
@ -161,8 +157,7 @@ Music_DefeatedWildMon_Ch3::
rest 3
note E_, 1
rest 3
Music_DefeatedWildMon_branch_23c21::
.mainloop:
octave 4
note E_, 1
rest 1
@ -299,4 +294,4 @@ Music_DefeatedWildMon_branch_23c21::
rest 3
octave 4
note D#, 4
sound_loop 0, Music_DefeatedWildMon_branch_23c21
sound_loop 0, .mainloop

View file

@ -10,14 +10,12 @@ Music_Dungeon1_Ch1::
octave 4
note F#, 8
stereo_panning %1111, %1111
Music_Dungeon1_branch_7dee5::
.mainloop:
note_type 12, 11, 2
octave 3
Music_Dungeon1_branch_7dee8::
sound_call Music_Dungeon1_branch_7dfaa
sound_loop 3, Music_Dungeon1_branch_7dee8
.loop1:
sound_call .sub1
sound_loop 3, .loop1
note E_, 1
note D#, 1
note B_, 1
@ -34,23 +32,22 @@ Music_Dungeon1_branch_7dee8::
note G#, 1
note A_, 1
note A#, 1
Music_Dungeon1_branch_7deff::
sound_call Music_Dungeon1_branch_7dfaa
sound_loop 4, Music_Dungeon1_branch_7deff
sound_call Music_Dungeon1_branch_7dfd5
.loop2:
sound_call .sub1
sound_loop 4, .loop2
sound_call .sub4
octave 3
note G_, 1
note F#, 1
note E_, 1
note G_, 1
sound_call Music_Dungeon1_branch_7dfd5
sound_call .sub4
octave 3
note A_, 1
note G_, 1
note E_, 1
note A_, 1
sound_call Music_Dungeon1_branch_7dfd5
sound_call .sub4
octave 3
note B_, 1
note A_, 1
@ -62,12 +59,12 @@ Music_Dungeon1_branch_7deff::
note E_, 4
note D#, 4
note_type 12, 12, 2
sound_call Music_Dungeon1_branch_7dfc5
sound_call .sub3
octave 3
note B_, 3
sound_call Music_Dungeon1_branch_7dfc5
sound_call .sub3
note C_, 3
sound_call Music_Dungeon1_branch_7dfc5
sound_call .sub3
note C#, 3
note_type 12, 12, 3
octave 3
@ -126,12 +123,11 @@ Music_Dungeon1_branch_7deff::
note A#, 1
octave 3
note C#, 1
Music_Dungeon1_branch_7df6e::
.loop3:
rest 16
sound_loop 8, Music_Dungeon1_branch_7df6e
sound_loop 8, .loop3
note_type 12, 12, 3
sound_call Music_Dungeon1_branch_7dfbb
sound_call .sub2
note B_, 2
note G_, 2
octave 3
@ -140,7 +136,7 @@ Music_Dungeon1_branch_7df6e::
note G_, 2
note A_, 4
note F#, 2
sound_call Music_Dungeon1_branch_7dfbb
sound_call .sub2
note A#, 2
note G_, 2
note B_, 4
@ -149,23 +145,23 @@ Music_Dungeon1_branch_7df6e::
note G_, 2
note D#, 2
note_type 12, 12, 2
sound_call Music_Dungeon1_branch_7dfc5
sound_call .sub3
octave 3
note B_, 3
sound_call Music_Dungeon1_branch_7dfc5
sound_call .sub3
note C_, 3
sound_call Music_Dungeon1_branch_7dfc5
sound_call .sub3
note C#, 3
note_type 12, 12, 7
octave 3
note F#, 8
note D#, 8
note_type 12, 12, 2
sound_call Music_Dungeon1_branch_7dfaa
sound_call Music_Dungeon1_branch_7dfaa
sound_loop 0, Music_Dungeon1_branch_7dee5
sound_call .sub1
sound_call .sub1
sound_loop 0, .mainloop
Music_Dungeon1_branch_7dfaa::
.sub1:
note E_, 1
note D#, 1
note B_, 1
@ -184,7 +180,7 @@ Music_Dungeon1_branch_7dfaa::
note A#, 1
sound_ret
Music_Dungeon1_branch_7dfbb::
.sub2:
octave 2
note G_, 2
note A#, 4
@ -196,7 +192,7 @@ Music_Dungeon1_branch_7dfbb::
note A#, 2
sound_ret
Music_Dungeon1_branch_7dfc5::
.sub3:
octave 3
note E_, 1
note E_, 1
@ -214,7 +210,7 @@ Music_Dungeon1_branch_7dfc5::
note C_, 1
sound_ret
Music_Dungeon1_branch_7dfd5::
.sub4:
note E_, 1
note E_, 1
rest 4
@ -225,7 +221,6 @@ Music_Dungeon1_branch_7dfd5::
rest 1
sound_ret
Music_Dungeon1_Ch2::
vibrato 11, 1, 5
duty_cycle 3
@ -235,13 +230,11 @@ Music_Dungeon1_Ch2::
note_type 12, 4, -5
octave 5
note D_, 8
Music_Dungeon1_branch_7dfeb::
.mainloop:
note_type 12, 12, 2
Music_Dungeon1_branch_7dfed::
sound_call Music_Dungeon1_branch_7e097
sound_loop 3, Music_Dungeon1_branch_7dfed
.loop1:
sound_call .sub1
sound_loop 3, .loop1
octave 2
note E_, 1
note E_, 1
@ -260,18 +253,17 @@ Music_Dungeon1_branch_7dfed::
note F#, 1
note G_, 1
note D#, 1
Music_Dungeon1_branch_7e006::
sound_call Music_Dungeon1_branch_7e097
sound_loop 4, Music_Dungeon1_branch_7e006
.loop2:
sound_call .sub1
sound_loop 4, .loop2
rest 2
sound_call Music_Dungeon1_branch_7e0ab
sound_call .sub2
octave 3
note C_, 4
sound_call Music_Dungeon1_branch_7e0ab
sound_call .sub2
octave 3
note C#, 4
sound_call Music_Dungeon1_branch_7e0ab
sound_call .sub2
octave 3
note D#, 4
note_type 12, 13, 3
@ -282,13 +274,13 @@ Music_Dungeon1_branch_7e006::
octave 3
note B_, 4
note_type 12, 13, 2
sound_call Music_Dungeon1_branch_7e0b5
sound_call .sub3
octave 3
note F#, 4
sound_call Music_Dungeon1_branch_7e0b5
sound_call .sub3
octave 3
note G_, 4
sound_call Music_Dungeon1_branch_7e0b5
sound_call .sub3
octave 3
note A#, 4
note_type 12, 13, 3
@ -310,24 +302,24 @@ Music_Dungeon1_branch_7e006::
note F#, 8
note G_, 8
note_type 12, 13, 2
sound_call Music_Dungeon1_branch_7e0ba
sound_call .sub4
rest 10
note E_, 1
rest 1
sound_call Music_Dungeon1_branch_7e0ba
sound_call .sub4
rest 12
sound_call Music_Dungeon1_branch_7e0ba
sound_call .sub4
rest 12
sound_call Music_Dungeon1_branch_7e0ba
sound_call .sub4
rest 14
note_type 12, 13, 3
sound_call Music_Dungeon1_branch_7e0cd
sound_call .sub6
note D#, 4
sound_call Music_Dungeon1_branch_7e0cd
sound_call .sub6
note D#, 2
rest 2
note_type 12, 13, 2
sound_call Music_Dungeon1_branch_7e0c0
sound_call .sub5
rest 2
octave 3
note F#, 4
@ -347,7 +339,7 @@ Music_Dungeon1_branch_7e006::
rest 2
octave 3
note G_, 4
sound_call Music_Dungeon1_branch_7e0c0
sound_call .sub5
octave 3
note A#, 4
note_type 12, 13, 6
@ -355,11 +347,11 @@ Music_Dungeon1_branch_7e006::
octave 4
note D#, 8
note_type 12, 13, 2
sound_call Music_Dungeon1_branch_7e097
sound_call Music_Dungeon1_branch_7e097
sound_loop 0, Music_Dungeon1_branch_7dfeb
sound_call .sub1
sound_call .sub1
sound_loop 0, .mainloop
Music_Dungeon1_branch_7e097::
.sub1:
octave 2
note E_, 1
note E_, 1
@ -381,7 +373,7 @@ Music_Dungeon1_branch_7e097::
note B_, 1
sound_ret
Music_Dungeon1_branch_7e0ab::
.sub2:
octave 2
note E_, 1
note E_, 1
@ -393,14 +385,14 @@ Music_Dungeon1_branch_7e0ab::
rest 3
sound_ret
Music_Dungeon1_branch_7e0b5::
.sub3:
octave 2
note E_, 1
note E_, 1
rest 10
sound_ret
Music_Dungeon1_branch_7e0ba::
.sub4:
octave 1
note E_, 1
note G_, 1
@ -408,7 +400,7 @@ Music_Dungeon1_branch_7e0ba::
note D#, 1
sound_ret
Music_Dungeon1_branch_7e0c0::
.sub5:
octave 2
note E_, 1
note E_, 1
@ -423,7 +415,7 @@ Music_Dungeon1_branch_7e0c0::
note C_, 1
sound_ret
Music_Dungeon1_branch_7e0cd::
.sub6:
octave 3
note E_, 6
note G_, 6
@ -440,7 +432,6 @@ Music_Dungeon1_branch_7e0cd::
note F#, 6
sound_ret
Music_Dungeon1_Ch3::
note_type 12, 1, 1
vibrato 8, 2, 6
@ -448,10 +439,9 @@ Music_Dungeon1_Ch3::
octave 4
note D_, 1
note D#, 1
Music_Dungeon1_branch_7e0e5::
sound_call Music_Dungeon1_branch_7e140
sound_call Music_Dungeon1_branch_7e140
.mainloop:
sound_call .sub1
sound_call .sub1
octave 5
note E_, 2
rest 4
@ -462,10 +452,10 @@ Music_Dungeon1_branch_7e0e5::
rest 1
octave 4
note F#, 4
sound_call Music_Dungeon1_branch_7e154
sound_call .sub2
octave 4
note G_, 4
sound_call Music_Dungeon1_branch_7e154
sound_call .sub2
octave 4
note A_, 4
note B_, 4
@ -473,7 +463,7 @@ Music_Dungeon1_branch_7e0e5::
note G_, 4
note F#, 4
rest 6
sound_call Music_Dungeon1_branch_7e177
sound_call .sub5
note B_, 4
note A#, 4
note G_, 4
@ -482,36 +472,36 @@ Music_Dungeon1_branch_7e0e5::
note F#, 4
note E_, 4
note D#, 4
sound_call Music_Dungeon1_branch_7e15e
sound_call .sub3
rest 12
sound_call Music_Dungeon1_branch_7e15e
sound_call .sub3
rest 12
sound_call Music_Dungeon1_branch_7e15e
sound_call .sub3
rest 10
note E_, 1
rest 1
sound_call Music_Dungeon1_branch_7e15e
sound_call .sub3
rest 12
sound_call Music_Dungeon1_branch_7e15e
sound_call .sub3
rest 12
sound_call Music_Dungeon1_branch_7e15e
sound_call .sub3
rest 10
note D_, 1
note D#, 1
sound_call Music_Dungeon1_branch_7e164
sound_call Music_Dungeon1_branch_7e164
sound_call .sub4
sound_call .sub4
note E_, 2
rest 4
sound_call Music_Dungeon1_branch_7e177
sound_call .sub5
note B_, 8
note F#, 6
note D_, 1
note D#, 1
rest 16
rest 16
sound_loop 0, Music_Dungeon1_branch_7e0e5
sound_loop 0, .mainloop
Music_Dungeon1_branch_7e140::
.sub1:
octave 5
note E_, 4
note B_, 4
@ -533,7 +523,7 @@ Music_Dungeon1_branch_7e140::
note D#, 4
sound_ret
Music_Dungeon1_branch_7e154::
.sub2:
octave 6
note E_, 1
note E_, 1
@ -545,7 +535,7 @@ Music_Dungeon1_branch_7e154::
rest 1
sound_ret
Music_Dungeon1_branch_7e15e::
.sub3:
octave 3
note E_, 1
note G_, 1
@ -553,7 +543,7 @@ Music_Dungeon1_branch_7e15e::
note D#, 1
sound_ret
Music_Dungeon1_branch_7e164::
.sub4:
note E_, 4
note B_, 4
note A#, 4
@ -574,7 +564,7 @@ Music_Dungeon1_branch_7e164::
note D#, 4
sound_ret
Music_Dungeon1_branch_7e177::
.sub5:
octave 4
note E_, 1
rest 3
@ -595,79 +585,73 @@ Music_Dungeon1_branch_7e177::
note A#, 4
sound_ret
Music_Dungeon1_Ch4::
drum_speed 12
rest 14
drum_note 12, 1
drum_note 12, 1
Music_Dungeon1_branch_7e190::
sound_call Music_Dungeon1_branch_7e1f1
sound_loop 3, Music_Dungeon1_branch_7e190
.mainloop:
.loop1:
sound_call .sub1
sound_loop 3, .loop1
drum_note 13, 4
drum_note 12, 4
drum_note 13, 4
drum_note 12, 2
drum_note 12, 2
Music_Dungeon1_branch_7e1a1::
sound_call Music_Dungeon1_branch_7e1f1
sound_loop 3, Music_Dungeon1_branch_7e1a1
.loop2:
sound_call .sub1
sound_loop 3, .loop2
drum_note 13, 4
drum_note 12, 4
drum_note 13, 4
drum_note 13, 4
Music_Dungeon1_branch_7e1b0::
sound_call Music_Dungeon1_branch_7e1fa
sound_loop 3, Music_Dungeon1_branch_7e1b0
sound_call Music_Dungeon1_branch_7e202
Music_Dungeon1_branch_7e1ba::
sound_call Music_Dungeon1_branch_7e1fa
sound_loop 3, Music_Dungeon1_branch_7e1ba
sound_call Music_Dungeon1_branch_7e202
.loop3:
sound_call .sub2
sound_loop 3, .loop3
sound_call .sub3
.loop4:
sound_call .sub2
sound_loop 3, .loop4
sound_call .sub3
drum_note 9, 4
drum_note 10, 4
drum_note 10, 4
rest 2
drum_note 9, 2
drum_note 13, 4
Music_Dungeon1_branch_7e1cf::
.loop5:
rest 16
sound_loop 13, Music_Dungeon1_branch_7e1cf
sound_loop 13, .loop5
rest 12
Music_Dungeon1_branch_7e1d5::
sound_call Music_Dungeon1_branch_7e1fa
sound_loop 3, Music_Dungeon1_branch_7e1d5
.loop6:
sound_call .sub2
sound_loop 3, .loop6
drum_note 12, 4
drum_note 12, 4
drum_note 12, 4
rest 2
drum_note 12, 1
drum_note 12, 1
sound_call Music_Dungeon1_branch_7e1f1
sound_call Music_Dungeon1_branch_7e1f1
sound_loop 0, Music_Dungeon1_branch_7e190
sound_call .sub1
sound_call .sub1
sound_loop 0, .mainloop
Music_Dungeon1_branch_7e1f1::
.sub1:
drum_note 13, 4
drum_note 12, 4
drum_note 13, 4
drum_note 12, 4
sound_ret
Music_Dungeon1_branch_7e1fa::
.sub2:
drum_note 12, 1
drum_note 12, 1
rest 10
drum_note 14, 4
sound_ret
Music_Dungeon1_branch_7e202::
.sub3:
drum_note 9, 4
drum_note 10, 4
drum_note 10, 4

View file

@ -4,8 +4,8 @@ Music_Dungeon2_Ch1::
duty_cycle 3
toggle_perfect_pitch
vibrato 10, 1, 4
Music_Dungeon2_branch_7e892::
.mainloop:
.loop1:
note_type 12, 11, 2
octave 4
note E_, 4
@ -51,7 +51,7 @@ Music_Dungeon2_branch_7e892::
note G_, 2
note A_, 4
note F#, 2
sound_loop 2, Music_Dungeon2_branch_7e892
sound_loop 2, .loop1
note_type 12, 1, -7
octave 3
note E_, 16
@ -67,13 +67,12 @@ Music_Dungeon2_branch_7e892::
rest 16
rest 16
rest 16
sound_loop 0, Music_Dungeon2_branch_7e892
sound_loop 0, .mainloop
Music_Dungeon2_Ch2::
vibrato 11, 1, 5
Music_Dungeon2_branch_7e8db::
.mainloop:
.loop1:
duty_cycle 3
note_type 12, 12, 2
octave 3
@ -110,7 +109,7 @@ Music_Dungeon2_branch_7e8db::
note G_, 4
note G_, 4
note F#, 4
sound_loop 2, Music_Dungeon2_branch_7e8db
sound_loop 2, .loop1
octave 3
note E_, 2
note G_, 2
@ -159,16 +158,15 @@ Music_Dungeon2_branch_7e8db::
note D_, 16
note C_, 16
note D_, 16
sound_loop 0, Music_Dungeon2_branch_7e8db
sound_loop 0, .mainloop
Music_Dungeon2_Ch3::
note_type 12, 1, 3
vibrato 8, 2, 6
Music_Dungeon2_branch_7e940::
sound_call Music_Dungeon2_branch_7e9d1
sound_loop 16, Music_Dungeon2_branch_7e940
.mainloop:
.loop1:
sound_call .sub2
sound_loop 16, .loop1
note E_, 4
rest 4
rest 4
@ -186,8 +184,7 @@ Music_Dungeon2_branch_7e940::
rest 4
rest 4
note A#, 4
Music_Dungeon2_branch_7e958::
.loop2:
octave 5
note E_, 2
rest 2
@ -223,7 +220,7 @@ Music_Dungeon2_branch_7e958::
rest 2
note D#, 2
rest 2
sound_loop 3, Music_Dungeon2_branch_7e958
sound_loop 3, .loop2
octave 4
note E_, 4
note B_, 4
@ -259,15 +256,17 @@ Music_Dungeon2_branch_7e958::
rest 16
rest 16
rest 16
sound_call Music_Dungeon2_branch_7e9d1
sound_call Music_Dungeon2_branch_7e9d1
sound_call Music_Dungeon2_branch_7e9d1
sound_call Music_Dungeon2_branch_7e9d1
sound_call Music_Dungeon2_branch_7e9d1
sound_call Music_Dungeon2_branch_7e9d1
sound_call Music_Dungeon2_branch_7e9d1
sound_call Music_Dungeon2_branch_7e9d1
sound_loop 0, Music_Dungeon2_branch_7e940
sound_call .sub2
sound_call .sub2
sound_call .sub2
sound_call .sub2
sound_call .sub2
sound_call .sub2
sound_call .sub2
sound_call .sub2
sound_loop 0, .mainloop
.sub1: ; unreferenced
octave 2
note G_, 2
note A#, 4
@ -288,7 +287,7 @@ Music_Dungeon2_branch_7e958::
rest 2
sound_ret
Music_Dungeon2_branch_7e9d1::
.sub2:
octave 4
note E_, 2
rest 4
@ -301,11 +300,9 @@ Music_Dungeon2_branch_7e9d1::
note F#, 4
sound_ret
Music_Dungeon2_Ch4::
drum_speed 12
Music_Dungeon2_branch_7e9dd::
.mainloop:
drum_note 12, 4
drum_note 13, 4
drum_note 12, 4
@ -314,4 +311,4 @@ Music_Dungeon2_branch_7e9dd::
drum_note 13, 4
drum_note 11, 4
drum_note 9, 4
sound_loop 0, Music_Dungeon2_branch_7e9dd
sound_loop 0, .mainloop

View file

@ -4,13 +4,11 @@ Music_Dungeon3_Ch1::
duty_cycle 3
toggle_perfect_pitch
vibrato 8, 1, 4
Music_Dungeon3_branch_7e9fc::
.mainloop:
note_type 12, 12, 3
Music_Dungeon3_branch_7e9fe::
sound_call Music_Dungeon3_branch_7eab2
sound_loop 3, Music_Dungeon3_branch_7e9fe
.loop1:
sound_call .sub1
sound_loop 3, .loop1
octave 2
note B_, 2
octave 3
@ -23,14 +21,12 @@ Music_Dungeon3_branch_7e9fe::
note G_, 2
note D#, 2
note E_, 2
Music_Dungeon3_branch_7ea11::
sound_call Music_Dungeon3_branch_7eac1
sound_loop 4, Music_Dungeon3_branch_7ea11
Music_Dungeon3_branch_7ea18::
sound_call Music_Dungeon3_branch_7eab2
sound_loop 4, Music_Dungeon3_branch_7ea18
.loop2:
sound_call .sub2
sound_loop 4, .loop2
.loop3:
sound_call .sub1
sound_loop 4, .loop3
octave 4
note F_, 2
note F_, 2
@ -44,7 +40,7 @@ Music_Dungeon3_branch_7ea18::
note D#, 2
note D_, 2
note D_, 2
sound_call Music_Dungeon3_branch_7eafc
sound_call .sub7
octave 4
note D_, 2
note D_, 2
@ -58,14 +54,12 @@ Music_Dungeon3_branch_7ea18::
note E_, 2
note F_, 2
note F_, 2
Music_Dungeon3_branch_7ea3c::
sound_call Music_Dungeon3_branch_7eace
sound_loop 4, Music_Dungeon3_branch_7ea3c
Music_Dungeon3_branch_7ea43::
sound_call Music_Dungeon3_branch_7eadd
sound_loop 3, Music_Dungeon3_branch_7ea43
.loop4:
sound_call .sub3
sound_loop 4, .loop4
.loop5:
sound_call .sub4
sound_loop 3, .loop5
octave 3
note C#, 2
octave 2
@ -130,8 +124,8 @@ Music_Dungeon3_branch_7ea43::
note E_, 2
octave 4
note C_, 2
sound_call Music_Dungeon3_branch_7eaea
sound_call Music_Dungeon3_branch_7eaea
sound_call .sub5
sound_call .sub5
octave 3
note G#, 2
note E_, 2
@ -147,16 +141,16 @@ Music_Dungeon3_branch_7ea43::
note E_, 2
rest 16
rest 8
sound_call Music_Dungeon3_branch_7eaf7
sound_call Music_Dungeon3_branch_7eaf7
sound_call Music_Dungeon3_branch_7eaf7
sound_call Music_Dungeon3_branch_7eaf7
sound_call .sub6
sound_call .sub6
sound_call .sub6
sound_call .sub6
note D#, 2
rest 16
rest 16
sound_loop 0, Music_Dungeon3_branch_7e9fc
sound_loop 0, .mainloop
Music_Dungeon3_branch_7eab2::
.sub1:
octave 2
note B_, 2
octave 3
@ -173,7 +167,7 @@ Music_Dungeon3_branch_7eab2::
note D#, 2
sound_ret
Music_Dungeon3_branch_7eac1::
.sub2:
note E_, 2
note G#, 2
octave 4
@ -188,7 +182,7 @@ Music_Dungeon3_branch_7eac1::
note G#, 2
sound_ret
Music_Dungeon3_branch_7eace::
.sub3:
octave 3
note D#, 2
octave 2
@ -205,7 +199,7 @@ Music_Dungeon3_branch_7eace::
note B_, 2
sound_ret
Music_Dungeon3_branch_7eadd::
.sub4:
note A_, 2
note F_, 2
octave 3
@ -220,7 +214,7 @@ Music_Dungeon3_branch_7eadd::
note F_, 2
sound_ret
Music_Dungeon3_branch_7eaea::
.sub5:
octave 3
note G#, 2
note E_, 2
@ -235,14 +229,14 @@ Music_Dungeon3_branch_7eaea::
note C_, 2
sound_ret
Music_Dungeon3_branch_7eaf7::
.sub6:
note D#, 2
note G_, 2
note D#, 2
note C#, 6
sound_ret
Music_Dungeon3_branch_7eafc::
.sub7:
tempo 168
octave 1
note A#, 1
@ -334,12 +328,10 @@ Music_Dungeon3_branch_7eafc::
tempo 160
sound_ret
Music_Dungeon3_Ch2::
vibrato 11, 1, 5
duty_cycle 3
Music_Dungeon3_branch_7eb6d::
.mainloop:
note_type 12, 13, 3
octave 4
note D#, 6
@ -604,10 +596,10 @@ Music_Dungeon3_branch_7eb6d::
note B_, 2
octave 3
note D#, 2
sound_loop 0, Music_Dungeon3_branch_7eb6d
sound_loop 0, .mainloop
Music_Dungeon3_Ch3::
.mainloop:
note_type 12, 1, 2
rest 16
rest 16
@ -707,8 +699,7 @@ Music_Dungeon3_Ch3::
rest 16
rest 16
rest 10
sound_loop 0, Music_Dungeon3_Ch3
sound_loop 0, .mainloop
Music_Dungeon3_Ch4::
drum_speed 12

View file

@ -103,8 +103,7 @@ Music_FinalBattle_Ch1::
note G#, 3
note_type 12, 11, 7
note D#, 4
Music_FinalBattle_branch_23429::
.mainloop:
note_type 12, 11, 7
octave 3
note E_, 4
@ -331,8 +330,8 @@ Music_FinalBattle_branch_23429::
octave 4
note C#, 12
note_type 12, 4, 0
sound_call Music_FinalBattle_branch_23710
sound_call Music_FinalBattle_branch_23710
sound_call Music_FinalBattle_Ch2.sub2
sound_call Music_FinalBattle_Ch2.sub2
note_type 12, 11, 7
octave 3
note E_, 4
@ -378,8 +377,7 @@ Music_FinalBattle_branch_23429::
note E_, 8
note_type 12, 11, 7
note E_, 8
sound_loop 0, Music_FinalBattle_branch_23429
sound_loop 0, .mainloop
Music_FinalBattle_Ch2::
duty_cycle 3
@ -464,13 +462,13 @@ Music_FinalBattle_Ch2::
note E_, 3
note_type 12, 12, 2
note D#, 4
sound_call Music_FinalBattle_branch_23704
sound_call Music_FinalBattle_branch_23704
sound_call Music_FinalBattle_branch_23704
sound_call Music_FinalBattle_branch_23704
sound_call Music_FinalBattle_branch_23704
sound_call Music_FinalBattle_branch_23704
sound_call Music_FinalBattle_branch_23704
sound_call .sub1
sound_call .sub1
sound_call .sub1
sound_call .sub1
sound_call .sub1
sound_call .sub1
sound_call .sub1
note_type 12, 12, 1
octave 4
note E_, 1
@ -478,8 +476,7 @@ Music_FinalBattle_Ch2::
note_type 12, 4, -2
octave 3
note G#, 4
Music_FinalBattle_branch_235e6::
.mainloop:
note_type 12, 13, 7
octave 4
note E_, 8
@ -671,9 +668,9 @@ Music_FinalBattle_branch_235e6::
note_type 12, 12, 7
note A_, 8
note_type 12, 12, 5
sound_call Music_FinalBattle_branch_23710
sound_call .sub2
note_type 12, 11, 1
sound_call Music_FinalBattle_branch_23710
sound_call .sub2
note_type 12, 13, 7
octave 4
note E_, 8
@ -707,9 +704,9 @@ Music_FinalBattle_branch_235e6::
note E_, 8
note A#, 4
note B_, 12
sound_loop 0, Music_FinalBattle_branch_235e6
sound_loop 0, .mainloop
Music_FinalBattle_branch_23704::
.sub1:
octave 4
note E_, 1
note E_, 1
@ -723,7 +720,7 @@ Music_FinalBattle_branch_23704::
note F_, 1
sound_ret
Music_FinalBattle_branch_23710::
.sub2:
octave 4
note D_, 2
note C#, 2
@ -737,7 +734,6 @@ Music_FinalBattle_branch_23710::
note D_, 2
sound_ret
Music_FinalBattle_Ch3::
note_type 12, 1, 1
octave 4
@ -835,8 +831,7 @@ Music_FinalBattle_Ch3::
note D#, 1
note E_, 1
note G_, 1
Music_FinalBattle_branch_2377d::
.mainloop:
octave 4
note E_, 1
octave 3
@ -1081,8 +1076,8 @@ Music_FinalBattle_branch_2377d::
note C#, 2
note E_, 2
note C#, 2
sound_call Music_FinalBattle_branch_2395b
sound_call Music_FinalBattle_branch_2395b
sound_call .sub1
sound_call .sub1
octave 4
note G_, 2
octave 5
@ -1116,8 +1111,8 @@ Music_FinalBattle_branch_2377d::
note F#, 1
note G_, 1
note G#, 1
sound_call Music_FinalBattle_branch_2396c
sound_call Music_FinalBattle_branch_2396c
sound_call .sub2
sound_call .sub2
octave 4
note A#, 2
octave 5
@ -1303,9 +1298,9 @@ Music_FinalBattle_branch_2377d::
note E_, 2
note A_, 2
note B_, 4
sound_loop 0, Music_FinalBattle_branch_2377d
sound_loop 0, .mainloop
Music_FinalBattle_branch_2395b::
.sub1:
octave 4
note F#, 2
octave 5
@ -1324,7 +1319,7 @@ Music_FinalBattle_branch_2395b::
note C#, 2
sound_ret
Music_FinalBattle_branch_2396c::
.sub2:
octave 4
note A_, 2
octave 5

View file

@ -14,8 +14,7 @@ Music_GameCorner_Ch1::
note D#, 2
note C#, 2
note D#, 16
Music_GameCorner_branch_7e222::
.mainloop:
note_type 12, 11, 5
octave 3
note C#, 4
@ -180,8 +179,7 @@ Music_GameCorner_branch_7e222::
note G#, 1
note G_, 1
note G#, 8
sound_loop 0, Music_GameCorner_branch_7e222
sound_loop 0, .mainloop
Music_GameCorner_Ch2::
duty_cycle 2
@ -205,8 +203,7 @@ Music_GameCorner_Ch2::
note B_, 1
note A#, 1
note B_, 8
Music_GameCorner_branch_7e2fa::
.mainloop:
duty_cycle 2
note_type 12, 12, 7
octave 3
@ -340,8 +337,7 @@ Music_GameCorner_branch_7e2fa::
note A_, 4
note F#, 4
note B_, 16
sound_loop 0, Music_GameCorner_branch_7e2fa
sound_loop 0, .mainloop
Music_GameCorner_Ch3::
note_type 12, 1, 3
@ -369,15 +365,14 @@ Music_GameCorner_Ch3::
rest 1
note D#, 1
rest 1
Music_GameCorner_branch_7e3a5::
sound_call Music_GameCorner_branch_7e418
sound_call Music_GameCorner_branch_7e42d
sound_call Music_GameCorner_branch_7e442
sound_call Music_GameCorner_branch_7e457
sound_call Music_GameCorner_branch_7e46c
sound_call Music_GameCorner_branch_7e481
sound_call Music_GameCorner_branch_7e496
.mainloop:
sound_call .sub1
sound_call .sub2
sound_call .sub3
sound_call .sub4
sound_call .sub5
sound_call .sub6
sound_call .sub7
note D#, 1
rest 1
note A_, 1
@ -396,13 +391,13 @@ Music_GameCorner_branch_7e3a5::
rest 1
note F#, 1
rest 1
sound_call Music_GameCorner_branch_7e418
sound_call Music_GameCorner_branch_7e42d
sound_call Music_GameCorner_branch_7e442
sound_call Music_GameCorner_branch_7e457
sound_call Music_GameCorner_branch_7e46c
sound_call Music_GameCorner_branch_7e481
sound_call Music_GameCorner_branch_7e496
sound_call .sub1
sound_call .sub2
sound_call .sub3
sound_call .sub4
sound_call .sub5
sound_call .sub6
sound_call .sub7
note E_, 1
rest 3
octave 3
@ -415,9 +410,9 @@ Music_GameCorner_branch_7e3a5::
rest 3
note B_, 1
rest 1
sound_call Music_GameCorner_branch_7e46c
sound_call Music_GameCorner_branch_7e418
sound_call Music_GameCorner_branch_7e4ab
sound_call .sub5
sound_call .sub1
sound_call .sub8
note E_, 1
rest 1
note G#, 1
@ -436,13 +431,13 @@ Music_GameCorner_branch_7e3a5::
rest 1
note E_, 1
rest 1
sound_call Music_GameCorner_branch_7e46c
sound_call Music_GameCorner_branch_7e418
sound_call Music_GameCorner_branch_7e4ab
sound_call Music_GameCorner_branch_7e42d
sound_loop 0, Music_GameCorner_branch_7e3a5
sound_call .sub5
sound_call .sub1
sound_call .sub8
sound_call .sub2
sound_loop 0, .mainloop
Music_GameCorner_branch_7e418::
.sub1:
note E_, 1
rest 1
note G#, 1
@ -465,7 +460,7 @@ Music_GameCorner_branch_7e418::
rest 1
sound_ret
Music_GameCorner_branch_7e42d::
.sub2:
note E_, 1
rest 1
note G#, 1
@ -488,7 +483,7 @@ Music_GameCorner_branch_7e42d::
rest 1
sound_ret
Music_GameCorner_branch_7e442::
.sub3:
note E_, 1
rest 1
note B_, 1
@ -511,7 +506,7 @@ Music_GameCorner_branch_7e442::
rest 1
sound_ret
Music_GameCorner_branch_7e457::
.sub4:
note D#, 1
rest 1
note A_, 1
@ -534,7 +529,7 @@ Music_GameCorner_branch_7e457::
rest 1
sound_ret
Music_GameCorner_branch_7e46c::
.sub5:
note D#, 1
rest 1
note F#, 1
@ -557,7 +552,7 @@ Music_GameCorner_branch_7e46c::
rest 1
sound_ret
Music_GameCorner_branch_7e481::
.sub6:
note D#, 1
rest 1
note F#, 1
@ -580,7 +575,7 @@ Music_GameCorner_branch_7e481::
rest 1
sound_ret
Music_GameCorner_branch_7e496::
.sub7:
note F#, 1
rest 1
note B_, 1
@ -603,7 +598,7 @@ Music_GameCorner_branch_7e496::
rest 1
sound_ret
Music_GameCorner_branch_7e4ab::
.sub8:
note F#, 1
rest 1
note A_, 1

View file

@ -21,8 +21,7 @@ Music_Gym_Ch1::
note E_, 1
note F_, 4
note G_, 4
Music_Gym_branch_bcd8::
.mainloop:
note E_, 4
note F_, 2
note G_, 2
@ -162,8 +161,7 @@ Music_Gym_branch_bcd8::
note A_, 2
note G_, 2
note A_, 2
sound_loop 0, Music_Gym_branch_bcd8
sound_loop 0, .mainloop
Music_Gym_Ch2::
duty_cycle 3
@ -183,8 +181,7 @@ Music_Gym_Ch2::
note A_, 12
note_type 12, 12, 7
note B_, 4
Music_Gym_branch_bd82::
.mainloop:
octave 4
note C_, 12
octave 3
@ -285,8 +282,7 @@ Music_Gym_branch_bd82::
note C_, 1
note D_, 1
note E_, 12
sound_loop 0, Music_Gym_branch_bd82
sound_loop 0, .mainloop
Music_Gym_Ch3::
note_type 12, 1, 1
@ -296,23 +292,22 @@ Music_Gym_Ch3::
note G_, 2
note F_, 2
note D_, 2
Music_Gym_branch_be02::
sound_call Music_Gym_branch_be3b
sound_call Music_Gym_branch_be44
sound_call Music_Gym_branch_be3b
sound_call Music_Gym_branch_be44
sound_call Music_Gym_branch_be3b
sound_call Music_Gym_branch_be44
sound_call Music_Gym_branch_be3b
sound_call Music_Gym_branch_be44
sound_call Music_Gym_branch_be3b
sound_call Music_Gym_branch_be4d
sound_call Music_Gym_branch_be3b
sound_call Music_Gym_branch_be4d
sound_call Music_Gym_branch_be3b
sound_call Music_Gym_branch_be4d
sound_call Music_Gym_branch_be3b
.mainloop:
sound_call .sub1
sound_call .sub2
sound_call .sub1
sound_call .sub2
sound_call .sub1
sound_call .sub2
sound_call .sub1
sound_call .sub2
sound_call .sub1
sound_call .sub3
sound_call .sub1
sound_call .sub3
sound_call .sub1
sound_call .sub3
sound_call .sub1
note F_, 2
note A#, 2
note F_, 2
@ -321,9 +316,9 @@ Music_Gym_branch_be02::
note A#, 2
note A_, 2
note F_, 2
sound_loop 0, Music_Gym_branch_be02
sound_loop 0, .mainloop
Music_Gym_branch_be3b::
.sub1:
note E_, 2
note G_, 2
note E_, 2
@ -334,7 +329,7 @@ Music_Gym_branch_be3b::
note G_, 2
sound_ret
Music_Gym_branch_be44::
.sub2:
note D_, 2
note F_, 2
note D_, 2
@ -345,7 +340,7 @@ Music_Gym_branch_be44::
note F_, 2
sound_ret
Music_Gym_branch_be4d::
.sub3:
note F_, 2
note A#, 2
note F_, 2

View file

@ -56,8 +56,7 @@ Music_GymLeaderBattle_Ch1::
note F#, 1
rest 9
note A_, 6
Music_GymLeaderBattle_branch_223b0::
.mainloop:
note F#, 1
octave 3
note C#, 1
@ -544,8 +543,7 @@ Music_GymLeaderBattle_branch_223b0::
note A_, 2
note G#, 4
note E_, 6
sound_loop 0, Music_GymLeaderBattle_branch_223b0
sound_loop 0, .mainloop
Music_GymLeaderBattle_Ch2::
duty_cycle 3
@ -607,8 +605,7 @@ Music_GymLeaderBattle_Ch2::
rest 9
octave 4
note C#, 6
Music_GymLeaderBattle_branch_225e0::
.mainloop:
note_type 12, 12, 5
note D#, 4
note C#, 4
@ -845,8 +842,7 @@ Music_GymLeaderBattle_branch_225e0::
note_type 12, 12, 3
octave 4
note A_, 6
sound_loop 0, Music_GymLeaderBattle_branch_225e0
sound_loop 0, .mainloop
Music_GymLeaderBattle_Ch3::
vibrato 0, 2, 0
@ -1039,8 +1035,7 @@ Music_GymLeaderBattle_Ch3::
octave 4
note C#, 6
note_type 12, 1, 4
Music_GymLeaderBattle_branch_227b1::
.mainloop:
octave 3
note B_, 2
octave 4
@ -1397,4 +1392,4 @@ Music_GymLeaderBattle_branch_227b1::
note B_, 2
octave 4
note G_, 6
sound_loop 0, Music_GymLeaderBattle_branch_227b1
sound_loop 0, .mainloop

View file

@ -14,8 +14,8 @@ Music_HallOfFame_Ch1::
note E_, 1
note F_, 1
note F#, 1
Music_HallOfFame_branch_7fbc5::
.mainloop:
.loop1:
note_type 12, 8, 0
octave 4
note C_, 16
@ -23,19 +23,17 @@ Music_HallOfFame_branch_7fbc5::
note F#, 16
note_type 12, 6, 0
note F_, 16
sound_loop 3, Music_HallOfFame_branch_7fbc5
sound_loop 3, .loop1
rest 16
rest 16
rest 16
rest 16
sound_loop 0, Music_HallOfFame_branch_7fbc5
sound_loop 0, .mainloop
Music_HallOfFame_Ch2::
vibrato 8, 2, 5
duty_cycle 3
Music_HallOfFame_branch_7fbdf::
.mainloop:
note_type 12, 12, 4
octave 3
note G_, 2
@ -60,13 +58,12 @@ Music_HallOfFame_branch_7fbdf::
note A#, 4
note A_, 4
note F_, 2
sound_loop 0, Music_HallOfFame_branch_7fbdf
sound_loop 0, .mainloop
Music_HallOfFame_Ch3::
.mainloop:
note_type 12, 1, 2
Music_HallOfFame_branch_7fbfe::
.loop1:
octave 4
note D_, 2
note G_, 2
@ -76,7 +73,7 @@ Music_HallOfFame_branch_7fbfe::
note G_, 2
note D_, 2
note G_, 2
sound_loop 12, Music_HallOfFame_branch_7fbfe
sound_loop 12, .loop1
note D_, 4
note G_, 4
note D_, 4
@ -93,4 +90,4 @@ Music_HallOfFame_branch_7fbfe::
note G_, 4
note E_, 4
note G_, 4
sound_loop 0, Music_HallOfFame_Ch3
sound_loop 0, .mainloop

View file

@ -12,25 +12,24 @@ Music_IndigoPlateau_Ch1::
note A_, 4
note_type 12, 10, 4
note A#, 4
Music_IndigoPlateau_branch_a605::
sound_call Music_IndigoPlateau_branch_a659
.mainloop:
sound_call .sub1
note_type 12, 11, 4
octave 3
note D_, 4
sound_call Music_IndigoPlateau_branch_a659
sound_call .sub1
note_type 12, 11, 4
octave 3
note D#, 4
sound_call Music_IndigoPlateau_branch_a659
sound_call .sub1
note_type 12, 11, 4
octave 3
note D_, 4
sound_call Music_IndigoPlateau_branch_a659
sound_call .sub1
note_type 12, 10, 0
octave 2
note A#, 4
sound_call Music_IndigoPlateau_branch_a659
sound_call .sub1
note_type 12, 11, 4
octave 3
note D_, 4
@ -71,9 +70,9 @@ Music_IndigoPlateau_branch_a605::
note_type 12, 4, -6
octave 2
note A#, 8
sound_loop 0, Music_IndigoPlateau_branch_a605
sound_loop 0, .mainloop
Music_IndigoPlateau_branch_a659::
.sub1:
note_type 12, 11, 2
octave 2
note A_, 4
@ -85,7 +84,6 @@ Music_IndigoPlateau_branch_a659::
note A_, 4
sound_ret
Music_IndigoPlateau_Ch2::
duty_cycle 3
vibrato 8, 2, 5
@ -97,27 +95,26 @@ Music_IndigoPlateau_Ch2::
note D_, 4
note_type 12, 5, -2
note D#, 4
Music_IndigoPlateau_branch_a673::
sound_call Music_IndigoPlateau_branch_a6af
.mainloop:
sound_call .sub1
note_type 12, 12, 5
note A_, 4
sound_call Music_IndigoPlateau_branch_a6af
sound_call .sub1
note_type 12, 12, 5
note A#, 4
sound_call Music_IndigoPlateau_branch_a6af
sound_call .sub1
note_type 12, 12, 5
note A_, 4
sound_call Music_IndigoPlateau_branch_a6af
sound_call .sub1
note_type 12, 12, 7
note C#, 4
sound_call Music_IndigoPlateau_branch_a6af
sound_call .sub1
note_type 12, 12, 5
note A_, 4
sound_call Music_IndigoPlateau_branch_a6af
sound_call .sub1
note_type 12, 12, 5
note A#, 4
sound_call Music_IndigoPlateau_branch_a6af
sound_call .sub1
note_type 12, 12, 5
octave 4
note C_, 2
@ -132,9 +129,9 @@ Music_IndigoPlateau_branch_a673::
note_type 12, 4, -5
octave 4
note D#, 8
sound_loop 0, Music_IndigoPlateau_branch_a673
sound_loop 0, .mainloop
Music_IndigoPlateau_branch_a6af::
.sub1:
note_type 12, 12, 2
octave 3
note D_, 4
@ -146,7 +143,6 @@ Music_IndigoPlateau_branch_a6af::
note D_, 4
sound_ret
Music_IndigoPlateau_Ch3::
note_type 12, 1, 0
octave 4
@ -159,11 +155,10 @@ Music_IndigoPlateau_Ch3::
note D_, 2
rest 2
note D#, 4
Music_IndigoPlateau_branch_a6c6::
sound_call Music_IndigoPlateau_branch_a6fe
sound_call Music_IndigoPlateau_branch_a6fe
sound_call Music_IndigoPlateau_branch_a6fe
.mainloop:
sound_call .sub1
sound_call .sub1
sound_call .sub1
note D_, 2
rest 2
note D_, 2
@ -179,8 +174,8 @@ Music_IndigoPlateau_branch_a6c6::
note D_, 2
rest 2
note F#, 4
sound_call Music_IndigoPlateau_branch_a6fe
sound_call Music_IndigoPlateau_branch_a6fe
sound_call .sub1
sound_call .sub1
note D_, 2
rest 2
note D_, 2
@ -203,9 +198,9 @@ Music_IndigoPlateau_branch_a6c6::
note D_, 8
note A#, 8
note D#, 8
sound_loop 0, Music_IndigoPlateau_branch_a6c6
sound_loop 0, .mainloop
Music_IndigoPlateau_branch_a6fe::
.sub1:
octave 4
note D_, 2
rest 2
@ -224,7 +219,6 @@ Music_IndigoPlateau_branch_a6fe::
note A_, 4
sound_ret
Music_IndigoPlateau_Ch4::
drum_speed 6
drum_note 17, 16
@ -239,22 +233,21 @@ Music_IndigoPlateau_Ch4::
drum_note 18, 1
drum_note 18, 1
drum_note 18, 1
Music_IndigoPlateau_branch_a728::
sound_call Music_IndigoPlateau_branch_a791
sound_call Music_IndigoPlateau_branch_a77e
sound_call Music_IndigoPlateau_branch_a791
sound_call Music_IndigoPlateau_branch_a7a8
sound_call Music_IndigoPlateau_branch_a791
sound_call Music_IndigoPlateau_branch_a77e
sound_call Music_IndigoPlateau_branch_a791
sound_call Music_IndigoPlateau_branch_a7a8
sound_call Music_IndigoPlateau_branch_a791
sound_call Music_IndigoPlateau_branch_a77e
sound_call Music_IndigoPlateau_branch_a791
sound_call Music_IndigoPlateau_branch_a7a8
sound_call Music_IndigoPlateau_branch_a77e
sound_call Music_IndigoPlateau_branch_a7a8
.mainloop:
sound_call .sub2
sound_call .sub1
sound_call .sub2
sound_call .sub3
sound_call .sub2
sound_call .sub1
sound_call .sub2
sound_call .sub3
sound_call .sub2
sound_call .sub1
sound_call .sub2
sound_call .sub3
sound_call .sub1
sound_call .sub3
drum_note 17, 16
drum_note 17, 8
drum_note 18, 8
@ -275,9 +268,9 @@ Music_IndigoPlateau_branch_a728::
drum_note 17, 1
drum_note 17, 1
drum_note 17, 1
sound_loop 0, Music_IndigoPlateau_branch_a728
sound_loop 0, .mainloop
Music_IndigoPlateau_branch_a77e::
.sub1:
drum_note 17, 4
drum_note 18, 4
drum_note 19, 4
@ -289,7 +282,7 @@ Music_IndigoPlateau_branch_a77e::
drum_note 18, 2
sound_ret
Music_IndigoPlateau_branch_a791::
.sub2:
drum_note 17, 4
drum_note 18, 4
drum_note 19, 4
@ -303,7 +296,7 @@ Music_IndigoPlateau_branch_a791::
drum_note 18, 1
sound_ret
Music_IndigoPlateau_branch_a7a8::
.sub3:
drum_note 17, 4
drum_note 18, 4
drum_note 17, 4

View file

@ -89,7 +89,6 @@ Music_IntroBattle_Ch1::
note D_, 16
sound_ret
Music_IntroBattle_Ch2::
duty_cycle 3
vibrato 8, 2, 5
@ -164,7 +163,6 @@ Music_IntroBattle_Ch2::
note D_, 16
sound_ret
Music_IntroBattle_Ch3::
note_type 12, 1, 0
rest 8
@ -228,7 +226,6 @@ Music_IntroBattle_Ch3::
rest 15
sound_ret
Music_IntroBattle_Ch4::
drum_speed 6
drum_note 19, 1

View file

@ -20,7 +20,6 @@ Music_JigglypuffSong_Ch1::
note E_, 10
sound_ret
Music_JigglypuffSong_Ch2::
vibrato 5, 1, 5
duty_cycle 2

View file

@ -10,8 +10,7 @@ Music_Lavender_Ch1::
rest 16
rest 16
note_type 12, 10, 7
Music_Lavender_branch_bb6b::
.mainloop:
octave 3
note G_, 8
note G_, 8
@ -59,22 +58,19 @@ Music_Lavender_branch_bb6b::
rest 16
rest 16
rest 16
sound_loop 0, Music_Lavender_branch_bb6b
sound_loop 0, .mainloop
Music_Lavender_Ch2::
vibrato 0, 3, 4
duty_cycle 3
note_type 12, 9, 1
Music_Lavender_branch_bba5::
.mainloop:
octave 5
note C_, 4
note G_, 4
note B_, 4
note F#, 4
sound_loop 0, Music_Lavender_branch_bba5
sound_loop 0, .mainloop
Music_Lavender_Ch3::
vibrato 4, 1, 1
@ -84,8 +80,7 @@ Music_Lavender_Ch3::
rest 16
rest 16
note_type 12, 2, 5
Music_Lavender_branch_bbb9::
.mainloop:
octave 4
note E_, 16
note D_, 16
@ -183,8 +178,7 @@ Music_Lavender_branch_bbb9::
note G_, 4
note F#, 4
note B_, 4
sound_loop 0, Music_Lavender_branch_bbb9
sound_loop 0, .mainloop
Music_Lavender_Ch4::
drum_speed 12
@ -192,8 +186,7 @@ Music_Lavender_Ch4::
rest 16
rest 16
rest 16
Music_Lavender_branch_bc26::
.mainloop:
drum_note 7, 8
drum_note 7, 8
sound_loop 0, Music_Lavender_branch_bc26
sound_loop 0, .mainloop

View file

@ -10,16 +10,14 @@ Music_MeetEvilTrainer_Ch1::
note C#, 2
note_type 12, 4, -7
note D_, 4
Music_MeetEvilTrainer_branch_7f6ae::
.mainloop:
note_type 12, 10, 1
note D_, 4
note D_, 4
note D_, 4
note_type 12, 7, 0
note D_, 4
sound_loop 0, Music_MeetEvilTrainer_branch_7f6ae
sound_loop 0, .mainloop
Music_MeetEvilTrainer_Ch2::
duty_cycle 1
@ -28,8 +26,7 @@ Music_MeetEvilTrainer_Ch2::
note B_, 2
note A#, 2
note B_, 8
Music_MeetEvilTrainer_branch_7f6c2::
.mainloop:
note_type 12, 12, 2
octave 4
note D#, 2
@ -57,8 +54,7 @@ Music_MeetEvilTrainer_branch_7f6c2::
note_type 12, 3, -7
note A#, 4
note_type 12, 12, 2
sound_loop 0, Music_MeetEvilTrainer_branch_7f6c2
sound_loop 0, .mainloop
Music_MeetEvilTrainer_Ch3::
note_type 12, 1, 0
@ -68,8 +64,7 @@ Music_MeetEvilTrainer_Ch3::
rest 1
note F_, 1
rest 1
Music_MeetEvilTrainer_branch_7f6ee::
.mainloop:
note F#, 1
rest 3
note F#, 1
@ -77,4 +72,4 @@ Music_MeetEvilTrainer_branch_7f6ee::
note F#, 1
rest 3
note A#, 4
sound_loop 0, Music_MeetEvilTrainer_branch_7f6ee
sound_loop 0, .mainloop

View file

@ -12,19 +12,18 @@ Music_MeetFemaleTrainer_Ch1::
note C#, 2
note C_, 2
note_type 12, 8, 1
Music_MeetFemaleTrainer_branch_7f70c::
.mainloop:
.loop1:
octave 3
note E_, 4
sound_loop 12, Music_MeetFemaleTrainer_branch_7f70c
sound_loop 12, .loop1
note E_, 4
octave 2
note B_, 4
note B_, 4
octave 3
note E_, 4
sound_loop 0, Music_MeetFemaleTrainer_branch_7f70c
sound_loop 0, .mainloop
Music_MeetFemaleTrainer_Ch2::
duty_cycle 2
@ -34,8 +33,7 @@ Music_MeetFemaleTrainer_Ch2::
note_type 12, 12, 7
octave 4
note B_, 12
Music_MeetFemaleTrainer_branch_7f726::
.mainloop:
note_type 12, 12, 2
octave 3
note B_, 4
@ -68,8 +66,7 @@ Music_MeetFemaleTrainer_branch_7f726::
note F#, 2
note G#, 2
note A_, 2
sound_loop 0, Music_MeetFemaleTrainer_branch_7f726
sound_loop 0, .mainloop
Music_MeetFemaleTrainer_Ch3::
note_type 12, 1, 0
@ -82,9 +79,8 @@ Music_MeetFemaleTrainer_Ch3::
rest 1
note A_, 1
rest 1
Music_MeetFemaleTrainer_branch_7f756::
sound_call Music_MeetFemaleTrainer_branch_7f770
.mainloop:
sound_call .sub1
note G#, 1
rest 3
note E_, 1
@ -93,7 +89,7 @@ Music_MeetFemaleTrainer_branch_7f756::
rest 3
note E_, 1
rest 3
sound_call Music_MeetFemaleTrainer_branch_7f770
sound_call .sub1
note G#, 1
rest 3
note E_, 1
@ -102,9 +98,9 @@ Music_MeetFemaleTrainer_branch_7f756::
rest 3
note B_, 1
rest 3
sound_loop 0, Music_MeetFemaleTrainer_branch_7f756
sound_loop 0, .mainloop
Music_MeetFemaleTrainer_branch_7f770::
.sub1:
note G#, 1
rest 3
note E_, 1

View file

@ -12,8 +12,7 @@ Music_MeetMaleTrainer_Ch1::
note E_, 1
note F_, 12
rest 16
Music_MeetMaleTrainer_branch_7f78f::
.mainloop:
octave 3
note B_, 4
note A_, 4
@ -29,8 +28,7 @@ Music_MeetMaleTrainer_branch_7f78f::
octave 4
note D_, 8
note E_, 16
sound_loop 0, Music_MeetMaleTrainer_branch_7f78f
sound_loop 0, .mainloop
Music_MeetMaleTrainer_Ch2::
duty_cycle 3
@ -48,8 +46,7 @@ Music_MeetMaleTrainer_Ch2::
rest 3
note E_, 1
rest 9
Music_MeetMaleTrainer_branch_7f7b5::
.mainloop:
note_type 12, 12, 4
octave 4
note E_, 6
@ -72,8 +69,7 @@ Music_MeetMaleTrainer_branch_7f7b5::
note F#, 8
octave 4
note C#, 8
sound_loop 0, Music_MeetMaleTrainer_branch_7f7b5
sound_loop 0, .mainloop
Music_MeetMaleTrainer_Ch3::
note_type 12, 1, 0
@ -99,8 +95,7 @@ Music_MeetMaleTrainer_Ch3::
rest 1
note F#, 1
rest 1
Music_MeetMaleTrainer_branch_7f7ea::
.mainloop:
note E_, 1
rest 1
note B_, 1
@ -187,4 +182,4 @@ Music_MeetMaleTrainer_branch_7f7ea::
rest 1
note D#, 1
rest 1
sound_loop 0, Music_MeetMaleTrainer_branch_7f7ea
sound_loop 0, .mainloop

View file

@ -37,8 +37,7 @@ Music_MeetProfOak_Ch1::
note D#, 4
note F#, 2
note F#, 4
Music_MeetProfOak_branch_af85::
.mainloop:
note F#, 6
note E_, 4
note A_, 2
@ -71,8 +70,7 @@ Music_MeetProfOak_branch_af85::
note E_, 4
note G#, 2
note G#, 4
sound_loop 0, Music_MeetProfOak_branch_af85
sound_loop 0, .mainloop
Music_MeetProfOak_Ch2::
vibrato 8, 1, 1
@ -154,8 +152,7 @@ Music_MeetProfOak_Ch2::
note B_, 2
note B_, 4
note_type 12, 11, 5
Music_MeetProfOak_branch_b005::
.mainloop:
octave 4
note C#, 6
octave 3
@ -205,8 +202,7 @@ Music_MeetProfOak_branch_b005::
note E_, 1
note_type 12, 11, 7
note G#, 16
sound_loop 0, Music_MeetProfOak_branch_b005
sound_loop 0, .mainloop
Music_MeetProfOak_Ch3::
note_type 12, 1, 2
@ -335,8 +331,8 @@ Music_MeetProfOak_Ch3::
rest 1
note G#, 1
rest 1
Music_MeetProfOak_branch_b0bc::
.mainloop:
.loop1:
octave 4
note A_, 1
rest 1
@ -361,9 +357,8 @@ Music_MeetProfOak_branch_b0bc::
octave 5
note C#, 1
rest 1
sound_loop 2, Music_MeetProfOak_branch_b0bc
Music_MeetProfOak_branch_b0d8::
sound_loop 2, .loop1
.loop2:
octave 4
note G#, 1
rest 1
@ -381,9 +376,8 @@ Music_MeetProfOak_branch_b0d8::
rest 1
note B_, 1
rest 1
sound_loop 2, Music_MeetProfOak_branch_b0d8
Music_MeetProfOak_branch_b0ed::
sound_loop 2, .loop2
.loop3:
note F#, 1
rest 1
note A_, 1
@ -400,9 +394,8 @@ Music_MeetProfOak_branch_b0ed::
rest 1
note A_, 1
rest 1
sound_loop 2, Music_MeetProfOak_branch_b0ed
Music_MeetProfOak_branch_b101::
sound_loop 2, .loop3
.loop4:
note G#, 1
rest 1
note B_, 1
@ -419,5 +412,5 @@ Music_MeetProfOak_branch_b101::
rest 1
note B_, 1
rest 1
sound_loop 2, Music_MeetProfOak_branch_b101
sound_loop 0, Music_MeetProfOak_branch_b0bc
sound_loop 2, .loop4
sound_loop 0, .mainloop

View file

@ -1,11 +1,10 @@
Music_MeetRival_branch_b119::
Music_MeetRival_Ch1_AlternateTempo::
tempo 100
sound_loop 0, Music_MeetRival_branch_b123
sound_loop 0, Music_MeetRival_Ch1.body
Music_MeetRival_Ch1::
tempo 112
Music_MeetRival_branch_b123::
.body:
volume 7, 7
duty_cycle 3
vibrato 6, 3, 4
@ -30,8 +29,7 @@ Music_MeetRival_branch_b123::
note A_, 2
note G_, 2
note A_, 2
Music_MeetRival_branch_b140::
.mainloop:
note B_, 4
note A#, 2
note A_, 4
@ -117,16 +115,15 @@ Music_MeetRival_branch_b140::
note A_, 2
note G_, 2
note A_, 2
sound_loop 0, Music_MeetRival_branch_b140
sound_loop 0, .mainloop
Music_MeetRival_branch_b19b::
Music_MeetRival_Ch1_AlternateStartAndTempo::
tempo 100
sound_loop 0, Music_MeetRival_branch_b1a5
sound_loop 0, Music_MeetRival_Ch1_AlternateStart.body
Music_MeetRival_branch_b1a2::
Music_MeetRival_Ch1_AlternateStart::
tempo 112
Music_MeetRival_branch_b1a5::
.body:
volume 7, 7
duty_cycle 3
vibrato 6, 3, 4
@ -140,8 +137,7 @@ Music_MeetRival_branch_b1a5::
note A_, 2
note G_, 2
note A_, 2
sound_loop 0, Music_MeetRival_branch_b140
sound_loop 0, Music_MeetRival_Ch1.mainloop
Music_MeetRival_Ch2::
duty_cycle 3
@ -169,8 +165,7 @@ Music_MeetRival_Ch2::
note D_, 2
note F_, 2
note F#, 2
Music_MeetRival_branch_b1d8::
.mainloop:
note_type 12, 12, 7
note G_, 4
note D_, 2
@ -228,9 +223,9 @@ Music_MeetRival_branch_b1d8::
note D_, 2
note F_, 2
note F#, 2
sound_loop 0, Music_MeetRival_branch_b1d8
sound_loop 0, .mainloop
Music_MeetRival_branch_b21d::
Music_MeetRival_Ch2_AlternateStart::
duty_cycle 3
vibrato 10, 2, 6
note_type 12, 12, 7
@ -245,8 +240,7 @@ Music_MeetRival_branch_b21d::
note D_, 2
note F_, 2
note F#, 2
sound_loop 0, Music_MeetRival_branch_b1d8
sound_loop 0, Music_MeetRival_Ch2.mainloop
Music_MeetRival_Ch3::
note_type 12, 1, 4
@ -272,8 +266,7 @@ Music_MeetRival_Ch3::
rest 1
note G_, 1
rest 1
Music_MeetRival_branch_b24b::
.mainloop:
note G_, 2
octave 5
note D_, 2
@ -376,9 +369,9 @@ Music_MeetRival_branch_b24b::
rest 2
octave 5
note D_, 2
sound_loop 0, Music_MeetRival_branch_b24b
sound_loop 0, .mainloop
Music_MeetRival_branch_b2b5::
Music_MeetRival_Ch3_AlternateStart::
note_type 12, 1, 4
octave 4
note G_, 1
@ -393,4 +386,4 @@ Music_MeetRival_branch_b2b5::
rest 1
note G_, 1
rest 1
sound_loop 0, Music_MeetRival_branch_b24b
sound_loop 0, Music_MeetRival_Ch3.mainloop

View file

@ -21,39 +21,37 @@ Music_MuseumGuy_Ch1::
note E_, 1
note G#, 1
note B_, 10
sound_call Music_MuseumGuy_branch_ade7
sound_call Music_MuseumGuy_branch_adec
sound_call Music_MuseumGuy_branch_ade7
sound_call .sub1
sound_call .sub2
sound_call .sub1
note E_, 4
note E_, 4
note E_, 2
note E_, 6
Music_MuseumGuy_branch_add6::
sound_call Music_MuseumGuy_branch_ade7
sound_call Music_MuseumGuy_branch_adec
sound_call Music_MuseumGuy_branch_ade7
.mainloop:
sound_call .sub1
sound_call .sub2
sound_call .sub1
note E_, 4
note E_, 4
note E_, 2
note E_, 6
sound_loop 0, Music_MuseumGuy_branch_add6
sound_loop 0, .mainloop
Music_MuseumGuy_branch_ade7::
.sub1:
note E_, 2
note E_, 6
note F#, 2
note F#, 6
sound_ret
Music_MuseumGuy_branch_adec::
.sub2:
note E_, 2
note E_, 6
note D_, 2
note D_, 6
sound_ret
Music_MuseumGuy_Ch2::
duty_cycle 2
note_type 12, 12, 1
@ -106,8 +104,7 @@ Music_MuseumGuy_Ch2::
note A_, 2
note A_, 2
note A_, 4
Music_MuseumGuy_branch_ae26::
.mainloop:
octave 3
note A_, 2
octave 4
@ -162,8 +159,7 @@ Music_MuseumGuy_branch_ae26::
note A_, 2
note A_, 2
note A_, 4
sound_loop 0, Music_MuseumGuy_branch_ae26
sound_loop 0, .mainloop
Music_MuseumGuy_Ch3::
note_type 12, 1, 0
@ -175,7 +171,7 @@ Music_MuseumGuy_Ch3::
rest 3
note E_, 1
rest 9
sound_call Music_MuseumGuy_branch_aeb8
sound_call .sub1
note A_, 1
rest 1
note A_, 1
@ -184,7 +180,7 @@ Music_MuseumGuy_Ch3::
rest 1
note G#, 1
rest 5
sound_call Music_MuseumGuy_branch_aeb8
sound_call .sub1
note B_, 1
rest 3
note G#, 1
@ -193,9 +189,8 @@ Music_MuseumGuy_Ch3::
rest 1
note A_, 1
rest 3
Music_MuseumGuy_branch_ae8e::
sound_call Music_MuseumGuy_branch_aec1
.mainloop:
sound_call .sub2
rest 3
octave 6
note E_, 1
@ -211,7 +206,7 @@ Music_MuseumGuy_branch_ae8e::
rest 1
note G#, 1
rest 3
sound_call Music_MuseumGuy_branch_aec1
sound_call .sub2
rest 1
octave 6
note E_, 1
@ -229,9 +224,9 @@ Music_MuseumGuy_branch_ae8e::
rest 1
note A_, 1
rest 3
sound_loop 0, Music_MuseumGuy_branch_ae8e
sound_loop 0, .mainloop
Music_MuseumGuy_branch_aeb8::
.sub1:
note A_, 1
rest 1
note A_, 1
@ -242,7 +237,7 @@ Music_MuseumGuy_branch_aeb8::
rest 5
sound_ret
Music_MuseumGuy_branch_aec1::
.sub2:
octave 6
note C#, 1
rest 1
@ -260,7 +255,6 @@ Music_MuseumGuy_branch_aec1::
note A_, 1
sound_ret
Music_MuseumGuy_Ch4::
drum_speed 12
rest 16
@ -274,8 +268,7 @@ Music_MuseumGuy_Ch4::
drum_note 19, 1
drum_note 18, 1
drum_note 18, 1
Music_MuseumGuy_branch_aee1::
.mainloop:
drum_note 17, 4
drum_note 17, 6
drum_note 17, 2
@ -334,4 +327,4 @@ Music_MuseumGuy_branch_aee1::
drum_note 19, 1
drum_note 18, 1
drum_note 18, 1
sound_loop 0, Music_MuseumGuy_branch_aee1
sound_loop 0, .mainloop

View file

@ -15,8 +15,7 @@ Music_OaksLab_Ch1::
note G#, 1
note A_, 1
note B_, 1
Music_OaksLab_branch_7eed0::
.mainloop:
octave 4
note C#, 4
octave 3
@ -66,8 +65,7 @@ Music_OaksLab_branch_7eed0::
note E_, 4
note F#, 4
note G#, 4
sound_loop 0, Music_OaksLab_branch_7eed0
sound_loop 0, .mainloop
Music_OaksLab_Ch2::
duty_cycle 3
@ -83,8 +81,7 @@ Music_OaksLab_Ch2::
note E_, 1
note F#, 1
note G#, 1
Music_OaksLab_branch_7ef16::
.mainloop:
note A_, 6
note G#, 1
note F#, 1
@ -141,8 +138,7 @@ Music_OaksLab_branch_7ef16::
rest 1
note F#, 1
rest 1
sound_loop 0, Music_OaksLab_branch_7ef16
sound_loop 0, .mainloop
Music_OaksLab_Ch3::
note_type 12, 1, 1
@ -154,8 +150,7 @@ Music_OaksLab_Ch3::
rest 1
note E_, 1
rest 1
Music_OaksLab_branch_7ef5c::
.mainloop:
note C#, 1
rest 1
note A_, 1
@ -390,4 +385,4 @@ Music_OaksLab_branch_7ef5c::
rest 3
note E_, 1
rest 3
sound_loop 0, Music_OaksLab_branch_7ef5c
sound_loop 0, .mainloop

View file

@ -3,8 +3,7 @@ Music_PalletTown_Ch1::
volume 7, 7
duty_cycle 2
note_type 12, 12, 3
Music_PalletTown_branch_a7ce::
.mainloop:
octave 3
note B_, 4
octave 4
@ -144,14 +143,13 @@ Music_PalletTown_branch_a7ce::
note D_, 2
note C_, 2
note D_, 2
sound_loop 0, Music_PalletTown_branch_a7ce
sound_ret
sound_loop 0, .mainloop
sound_ret ; unused
Music_PalletTown_Ch2::
duty_cycle 2
Music_PalletTown_branch_a861::
.mainloop:
note_type 12, 13, 3
octave 5
note D_, 2
@ -258,15 +256,14 @@ Music_PalletTown_branch_a861::
note B_, 4
note B_, 8
note A_, 8
sound_loop 0, Music_PalletTown_branch_a861
sound_ret
sound_loop 0, .mainloop
sound_ret ; unused
Music_PalletTown_Ch3::
vibrato 24, 2, 8
note_type 12, 1, 2
Music_PalletTown_branch_a8e3::
.mainloop:
octave 4
note G_, 6
note E_, 6
@ -310,5 +307,6 @@ Music_PalletTown_branch_a8e3::
note E_, 8
note E_, 8
note F#, 8
sound_loop 0, Music_PalletTown_branch_a8e3
sound_ret
sound_loop 0, .mainloop
sound_ret ; unused

View file

@ -18,7 +18,6 @@ Music_PkmnHealed_Ch1::
note B_, 4
sound_ret
Music_PkmnHealed_Ch2::
duty_cycle 2
note_type 12, 12, 3
@ -32,7 +31,6 @@ Music_PkmnHealed_Ch2::
note E_, 8
sound_ret
Music_PkmnHealed_Ch3::
note_type 12, 1, 0
octave 4

View file

@ -4,8 +4,7 @@ Music_Pokecenter_Ch1::
duty_cycle 3
vibrato 10, 2, 2
toggle_perfect_pitch
Music_Pokecenter_branch_be61::
.mainloop:
note_type 12, 10, 3
octave 3
note F#, 2
@ -146,20 +145,18 @@ Music_Pokecenter_branch_be61::
note E_, 2
note F#, 2
note G_, 2
sound_loop 0, Music_Pokecenter_branch_be61
sound_loop 0, .mainloop
Music_Pokecenter_Ch2::
vibrato 8, 2, 5
Music_Pokecenter_branch_befc::
sound_call Music_Pokecenter_branch_bf4e
.mainloop:
sound_call .sub1
duty_cycle 3
note_type 12, 10, 5
octave 3
note A_, 4
note E_, 4
sound_call Music_Pokecenter_branch_bf60
sound_call .sub2
note D_, 2
note F#, 6
duty_cycle 3
@ -167,13 +164,13 @@ Music_Pokecenter_branch_befc::
octave 3
note A_, 4
note E_, 4
sound_call Music_Pokecenter_branch_bf4e
sound_call .sub1
duty_cycle 3
note_type 12, 10, 5
octave 3
note A_, 4
note E_, 4
sound_call Music_Pokecenter_branch_bf60
sound_call .sub2
note D_, 8
duty_cycle 3
note_type 12, 10, 5
@ -213,9 +210,9 @@ Music_Pokecenter_branch_befc::
note F#, 2
note E_, 2
note D_, 8
sound_loop 0, Music_Pokecenter_branch_befc
sound_loop 0, .mainloop
Music_Pokecenter_branch_bf4e::
.sub1:
duty_cycle 2
note_type 12, 12, 2
octave 4
@ -232,7 +229,7 @@ Music_Pokecenter_branch_bf4e::
note C#, 6
sound_ret
Music_Pokecenter_branch_bf60::
.sub2:
duty_cycle 2
note_type 12, 12, 2
octave 4
@ -247,11 +244,9 @@ Music_Pokecenter_branch_bf60::
note C#, 2
sound_ret
Music_Pokecenter_Ch3::
note_type 12, 1, 0
Music_Pokecenter_branch_bf72::
.mainloop:
octave 4
note D_, 2
note F#, 2
@ -261,8 +256,8 @@ Music_Pokecenter_branch_bf72::
note F#, 2
note G_, 2
note F#, 2
sound_call Music_Pokecenter_branch_bfd9
sound_call Music_Pokecenter_branch_bfe2
sound_call .sub1
sound_call .sub2
note F#, 2
note A_, 2
note F#, 2
@ -279,8 +274,8 @@ Music_Pokecenter_branch_bf72::
note F#, 2
note G_, 2
note F#, 2
sound_call Music_Pokecenter_branch_bfd9
sound_call Music_Pokecenter_branch_bfe2
sound_call .sub1
sound_call .sub2
note D_, 2
note F#, 2
note D_, 2
@ -289,7 +284,7 @@ Music_Pokecenter_branch_bf72::
note B_, 2
note A_, 2
note G_, 2
sound_call Music_Pokecenter_branch_bfeb
sound_call .sub3
note G_, 2
note B_, 2
note G_, 2
@ -314,7 +309,7 @@ Music_Pokecenter_branch_bf72::
note A_, 2
note G#, 2
note A_, 2
sound_call Music_Pokecenter_branch_bfeb
sound_call .sub3
note G_, 2
note B_, 2
note G_, 2
@ -339,9 +334,9 @@ Music_Pokecenter_branch_bf72::
note G_, 2
note F#, 2
note E_, 2
sound_loop 0, Music_Pokecenter_branch_bf72
sound_loop 0, .mainloop
Music_Pokecenter_branch_bfd9::
.sub1:
note E_, 2
note A_, 2
note E_, 2
@ -352,7 +347,7 @@ Music_Pokecenter_branch_bfd9::
note A_, 2
sound_ret
Music_Pokecenter_branch_bfe2::
.sub2:
note E_, 2
note A_, 2
note E_, 2
@ -363,7 +358,7 @@ Music_Pokecenter_branch_bfe2::
note A_, 2
sound_ret
Music_Pokecenter_branch_bfeb::
.sub3:
note F#, 2
note A_, 2
note F#, 2

View file

@ -8,8 +8,7 @@ Music_PokemonTower_Ch1::
rest 4
octave 4
note B_, 12
Music_PokemonTower_branch_7f05a::
.mainloop:
note_type 12, 11, 4
octave 4
note G_, 1
@ -137,8 +136,7 @@ Music_PokemonTower_branch_7f05a::
octave 5
note C_, 16
note C_, 16
sound_loop 0, Music_PokemonTower_branch_7f05a
sound_loop 0, .mainloop
Music_PokemonTower_Ch2::
vibrato 20, 3, 4
@ -148,8 +146,7 @@ Music_PokemonTower_Ch2::
note C_, 12
octave 4
note E_, 4
Music_PokemonTower_branch_7f0ee::
.mainloop:
note_type 12, 12, 1
octave 5
note C_, 8
@ -289,8 +286,7 @@ Music_PokemonTower_branch_7f0ee::
vibrato 0, 3, 4
note_type 12, 10, 7
note C_, 16
sound_loop 0, Music_PokemonTower_branch_7f0ee
sound_loop 0, .mainloop
Music_PokemonTower_Ch3::
vibrato 4, 1, 1
@ -298,8 +294,7 @@ Music_PokemonTower_Ch3::
rest 8
octave 5
note G_, 8
Music_PokemonTower_branch_7f1a2::
.mainloop:
note E_, 1
rest 7
note E_, 1
@ -455,4 +450,4 @@ Music_PokemonTower_branch_7f1a2::
rest 1
note D#, 1
rest 1
sound_loop 0, Music_PokemonTower_branch_7f1a2
sound_loop 0, .mainloop

View file

@ -4,8 +4,7 @@ Music_Routes1_Ch1::
vibrato 4, 2, 3
duty_cycle 2
toggle_perfect_pitch
Music_Routes1_branch_9be9::
.mainloop:
note_type 12, 10, 1
rest 4
octave 4
@ -102,22 +101,21 @@ Music_Routes1_branch_9be9::
octave 3
note A_, 2
note A_, 2
sound_loop 0, Music_Routes1_branch_9be9
sound_ret
sound_loop 0, .mainloop
sound_ret ; unused
Music_Routes1_Ch2::
duty_cycle 2
Music_Routes1_branch_9c53::
.mainloop:
note_type 12, 13, 1
sound_call Music_Routes1_branch_9c65
sound_call Music_Routes1_branch_9c78
sound_call Music_Routes1_branch_9c65
sound_call Music_Routes1_branch_9c8d
sound_loop 0, Music_Routes1_branch_9c53
sound_call .sub1
sound_call .sub2
sound_call .sub1
sound_call .sub3
sound_loop 0, .mainloop
Music_Routes1_branch_9c65::
.sub1:
octave 4
note D_, 1
note E_, 1
@ -138,7 +136,7 @@ Music_Routes1_branch_9c65::
note E_, 6
sound_ret
Music_Routes1_branch_9c78::
.sub2:
note C#, 1
note D_, 1
note E_, 2
@ -161,7 +159,7 @@ Music_Routes1_branch_9c78::
note F#, 2
sound_ret
Music_Routes1_branch_9c8d::
.sub3:
note C#, 1
note D_, 1
note E_, 2
@ -231,14 +229,13 @@ Music_Routes1_branch_9c8d::
note D_, 2
note D_, 2
sound_ret
sound_ret
sound_ret ; unused
Music_Routes1_Ch3::
vibrato 8, 2, 5
note_type 12, 1, 3
Music_Routes1_branch_9cdd::
.mainloop:
rest 2
octave 4
note D_, 4
@ -305,11 +302,12 @@ Music_Routes1_branch_9cdd::
note A_, 8
octave 4
note D_, 6
sound_loop 0, Music_Routes1_branch_9cdd
sound_ret
sound_loop 0, .mainloop
sound_ret ; unused
Music_Routes1_Ch4::
.mainloop:
drum_speed 12
rest 4
drum_note 15, 2
@ -400,5 +398,6 @@ Music_Routes1_Ch4::
rest 2
drum_note 15, 2
drum_note 15, 2
sound_loop 0, Music_Routes1_Ch4
sound_ret
sound_loop 0, .mainloop
sound_ret ; unused

View file

@ -3,8 +3,7 @@ Music_Routes2_Ch1::
volume 7, 7
vibrato 9, 2, 5
duty_cycle 1
Music_Routes2_branch_9dc3::
.mainloop:
note_type 12, 11, 2
octave 2
note B_, 4
@ -138,15 +137,14 @@ Music_Routes2_branch_9dc3::
note B_, 2
octave 4
note E_, 2
sound_loop 0, Music_Routes2_branch_9dc3
sound_ret
sound_loop 0, .mainloop
sound_ret ; unused
Music_Routes2_Ch2::
vibrato 8, 2, 6
duty_cycle 3
Music_Routes2_branch_9e54::
.mainloop:
note_type 12, 13, 4
octave 4
note E_, 6
@ -212,14 +210,13 @@ Music_Routes2_branch_9e54::
note A_, 1
note G#, 8
rest 4
sound_loop 0, Music_Routes2_branch_9e54
sound_ret
sound_loop 0, .mainloop
sound_ret ; unused
Music_Routes2_Ch3::
vibrato 9, 2, 8
Music_Routes2_branch_9e9e::
.mainloop:
note_type 12, 1, 1
octave 3
note E_, 2
@ -320,11 +317,12 @@ Music_Routes2_branch_9e9e::
rest 2
note E_, 2
rest 2
sound_loop 0, Music_Routes2_branch_9e9e
sound_ret
sound_loop 0, .mainloop
sound_ret ; unused
Music_Routes2_Ch4::
.mainloop:
drum_speed 12
drum_note 3, 2
rest 2
@ -421,5 +419,6 @@ Music_Routes2_Ch4::
rest 3
drum_note 3, 3
rest 3
sound_loop 0, Music_Routes2_Ch4
sound_ret
sound_loop 0, .mainloop
sound_ret ; unused

View file

@ -14,8 +14,7 @@ Music_Routes3_Ch1::
note E_, 1
rest 16
rest 15
Music_Routes3_branch_9fc3::
.mainloop:
note_type 12, 11, 5
note E_, 6
note D_, 1
@ -74,8 +73,7 @@ Music_Routes3_branch_9fc3::
note_type 8, 9, 0
note F_, 12
note G_, 12
sound_loop 0, Music_Routes3_branch_9fc3
sound_loop 0, .mainloop
Music_Routes3_Ch2::
vibrato 8, 2, 3
@ -91,8 +89,7 @@ Music_Routes3_Ch2::
note C_, 1
rest 15
rest 16
Music_Routes3_branch_a01a::
.mainloop:
note_type 12, 12, 7
duty_cycle 2
octave 4
@ -175,8 +172,7 @@ Music_Routes3_branch_a01a::
octave 3
note A_, 8
note B_, 8
sound_loop 0, Music_Routes3_branch_a01a
sound_loop 0, .mainloop
Music_Routes3_Ch3::
vibrato 4, 1, 0
@ -212,8 +208,7 @@ Music_Routes3_Ch3::
note G_, 2
rest 2
note G_, 8
Music_Routes3_branch_a0a3::
.mainloop:
note_type 12, 1, 2
note E_, 1
rest 1
@ -351,8 +346,7 @@ Music_Routes3_branch_a0a3::
note F_, 1
rest 1
note A_, 4
sound_loop 0, Music_Routes3_branch_a0a3
sound_loop 0, .mainloop
Music_Routes3_Ch4::
drum_speed 6
@ -392,8 +386,7 @@ Music_Routes3_Ch4::
drum_note 19, 1
drum_note 18, 1
drum_note 18, 1
Music_Routes3_branch_a17a::
.mainloop:
drum_note 17, 12
drum_note 17, 2
drum_note 18, 2
@ -512,4 +505,4 @@ Music_Routes3_branch_a17a::
drum_note 18, 1
drum_note 18, 1
drum_note 18, 1
sound_loop 0, Music_Routes3_branch_a17a
sound_loop 0, .mainloop

View file

@ -21,8 +21,7 @@ Music_Routes4_Ch1::
note E_, 1
note F#, 1
note B_, 1
Music_Routes4_branch_a28a::
.mainloop:
note_type 12, 11, 7
note B_, 6
note E_, 2
@ -135,8 +134,7 @@ Music_Routes4_branch_a28a::
note F#, 3
note G#, 3
note A_, 3
sound_loop 0, Music_Routes4_branch_a28a
sound_loop 0, .mainloop
Music_Routes4_Ch2::
vibrato 12, 2, 4
@ -163,8 +161,7 @@ Music_Routes4_Ch2::
note B_, 1
octave 4
note D#, 1
Music_Routes4_branch_a325::
.mainloop:
note_type 12, 12, 7
note E_, 6
octave 3
@ -285,8 +282,7 @@ Music_Routes4_branch_a325::
note E_, 8
note_type 12, 10, 7
note E_, 10
sound_loop 0, Music_Routes4_branch_a325
sound_loop 0, .mainloop
Music_Routes4_Ch3::
note_type 12, 1, 0
@ -307,8 +303,7 @@ Music_Routes4_Ch3::
rest 3
note D#, 1
rest 3
Music_Routes4_branch_a3d7::
.mainloop:
note E_, 1
rest 3
note E_, 1
@ -503,8 +498,7 @@ Music_Routes4_branch_a3d7::
rest 3
note D#, 1
rest 1
sound_loop 0, Music_Routes4_branch_a3d7
sound_loop 0, .mainloop
Music_Routes4_Ch4::
drum_speed 12
@ -514,8 +508,7 @@ Music_Routes4_Ch4::
drum_note 19, 1
drum_note 18, 1
drum_note 18, 1
Music_Routes4_branch_a4a8::
.mainloop:
drum_note 17, 4
drum_note 19, 1
drum_note 19, 1
@ -678,4 +671,4 @@ Music_Routes4_branch_a4a8::
drum_note 17, 2
drum_note 17, 2
drum_note 17, 2
sound_loop 0, Music_Routes4_branch_a4a8
sound_loop 0, .mainloop

View file

@ -16,17 +16,16 @@ Music_SafariZone_Ch1::
note G_, 1
rest 4
duty_cycle 3
Music_SafariZone_branch_bc4f::
sound_call Music_SafariZone_branch_bc5f
.mainloop:
sound_call .sub1
note_type 12, 10, 4
note F#, 4
sound_call Music_SafariZone_branch_bc5f
sound_call .sub1
note_type 12, 10, 4
note F#, 4
sound_loop 0, Music_SafariZone_branch_bc4f
sound_loop 0, .mainloop
Music_SafariZone_branch_bc5f::
.sub1:
note_type 12, 10, 2
octave 3
note C_, 4
@ -38,7 +37,6 @@ Music_SafariZone_branch_bc5f::
note C_, 4
sound_ret
Music_SafariZone_Ch2::
duty_cycle 2
vibrato 8, 2, 5
@ -50,17 +48,16 @@ Music_SafariZone_Ch2::
note D_, 1
rest 4
duty_cycle 3
Music_SafariZone_branch_bc79::
sound_call Music_SafariZone_branch_bc89
.mainloop:
sound_call .sub1
note_type 12, 11, 5
note A_, 4
sound_call Music_SafariZone_branch_bc89
sound_call .sub1
note_type 12, 11, 5
note B_, 4
sound_loop 0, Music_SafariZone_branch_bc79
sound_loop 0, .mainloop
Music_SafariZone_branch_bc89::
.sub1:
note_type 12, 11, 2
octave 3
note G_, 4
@ -72,21 +69,19 @@ Music_SafariZone_branch_bc89::
note G_, 4
sound_ret
Music_SafariZone_Ch3::
note_type 12, 1, 0
rest 8
Music_SafariZone_branch_bc97::
sound_call Music_SafariZone_branch_bca5
.mainloop:
sound_call .sub1
octave 4
note A_, 4
sound_call Music_SafariZone_branch_bca5
sound_call .sub1
octave 4
note B_, 4
sound_loop 0, Music_SafariZone_branch_bc97
sound_loop 0, .mainloop
Music_SafariZone_branch_bca5::
.sub1:
octave 3
note A_, 2
rest 2

View file

@ -32,8 +32,7 @@ Music_SilphCo_Ch1::
rest 6
note B_, 2
rest 2
Music_SilphCo_branch_7f26d::
.mainloop:
note G_, 2
rest 2
note B_, 2
@ -185,9 +184,9 @@ Music_SilphCo_branch_7f26d::
note A#, 2
note B_, 2
note A#, 2
sound_call Music_SilphCo_branch_7f3f0
sound_call Music_SilphCo_branch_7f3f0
sound_call Music_SilphCo_branch_7f3f0
sound_call .sub1
sound_call .sub1
sound_call .sub1
rest 4
note C_, 2
rest 6
@ -365,9 +364,9 @@ Music_SilphCo_branch_7f26d::
rest 6
note B_, 2
rest 2
sound_loop 0, Music_SilphCo_branch_7f26d
sound_loop 0, .mainloop
Music_SilphCo_branch_7f3f0::
.sub1:
octave 2
note B_, 2
note A#, 2
@ -394,7 +393,6 @@ Music_SilphCo_branch_7f3f0::
note C_, 2
sound_ret
Music_SilphCo_Ch2::
vibrato 10, 3, 2
duty_cycle 3
@ -427,8 +425,7 @@ Music_SilphCo_Ch2::
rest 6
note G#, 2
rest 2
Music_SilphCo_branch_7f42e::
.mainloop:
note E_, 2
rest 2
note G_, 2
@ -777,8 +774,7 @@ Music_SilphCo_branch_7f42e::
rest 6
note G#, 2
rest 2
sound_loop 0, Music_SilphCo_branch_7f42e
sound_loop 0, .mainloop
Music_SilphCo_Ch3::
vibrato 8, 1, 1
@ -789,8 +785,7 @@ Music_SilphCo_Ch3::
note D#, 4
note E_, 4
note F_, 4
Music_SilphCo_branch_7f5c9::
.mainloop:
note E_, 4
note D#, 4
note D_, 4
@ -997,4 +992,4 @@ Music_SilphCo_branch_7f5c9::
note D#, 4
note E_, 4
note F_, 4
sound_loop 0, Music_SilphCo_branch_7f5c9
sound_loop 0, .mainloop

View file

@ -4,8 +4,7 @@ Music_SSAnne_Ch1::
duty_cycle 1
vibrato 8, 3, 4
toggle_perfect_pitch
Music_SSAnne_branch_b3b2::
.mainloop:
note_type 12, 10, 4
rest 12
octave 3
@ -104,14 +103,12 @@ Music_SSAnne_branch_b3b2::
rest 4
octave 3
note D_, 8
sound_loop 0, Music_SSAnne_branch_b3b2
sound_loop 0, .mainloop
Music_SSAnne_Ch2::
duty_cycle 0
vibrato 12, 2, 4
Music_SSAnne_branch_b41e::
.mainloop:
note_type 12, 12, 5
octave 3
note A_, 2
@ -279,10 +276,10 @@ Music_SSAnne_branch_b41e::
note C#, 3
octave 3
note B_, 3
sound_loop 0, Music_SSAnne_branch_b41e
sound_loop 0, .mainloop
Music_SSAnne_Ch3::
.mainloop:
note_type 12, 1, 3
rest 16
rest 12
@ -335,4 +332,4 @@ Music_SSAnne_Ch3::
note F#, 8
note G#, 8
note B_, 8
sound_loop 0, Music_SSAnne_Ch3
sound_loop 0, .mainloop

View file

@ -15,8 +15,7 @@ Music_Surfing_Ch1::
note G#, 2
note F#, 2
note G#, 4
Music_Surfing_branch_7fa30::
.mainloop:
note_type 12, 11, 2
note E_, 2
note E_, 4
@ -113,8 +112,7 @@ Music_Surfing_branch_7fa30::
note G#, 2
note F#, 2
note E_, 4
sound_loop 0, Music_Surfing_branch_7fa30
sound_loop 0, .mainloop
Music_Surfing_Ch2::
duty_cycle 3
@ -131,8 +129,7 @@ Music_Surfing_Ch2::
note D_, 2
octave 3
note B_, 2
Music_Surfing_branch_7faae::
.mainloop:
note_type 12, 12, 6
octave 4
note E_, 6
@ -200,8 +197,7 @@ Music_Surfing_branch_7faae::
note A_, 1
octave 5
note C#, 6
sound_loop 0, Music_Surfing_branch_7faae
sound_loop 0, .mainloop
Music_Surfing_Ch3::
note_type 12, 1, 0
@ -212,8 +208,7 @@ Music_Surfing_Ch3::
note E_, 2
note F#, 2
note G#, 2
Music_Surfing_branch_7fb03::
.mainloop:
octave 3
note A_, 2
octave 4
@ -332,4 +327,4 @@ Music_Surfing_branch_7fb03::
note C#, 2
note D_, 2
note E_, 2
sound_loop 0, Music_Surfing_branch_7fb03
sound_loop 0, .mainloop

View file

@ -25,11 +25,10 @@ Music_TitleScreen_Ch1::
note A_, 2
note A_, 2
note F#, 2
Music_TitleScreen_branch_7e4e2::
sound_call Music_TitleScreen_branch_7e541
sound_call Music_TitleScreen_branch_7e54a
sound_call Music_TitleScreen_branch_7e541
.mainloop:
sound_call .sub1
sound_call .sub2
sound_call .sub1
octave 3
note C_, 8
note_type 8, 12, 6
@ -52,9 +51,9 @@ Music_TitleScreen_branch_7e4e2::
octave 3
note C_, 2
note D_, 2
sound_call Music_TitleScreen_branch_7e541
sound_call Music_TitleScreen_branch_7e54a
sound_call Music_TitleScreen_branch_7e541
sound_call .sub1
sound_call .sub2
sound_call .sub1
note C_, 6
note C_, 6
note E_, 4
@ -82,21 +81,21 @@ Music_TitleScreen_branch_7e4e2::
octave 4
note C_, 4
note C#, 4
sound_call Music_TitleScreen_branch_7e55c
sound_call .sub3
note_type 8, 11, 4
octave 4
note C_, 4
note C_, 4
note C#, 4
sound_call Music_TitleScreen_branch_7e55c
sound_call .sub3
note_type 8, 11, 2
octave 3
note E_, 4
note E_, 4
note C#, 4
sound_loop 0, Music_TitleScreen_branch_7e4e2
sound_loop 0, .mainloop
Music_TitleScreen_branch_7e541::
.sub1:
note_type 12, 12, 6
octave 3
note D_, 6
@ -106,7 +105,7 @@ Music_TitleScreen_branch_7e541::
note D_, 8
sound_ret
Music_TitleScreen_branch_7e54a::
.sub2:
note C_, 6
note F_, 6
note C_, 4
@ -124,7 +123,7 @@ Music_TitleScreen_branch_7e54a::
note C_, 4
sound_ret
Music_TitleScreen_branch_7e55c::
.sub3:
note_type 12, 12, 1
note D_, 1
rest 1
@ -153,7 +152,6 @@ Music_TitleScreen_branch_7e55c::
note D_, 1
sound_ret
Music_TitleScreen_Ch2::
vibrato 16, 4, 6
duty_cycle 1
@ -178,18 +176,17 @@ Music_TitleScreen_Ch2::
note F_, 2
note F_, 2
note F#, 2
Music_TitleScreen_branch_7e594::
.mainloop:
vibrato 16, 4, 6
sound_call Music_TitleScreen_branch_7e622
sound_call .sub1
octave 2
note A_, 4
note F_, 4
sound_call Music_TitleScreen_branch_7e62c
sound_call .sub2
octave 2
note A_, 8
note B_, 16
sound_call Music_TitleScreen_branch_7e622
sound_call .sub1
octave 2
note A_, 6
note F_, 2
@ -208,11 +205,11 @@ Music_TitleScreen_branch_7e594::
note D_, 1
note F#, 1
note G_, 16
sound_call Music_TitleScreen_branch_7e622
sound_call .sub1
octave 2
note A_, 2
note F_, 6
sound_call Music_TitleScreen_branch_7e62c
sound_call .sub2
octave 3
note C_, 2
octave 2
@ -220,7 +217,7 @@ Music_TitleScreen_branch_7e594::
note B_, 6
note G_, 2
note F_, 8
sound_call Music_TitleScreen_branch_7e622
sound_call .sub1
note_type 8, 9, 5
octave 2
note G_, 4
@ -262,7 +259,7 @@ Music_TitleScreen_branch_7e594::
octave 5
note C_, 4
note C#, 4
sound_call Music_TitleScreen_branch_7e636
sound_call .sub3
rest 3
note D_, 1
rest 3
@ -272,7 +269,7 @@ Music_TitleScreen_branch_7e594::
note C_, 4
note C_, 4
note C#, 4
sound_call Music_TitleScreen_branch_7e636
sound_call .sub3
note D_, 1
rest 2
note D_, 1
@ -284,9 +281,9 @@ Music_TitleScreen_branch_7e594::
note C_, 4
octave 4
note B_, 4
sound_loop 0, Music_TitleScreen_branch_7e594
sound_loop 0, .mainloop
Music_TitleScreen_branch_7e622::
.sub1:
note_type 12, 14, 7
octave 3
note G_, 6
@ -296,7 +293,7 @@ Music_TitleScreen_branch_7e622::
note_type 12, 9, 5
sound_ret
Music_TitleScreen_branch_7e62c::
.sub2:
note_type 12, 14, 7
octave 4
note F_, 6
@ -306,7 +303,7 @@ Music_TitleScreen_branch_7e62c::
note_type 12, 9, 5
sound_ret
Music_TitleScreen_branch_7e636::
.sub3:
note_type 12, 14, 1
note D_, 1
rest 2
@ -320,7 +317,6 @@ Music_TitleScreen_branch_7e636::
note D_, 1
sound_ret
Music_TitleScreen_Ch3::
note_type 12, 1, 0
octave 3
@ -347,41 +343,39 @@ Music_TitleScreen_Ch3::
note F_, 2
note F_, 2
note A_, 2
Music_TitleScreen_branch_7e65e::
sound_call Music_TitleScreen_branch_7e6c9
sound_call Music_TitleScreen_branch_7e6d0
Music_TitleScreen_branch_7e664::
sound_call Music_TitleScreen_branch_7e6c9
sound_call Music_TitleScreen_branch_7e6c9
sound_call Music_TitleScreen_branch_7e6c9
sound_call Music_TitleScreen_branch_7e6d0
sound_loop 3, Music_TitleScreen_branch_7e664
sound_call Music_TitleScreen_branch_7e6c9
.mainloop:
sound_call .sub1
sound_call .sub2
.loop1:
sound_call .sub1
sound_call .sub1
sound_call .sub1
sound_call .sub2
sound_loop 3, .loop1
sound_call .sub1
note G_, 6
note D_, 3
note A_, 6
note F_, 3
note A_, 3
note F_, 3
sound_call Music_TitleScreen_branch_7e6d7
sound_call .sub3
note A#, 3
note F_, 3
sound_call Music_TitleScreen_branch_7e6d7
sound_call .sub3
note B_, 3
note G_, 3
sound_call Music_TitleScreen_branch_7e6dc
sound_call .sub4
octave 4
note C_, 3
octave 3
note G_, 3
sound_call Music_TitleScreen_branch_7e6dc
sound_call .sub4
octave 4
note C#, 3
octave 3
note A_, 3
sound_call Music_TitleScreen_branch_7e6e5
sound_call .sub5
octave 5
pitch_slide 1, 4, D_
note D_, 4
@ -398,7 +392,7 @@ Music_TitleScreen_branch_7e664::
note C_, 4
note C_, 4
note C#, 4
sound_call Music_TitleScreen_branch_7e6e5
sound_call .sub5
octave 6
pitch_slide 1, 5, D_
note D_, 4
@ -413,9 +407,9 @@ Music_TitleScreen_branch_7e664::
note C_, 4
octave 3
note B_, 4
sound_loop 0, Music_TitleScreen_branch_7e65e
sound_loop 0, .mainloop
Music_TitleScreen_branch_7e6c9::
.sub1:
note G_, 6
note D_, 3
note G_, 6
@ -424,7 +418,7 @@ Music_TitleScreen_branch_7e6c9::
note D_, 3
sound_ret
Music_TitleScreen_branch_7e6d0::
.sub2:
note F_, 6
note C_, 3
note F_, 6
@ -433,14 +427,14 @@ Music_TitleScreen_branch_7e6d0::
note C_, 3
sound_ret
Music_TitleScreen_branch_7e6d7::
.sub3:
note A#, 6
note F_, 3
note A#, 6
note F_, 3
sound_ret
Music_TitleScreen_branch_7e6dc::
.sub4:
octave 4
note C_, 6
octave 3
@ -451,14 +445,13 @@ Music_TitleScreen_branch_7e6dc::
note G_, 3
sound_ret
Music_TitleScreen_branch_7e6e5::
.sub5:
note_type 12, 1, 0
octave 4
note D_, 1
rest 5
sound_ret
Music_TitleScreen_Ch4::
drum_speed 6
rest 4
@ -486,8 +479,7 @@ Music_TitleScreen_Ch4::
drum_note 3, 2
drum_note 2, 2
drum_note 1, 2
Music_TitleScreen_branch_7e716::
.mainloop:
drum_speed 12
drum_note 2, 1
rest 3
@ -497,8 +489,8 @@ Music_TitleScreen_branch_7e716::
drum_note 2, 1
drum_note 3, 1
rest 3
sound_call Music_TitleScreen_branch_7e834
sound_call Music_TitleScreen_branch_7e834
sound_call .sub1
sound_call .sub1
drum_note 2, 1
rest 3
drum_note 2, 1
@ -509,7 +501,7 @@ Music_TitleScreen_branch_7e716::
rest 1
drum_note 3, 1
drum_note 2, 1
sound_call Music_TitleScreen_branch_7e842
sound_call .sub2
drum_note 2, 1
rest 3
drum_note 2, 1
@ -520,7 +512,7 @@ Music_TitleScreen_branch_7e716::
rest 1
drum_note 2, 1
rest 1
sound_call Music_TitleScreen_branch_7e842
sound_call .sub2
drum_note 2, 1
rest 3
drum_note 2, 1
@ -535,8 +527,8 @@ Music_TitleScreen_branch_7e716::
drum_note 4, 1
drum_note 4, 1
drum_speed 12
sound_call Music_TitleScreen_branch_7e834
sound_call Music_TitleScreen_branch_7e842
sound_call .sub1
sound_call .sub2
drum_note 2, 1
rest 3
drum_note 2, 1
@ -555,8 +547,8 @@ Music_TitleScreen_branch_7e716::
rest 1
drum_note 3, 1
drum_note 2, 1
sound_call Music_TitleScreen_branch_7e834
sound_call Music_TitleScreen_branch_7e842
sound_call .sub1
sound_call .sub2
drum_note 2, 1
rest 3
drum_note 2, 1
@ -652,9 +644,9 @@ Music_TitleScreen_branch_7e716::
drum_note 2, 4
drum_note 3, 4
drum_note 2, 4
sound_loop 0, Music_TitleScreen_branch_7e716
sound_loop 0, .mainloop
Music_TitleScreen_branch_7e834::
.sub1:
drum_note 2, 1
rest 3
drum_note 2, 1
@ -665,7 +657,7 @@ Music_TitleScreen_branch_7e834::
rest 3
sound_ret
Music_TitleScreen_branch_7e842::
.sub2:
drum_note 2, 1
rest 3
drum_note 2, 1

View file

@ -65,8 +65,7 @@ Music_TrainerBattle_Ch1::
note F_, 6
note C_, 2
note C#, 2
Music_TrainerBattle_branch_22962::
.mainloop:
note_type 12, 11, 5
note D_, 2
note E_, 4
@ -646,8 +645,7 @@ Music_TrainerBattle_branch_22962::
note G#, 1
note A_, 1
note A#, 1
sound_loop 0, Music_TrainerBattle_branch_22962
sound_loop 0, .mainloop
Music_TrainerBattle_Ch2::
duty_cycle 3
@ -721,8 +719,7 @@ Music_TrainerBattle_Ch2::
note D_, 6
octave 4
note A_, 4
Music_TrainerBattle_branch_22bfc::
.mainloop:
note_type 12, 12, 7
octave 3
note B_, 6
@ -950,8 +947,7 @@ Music_TrainerBattle_branch_22bfc::
note C_, 16
note E_, 8
note G_, 8
sound_loop 0, Music_TrainerBattle_branch_22bfc
sound_loop 0, .mainloop
Music_TrainerBattle_Ch3::
vibrato 0, 2, 0
@ -1091,8 +1087,7 @@ Music_TrainerBattle_Ch3::
note A#, 2
octave 3
note C_, 2
Music_TrainerBattle_branch_22d9c::
.mainloop:
octave 2
note A#, 1
note B_, 1
@ -1854,4 +1849,4 @@ Music_TrainerBattle_branch_22d9c::
note E_, 2
note D_, 2
note C_, 2
sound_loop 0, Music_TrainerBattle_branch_22d9c
sound_loop 0, .mainloop

View file

@ -2,8 +2,7 @@ Music_UnusedSong_Ch1::
tempo 144
volume 7, 7
vibrato 5, 1, 6
Music_UnusedSong_branch_a91b::
.mainloop:
note_type 12, 1, 0
octave 6
note E_, 1
@ -178,17 +177,16 @@ Music_UnusedSong_branch_a91b::
rest 6
note B_, 2
rest 6
sound_loop 0, Music_UnusedSong_branch_a91b
sound_ret
sound_loop 0, .mainloop
sound_ret ; unused
Music_UnusedSong_Ch2::
tempo 144
volume 7, 7
toggle_perfect_pitch
vibrato 6, 1, 5
Music_UnusedSong_branch_a9d8::
.mainloop:
note_type 12, 1, 0
octave 6
note E_, 1
@ -334,5 +332,6 @@ Music_UnusedSong_branch_a9d8::
rest 6
note D#, 2
rest 6
sound_loop 0, Music_UnusedSong_branch_a9d8
sound_ret
sound_loop 0, .mainloop
sound_ret ; unused

View file

@ -4,8 +4,7 @@ Music_Vermilion_Ch1::
duty_cycle 3
vibrato 12, 3, 4
toggle_perfect_pitch
Music_Vermilion_branch_b9f6::
.mainloop:
note_type 12, 11, 5
octave 3
note E_, 4
@ -108,14 +107,12 @@ Music_Vermilion_branch_b9f6::
note F#, 2
note G#, 2
note B_, 2
sound_loop 0, Music_Vermilion_branch_b9f6
sound_loop 0, .mainloop
Music_Vermilion_Ch2::
duty_cycle 3
vibrato 10, 2, 3
Music_Vermilion_branch_ba66::
.mainloop:
note_type 12, 12, 7
octave 3
note A_, 8
@ -175,13 +172,11 @@ Music_Vermilion_branch_ba66::
note E_, 4
note F#, 8
note E_, 8
sound_loop 0, Music_Vermilion_branch_ba66
sound_loop 0, .mainloop
Music_Vermilion_Ch3::
note_type 12, 1, 0
Music_Vermilion_branch_baa8::
.mainloop:
octave 4
note A_, 2
note E_, 2
@ -279,35 +274,34 @@ Music_Vermilion_branch_baa8::
note E_, 2
note G#, 2
note E_, 2
sound_loop 0, Music_Vermilion_branch_baa8
sound_loop 0, .mainloop
Music_Vermilion_Ch4::
drum_speed 12
.mainloop:
.loop1:
sound_call .sub1
drum_note 6, 2
drum_note 6, 1
drum_note 6, 1
drum_note 6, 2
drum_note 6, 1
drum_note 6, 1
drum_note 6, 2
drum_note 6, 1
drum_note 6, 1
drum_note 6, 1
drum_note 6, 1
drum_note 6, 1
drum_note 6, 1
sound_loop 4, .loop1
sound_call .sub1
sound_call .sub1
sound_call .sub1
sound_call .sub1
sound_loop 0, .mainloop
Music_Vermilion_branch_bb0e::
sound_call Music_Vermilion_branch_bb3f
drum_note 6, 2
drum_note 6, 1
drum_note 6, 1
drum_note 6, 2
drum_note 6, 1
drum_note 6, 1
drum_note 6, 2
drum_note 6, 1
drum_note 6, 1
drum_note 6, 1
drum_note 6, 1
drum_note 6, 1
drum_note 6, 1
sound_loop 4, Music_Vermilion_branch_bb0e
sound_call Music_Vermilion_branch_bb3f
sound_call Music_Vermilion_branch_bb3f
sound_call Music_Vermilion_branch_bb3f
sound_call Music_Vermilion_branch_bb3f
sound_loop 0, Music_Vermilion_branch_bb0e
Music_Vermilion_branch_bb3f::
.sub1:
drum_note 6, 2
drum_note 6, 1
drum_note 6, 1

View file

@ -60,8 +60,7 @@ Music_WildBattle_Ch1::
note E_, 6
note D#, 10
note C#, 10
Music_WildBattle_branch_230e0::
.mainloop:
note_type 12, 11, 3
note C#, 1
note D_, 1
@ -297,8 +296,7 @@ Music_WildBattle_branch_230e0::
note D#, 6
note_type 12, 10, 7
note C#, 8
sound_loop 0, Music_WildBattle_branch_230e0
sound_loop 0, .mainloop
Music_WildBattle_Ch2::
duty_cycle 3
@ -371,8 +369,7 @@ Music_WildBattle_Ch2::
note G_, 6
note G_, 10
note G_, 10
Music_WildBattle_branch_23225::
.mainloop:
note_type 12, 12, 5
note G_, 6
note F#, 6
@ -459,8 +456,7 @@ Music_WildBattle_branch_23225::
note G_, 6
note_type 12, 12, 7
note F_, 8
sound_loop 0, Music_WildBattle_branch_23225
sound_loop 0, .mainloop
Music_WildBattle_Ch3::
vibrato 0, 2, 0
@ -497,8 +493,7 @@ Music_WildBattle_Ch3::
octave 3
note A#, 2
note B_, 2
Music_WildBattle_branch_232b5::
.introloop:
octave 4
note C_, 2
note G_, 2
@ -530,9 +525,8 @@ Music_WildBattle_branch_232b5::
note A#, 2
note G#, 2
note F_, 2
sound_loop 2, Music_WildBattle_branch_232b5
Music_WildBattle_branch_232d8::
sound_loop 2, .introloop
.mainloop:
note C_, 2
note G_, 2
note C_, 2
@ -735,4 +729,4 @@ Music_WildBattle_branch_232d8::
note G#, 2
note C#, 2
note G#, 2
sound_loop 0, Music_WildBattle_branch_232d8
sound_loop 0, .mainloop

View file

@ -3,7 +3,7 @@ Music_PokeFluteInBattle::
ld a, SFX_CAUGHT_MON
call PlaySoundWaitForCurrent
; then immediately overwrite the channel pointers
ld hl, wChannelCommandPointers + Ch5 * 2
ld hl, wChannelCommandPointers + CHAN5 * 2
ld de, SFX_Pokeflute_Ch5
call Audio2_OverwriteChannelPointer
ld de, SFX_Pokeflute_Ch6

View file

@ -3,7 +3,6 @@ SFX_59_1_Ch5:
square_note 4, 15, 1, 1920
sound_ret
SFX_59_1_Ch6:
duty_cycle 2
square_note 1, 0, 8, 0

View file

@ -5,7 +5,6 @@ SFX_Ball_Poof_Ch5:
pitch_sweep 0, 8
sound_ret
SFX_Ball_Poof_Ch8:
noise_note 15, 10, 2, 34
sound_ret

View file

@ -4,7 +4,6 @@ SFX_Ball_Toss_Ch5:
square_note 15, 15, 2, 1920
sound_ret
SFX_Ball_Toss_Ch6:
duty_cycle 2
square_note 15, 12, 2, 1922

View file

@ -7,7 +7,6 @@ SFX_Battle_1E_Ch5:
pitch_sweep 0, 8
sound_ret
SFX_Battle_1E_Ch8:
noise_note 0, 13, 1, 66
noise_note 4, 10, 1, 50

View file

@ -5,7 +5,6 @@ SFX_Battle_24_Ch5:
pitch_sweep 0, 8
sound_ret
SFX_Battle_24_Ch8:
noise_note 15, 3, -7, 34
noise_note 15, 15, 2, 33

View file

@ -1,25 +1,21 @@
SFX_Battle_27_Ch5:
duty_cycle 2
square_note 15, 3, -7, 1984
SFX_Battle_27_branch_2062a:
.loop1:
square_note 15, 13, -7, 1984
sound_loop 4, SFX_Battle_27_branch_2062a
sound_loop 4, .loop1
square_note 15, 13, 1, 1984
sound_ret
SFX_Battle_27_Ch6:
duty_cycle_pattern 2, 3, 0, 3
square_note 15, 2, -7, 1992
SFX_Battle_27_branch_2063d:
.loop1:
square_note 15, 12, -7, 1991
sound_loop 4, SFX_Battle_27_branch_2063d
sound_loop 4, .loop1
square_note 15, 12, 1, 1992
sound_ret
SFX_Battle_27_Ch8:
noise_note 3, 9, 7, 18
noise_note 3, 10, 1, 17

View file

@ -5,7 +5,6 @@ SFX_Battle_28_Ch5:
sound_loop 12, SFX_Battle_28_Ch5
sound_ret
SFX_Battle_28_Ch6:
duty_cycle_pattern 2, 3, 0, 3
square_note 0, 14, 1, 1985
@ -13,7 +12,6 @@ SFX_Battle_28_Ch6:
sound_loop 12, SFX_Battle_28_Ch6
sound_ret
SFX_Battle_28_Ch8:
noise_note 1, 13, 1, 73
noise_note 1, 13, 1, 41

View file

@ -7,7 +7,6 @@ SFX_Battle_29_Ch5:
square_note 15, 12, 2, 272
sound_ret
SFX_Battle_29_Ch8:
noise_note 10, 15, 3, 53
noise_note 14, 15, 6, 69

View file

@ -8,7 +8,6 @@ SFX_Battle_2A_Ch5:
square_note 8, 13, 1, 1536
sound_ret
SFX_Battle_2A_Ch6:
duty_cycle_pattern 2, 0, 3, 1
square_note 5, 14, 4, 1504
@ -18,7 +17,6 @@ SFX_Battle_2A_Ch6:
sound_loop 3, SFX_Battle_2A_Ch6
sound_ret
SFX_Battle_2A_Ch8:
noise_note 5, 12, 3, 51
noise_note 3, 9, 2, 67

View file

@ -9,7 +9,6 @@ SFX_Battle_2B_Ch5:
square_note 8, 8, 1, 1024
sound_ret
SFX_Battle_2B_Ch8:
noise_note 3, 6, 2, 34
noise_note 3, 10, 2, 50

View file

@ -6,7 +6,6 @@ SFX_Battle_2C_Ch5:
sound_loop 3, SFX_Battle_2C_Ch5
sound_ret
SFX_Battle_2C_Ch6:
duty_cycle_pattern 2, 0, 3, 1
square_note 7, 14, 4, 1072
@ -15,7 +14,6 @@ SFX_Battle_2C_Ch6:
sound_loop 4, SFX_Battle_2C_Ch6
sound_ret
SFX_Battle_2C_Ch8:
noise_note 9, 15, 4, 68
noise_note 9, 15, 2, 67

View file

@ -7,7 +7,6 @@ SFX_Battle_2E_Ch5:
sound_loop 8, SFX_Battle_2E_Ch5
sound_ret
SFX_Battle_2E_Ch6:
duty_cycle_pattern 2, 3, 0, 3
square_note 2, 14, 1, 770
@ -17,7 +16,6 @@ SFX_Battle_2E_Ch6:
sound_loop 8, SFX_Battle_2E_Ch6
sound_ret
SFX_Battle_2E_Ch8:
noise_note 2, 13, 3, 16
noise_note 3, 13, 3, 17

View file

@ -5,7 +5,6 @@ SFX_Battle_2F_Ch5:
sound_loop 8, SFX_Battle_2F_Ch5
sound_ret
SFX_Battle_2F_Ch6:
duty_cycle_pattern 2, 3, 0, 3
square_note 4, 14, 2, 514
@ -13,7 +12,6 @@ SFX_Battle_2F_Ch6:
sound_loop 9, SFX_Battle_2F_Ch6
sound_ret
SFX_Battle_2F_Ch8:
noise_note 4, 15, -7, 67
noise_note 4, 15, 2, 68

View file

@ -7,7 +7,6 @@ SFX_Battle_31_Ch5:
square_note 15, 15, 2, 2016
sound_ret
SFX_Battle_31_Ch6:
duty_cycle 3
square_note 15, 15, -7, 2018

View file

@ -5,7 +5,6 @@ SFX_Battle_32_Ch5:
pitch_sweep 0, 8
sound_ret
SFX_Battle_32_Ch6:
duty_cycle 3
square_note 8, 15, 1, 1793

View file

@ -7,7 +7,6 @@ SFX_Battle_33_Ch5:
square_note 8, 15, 1, 1792
sound_ret
SFX_Battle_33_Ch6:
duty_cycle 3
square_note 6, 14, 1, 1296

View file

@ -5,7 +5,6 @@ SFX_Battle_34_Ch5:
square_note 15, 15, 3, 1024
sound_ret
SFX_Battle_34_Ch6:
duty_cycle_pattern 2, 3, 1, 0
square_note 8, 14, -7, 960
@ -13,7 +12,6 @@ SFX_Battle_34_Ch6:
square_note 15, 14, 3, 960
sound_ret
SFX_Battle_34_Ch8:
noise_note 4, 15, -7, 81
noise_note 8, 15, -7, 84

View file

@ -12,7 +12,6 @@ SFX_Battle_35_Ch5:
note G#, 8
sound_ret
SFX_Battle_35_Ch6:
execute_music
vibrato 10, 2, 3

View file

@ -11,15 +11,13 @@ SFX_Battle_36_Ch5:
square_note 2, 15, 1, 1984
square_note 2, 15, 1, 1792
square_note 2, 15, 1, 2000
SFX_Battle_36_branch_20930:
.loop1:
square_note 2, 15, 1, 1792
square_note 2, 15, 1, 2016
sound_loop 12, SFX_Battle_36_branch_20930
sound_loop 12, .loop1
square_note 15, 15, 1, 1792
sound_ret
SFX_Battle_36_Ch6:
duty_cycle_pattern 2, 3, 0, 3
square_note 2, 15, 1, 1921
@ -35,11 +33,10 @@ SFX_Battle_36_Ch6:
square_note 2, 15, 1, 2001
square_note 2, 15, 1, 1793
square_note 2, 15, 1, 2017
sound_loop 12, SFX_Battle_36_branch_20930
sound_loop 12, SFX_Battle_36_Ch5.loop1
square_note 15, 15, 1, 1793
sound_ret
SFX_Battle_36_Ch8:
noise_note 1, 13, 1, 73
noise_note 1, 13, 1, 41

View file

@ -21,7 +21,6 @@ SFX_Caught_Mon_Ch5:
note E_, 8
sound_ret
SFX_Caught_Mon_Ch6:
execute_music
duty_cycle 2
@ -43,7 +42,6 @@ SFX_Caught_Mon_Ch6:
note G#, 8
sound_ret
SFX_Caught_Mon_Ch7:
execute_music
note_type 6, 1, 0

View file

@ -8,7 +8,6 @@ SFX_Denied_1_Ch5:
square_note 1, 0, 0, 0
sound_ret
SFX_Denied_1_Ch6:
duty_cycle 3
square_note 4, 15, 0, 1025

View file

@ -7,7 +7,6 @@ SFX_Dex_Page_Added_Ch5:
pitch_sweep 0, 8
sound_ret
SFX_Dex_Page_Added_Ch6:
duty_cycle 2
square_note 15, 9, 2, 1536

View file

@ -3,7 +3,6 @@ SFX_Faint_Thud_Ch5:
pitch_sweep 0, 8
sound_ret
SFX_Faint_Thud_Ch8:
noise_note 4, 15, 5, 51
noise_note 8, 15, 4, 34

View file

@ -15,7 +15,6 @@ SFX_Get_Item1_1_Ch5:
note E_, 4
sound_ret
SFX_Get_Item1_1_Ch6:
execute_music
vibrato 8, 2, 7
@ -29,7 +28,6 @@ SFX_Get_Item1_1_Ch6:
note B_, 4
sound_ret
SFX_Get_Item1_1_Ch7:
execute_music
note_type 4, 1, 0

View file

@ -24,7 +24,6 @@ SFX_Get_Item2_1_Ch5:
note C_, 8
sound_ret
SFX_Get_Item2_1_Ch6:
execute_music
vibrato 8, 2, 7
@ -45,7 +44,6 @@ SFX_Get_Item2_1_Ch6:
note A_, 8
sound_ret
SFX_Get_Item2_1_Ch7:
execute_music
note_type 5, 1, 0

View file

@ -22,7 +22,6 @@ SFX_Get_Key_Item_1_Ch5:
note A#, 8
sound_ret
SFX_Get_Key_Item_1_Ch6:
execute_music
vibrato 4, 2, 3
@ -46,7 +45,6 @@ SFX_Get_Key_Item_1_Ch6:
note D#, 8
sound_ret
SFX_Get_Key_Item_1_Ch7:
execute_music
note_type 5, 1, 0

View file

@ -19,7 +19,6 @@ SFX_Level_Up_Ch5:
note F_, 8
sound_ret
SFX_Level_Up_Ch6:
execute_music
vibrato 4, 2, 2
@ -39,7 +38,6 @@ SFX_Level_Up_Ch6:
note A_, 8
sound_ret
SFX_Level_Up_Ch7:
execute_music
note_type 6, 1, 0

View file

@ -20,7 +20,6 @@ SFX_Pokedex_Rating_1_Ch5:
note F_, 4
sound_ret
SFX_Pokedex_Rating_1_Ch6:
execute_music
duty_cycle 2
@ -43,7 +42,6 @@ SFX_Pokedex_Rating_1_Ch6:
note F_, 4
sound_ret
SFX_Pokedex_Rating_1_Ch7:
execute_music
note_type 5, 1, 0

View file

@ -1,7 +1,6 @@
SFX_PokefluteInBattle_Ch5:
tempo 256
SFX_PokefluteInBattle_Ch6:
execute_music
note_type 8, 0, 0

View file

@ -7,7 +7,6 @@ SFX_Psybeam_Ch5:
square_note 10, 15, 1, 1600
sound_ret
SFX_Psybeam_Ch6:
duty_cycle_pattern 2, 3, 0, 3
square_note 10, 15, 3, 1393
@ -17,7 +16,6 @@ SFX_Psybeam_Ch6:
square_note 10, 15, 1, 1393
sound_ret
SFX_Psybeam_Ch8:
noise_note 2, 13, 1, 74
noise_note 2, 13, 2, 42

Some files were not shown because too many files have changed in this diff Show more